Renamed dah plugins to org_commontk_dah_*

All DICOM application hosting related plugins are now named
consistently and the plugin installation and starting logic
for the example host and app is refined.

Applications/ctkExampleHost/ctkExampleHostMain.cpp

@@ -68,15 +68,25 @@ int main(int argv, char** argc)
   QStringList libFilter;
   libFilter << "*.dll" << "*.so" << "*.dylib";
   QDirIterator dirIter(pluginPath, libFilter, QDir::Files);
+
+  QStringList pluginsToInstall;
+  pluginsToInstall << "org_commontk_dah_core" << "org_commontk_dah_host"
+                   << "org_commontk_dah_examplehost";
+
+  QList<ctkPlugin*> installedPlugins;
   while(dirIter.hasNext())
   {
     try
     {
       QString fileLocation = dirIter.next();
-      if (fileLocation.contains("org_commontk_dicom"))
+      foreach(QString pluginToInstall, pluginsToInstall)
       {
-        ctkPlugin* plugin = framework->getPluginContext()->installPlugin(QUrl::fromLocalFile(fileLocation));
-        plugin->start(ctkPlugin::START_TRANSIENT);
+        if (fileLocation.contains(pluginToInstall))
+        {
+          ctkPlugin* plugin = framework->getPluginContext()->installPlugin(QUrl::fromLocalFile(fileLocation));
+          installedPlugins << plugin;
+          break;
+        }
       }
     }
     catch (const ctkPluginException& e)
@@ -85,6 +95,11 @@ int main(int argv, char** argc)
     }
   }
 
+  foreach(ctkPlugin* plugin, installedPlugins)
+  {
+    plugin->start(ctkPlugin::START_TRANSIENT);
+  }
+
   framework->start();
 
 

Applications/ctkExampleHost/target_libraries.cmake

@@ -5,6 +5,6 @@
 # 
 
 SET(target_libraries
-  org_commontk_dicom_examplehost
+  org_commontk_dah_examplehost
 
   )

Applications/ctkExampleHostedApp/ctkExampleHostedAppMain.cpp

@@ -111,8 +111,7 @@ int main(int argv, char** argc)
   }
   else
   {
-    pluginName = "org_commontk_dicomhosting_app_";
-    pluginName += QFileInfo(qApp->arguments().at(0)).fileName();
+    pluginName = "org_commontk_dah_exampleapp";
   }
 
   // try to find the plugin and install all plugins available in 
@@ -122,15 +121,17 @@ int main(int argv, char** argc)
   QDirIterator dirIter(pluginPath, libFilter, QDir::Files);
   bool pluginFound = false;
   QString pluginFileLocation;
