Use QIODevice types in XslTransform class.

Libs/CommandLineModules/Core/ctkCmdLineModuleXslTransform.cpp

@@ -32,13 +32,18 @@
 #include <QDebug>
 
 
-ctkCmdLineModuleXslTransform::ctkCmdLineModuleXslTransform(QIODevice *input)
+ctkCmdLineModuleXslTransform::ctkCmdLineModuleXslTransform(QIODevice *input, QIODevice *output)
   : ctkCmdLineModuleXmlValidator(input),
-    OutputSchema(0), Transformation(0)
+    Validate(false), OutputSchema(0), Transformation(0), Output(output)
 {
 }
 
-QString ctkCmdLineModuleXslTransform::output() const
+void ctkCmdLineModuleXslTransform::setOutput(QIODevice* output)
+{
+  Output = output;
+}
+
+QIODevice* ctkCmdLineModuleXslTransform::output() const
 {
   return Output;
 }
@@ -50,6 +55,12 @@ void ctkCmdLineModuleXslTransform::setOutputSchema(QIODevice *output)
 
 bool ctkCmdLineModuleXslTransform::transform()
 {
+  if (!Output)
+  {
+    ErrorStr = "No output device set";
+    return false;
+  }
+
   QIODevice* inputDevice = input();
   if (!inputDevice)
   {
@@ -82,15 +93,34 @@ bool ctkCmdLineModuleXslTransform::transform()
   }
   xslTransform.setQuery(transformation);
 
-  if (!xslTransform.evaluateTo(&Output))
+  bool closeOutput = false;
+  if (!(Output->openMode() & QIODevice::WriteOnly))
+  {
+    Output->open(QIODevice::WriteOnly);
+    closeOutput = true;
+  }
+
+  if (!xslTransform.evaluateTo(Output))
   {
-    Output.clear();
     QString msg("Error transforming XML input, at line %1, column %2: %3");
     ErrorStr = msg.arg(msgHandler.line()).arg(msgHandler.column())
         .arg(msgHandler.statusMessage());
     return false;
   }
 
+  if (closeOutput)
+  {
+    Output->close();
+  }
+  else
+  {
+    Output->reset();
+  }
+
+  if (Validate)
+  {
+    return validateOutput();
+  }
   return true;
 }
 
@@ -99,16 +129,15 @@ void ctkCmdLineModuleXslTransform::setXslTransformation(QIODevice *transformatio
   Transformation = transformation;
 }
 
+void ctkCmdLineModuleXslTransform::setValidateOutput(bool validate)
+{
+  Validate = validate;
+}
+
 bool ctkCmdLineModuleXslTransform::validateOutput()
 {
   ErrorStr.clear();
 
-  if (Output.isEmpty())
-  {
-    // nothing to validate
-    return true;
-  }
-
   QIODevice* outputSchema = OutputSchema;
 
   // If there is no custom schema for validating the output, we just return.
@@ -139,10 +168,7 @@ bool ctkCmdLineModuleXslTransform::validateOutput()
   QXmlSchemaValidator validator(schema);
   validator.setMessageHandler(&msgHandler);
 
-  QByteArray outputData;
-  outputData.append(Output);
-
-  if (!validator.validate(outputData))
+  if (!validator.validate(Output))
   {
     QString msg("Error validating transformed XML input, at line %1, column %2: %3");
     ErrorStr = msg.arg(msgHandler.line()).arg(msgHandler.column())

Libs/CommandLineModules/Core/ctkCmdLineModuleXslTransform.h

@@ -38,7 +38,10 @@ class CTK_CMDLINEMODULECORE_EXPORT ctkCmdLineModuleXslTransform
 
 public:
 
-  ctkCmdLineModuleXslTransform(QIODevice* input = 0);
+  ctkCmdLineModuleXslTransform(QIODevice* input = 0, QIODevice* output = 0);
+
+  void setOutput(QIODevice* output);
+  QIODevice* output() const;
 
   void setOutputSchema(QIODevice* output);
 
@@ -52,21 +55,23 @@ public:
    */
   bool transform();
 
-  QString output() const;
-
   void setXslTransformation(QIODevice* transformation);
 
-  bool validateOutput();
+  void setValidateOutput(bool validate);
 
   bool error() const;
   QString errorString() const;
 
 private:
 
+  bool validateOutput();
+
+  bool Validate;
+
   QIODevice* OutputSchema;
   QIODevice* Transformation;
 
-  QString Output;
+  QIODevice* Output;
   QString ErrorStr;
 };
 

Libs/CommandLineModules/QtGui/ctkCmdLineModuleInstanceQtGui.cpp

@@ -44,7 +44,9 @@ QObject* ctkCmdLineModuleInstanceQtGui::guiHandle() const
   QBuffer input;
   input.setData(moduleReference().rawXmlDescription());
 
-  ctkCmdLineModuleXslTransform xslTransform(&input);
+  QBuffer uiForm;
+  uiForm.open(QIODevice::ReadWrite);
+  ctkCmdLineModuleXslTransform xslTransform(&input, &uiForm);
   if (!xslTransform.transform())
   {
     // maybe throw an exception
@@ -53,10 +55,6 @@ QObject* ctkCmdLineModuleInstanceQtGui::guiHandle() const
   }
 
   QUiLoader uiLoader;
-  QByteArray uiBlob;
-  uiBlob.append(xslTransform.output());
-
-  QBuffer uiForm(&uiBlob);
   WidgetTree = uiLoader.load(&uiForm);
   return WidgetTree;
 }