Browse Source

Merge branch 'cli-module-support'

Matt Clarkson 13 years ago
parent
commit
12cc05735a

+ 2 - 0
Libs/CommandLineModules/Backend/LocalProcess/ctkCmdLineModuleProcessTask.cpp

@@ -83,6 +83,8 @@ void ctkCmdLineModuleProcessTask::run()
   QObject::connect(&process, SIGNAL(finished(int)), &localLoop, SLOT(quit()));
   QObject::connect(&process, SIGNAL(error(QProcess::ProcessError)), &localLoop, SLOT(quit()));
 
+  qDebug() << "ctkCmdLineModuleProcessTask::run() starting d->Location=" << d->Location << ", d->Args=" << d->Args;
+
   process.start(d->Location, d->Args, QIODevice::ReadOnly | QIODevice::Text);
 
   ctkCmdLineModuleProcessWatcher progressWatcher(process, d->Location, *this);

+ 4 - 4
Libs/CommandLineModules/Frontend/QtGui/Resources/ctkCmdLineModuleXmlToQtUi.xsl

@@ -438,7 +438,7 @@
             <xsl:call-template name="createQtDesignerStringListProperty"/>
             <xsl:if test="$imageInputSetProperty != ''">
               <property name="{$imageInputSetProperty}">
-                <set>{$imageInputSetValue}</set>
+                <set><xsl:value-of select="$imageInputSetValue"/></set>
               </property>
             </xsl:if>
           </widget>
@@ -449,7 +449,7 @@
             <xsl:call-template name="createQtDesignerStringListProperty"/>
             <xsl:if test="$imageOutputSetProperty != ''">
               <property name="{$imageOutputSetProperty}">
-                <set>{$imageOutputSetValue}</set>
+                <set><xsl:value-of select="$imageOutputSetValue"/></set>
               </property>
             </xsl:if>
           </widget>
@@ -474,7 +474,7 @@
             <xsl:call-template name="createQtDesignerStringListProperty"/>
             <xsl:if test="$fileInputSetProperty != ''">
               <property name="{$fileInputSetProperty}">
-                <set>{$fileInputSetValue}</set>
+                <set><xsl:value-of select="$fileInputSetValue"/></set>
               </property>
             </xsl:if>
           </widget>
@@ -485,7 +485,7 @@
             <xsl:call-template name="createQtDesignerStringListProperty"/>
             <xsl:if test="$fileOutputSetProperty != ''">
               <property name="{$fileOutputSetProperty}">
-                <set>{$fileOutputSetValue}</set>
+                <set><xsl:value-of select="$fileOutputSetValue"/></set>
               </property>
             </xsl:if>
           </widget>

+ 1 - 1
Libs/CommandLineModules/Frontend/QtGui/ctkCmdLineModuleFrontendQtGui.h

@@ -161,7 +161,7 @@ public:
    * ctkCmdLineModuleFrontend::DisplayRole. If it does, it sets the value of the default
    * QObject property to the provided value.
    *
-   * @see ctkCmdLiineModuleFrontend::setValue()
+   * @see ctkCmdLineModuleFrontend::setValue()
    */
   virtual void setValue(const QString& parameter, const QVariant& value, int role = DisplayRole);