Renamed library and sample app for CLI module support.

Applications/ctkCLIPluginExplorer/CMakeLists.txt

@@ -1,28 +1,28 @@
-project(ctkCLIPluginExplorer)
+project(ctkCommandLineModuleExplorer)
 
 #
 # See CTK/CMake/ctkMacroBuildApp.cmake for details
 #
 
 set(KIT_SRCS
-  ctkCLIPluginExplorerMain.cpp
-  ctkCLIPluginExplorerMainWindow.h
-  ctkCLIPluginExplorerMainWindow.cpp
+  ctkCommandLineModuleExplorerMain.cpp
+  ctkCLModuleExplorerMainWindow.h
+  ctkCLModuleExplorerMainWindow.cpp
 )
 
 # Headers that should run through moc
 set(KIT_MOC_SRCS
-  ctkCLIPluginExplorerMainWindow.h
+  ctkCLModuleExplorerMainWindow.h
 )
 
 # UI files
 set(KIT_UI_FORMS
-  ctkCLIPluginExplorerMainWindow.ui
+  ctkCLModuleExplorerMainWindow.ui
 )
 
 # Resources
 set(KIT_resources
-  resources/ctkCLIPluginExplorer.qrc
+  resources/ctkCLModuleExplorer.qrc
 )
 
 set(QT_USE_QTUITOOLS 1)

Applications/ctkCLIPluginExplorer/ctkCLIPluginExplorerMainWindow.cpp

@@ -19,8 +19,8 @@
   
 =============================================================================*/
 
-#include "ctkCLIPluginExplorerMainWindow.h"
-#include "ui_ctkCLIPluginExplorerMainWindow.h"
+#include "ctkCLModuleExplorerMainWindow.h"
+#include "ui_ctkCLModuleExplorerMainWindow.h"
 
 #include <ctkModuleDescriptionValidator.h>
 #include <ctkModuleManager.h>
@@ -79,22 +79,22 @@ private:
 };
 
 
-ctkCLIPluginExplorerMainWindow::ctkCLIPluginExplorerMainWindow(QWidget *parent) :
+ctkCLModuleExplorerMainWindow::ctkCLModuleExplorerMainWindow(QWidget *parent) :
   QMainWindow(parent),
-  ui(new Ui::ctkCLIPluginExplorerMainWindow),
+  ui(new Ui::ctkCLModuleExplorerMainWindow),
   factory(new ctkModuleDescriptionDefaultFactory),
   moduleManager(factory)
 {
   ui->setupUi(this);
 }
 
-ctkCLIPluginExplorerMainWindow::~ctkCLIPluginExplorerMainWindow()
+ctkCLModuleExplorerMainWindow::~ctkCLModuleExplorerMainWindow()
 {
   delete ui;
   delete factory;
 }
 
-void ctkCLIPluginExplorerMainWindow::addModuleTab(const ctkModuleReference& moduleRef)
+void ctkCLModuleExplorerMainWindow::addModuleTab(const ctkModuleReference& moduleRef)
 {
   if (moduleRef.widgetTree() == 0) return;
 
@@ -103,7 +103,7 @@ void ctkCLIPluginExplorerMainWindow::addModuleTab(const ctkModuleReference& modu
   mapTabToModuleRef[tabIndex] = moduleRef;
 }
 
-void ctkCLIPluginExplorerMainWindow::addModule(const QString &location)
+void ctkCLModuleExplorerMainWindow::addModule(const QString &location)
 {
   ctkModuleReference ref = moduleManager.addModule(location);
   if (ref.isValid())
@@ -112,7 +112,7 @@ void ctkCLIPluginExplorerMainWindow::addModule(const QString &location)
   }
 }
 
-void ctkCLIPluginExplorerMainWindow::testModuleXML(const QByteArray &xml)
+void ctkCLModuleExplorerMainWindow::testModuleXML(const QByteArray &xml)
 {
   QObject* root = factory->createGUIFromXML(xml);
   if (root)
@@ -123,7 +123,7 @@ void ctkCLIPluginExplorerMainWindow::testModuleXML(const QByteArray &xml)
   }
 }
 
-void ctkCLIPluginExplorerMainWindow::on_actionRun_triggered()
+void ctkCLModuleExplorerMainWindow::on_actionRun_triggered()
 {
   qDebug() << "Creating module command line...";
 
@@ -142,14 +142,14 @@ void ctkCLIPluginExplorerMainWindow::on_actionRun_triggered()
   futureWatcher.setFuture(future);
 }
 