+  QList<ctkPlugin*> installedPlugins;
   while(dirIter.hasNext())
   {
     try
     {
       QString fileLocation = dirIter.next();
-      if (fileLocation.contains("org_commontk_dicom_wg23"))
+      if (fileLocation.contains("org_commontk_dah") && !fileLocation.contains(pluginName))
       {
         ctkPlugin* plugin = framework->getPluginContext()->installPlugin(QUrl::fromLocalFile(fileLocation));
-        plugin->start(ctkPlugin::START_TRANSIENT);
+        installedPlugins << plugin;
+        //plugin->start(ctkPlugin::START_TRANSIENT);
       }
       if (fileLocation.contains(pluginName))
       {
@@ -144,6 +145,18 @@ int main(int argv, char** argc)
     }
   }
 
+  try
+  {
+    foreach(ctkPlugin* plugin, installedPlugins)
+    {
+      plugin->start(ctkPlugin::START_TRANSIENT);
+    }
+  }
+  catch (const ctkPluginException& e)
+  {
+    qCritical() << e.what();
+  }
+
   // if we did not find the business logic: abort
   if(!pluginFound)
   {

Applications/ctkExampleHostedApp/target_libraries.cmake

@@ -6,5 +6,5 @@
 
 SET(target_libraries
   CTKPluginFramework
-  org_commontk_dicom_wg23_app
+  org_commontk_dah_app
   )

CMakeLists.txt

@@ -288,11 +288,11 @@ SET(CTK_LIBS
 SET(CTK_PLUGINS
   org.commontk.eventbus:ON
   org.commontk.cli:OFF
-  org.commontk.dicom.wg23.app:OFF
-  org.commontk.dicom.wg23.core:OFF
-  org.commontk.dicom.wg23.host:OFF
-  org.commontk.dicom.examplehost:OFF
-  org.commontk.example.dicomapp:OFF
+  org.commontk.dah.app:OFF
+  org.commontk.dah.core:OFF
+  org.commontk.dah.exampleapp:OFF
+  org.commontk.dah.examplehost:OFF
+  org.commontk.dah.host:OFF
   org.commontk.plugingenerator.core:OFF
   org.commontk.plugingenerator.ui:OFF
   )

Plugins/org.commontk.dicom.wg23.app/CMakeLists.txt

@@ -1,11 +1,11 @@
-PROJECT(org_commontk_dicom_wg23_app)
+PROJECT(org_commontk_dah_app)
 
 FIND_PACKAGE(QtSOAP)
 IF(NOT QtSOAP_FOUND)
   MESSAGE(FATAL_ERROR "error: QtSOAP package is required to build ${PROJECT_NAME}" )
 ENDIF()
 
-SET(PLUGIN_export_directive "org_commontk_dicom_wg23_app_EXPORT")
+SET(PLUGIN_export_directive "org_commontk_dah_app_EXPORT")
 
 SET(PLUGIN_SRCS
   ctkDicomAppServer.cpp

Plugins/org.commontk.dicom.wg23.app/ctkDicomAppServer.h

@@ -26,11 +26,11 @@
 class ctkDicomAppInterface;
 
 #include <QScopedPointer>
-#include <org_commontk_dicom_wg23_app_Export.h>
+#include <org_commontk_dah_app_Export.h>
 
 class ctkDicomAppServerPrivate;
 
-class org_commontk_dicom_wg23_app_EXPORT ctkDicomAppServer
+class org_commontk_dah_app_EXPORT ctkDicomAppServer
 {
 
 public:

Plugins/org.commontk.dicom.wg23.app/ctkDicomHostService.h

@@ -25,9 +25,9 @@
 
 #include <ctkDicomHostInterface.h>
 #include <ctkDicomExchangeService.h>
-#include <org_commontk_dicom_wg23_app_Export.h>
+#include <org_commontk_dah_app_Export.h>
 
-class org_commontk_dicom_wg23_app_EXPORT ctkDicomHostService : public ctkDicomHostInterface
+class org_commontk_dah_app_EXPORT ctkDicomHostService : public ctkDicomHostInterface
 {
 
 public:

Plugins/org.commontk.dicom.wg23.app/ctkDicomWG23AppPlugin.cpp

@@ -58,6 +58,6 @@ ctkPluginContext* ctkDicomWG23AppPlugin::getPluginContext() const
   return context;
 }
 
-Q_EXPORT_PLUGIN2(org_commontk_dicom_wg23_app, ctkDicomWG23AppPlugin)
+Q_EXPORT_PLUGIN2(org_commontk_dah_app, ctkDicomWG23AppPlugin)
 
 

Plugins/org.commontk.dah.app/manifest_headers.cmake

@@ -0,0 +1 @@
+SET(Require-Plugin org.commontk.dah.core)

Plugins/org.commontk.dicom.wg23.core/CMakeLists.txt

@@ -1,4 +1,4 @@
-PROJECT(org_commontk_dicom_wg23_core)
+PROJECT(org_commontk_dah_core)
 
 FIND_PACKAGE(QtSOAP)
 IF(NOT QtSOAP_FOUND)
@@ -8,7 +8,7 @@ ENDIF()
 # TODO: Fix this after discussing include dependencies with Jc
 SET(CTK_BASE_INCLUDE_DIRS ${CTK_BASE_INCLUDE_DIRS} ${QTSOAP_INCLUDE_DIR} CACHE INTERNAL "CTK includes" FORCE)
 
-SET(PLUGIN_export_directive "org_commontk_dicom_wg23_core_EXPORT")
+SET(PLUGIN_export_directive "org_commontk_dah_core_EXPORT")
 
 # Additional directories to include
 SET(PLUGIN_include_directories

Plugins/org.commontk.dicom.wg23.core/ctkDicomAppInterface.h

@@ -29,9 +29,9 @@
 #include "ctkDicomWG23Types.h"
 #include "ctkDicomExchangeInterface.h"
 
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 
-class org_commontk_dicom_wg23_core_EXPORT ctkDicomAppInterface : public ctkDicomExchangeInterface
+class org_commontk_dah_core_EXPORT ctkDicomAppInterface : public ctkDicomExchangeInterface
 {
   Q_OBJECT
 

Plugins/org.commontk.dicom.wg23.core/ctkDicomExchangeInterface.h

@@ -27,9 +27,9 @@
 #include <QRect>
 
 #include "ctkDicomWG23Types.h"
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 
-class org_commontk_dicom_wg23_core_EXPORT ctkDicomExchangeInterface : public QObject
+class org_commontk_dah_core_EXPORT ctkDicomExchangeInterface : public QObject
 {
   Q_OBJECT
 

Plugins/org.commontk.dicom.wg23.core/ctkDicomExchangeService.h

@@ -25,11 +25,11 @@
 
 #include <ctkDicomExchangeInterface.h>
 #include <QScopedPointer>
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 
 class ctkDicomServicePrivate;
 
-class org_commontk_dicom_wg23_core_EXPORT ctkDicomExchangeService : public ctkDicomExchangeInterface
+class org_commontk_dah_core_EXPORT ctkDicomExchangeService : public ctkDicomExchangeInterface
 {
 
 public:

Plugins/org.commontk.dicom.wg23.core/ctkDicomHostInterface.h

@@ -29,9 +29,9 @@
 #include "ctkDicomWG23Types.h"
 #include "ctkDicomExchangeInterface.h"
 
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 
-class org_commontk_dicom_wg23_core_EXPORT ctkDicomHostInterface: public ctkDicomExchangeInterface
+class org_commontk_dah_core_EXPORT ctkDicomHostInterface: public ctkDicomExchangeInterface
 {
   Q_OBJECT
 

Plugins/org.commontk.dicom.wg23.core/ctkDicomServicePrivate.h

@@ -26,10 +26,10 @@
 
 #include <QEventLoop>
 #include <QtSoapHttpTransport>
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 #include <ctkDicomExchangeInterface.h>
 
-class org_commontk_dicom_wg23_core_EXPORT ctkDicomServicePrivate : public QObject
+class org_commontk_dah_core_EXPORT ctkDicomServicePrivate : public QObject
 {
   Q_OBJECT
 

Plugins/org.commontk.dicom.wg23.core/ctkDicomWG23CorePlugin.cpp

@@ -56,6 +56,6 @@ ctkPluginContext* ctkDicomWG23CorePlugin::getPluginContext() const
   return context;
 }
 
-Q_EXPORT_PLUGIN2(org_commontk_dicom_wg23_core, ctkDicomWG23CorePlugin)
+Q_EXPORT_PLUGIN2(org_commontk_dah_core, ctkDicomWG23CorePlugin)
 
 

Plugins/org.commontk.dicom.wg23.core/ctkExchangeSoapMessageProcessor.h

@@ -24,9 +24,9 @@
 
 #include "ctkSoapMessageProcessor.h"
 #include "ctkDicomExchangeInterface.h"
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 
-class org_commontk_dicom_wg23_core_EXPORT ctkExchangeSoapMessageProcessor : public ctkSoapMessageProcessor
+class org_commontk_dah_core_EXPORT ctkExchangeSoapMessageProcessor : public ctkSoapMessageProcessor
 {
 
 public:

Plugins/org.commontk.dicom.wg23.core/ctkSimpleSoapServer.h

@@ -27,10 +27,10 @@
 
 #include <qtsoap.h>
 
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 #include <ctkDicomWG23Types.h>
 
-class org_commontk_dicom_wg23_core_EXPORT ctkSimpleSoapServer : public QTcpServer
+class org_commontk_dah_core_EXPORT ctkSimpleSoapServer : public QTcpServer
 {
   Q_OBJECT
 

Plugins/org.commontk.dicom.wg23.core/ctkSoapMessageProcessor.h

@@ -24,9 +24,9 @@
 
 #include <qtsoap.h>
 
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 
-class org_commontk_dicom_wg23_core_EXPORT ctkSoapMessageProcessor
+class org_commontk_dah_core_EXPORT ctkSoapMessageProcessor
 {
 
 public:

Plugins/org.commontk.dicom.wg23.core/ctkSoapMessageProcessorList.h

@@ -25,9 +25,9 @@
 #include <list>
 #include "ctkSoapMessageProcessor.h"
 
-#include <org_commontk_dicom_wg23_core_Export.h>
+#include <org_commontk_dah_core_Export.h>
 
-class org_commontk_dicom_wg23_core_EXPORT ctkSoapMessageProcessorList : public ctkSoapMessageProcessor
+class org_commontk_dah_core_EXPORT ctkSoapMessageProcessorList : public ctkSoapMessageProcessor
 {
 
 public:

Plugins/org.commontk.example.dicomapp/CMakeLists.txt

@@ -1,4 +1,4 @@
-PROJECT(org_commontk_example_dicomapp)
+PROJECT(org_commontk_dah_exampleapp)
 
 SET(PLUGIN_export_directive "org_commontk_example_dicomapp_EXPORT")
 

Plugins/org.commontk.dah.exampleapp/manifest_headers.cmake

@@ -0,0 +1 @@
+SET(Require-Plugin org.commontk.dah.app)

Plugins/org.commontk.dicom.examplehost/CMakeLists.txt

@@ -1,6 +1,6 @@
-PROJECT(org_commontk_dicom_examplehost)
+PROJECT(org_commontk_dah_examplehost)
 
-SET(PLUGIN_export_directive "org_commontk_dicom_examplehost_EXPORT")
+SET(PLUGIN_export_directive "org_commontk_dah_examplehost_EXPORT")
 
 SET(PLUGIN_SRCS
   ctkDicomExampleHostPlugin.cpp

Plugins/org.commontk.dicom.examplehost/ctkDicomExampleHost.h

@@ -4,12 +4,12 @@
 #include <ctkDicomAbstractHost.h>
 #include <ctkHostedAppPlaceholderWidget.h>
 
-#include <org_commontk_dicom_examplehost_Export.h>
+#include <org_commontk_dah_examplehost_Export.h>
 
 #include <QUrl>
 #include <QProcess>
 
-class org_commontk_dicom_examplehost_EXPORT ctkDicomExampleHost : public ctkDicomAbstractHost{
+class org_commontk_dah_examplehost_EXPORT ctkDicomExampleHost : public ctkDicomAbstractHost{
     Q_OBJECT
 public:
     ctkDicomExampleHost(ctkHostedAppPlaceholderWidget* placeholderWidget, int hostPort = 8080, int appPort = 8081);

Plugins/org.commontk.dicom.examplehost/ctkDicomExampleHostPlugin.cpp

@@ -56,6 +56,6 @@ ctkPluginContext* ctkDicomExampleHostPlugin::getPluginContext() const
   return context;
 }
 
-Q_EXPORT_PLUGIN2(org_commontk_dicom_examplehost, ctkDicomExampleHostPlugin)
+Q_EXPORT_PLUGIN2(org_commontk_dah_examplehost_Export_Export, ctkDicomExampleHostPlugin)
 
 

Plugins/org.commontk.dicom.examplehost/ctkHostedAppPlaceholderWidget.h

@@ -3,9 +3,9 @@
 
 #include <QFrame>
 #include <QDebug>
-#include <org_commontk_dicom_examplehost_Export.h>
+#include <org_commontk_dah_examplehost_Export.h>
 
-class org_commontk_dicom_examplehost_EXPORT ctkHostedAppPlaceholderWidget : public QFrame
+class org_commontk_dah_examplehost_EXPORT ctkHostedAppPlaceholderWidget : public QFrame
 {
   Q_OBJECT
 public:

Plugins/org.commontk.dah.examplehost/manifest_headers.cmake

@@ -0,0 +1 @@
+SET(Require-Plugin org.commontk.dah.host)

Plugins/org.commontk.dicom.wg23.host/CMakeLists.txt

@@ -1,6 +1,6 @@
-PROJECT(org_commontk_dicom_wg23_host)
+PROJECT(org_commontk_dah_host)
 
-SET(PLUGIN_export_directive "org_commontk_dicom_wg23_host_EXPORT")
+SET(PLUGIN_export_directive "org_commontk_dah_host_EXPORT")
 
 SET(PLUGIN_SRCS
   ctkDicomHostServer.cpp

Plugins/org.commontk.dicom.wg23.host/ctkDicomAbstractHost.h

@@ -5,7 +5,7 @@
 #include <ctkDicomAppInterface.h>
 #include <QScopedPointer>
 
-#include <org_commontk_dicom_wg23_host_Export.h>
+#include <org_commontk_dah_host_Export.h>
 
 class ctkDicomAbstractHostPrivate;
 
@@ -18,7 +18,7 @@ class ctkDicomAbstractHostPrivate;
   * The methods of the ctkDicomHostInterface have to be implemented for the business logic,
   *
   */
-class org_commontk_dicom_wg23_host_EXPORT ctkDicomAbstractHost : public ctkDicomHostInterface
+class org_commontk_dah_host_EXPORT ctkDicomAbstractHost : public ctkDicomHostInterface
 {
 public:
     /**

Plugins/org.commontk.dicom.wg23.host/ctkDicomAppService.h

@@ -25,9 +25,9 @@
 
 #include <ctkDicomAppInterface.h>
 #include <ctkDicomExchangeService.h>
-#include <org_commontk_dicom_wg23_host_Export.h>
+#include <org_commontk_dah_host_Export.h>
 
-class org_commontk_dicom_wg23_host_EXPORT ctkDicomAppService : public ctkDicomAppInterface
+class org_commontk_dah_host_EXPORT ctkDicomAppService : public ctkDicomAppInterface
 {
 
 public:

Plugins/org.commontk.dicom.wg23.host/ctkDicomWG23HostPlugin.cpp

@@ -56,6 +56,6 @@ ctkPluginContext* ctkDicomWG23HostPlugin::getPluginContext() const
   return context;
 }
 
-Q_EXPORT_PLUGIN2(org_commontk_dicom_wg23_host, ctkDicomWG23HostPlugin)
+Q_EXPORT_PLUGIN2(org_commontk_dah_host, ctkDicomWG23HostPlugin)
 
 

Plugins/org.commontk.dah.host/manifest_headers.cmake

@@ -0,0 +1 @@
+SET(Require-Plugin org.commontk.dah.core)

Plugins/org.commontk.dicom.examplehost/manifest_headers.cmake

@@ -1 +0,0 @@
-SET(Require-Plugin org.commontk.dicom.wg23.host)

Plugins/org.commontk.dicom.wg23.app/manifest_headers.cmake

@@ -1 +0,0 @@
-SET(Require-Plugin org.commontk.dicom.wg23.core)

Plugins/org.commontk.dicom.wg23.host/manifest_headers.cmake

@@ -1 +0,0 @@
-SET(Require-Plugin org.commontk.dicom.wg23.core)

Plugins/org.commontk.example.dicomapp/manifest_headers.cmake

@@ -1 +0,0 @@
-SET(Require-Plugin org.commontk.dicom.wg23.app)