-void ctkCLIPluginExplorerMainWindow::futureFinished()
+void ctkCLModuleExplorerMainWindow::futureFinished()
 {
   qDebug() << "*** Future finished";
   qDebug() << "stdout:" << futureWatcher.future().standardOutput();
   qDebug() << "stderr:" << futureWatcher.future().standardError();
 }
 
-ctkModuleReference ctkCLIPluginExplorerMainWindow::moduleReference(int tabIndex)
+ctkModuleReference ctkCLModuleExplorerMainWindow::moduleReference(int tabIndex)
 {
   return mapTabToModuleRef[tabIndex];
 }

Applications/ctkCLIPluginExplorer/ctkCLIPluginExplorerMainWindow.h

@@ -29,16 +29,16 @@
 class ctkModuleDescriptionDefaultFactory;
 
 namespace Ui {
-class ctkCLIPluginExplorerMainWindow;
+class ctkCLModuleExplorerMainWindow;
 }
 
-class ctkCLIPluginExplorerMainWindow : public QMainWindow
+class ctkCLModuleExplorerMainWindow : public QMainWindow
 {
   Q_OBJECT
   
 public:
-  explicit ctkCLIPluginExplorerMainWindow(QWidget *parent = 0);
-  ~ctkCLIPluginExplorerMainWindow();
+  explicit ctkCLModuleExplorerMainWindow(QWidget *parent = 0);
+  ~ctkCLModuleExplorerMainWindow();
 
   void addModule(const QString& location);
   void testModuleXML(const QByteArray& xml);
@@ -56,7 +56,7 @@ protected:
   ctkModuleReference moduleReference(int tabIndex);
   
 private:
-  Ui::ctkCLIPluginExplorerMainWindow *ui;
+  Ui::ctkCLModuleExplorerMainWindow *ui;
 
   ctkModuleDescriptionDefaultFactory* factory;
   ctkModuleManager moduleManager;

Applications/ctkCLIPluginExplorer/ctkCLIPluginExplorerMainWindow.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ctkCLIPluginExplorerMainWindow</class>
- <widget class="QMainWindow" name="ctkCLIPluginExplorerMainWindow">
+ <class>ctkCLModuleExplorerMainWindow</class>
+ <widget class="QMainWindow" name="ctkCLModuleExplorerMainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>CTK CLI Plug-in Explorer</string>
+   <string>CTK Command Line Module Explorer</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
@@ -62,7 +62,7 @@
   </widget>
   <action name="actionRun">
    <property name="icon">
-    <iconset resource="resources/ctkCLIPluginExplorer.qrc">
+    <iconset resource="resources/ctkCLModuleExplorer.qrc">
      <normaloff>:/icons/run.png</normaloff>:/icons/run.png</iconset>
    </property>
    <property name="text">
@@ -77,7 +77,7 @@
   </action>
   <action name="actionStop">
    <property name="icon">
-    <iconset resource="resources/ctkCLIPluginExplorer.qrc">
+    <iconset resource="resources/ctkCLModuleExplorer.qrc">
      <normaloff>:/icons/stop.png</normaloff>:/icons/stop.png</iconset>
    </property>
    <property name="text">
@@ -92,7 +92,7 @@
   </action>
  </widget>
  <resources>
-  <include location="resources/ctkCLIPluginExplorer.qrc"/>
+  <include location="resources/ctkCLModuleExplorer.qrc"/>
  </resources>
  <connections/>
 </ui>

Applications/ctkCLIPluginExplorer/ctkCLIPluginExplorerMain.cpp

@@ -33,7 +33,7 @@
 #include <ctkCommandLineParser.h>
 #include <ctkModuleDescriptionValidator.h>
 
-#include "ctkCLIPluginExplorerMainWindow.h"
+#include "ctkCLModuleExplorerMainWindow.h"
 
 int main(int argc, char** argv)
 {
@@ -99,7 +99,7 @@ int main(int argc, char** argv)
 
   //ctkModuleDescription* descr = ctkModuleDescription::parse(&input);
 
-  ctkCLIPluginExplorerMainWindow mainWindow;
+  ctkCLModuleExplorerMainWindow mainWindow;
 
   if (args.contains("cli-xml"))
   {

Applications/ctkCLIPluginExplorer/target_libraries.cmake

@@ -5,5 +5,5 @@
 # 
 
 set(target_libraries
-  CTKModuleDescription
+  CTKCommandLineModules
   )

CMakeLists.txt

@@ -449,8 +449,8 @@ ctk_lib_option(Visualization/VTK/Core
 ctk_lib_option(Visualization/VTK/Widgets
                "Build the VTK Widgets library" OFF)
                
-ctk_lib_option(ModuleDescription
-               "Build the Command Line Module Description library" OFF)
+ctk_lib_option(CommandLineModules
+               "Build the Command Line Module support library" OFF)
 
 #ctk_lib_option(Visualization/XIP
 #               "Build the XIP library" OFF)
@@ -467,8 +467,6 @@ set(CTK_ENABLED_LIBS ${_enabled_libs} CACHE INTERNAL "" FORCE)
 # CTK Applications - Use ON or OFF to indicate if the application should be built by default
 #
  
-#ctk_app_option(ctkCLIPluginExplorer "Build the CLI Plugin Explorer" OFF)
-
 ctk_app_option(ctkDICOM
                "Build the DICOM example application" OFF
                CTK_ENABLE_DICOM AND CTK_BUILD_EXAMPLES)
@@ -505,8 +503,8 @@ ctk_app_option(ctkEventBusDemo
                "Build the DICOM example application" OFF
                CTK_ENABLE_PluginFramework AND CTK_BUILD_EXAMPLES)
 
-ctk_app_option(ctkCLIPluginExplorer
-               "Build the Command Line Interface Plugin Explorer" OFF
+ctk_app_option(ctkCommandLineModuleExplorer
+               "Build the Command Line Module Explorer" OFF
                CTK_BUILD_EXAMPLES)
                
 ctk_app_option(ctkPluginBrowser

Libs/ModuleDescription/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(CTKModuleDescription)
+project(CTKCommandLineModules)
 
 #
 # 3rd party dependencies
@@ -8,7 +8,7 @@ project(CTKModuleDescription)
 # See CTK/CMake/ctkMacroBuildLib.cmake for details
 #
 
-set(KIT_export_directive "CTK_MODULDESC_EXPORT")
+set(KIT_export_directive "CTK_CMDLINEMODULE_EXPORT")
 
 # Additional directories to include
 

Libs/ModuleDescription/ctkModuleDescription.h

@@ -38,7 +38,7 @@ struct ctkModuleDescriptionPrivate;
 * command (with path) for an executable.
 * - Location: This is path to the executable for the module
 */
-class CTK_MODULDESC_EXPORT ctkModuleDescription
+class CTK_CMDLINEMODULE_EXPORT ctkModuleDescription
 {
   Q_DECLARE_PRIVATE(ctkModuleDescription)
 
@@ -123,6 +123,6 @@ private:
 
 };
 
-CTK_MODULDESC_EXPORT QTextStream & operator<<(QTextStream& os, const ctkModuleDescription& module);
+CTK_CMDLINEMODULE_EXPORT QTextStream & operator<<(QTextStream& os, const ctkModuleDescription& module);
 
 #endif

Libs/ModuleDescription/ctkModuleDescriptionValidator.h

@@ -22,13 +22,13 @@
 #ifndef CTKMODULEDESCRIPTIONVALIDATOR_H
 #define CTKMODULEDESCRIPTIONVALIDATOR_H
 
-#include <ctkModuleDescriptionExport.h>
+#include <ctkCommandLineModulesExport.h>
 
 #include <QString>
 
 class QIODevice;
 
-class CTK_MODULDESC_EXPORT ctkModuleDescriptionValidator
+class CTK_CMDLINEMODULE_EXPORT ctkModuleDescriptionValidator
 {
 
 public:

Libs/ModuleDescription/ctkModuleManager.h

@@ -25,7 +25,7 @@
 #include <QStringList>
 #include <QString>
 
-#include <ctkModuleDescriptionExport.h>
+#include <ctkCommandLineModulesExport.h>
 
 #include "ctkModuleReference.h"
 #include "ctkModuleProcessFuture.h"
@@ -46,7 +46,7 @@ struct ctkModuleDescriptionFactory
 };
 
 /// The methods in this class are for playing around... no API design yet
-class CTK_MODULDESC_EXPORT ctkModuleManager
+class CTK_CMDLINEMODULE_EXPORT ctkModuleManager
 {
 public:
   ctkModuleManager(ctkModuleDescriptionFactory* descriptionFactory);

Libs/ModuleDescription/ctkModuleObjectHierarchyReader.h

@@ -26,13 +26,13 @@
 #include <QScopedPointer>
 #include <QVariant>
 
-#include <ctkModuleDescriptionExport.h>
+#include <ctkCommandLineModulesExport.h>
 
 class QObject;
 
 class ctkModuleObjectHierarchyReaderPrivate;
 
-class CTK_MODULDESC_EXPORT ctkModuleObjectHierarchyReader
+class CTK_CMDLINEMODULE_EXPORT ctkModuleObjectHierarchyReader
 {
 
 public:

Libs/ModuleDescription/ctkModuleParameter.h

@@ -21,7 +21,7 @@
 #ifndef __ctkModuleParameter_h
 #define __ctkModuleParameter_h
 
-#include "ctkModuleDescriptionExport.h"
+#include "ctkCommandLineModulesExport.h"
 
 #include <QTextStream>
 
@@ -36,7 +36,7 @@ class ctkModuleParameterPrivate;
  * stored.
  *
  */
-class CTK_MODULDESC_EXPORT ctkModuleParameter
+class CTK_CMDLINEMODULE_EXPORT ctkModuleParameter
 {
   Q_DECLARE_PRIVATE(ctkModuleParameter)
 
@@ -152,6 +152,6 @@ private:
   ctkModuleParameterPrivate * const d_ptr;
 };
 
-CTK_MODULDESC_EXPORT QTextStream& operator<<(QTextStream& os, const ctkModuleParameter& parameter);
+CTK_CMDLINEMODULE_EXPORT QTextStream& operator<<(QTextStream& os, const ctkModuleParameter& parameter);
 
 #endif

Libs/ModuleDescription/ctkModuleParameterGroup.h

@@ -29,7 +29,7 @@ class ctkModuleParameterGroupPrivate;
 *  \brief Group of parameters
 *
 */
-class CTK_MODULDESC_EXPORT ctkModuleParameterGroup
+class CTK_CMDLINEMODULE_EXPORT ctkModuleParameterGroup
 {
   Q_DECLARE_PRIVATE(ctkModuleParameterGroup)
 
@@ -65,6 +65,6 @@ private:
   ctkModuleParameterGroupPrivate * const d_ptr;
 };
 
-CTK_MODULDESC_EXPORT QTextStream & operator<<(QTextStream &os, const ctkModuleParameterGroup& group);
+CTK_CMDLINEMODULE_EXPORT QTextStream & operator<<(QTextStream &os, const ctkModuleParameterGroup& group);
 
 #endif

Libs/ModuleDescription/ctkModuleProcessFuture.h

@@ -22,7 +22,7 @@
 #ifndef CTKMODULEPROCESSFUTURE_H
 #define CTKMODULEPROCESSFUTURE_H
 
-#include <ctkModuleDescriptionExport.h>
+#include <ctkCommandLineModulesExport.h>
 
 #include <QFutureInterface>
 #include <QFutureWatcher>
@@ -35,7 +35,7 @@ typedef QFutureWatcher<ctkModuleProcessDummy> ctkModuleProcessFutureWatcher;
 
 
 template<>
-class CTK_MODULDESC_EXPORT QFutureInterface<ctkModuleProcessDummy> : public QFutureInterfaceBase
+class CTK_CMDLINEMODULE_EXPORT QFutureInterface<ctkModuleProcessDummy> : public QFutureInterfaceBase
 {
 
 public:

Libs/ModuleDescription/ctkModuleReference.h

@@ -22,7 +22,7 @@
 #ifndef CTKMODULEREFERENCE_H
 #define CTKMODULEREFERENCE_H
 
-#include <ctkModuleDescriptionExport.h>
+#include <ctkCommandLineModulesExport.h>
 
 #include <QByteArray>
 #include <QString>
@@ -31,7 +31,7 @@ class QObject;
 
 class ctkModuleReferencePrivate;
 
-class CTK_MODULDESC_EXPORT ctkModuleReference
+class CTK_CMDLINEMODULE_EXPORT ctkModuleReference
 {
 public: