Renaming ctkDicomWG23* to ctkDicomAppHosting*

Renamed file ctkDicomWG23Types.h to ctkDicomAppHostingTypes.h,
ctkDicomWG23TypesHelper.h to ctkDicomAppHostingTypesHelper.h.

Renamed namespace ctkDicomWG23 to ctkDicomAppHosting.

Applications/ctkExampleHost/ctkHostAppExampleWidget.cpp

@@ -2,7 +2,7 @@
 #include "ui_ctkHostAppExampleWidget.h"
 #include "ctkExampleDicomHost.h"
 #include "ctkDicomAppService.h"
-#include <ctkDicomWG23TypesHelper.h>
+#include <ctkDicomAppHostingTypesHelper.h>
 
 #include <QDebug>
 #include <QFileDialog>
@@ -21,7 +21,7 @@ ctkHostAppExampleWidget::ctkHostAppExampleWidget(QWidget *parent) :
     connect(&this->host->getAppProcess(),SIGNAL(error(QProcess::ProcessError)),SLOT(appProcessError(QProcess::ProcessError)));
     connect(&this->host->getAppProcess(),SIGNAL(stateChanged(QProcess::ProcessState)),SLOT(appProcessStateChanged(QProcess::ProcessState)));
     connect(ui->placeholderFrame,SIGNAL(resized()),SLOT(placeholderResized()));
-    connect(this->host,SIGNAL( stateChangeReceived(ctkDicomWG23::State)),SLOT(appStateChanged(ctkDicomWG23::State)));
+    connect(this->host,SIGNAL( stateChangeReceived(ctkDicomAppHosting::State)),SLOT(appStateChanged(ctkDicomAppHosting::State)));
 
   }
 
@@ -47,7 +47,7 @@ void ctkHostAppExampleWidget::runButtonClicked()
     qDebug() << "run button clicked";
     if (host)
     {
-      bool reply = host->getDicomAppService()->setState(ctkDicomWG23::INPROGRESS);
+      bool reply = host->getDicomAppService()->setState(ctkDicomAppHosting::INPROGRESS);
       qDebug() << "  setState(INPROGRESS) returned: " << reply;
     }
 }
@@ -117,7 +117,7 @@ void ctkHostAppExampleWidget::placeholderResized()
   //ui->placeholderFrame->printPosition();
 }
 
-void ctkHostAppExampleWidget::appStateChanged(ctkDicomWG23::State state)
+void ctkHostAppExampleWidget::appStateChanged(ctkDicomAppHosting::State state)
 {
    ui->statusLabel->setText(ctkDicomSoapState::toStringValue(state));
 }

Applications/ctkExampleHost/ctkHostAppExampleWidget.h

@@ -4,7 +4,7 @@
 #include <QWidget>
 #include <QProcess>
 
-#include <ctkDicomWG23Types.h>
+#include <ctkDicomAppHostingTypes.h>
 
 class ctkExampleDicomHost;
 
@@ -28,7 +28,7 @@ public slots:
     void stopButtonClicked();
     void appProcessError(QProcess::ProcessError error);
     void appProcessStateChanged(QProcess::ProcessState state);
-    void appStateChanged(ctkDicomWG23::State state);
+    void appStateChanged(ctkDicomAppHosting::State state);
 
     void placeholderResized();
 

Plugins/org.commontk.dah.app/ctkAppSoapMessageProcessor.cpp

@@ -21,7 +21,7 @@
 
 #include "ctkAppSoapMessageProcessor.h"
 
-#include <ctkDicomWG23TypesHelper.h>
+#include <ctkDicomAppHostingTypesHelper.h>
 
 
 ctkAppSoapMessageProcessor::ctkAppSoapMessageProcessor(ctkDicomAppInterface* inter)
@@ -65,7 +65,7 @@ void ctkAppSoapMessageProcessor::processGetState(
 {
   // extract arguments from input message: nothing to be done
   // query interface
-  const ctkDicomWG23::State result = appInterface->getState();
+  const ctkDicomAppHosting::State result = appInterface->getState();
   // set reply message
   reply->setMethod("getState");
   QtSoapSimpleType* resultType = new ctkDicomSoapState("getStateResponse",result);

Plugins/org.commontk.dah.app/ctkDicomAppServerPrivate.cpp

@@ -28,7 +28,7 @@
 #include <QHostAddress>
 
 #include <stdexcept>
-#include <ctkDicomWG23TypesHelper.h>
+#include <ctkDicomAppHostingTypesHelper.h>
 #include <ctkDicomAppPlugin_p.h>
 
 #include <ctkExchangeSoapMessageProcessor.h>

Plugins/org.commontk.dah.app/ctkDicomHostService.cpp

@@ -23,7 +23,7 @@
 
 #include "ctkDicomServicePrivate.h"
 
-#include "ctkDicomWG23TypesHelper.h"
+#include "ctkDicomAppHostingTypesHelper.h"
 
 ctkDicomHostService::ctkDicomHostService(ushort port, QString path):
     service(port, path), d(new ctkDicomServicePrivate(port, path))
@@ -65,7 +65,7 @@ QRect ctkDicomHostService::getAvailableScreen(const QRect& preferredScreen)
   return resultRect;
 }
 
-void ctkDicomHostService::notifyStateChanged(ctkDicomWG23::State state)
+void ctkDicomHostService::notifyStateChanged(ctkDicomAppHosting::State state)
 {
   //Q_D(ctkDicomService);
 
@@ -73,7 +73,7 @@ void ctkDicomHostService::notifyStateChanged(ctkDicomWG23::State state)
   d->askHost("notifyStateChanged", input);
 }
 
-void ctkDicomHostService::notifyStatus(const ctkDicomWG23::Status& status)
+void ctkDicomHostService::notifyStatus(const ctkDicomAppHosting::Status& status)
 {
   //Q_D(ctkDicomService);
   QtSoapStruct* input = new ctkDicomSoapStatus("status", status);
@@ -82,12 +82,12 @@ void ctkDicomHostService::notifyStatus(const ctkDicomWG23::Status& status)
 
 // Exchange methods
 
-bool ctkDicomHostService::notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData)
+bool ctkDicomHostService::notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData)
 {
   return service.notifyDataAvailable(data, lastData);
 }
 
-QList<ctkDicomWG23::ObjectLocator>* ctkDicomHostService::getData(
+QList<ctkDicomAppHosting::ObjectLocator>* ctkDicomHostService::getData(
   QList<QUuid> objectUUIDs, 
   QList<QString> acceptableTransferSyntaxUIDs, 
   bool includeBulkData)

Plugins/org.commontk.dah.app/ctkDicomHostService.h

@@ -37,12 +37,12 @@ public:
   QString generateUID();
   QRect getAvailableScreen(const QRect& preferredScreen);
   QString getOutputLocation(const QStringList& preferredProtocols);
-  void notifyStateChanged(ctkDicomWG23::State state);
-  void notifyStatus(const ctkDicomWG23::Status& status);
+  void notifyStateChanged(ctkDicomAppHosting::State state);
+  void notifyStatus(const ctkDicomAppHosting::Status& status);
 
   // Exchange methods
-  bool notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData);
-  QList<ctkDicomWG23::ObjectLocator>* getData(
+  bool notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData);
+  QList<ctkDicomAppHosting::ObjectLocator>* getData(
     QList<QUuid> objectUUIDs, 
     QList<QString> acceptableTransferSyntaxUIDs, 
     bool includeBulkData);

Plugins/org.commontk.dah.core/CMakeLists.txt

@@ -20,8 +20,8 @@ SET(PLUGIN_SRCS
   ctkSimpleSoapServer.cpp
   ctkSoapConnectionRunnable.cpp
   ctkDicomServicePrivate.cpp
-  ctkDicomWG23Types.h
-  ctkDicomWG23TypesHelper.h
+  ctkDicomAppHostingTypes.h
+  ctkDicomAppHostingTypesHelper.h
   ctkDicomExchangeService.cpp
   ctkSoapMessageProcessorList.cpp
   ctkExchangeSoapMessageProcessor.cpp

Plugins/org.commontk.dah.core/ctkDicomWG23Types.h

@@ -23,14 +23,14 @@
 #include <QList>
 #include <QUuid>
 
-#ifndef CTKDICOMWG23TYPES_H
-#define CTKDICOMWG23TYPES_H
+#ifndef CTKDICOMAPPHOSTINGTYPES_H
+#define CTKDICOMAPPHOSTINGTYPES_H
 
 /**
   * \brief Typedefs and classes defined in the interfaces of DICOM Supplement 118.
   *
   */
-namespace ctkDicomWG23 {
+namespace ctkDicomAppHosting {
 
   enum State {
     IDLE,
@@ -100,4 +100,4 @@ namespace ctkDicomWG23 {
 
 }
 
-#endif // CTKDICOMWG23TYPES_H
+#endif // CTKDICOMAPPHOSTINGTYPES

Plugins/org.commontk.dah.core/ctkDicomWG23TypesHelper.h

@@ -26,7 +26,7 @@
 #include <QtSoapStruct>
 #include <QtSoapQName>
 #include <QRect>
-#include <ctkDicomWG23Types.h>
+#include <ctkDicomAppHostingTypes.h>
 
 #include <stdexcept>
 
@@ -54,39 +54,39 @@ class ctkDicomSoapRectangle :public QtSoapStruct {
 
 class ctkDicomSoapState : public QtSoapSimpleType{
     public:
-   ctkDicomSoapState ( const QString & name, ctkDicomWG23::State s ):
+   ctkDicomSoapState ( const QString & name, ctkDicomAppHosting::State s ):
        QtSoapSimpleType ( QtSoapQName(name), toStringValue(s) ){};
 
-   static ctkDicomWG23::State getState(const QtSoapType& type){
+   static ctkDicomAppHosting::State getState(const QtSoapType& type){
         return fromString( type.value().toString() );
    };
 
-   static ctkDicomWG23::State fromString(QString string)
+   static ctkDicomAppHosting::State fromString(QString string)
    {
-     if (string == "IDLE") return ctkDicomWG23::IDLE;
-     if (string == "INPROGRESS") return ctkDicomWG23::INPROGRESS;
-     if (string == "COMPLETED") return ctkDicomWG23::COMPLETED;
-     if (string == "SUSPENDED") return ctkDicomWG23::SUSPENDED;
-     if (string == "CANCELED") return ctkDicomWG23::CANCELED;
-     if (string == "EXIT") return ctkDicomWG23::EXIT;
+     if (string == "IDLE") return ctkDicomAppHosting::IDLE;
+     if (string == "INPROGRESS") return ctkDicomAppHosting::INPROGRESS;
+     if (string == "COMPLETED") return ctkDicomAppHosting::COMPLETED;
+     if (string == "SUSPENDED") return ctkDicomAppHosting::SUSPENDED;
+     if (string == "CANCELED") return ctkDicomAppHosting::CANCELED;
+     if (string == "EXIT") return ctkDicomAppHosting::EXIT;
      throw std::runtime_error( string.prepend("Invalid STATE:").toStdString() );
-     return ctkDicomWG23::EXIT;
+     return ctkDicomAppHosting::EXIT;
    }
-   static QString toStringValue(ctkDicomWG23::State state)
+   static QString toStringValue(ctkDicomAppHosting::State state)
    {
      switch(state)
      {
-     case ctkDicomWG23::IDLE:
+     case ctkDicomAppHosting::IDLE:
          return "IDLE";
-     case ctkDicomWG23::INPROGRESS:
+     case ctkDicomAppHosting::INPROGRESS:
          return "INPROGRESS";
-     case ctkDicomWG23::COMPLETED:
+     case ctkDicomAppHosting::COMPLETED:
          return "COMPLETED";
-     case ctkDicomWG23::SUSPENDED:
+     case ctkDicomAppHosting::SUSPENDED:
          return "SUSPENDED";
-     case ctkDicomWG23::CANCELED:
+     case ctkDicomAppHosting::CANCELED:
          return "CANCELED";
-     case ctkDicomWG23::EXIT:
+     case ctkDicomAppHosting::EXIT:
          return "EXIT";
      default:
        throw std::runtime_error( "Invalid value for state" );
@@ -100,7 +100,7 @@ class ctkDicomSoapState : public QtSoapSimpleType{
 class ctkDicomSoapStatus : public QtSoapStruct{
     public: 
     ctkDicomSoapStatus ( const QString & name,
-            const ctkDicomWG23::Status& s ):
+            const ctkDicomAppHosting::Status& s ):
        QtSoapStruct ( QtSoapQName(name) ){
         this->insert(new QtSoapSimpleType(QtSoapQName("StatusType"), 
                     s.statusType) );
@@ -114,10 +114,10 @@ class ctkDicomSoapStatus : public QtSoapStruct{
                     QtSoapQName("CodeMeaning"), 
                     s.codeMeaning) );
     };
-   static ctkDicomWG23::Status getStatus(const QtSoapType& type){
-        ctkDicomWG23::Status s;
+   static ctkDicomAppHosting::Status getStatus(const QtSoapType& type){
+        ctkDicomAppHosting::Status s;
         
-        s.statusType = static_cast<ctkDicomWG23::StatusType>
+        s.statusType = static_cast<ctkDicomAppHosting::StatusType>
             (type["StatusType"].value().toInt());
         s.codingSchemeDesignator = 
             type["CodingSchemeDesignator"].value().toString();
@@ -201,7 +201,7 @@ class ctkDicomSoapArrayOfUUIDS : public QtSoapArray{
 class ctkDicomSoapObjectDescriptor : public QtSoapStruct{
 public:
     ctkDicomSoapObjectDescriptor ( const QString & name,
-        const ctkDicomWG23::ObjectDescriptor& od ):
+        const ctkDicomAppHosting::ObjectDescriptor& od ):
     QtSoapStruct ( QtSoapQName(name) ){
         this->insert(new QtSoapSimpleType(QtSoapQName("DescriptorUUID"),
                 od.descriptorUUID) );
@@ -219,8 +219,8 @@ public:
                 od.modality) );
     };
 
-    static ctkDicomWG23::ObjectDescriptor getObjectDescriptor(const QtSoapType& type){
-         ctkDicomWG23::ObjectDescriptor od;
+    static ctkDicomAppHosting::ObjectDescriptor getObjectDescriptor(const QtSoapType& type){
+         ctkDicomAppHosting::ObjectDescriptor od;
 
          od.descriptorUUID = QUuid(type["DescriptorUUID"].value().toString());
          od.mimeType =
@@ -238,28 +238,28 @@ public:
 class ctkDicomSoapSeries : public QtSoapStruct{
     public:
         ctkDicomSoapSeries ( const QString & name,
-            const ctkDicomWG23::Series& s ):
+            const ctkDicomAppHosting::Series& s ):
         QtSoapStruct ( QtSoapQName(name) ){
             this->insert(new QtSoapSimpleType(QtSoapQName("SeriesUID"),
                     s.seriesUID) );
         QtSoapArray * odescriptors = new QtSoapArray( QtSoapQName("ObjectDescriptors"),QtSoapType::Other,
                           s.objectDescriptors.size());
 
-        for (QList<ctkDicomWG23::ObjectDescriptor>::ConstIterator it = s.objectDescriptors.constBegin();
+        for (QList<ctkDicomAppHosting::ObjectDescriptor>::ConstIterator it = s.objectDescriptors.constBegin();
                 it < s.objectDescriptors.constEnd(); it++){
             odescriptors->append(new ctkDicomSoapObjectDescriptor("ObjectDescriptor",*it));
         }
         this->insert(odescriptors);
     };
 
-    static ctkDicomWG23::Series getSeries(const QtSoapType& type){
-         ctkDicomWG23::Series s;
+    static ctkDicomAppHosting::Series getSeries(const QtSoapType& type){
+         ctkDicomAppHosting::Series s;
 
          s.seriesUID = type["SeriesUID"].value().toString();
-         QList<ctkDicomWG23::ObjectDescriptor> list;
+         QList<ctkDicomAppHosting::ObjectDescriptor> list;
          const QtSoapArray& array = static_cast<const QtSoapArray&> (type["ObjectDescriptors"]);
          for (int i = 0; i < array.count() ; i++ ){
-             const ctkDicomWG23::ObjectDescriptor od =
+             const ctkDicomAppHosting::ObjectDescriptor od =
                      ctkDicomSoapObjectDescriptor::getObjectDescriptor(array.at(i));
              list.append(od);
          }
@@ -273,14 +273,14 @@ class ctkDicomSoapSeries : public QtSoapStruct{
 class ctkDicomSoapStudy : public QtSoapStruct{
     public:
         ctkDicomSoapStudy ( const QString & name,
-            const ctkDicomWG23::Study& s ):
+            const ctkDicomAppHosting::Study& s ):
         QtSoapStruct ( QtSoapQName(name) ){
             this->insert(new QtSoapSimpleType(QtSoapQName("StudyUID"),
                     s.studyUID) );
         QtSoapArray * odescriptors = new QtSoapArray( QtSoapQName("ObjectDescriptors"),QtSoapType::Other,
                           s.objectDescriptors.size());
 
-        for (QList<ctkDicomWG23::ObjectDescriptor>::ConstIterator it = s.objectDescriptors.constBegin();
+        for (QList<ctkDicomAppHosting::ObjectDescriptor>::ConstIterator it = s.objectDescriptors.constBegin();
                 it < s.objectDescriptors.constEnd(); it++){
             odescriptors->append(new ctkDicomSoapObjectDescriptor("ObjectDescriptor",*it));
         }
@@ -289,29 +289,29 @@ class ctkDicomSoapStudy : public QtSoapStruct{
         QtSoapArray * series = new QtSoapArray( QtSoapQName("Series"),QtSoapType::Other,
                           s.series.size());
 
-        for (QList<ctkDicomWG23::Series>::ConstIterator it = s.series.constBegin();
+        for (QList<ctkDicomAppHosting::Series>::ConstIterator it = s.series.constBegin();
                 it < s.series.constEnd(); it++){
             series->append(new ctkDicomSoapSeries("Series",*it));
         }
         this->insert(series);
     };
 
-    static ctkDicomWG23::Study getStudy(const QtSoapType& type){
-         ctkDicomWG23::Study s;
+    static ctkDicomAppHosting::Study getStudy(const QtSoapType& type){
+         ctkDicomAppHosting::Study s;
 
          s.studyUID = type["StudyUID"].value().toString();
-         QList<ctkDicomWG23::ObjectDescriptor> list;
+         QList<ctkDicomAppHosting::ObjectDescriptor> list;
          const QtSoapArray& array = static_cast<const QtSoapArray&> (type["ObjectDescriptors"]);
          for (int i = 0; i < array.count() ; i++ ){
-             const ctkDicomWG23::ObjectDescriptor od =
+             const ctkDicomAppHosting::ObjectDescriptor od =
                      ctkDicomSoapObjectDescriptor::getObjectDescriptor(array.at(i));
              list.append(od);
          }
          s.objectDescriptors = list;
-         QList<ctkDicomWG23::Series> listSeries;
+         QList<ctkDicomAppHosting::Series> listSeries;
          const QtSoapArray& array2 = static_cast<const QtSoapArray&> (type["Series"]);
          for (int i = 0; i < array2.count() ; i++ ){
-             const ctkDicomWG23::Series series =
+             const ctkDicomAppHosting::Series series =
                      ctkDicomSoapSeries::getSeries(array2.at(i));
              listSeries.append(series);
          }
@@ -324,7 +324,7 @@ class ctkDicomSoapStudy : public QtSoapStruct{
 class ctkDicomSoapPatient : public QtSoapStruct{
     public:
         ctkDicomSoapPatient ( const QString & name,
-            const ctkDicomWG23::Patient& p ):
+            const ctkDicomAppHosting::Patient& p ):
         QtSoapStruct ( QtSoapQName(name) ){
             this->insert(new QtSoapSimpleType(QtSoapQName("Name"),
                     p.name) );
@@ -339,7 +339,7 @@ class ctkDicomSoapPatient : public QtSoapStruct{
             QtSoapArray * odescriptors = new QtSoapArray( QtSoapQName("ObjectDescriptors"),QtSoapType::Other,
                           p.objectDescriptors.size());
 
-            for (QList<ctkDicomWG23::ObjectDescriptor>::ConstIterator it = p.objectDescriptors.constBegin();
+            for (QList<ctkDicomAppHosting::ObjectDescriptor>::ConstIterator it = p.objectDescriptors.constBegin();
                 it < p.objectDescriptors.constEnd(); it++){
                 odescriptors->append(new ctkDicomSoapObjectDescriptor("ObjectDescriptor",*it));
             }
@@ -348,15 +348,15 @@ class ctkDicomSoapPatient : public QtSoapStruct{
             QtSoapArray * study = new QtSoapArray( QtSoapQName("Studies"),QtSoapType::Other,
                               p.studies.size());
 
-            for (QList<ctkDicomWG23::Study>::ConstIterator it = p.studies.constBegin();
+            for (QList<ctkDicomAppHosting::Study>::ConstIterator it = p.studies.constBegin();
                 it < p.studies.constEnd(); it++){
                 study->append(new ctkDicomSoapStudy("Study",*it));
             }
             this->insert(study);
         };
 
-        static ctkDicomWG23::Patient getPatient(const QtSoapType& type){
-             ctkDicomWG23::Patient p;
+        static ctkDicomAppHosting::Patient getPatient(const QtSoapType& type){
+             ctkDicomAppHosting::Patient p;
 
              p.name = type["Name"].value().toString();
              p.id = type["ID"].value().toString();
@@ -364,19 +364,19 @@ class ctkDicomSoapPatient : public QtSoapStruct{
              p.sex = type["Sex"].value().toString();
              p.birthDate = type["Birthdate"].value().toString();
 
-             QList<ctkDicomWG23::ObjectDescriptor> list;
+             QList<ctkDicomAppHosting::ObjectDescriptor> list;
              const QtSoapArray& array = static_cast<const QtSoapArray&> (type["ObjectDescriptors"]);
              for (int i = 0; i < array.count() ; i++ ){
-                 const ctkDicomWG23::ObjectDescriptor od =
+                 const ctkDicomAppHosting::ObjectDescriptor od =
                          ctkDicomSoapObjectDescriptor::getObjectDescriptor(array.at(i));
                  list.append(od);
              }
 
              p.objectDescriptors = list;
-             QList<ctkDicomWG23::Study> listPatient;
+             QList<ctkDicomAppHosting::Study> listPatient;
              const QtSoapArray& array2 = static_cast<const QtSoapArray&> (type["Studies"]);
              for (int i = 0; i < array2.count() ; i++ ){
-                 const ctkDicomWG23::Study study =
+                 const ctkDicomAppHosting::Study study =
                          ctkDicomSoapStudy::getStudy(array2.at(i));
                  listPatient.append(study);
              }
@@ -390,12 +390,12 @@ class ctkDicomSoapPatient : public QtSoapStruct{
 class ctkDicomSoapAvailableData :public QtSoapStruct {
 public:
     ctkDicomSoapAvailableData ( const QString & name,
-            const ctkDicomWG23::AvailableData& ad ):
+            const ctkDicomAppHosting::AvailableData& ad ):
        QtSoapStruct ( QtSoapQName(name) ){
         QtSoapArray * odescriptors = new QtSoapArray( QtSoapQName("ObjectDescriptors"),QtSoapType::Other,
                       ad.objectDescriptors.size());
 
-        for (QList<ctkDicomWG23::ObjectDescriptor>::ConstIterator it = ad.objectDescriptors.constBegin();
+        for (QList<ctkDicomAppHosting::ObjectDescriptor>::ConstIterator it = ad.objectDescriptors.constBegin();
             it < ad.objectDescriptors.constEnd(); it++){
             odescriptors->append(new ctkDicomSoapObjectDescriptor("ObjectDescriptor",*it));
         }
@@ -404,27 +404,27 @@ public:
         QtSoapArray * patient = new QtSoapArray( QtSoapQName("Patient"),QtSoapType::Other,
                           ad.patients.size());
 
-        for (QList<ctkDicomWG23::Patient>::ConstIterator it = ad.patients.constBegin();
+        for (QList<ctkDicomAppHosting::Patient>::ConstIterator it = ad.patients.constBegin();
             it < ad.patients.constEnd(); it++){
             patient->append(new ctkDicomSoapPatient("Patient",*it));
         }
         this->insert(patient);
     };
-   static ctkDicomWG23::AvailableData getAvailableData (const QtSoapType& type){
-        ctkDicomWG23::AvailableData ad;
+   static ctkDicomAppHosting::AvailableData getAvailableData (const QtSoapType& type){
+        ctkDicomAppHosting::AvailableData ad;
 
-        QList<ctkDicomWG23::ObjectDescriptor> list;
+        QList<ctkDicomAppHosting::ObjectDescriptor> list;
         const QtSoapArray& array = static_cast<const QtSoapArray&> (type["ObjectDescriptors"]);
         for (int i = 0; i < array.count() ; i++ ){
-            const ctkDicomWG23::ObjectDescriptor od =
+            const ctkDicomAppHosting::ObjectDescriptor od =
                     ctkDicomSoapObjectDescriptor::getObjectDescriptor(array.at(i));
             list.append(od);
         }
         ad.objectDescriptors = list;
-        QList<ctkDicomWG23::Patient> listPatients;
+        QList<ctkDicomAppHosting::Patient> listPatients;
         const QtSoapArray& array2 = static_cast<const QtSoapArray&> (type["Patients"]);
         for (int i = 0; i < array2.count() ; i++ ){
-            const ctkDicomWG23::Patient patient =
+            const ctkDicomAppHosting::Patient patient =
                     ctkDicomSoapPatient::getPatient(array2.at(i));
             listPatients.append(patient);
         }
@@ -436,7 +436,7 @@ public:
 class ctkDicomSoapObjectLocator : public QtSoapStruct{
 public:
     ctkDicomSoapObjectLocator ( const QString & name,
-        const ctkDicomWG23::ObjectLocator& ol ):
+        const ctkDicomAppHosting::ObjectLocator& ol ):
     QtSoapStruct ( QtSoapQName(name) ){
         this->insert(new QtSoapSimpleType(QtSoapQName("Locator"),
                 ol.locator) );
@@ -457,8 +457,8 @@ public:
                 ol.URI) );
     };
 
-    static ctkDicomWG23::ObjectLocator getObjectLocator(const QtSoapType& type){
-         ctkDicomWG23::ObjectLocator ol;
+    static ctkDicomAppHosting::ObjectLocator getObjectLocator(const QtSoapType& type){
+         ctkDicomAppHosting::ObjectLocator ol;
 
          ol.locator = QUuid(type["Locator"].value().toString());
          ol.source = QUuid(type["Source"].value().toString());
@@ -477,21 +477,21 @@ public:
 
 class ctkDicomSoapArrayOfObjectLocators : public QtSoapArray{
     public:
-    ctkDicomSoapArrayOfObjectLocators ( const QString & name, const QList<ctkDicomWG23::ObjectLocator> &array):
+    ctkDicomSoapArrayOfObjectLocators ( const QString & name, const QList<ctkDicomAppHosting::ObjectLocator> &array):
             QtSoapArray ( QtSoapQName(name),QtSoapType::String,
                           array.size()){
 
-        for (QList<ctkDicomWG23::ObjectLocator>::ConstIterator it = array.constBegin();
+        for (QList<ctkDicomAppHosting::ObjectLocator>::ConstIterator it = array.constBegin();
                 it < array.constEnd(); it++){
                     this->append(new ctkDicomSoapObjectLocator("objectLocator",(*it)));
         }
     };
 
-    static QList<ctkDicomWG23::ObjectLocator>* getArray(const QtSoapArray& array){
-        QList<ctkDicomWG23::ObjectLocator> * list = new QList<ctkDicomWG23::ObjectLocator>();
+    static QList<ctkDicomAppHosting::ObjectLocator>* getArray(const QtSoapArray& array){
+        QList<ctkDicomAppHosting::ObjectLocator> * list = new QList<ctkDicomAppHosting::ObjectLocator>();
 
         for (int i = 0; i < array.count() ; i++ ){
-            const ctkDicomWG23::ObjectLocator ol =
+            const ctkDicomAppHosting::ObjectLocator ol =
                     ctkDicomSoapObjectLocator::getObjectLocator(array.at(i));
             list->append(ol);
         }

Plugins/org.commontk.dah.core/ctkDicomAppInterface.h

@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QRect>
 
-#include "ctkDicomWG23Types.h"
+#include "ctkDicomAppHostingTypes.h"
 #include "ctkDicomExchangeInterface.h"
 
 #include <org_commontk_dah_core_Export.h>
@@ -38,8 +38,8 @@ class org_commontk_dah_core_EXPORT ctkDicomAppInterface : public ctkDicomExchang
 public:
 
   // Application interface methods
-  virtual ctkDicomWG23::State getState() = 0;
-  virtual bool setState(ctkDicomWG23::State newState) = 0;
+  virtual ctkDicomAppHosting::State getState() = 0;
+  virtual bool setState(ctkDicomAppHosting::State newState) = 0;
   virtual bool bringToFront(const QRect& requestedScreenArea) = 0;
 
   // Data exchange interface methods

Plugins/org.commontk.dah.core/ctkDicomExchangeInterface.h

@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QRect>
 
-#include "ctkDicomWG23Types.h"
+#include "ctkDicomAppHostingTypes.h"
 #include <org_commontk_dah_core_Export.h>
 
 class org_commontk_dah_core_EXPORT ctkDicomExchangeInterface : public QObject
@@ -37,9 +37,9 @@ public:
 
   // Data exchange interface methods
 
-  virtual bool notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData) = 0;
+  virtual bool notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData) = 0;
 
-  virtual QList<ctkDicomWG23::ObjectLocator>* getData(
+  virtual QList<ctkDicomAppHosting::ObjectLocator>* getData(
     QList<QUuid> objectUUIDs, 
     QList<QString> acceptableTransferSyntaxUIDs, 
     bool includeBulkData) = 0;

Plugins/org.commontk.dah.core/ctkDicomExchangeService.cpp

@@ -23,7 +23,7 @@
 
 #include "ctkDicomServicePrivate.h"
 
-#include "ctkDicomWG23TypesHelper.h"
+#include "ctkDicomAppHostingTypesHelper.h"
 
 ctkDicomExchangeService::ctkDicomExchangeService(ushort port, QString path)
  : d(new ctkDicomServicePrivate(port, path))
@@ -37,7 +37,7 @@ ctkDicomExchangeService::~ctkDicomExchangeService()
 }
 
 bool ctkDicomExchangeService::notifyDataAvailable(
-        ctkDicomWG23::AvailableData data, bool lastData){
+        ctkDicomAppHosting::AvailableData data, bool lastData){
     //Q_D(ctkDicomService);
     QList<QtSoapType*> list;
     list << new ctkDicomSoapAvailableData("data", data);
@@ -48,7 +48,7 @@ bool ctkDicomExchangeService::notifyDataAvailable(
 
 
 
-QList<ctkDicomWG23::ObjectLocator>* ctkDicomExchangeService::getData(
+QList<ctkDicomAppHosting::ObjectLocator>* ctkDicomExchangeService::getData(
         QList<QUuid> objectUUIDs,
         QList<QString> acceptableTransferSyntaxUIDs, bool includeBulkData){
 

Plugins/org.commontk.dah.core/ctkDicomExchangeService.h

@@ -36,8 +36,8 @@ public:
   ctkDicomExchangeService(ushort port, QString path);
   ~ctkDicomExchangeService();
 
-  bool notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData);
-  QList<ctkDicomWG23::ObjectLocator> *getData(QList<QUuid> objectUUIDs,
+  bool notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData);
+  QList<ctkDicomAppHosting::ObjectLocator> *getData(QList<QUuid> objectUUIDs,
                                              QList<QString> acceptableTransferSyntaxUIDs, bool includeBulkData);
   void releaseData(QList<QUuid> objectUUIDs);
 

Plugins/org.commontk.dah.core/ctkDicomHostInterface.h

@@ -26,7 +26,7 @@
 #include <QObject>
 #include <QRect>
 
-#include "ctkDicomWG23Types.h"
+#include "ctkDicomAppHostingTypes.h"
 #include "ctkDicomExchangeInterface.h"
 
 #include <org_commontk_dah_core_Export.h>
@@ -41,8 +41,8 @@ public:
   virtual QString generateUID() = 0;
   virtual QRect getAvailableScreen(const QRect& preferredScreen) = 0;
   virtual QString getOutputLocation(const QStringList& preferredProtocols) = 0;
-  virtual void notifyStateChanged(ctkDicomWG23::State state) = 0;
-  virtual void notifyStatus(const ctkDicomWG23::Status& status) = 0;
+  virtual void notifyStateChanged(ctkDicomAppHosting::State state) = 0;
+  virtual void notifyStatus(const ctkDicomAppHosting::Status& status) = 0;
 
   // Data exchange interface methods
   // inherited from ctkDicomExchangeInterface

Plugins/org.commontk.dah.core/ctkDicomServicePrivate.cpp

@@ -20,7 +20,7 @@
 =============================================================================*/
 
 #include "ctkDicomServicePrivate.h"
-#include "ctkDicomWG23TypesHelper.h"
+#include "ctkDicomAppHostingTypesHelper.h"
 
 #include <QApplication>
 #include <QCursor>

Plugins/org.commontk.dah.core/ctkDicomServicePrivate.h

@@ -22,7 +22,7 @@
 #ifndef CTKDICOMSERVICEPRIVATE_H
 #define CTKDICOMSERVICEPRIVATE_H
 
-#include <ctkDicomWG23Types.h>
+#include <ctkDicomAppHostingTypes.h>
 
 #include <QEventLoop>
 #include <QtSoapHttpTransport>

Plugins/org.commontk.dah.core/ctkExchangeSoapMessageProcessor.cpp

@@ -21,7 +21,7 @@
 
 #include "ctkExchangeSoapMessageProcessor.h"
 
-#include <ctkDicomWG23TypesHelper.h>
+#include <ctkDicomAppHostingTypesHelper.h>
 
 ctkExchangeSoapMessageProcessor::ctkExchangeSoapMessageProcessor(ctkDicomExchangeInterface* inter)
 : exchangeInterface(inter)
@@ -64,7 +64,7 @@ void ctkExchangeSoapMessageProcessor::processNotifyDataAvailable(
 {
   // extract arguments from input message
   const QtSoapType& inputType = message.method()["data"];
-  const ctkDicomWG23::AvailableData data = ctkDicomSoapAvailableData::getAvailableData(inputType);
+  const ctkDicomAppHosting::AvailableData data = ctkDicomSoapAvailableData::getAvailableData(inputType);
   const QtSoapType& inputType2 = message.method()["lastData"];
   const bool lastData = ctkDicomSoapBool::getBool(inputType2);
   // query interface
@@ -88,7 +88,7 @@ void ctkExchangeSoapMessageProcessor::processGetData(
   const QtSoapType& inputType3 = message.method()["includeBulkData"];
   const bool includeBulkData = ctkDicomSoapBool::getBool(inputType3);
   // query interface
-  const QList<ctkDicomWG23::ObjectLocator>* result = exchangeInterface->getData(
+  const QList<ctkDicomAppHosting::ObjectLocator>* result = exchangeInterface->getData(
     *objectUUIDs, *acceptableTransferSyntaxUIDs, includeBulkData);
   // set reply message
   reply->setMethod("getData");

Plugins/org.commontk.dah.core/ctkSimpleSoapServer.h

@@ -28,7 +28,7 @@
 #include <qtsoap.h>
 
 #include <org_commontk_dah_core_Export.h>
-#include <ctkDicomWG23Types.h>
+#include <ctkDicomAppHostingTypes.h>
 
 class org_commontk_dah_core_EXPORT ctkSimpleSoapServer : public QTcpServer
 {

Plugins/org.commontk.dah.exampleapp/ctkExampleDicomAppLogic.cpp

@@ -30,19 +30,19 @@ ctkExampleDicomAppLogic::ctkExampleDicomAppLogic(ServiceAccessor<ctkDicomHostInt
   : host(host)
 {
   connect(this, SIGNAL(stateChanged(int)), this, SLOT(changeState(int)), Qt::QueuedConnection);
-  emit stateChanged(ctkDicomWG23::IDLE);
+  emit stateChanged(ctkDicomAppHosting::IDLE);
 }
 
 ctkExampleDicomAppLogic::~ctkExampleDicomAppLogic()
 {
 }
 
-ctkDicomWG23::State ctkExampleDicomAppLogic::getState()
+ctkDicomAppHosting::State ctkExampleDicomAppLogic::getState()
 {
-  return ctkDicomWG23::IDLE;
+  return ctkDicomAppHosting::IDLE;
 }
 
-bool ctkExampleDicomAppLogic::setState(ctkDicomWG23::State newState)
+bool ctkExampleDicomAppLogic::setState(ctkDicomAppHosting::State newState)
 {
   qDebug() << "setState called";
   emit stateChanged(newState);
@@ -75,7 +75,7 @@ void ctkExampleDicomAppLogic::do_something()
 
 void ctkExampleDicomAppLogic::changeState(int anewstate)
 {
-  ctkDicomWG23::State newstate = static_cast<ctkDicomWG23::State>(anewstate);
+  ctkDicomAppHosting::State newstate = static_cast<ctkDicomAppHosting::State>(anewstate);
   try
   {
     host->notifyStateChanged(newstate);
@@ -85,18 +85,18 @@ void ctkExampleDicomAppLogic::changeState(int anewstate)
     qCritical() << e.what();
   }
 
-  if (newstate == ctkDicomWG23::INPROGRESS)
+  if (newstate == ctkDicomAppHosting::INPROGRESS)
   {
     do_something();
   }
 }
 
-bool ctkExampleDicomAppLogic::notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData)
+bool ctkExampleDicomAppLogic::notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData)
 {
   return false;
 }
 
-QList<ctkDicomWG23::ObjectLocator>* ctkExampleDicomAppLogic::getData(
+QList<ctkDicomAppHosting::ObjectLocator>* ctkExampleDicomAppLogic::getData(
   QList<QUuid> objectUUIDs, 
   QList<QString> acceptableTransferSyntaxUIDs, 
   bool includeBulkData)

Plugins/org.commontk.dah.exampleapp/ctkExampleDicomAppLogic_p.h

@@ -65,13 +65,13 @@ public:
   ~ctkExampleDicomAppLogic();
 
   // ctkDicomAppInterface
-  ctkDicomWG23::State getState();
-  bool setState(ctkDicomWG23::State newState);
+  ctkDicomAppHosting::State getState();
+  bool setState(ctkDicomAppHosting::State newState);
   bool bringToFront(const QRect& requestedScreenArea);
 
   // ctkDicomExchangeInterface
-  bool notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData);
-  QList<ctkDicomWG23::ObjectLocator>* getData(
+  bool notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData);
+  QList<ctkDicomAppHosting::ObjectLocator>* getData(
     QList<QUuid> objectUUIDs, 
     QList<QString> acceptableTransferSyntaxUIDs, 
     bool includeBulkData);

Plugins/org.commontk.dah.examplehost/ctkExampleDicomHost.cpp

@@ -1,5 +1,5 @@
 #include "ctkExampleDicomHost.h"
-#include "ctkDicomWG23TypesHelper.h"
+#include "ctkDicomAppHostingTypesHelper.h"
 
 #include <QProcess>
 #include <QtDebug>
@@ -10,7 +10,7 @@
 ctkExampleDicomHost::ctkExampleDicomHost(ctkHostedAppPlaceholderWidget* placeholderWidget, int hostPort, int appPort) :
     ctkDicomAbstractHost(hostPort, appPort),
     placeholderWidget(placeholderWidget),
-    applicationState(ctkDicomWG23::IDLE)
+    applicationState(ctkDicomAppHosting::IDLE)
 {
   connect(&this->appProcess,SIGNAL(readyReadStandardOutput()),SLOT(forwardConsoleOutput()));
 }
@@ -44,13 +44,13 @@ QRect ctkExampleDicomHost::getAvailableScreen(const QRect& preferredScreen){
 }
 
 
-void ctkExampleDicomHost::notifyStateChanged(ctkDicomWG23::State state){
+void ctkExampleDicomHost::notifyStateChanged(ctkDicomAppHosting::State state){
     qDebug()<< "new state received:"<< static_cast<int>(state);
     qDebug()<< "new state received:"<< ctkDicomSoapState::toStringValue(state);
     emit stateChangedReceived(state);
 }
 
-void ctkExampleDicomHost::notifyStatus(const ctkDicomWG23::Status& status){
+void ctkExampleDicomHost::notifyStatus(const ctkDicomAppHosting::Status& status){
     qDebug()<< "new status received:"<<status.codeMeaning;
     emit statusReceived(status);;
 }
@@ -73,12 +73,12 @@ void ctkExampleDicomHost::forwardConsoleOutput()
   }
 }
 
-bool ctkExampleDicomHost::notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData)
+bool ctkExampleDicomHost::notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData)
 {
   return false;
 }
 
-QList<ctkDicomWG23::ObjectLocator>* ctkExampleDicomHost::getData(
+QList<ctkDicomAppHosting::ObjectLocator>* ctkExampleDicomHost::getData(
   QList<QUuid> objectUUIDs, 
   QList<QString> acceptableTransferSyntaxUIDs, 
   bool includeBulkData)

Plugins/org.commontk.dah.examplehost/ctkExampleDicomHost.h

@@ -18,11 +18,11 @@ public:
     virtual QString generateUID() { return ""; }
     virtual QRect getAvailableScreen(const QRect& preferredScreen);
     virtual QString getOutputLocation(const QStringList& /*preferredProtocols*/) { return ""; }
-    virtual void notifyStateChanged(ctkDicomWG23::State state);
-    virtual void notifyStatus(const ctkDicomWG23::Status& status);
+    virtual void notifyStateChanged(ctkDicomAppHosting::State state);
+    virtual void notifyStatus(const ctkDicomAppHosting::Status& status);
     // exchange methods
-    virtual bool notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData);
-    virtual QList<ctkDicomWG23::ObjectLocator>* getData(
+    virtual bool notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData);
+    virtual QList<ctkDicomAppHosting::ObjectLocator>* getData(
       QList<QUuid> objectUUIDs, 
       QList<QString> acceptableTransferSyntaxUIDs, 
       bool includeBulkData);
@@ -32,14 +32,14 @@ public:
     ~ctkExampleDicomHost();
 
 signals:
-    void stateChangedReceived(ctkDicomWG23::State state);
-    void statusReceived(const ctkDicomWG23::Status& status);
+    void stateChangedReceived(ctkDicomAppHosting::State state);
+    void statusReceived(const ctkDicomAppHosting::Status& status);
     void giveAvailableScreen(QRect rect);
 
 protected:
     QProcess appProcess;
     ctkHostedAppPlaceholderWidget* placeholderWidget;
-    ctkDicomWG23::State applicationState;
+    ctkDicomAppHosting::State applicationState;
   protected slots:
     void forwardConsoleOutput();
 };

Plugins/org.commontk.dah.host/ctkDicomAbstractHost.cpp

@@ -30,7 +30,7 @@ class ctkDicomAbstractHostPrivate
   int appPort;
   ctkDicomHostServer* server;
   ctkDicomAppInterface* appService;
-  // ctkDicomWG23::Status
+  // ctkDicomAppHosting::Status
 };
 
 ctkDicomAbstractHost::ctkDicomAbstractHost(int hostPort, int appPort) : d_ptr(new ctkDicomAbstractHostPrivate(this,hostPort,appPort))

Plugins/org.commontk.dah.host/ctkDicomAppService.cpp

@@ -23,7 +23,7 @@
 
 #include "ctkDicomServicePrivate.h"
 
-#include "ctkDicomWG23TypesHelper.h"
+#include "ctkDicomAppHostingTypesHelper.h"
 
 ctkDicomAppService::ctkDicomAppService(ushort port, QString path):
   service(port, path), d(new ctkDicomServicePrivate(port, path))
@@ -35,14 +35,14 @@ ctkDicomAppService::~ctkDicomAppService()
 }
 
 
-ctkDicomWG23::State ctkDicomAppService::getState()
+ctkDicomAppHosting::State ctkDicomAppService::getState()
 {
   //Q_D(ctkDicomService);
   const QtSoapType & result = d->askHost("getState", NULL);
   return ctkDicomSoapState::getState(result);
 }
 
-bool ctkDicomAppService::setState(ctkDicomWG23::State newState)
+bool ctkDicomAppService::setState(ctkDicomAppHosting::State newState)
 {
   //Q_D(ctkDicomService);
   QtSoapType* input = new ctkDicomSoapState("newState", newState);
@@ -60,12 +60,12 @@ bool ctkDicomAppService::bringToFront(const QRect& requestedScreenArea)
 
 // Exchange methods
 
-bool ctkDicomAppService::notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData)
+bool ctkDicomAppService::notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData)
 {
   return service.notifyDataAvailable(data, lastData);
 }
 
-QList<ctkDicomWG23::ObjectLocator>* ctkDicomAppService::getData(
+QList<ctkDicomAppHosting::ObjectLocator>* ctkDicomAppService::getData(
   QList<QUuid> objectUUIDs, 
   QList<QString> acceptableTransferSyntaxUIDs, 
   bool includeBulkData)

Plugins/org.commontk.dah.host/ctkDicomAppService.h

@@ -34,13 +34,13 @@ public:
   ctkDicomAppService(ushort port, QString path);
   ~ctkDicomAppService();
 
-  ctkDicomWG23::State getState();
-  bool setState(ctkDicomWG23::State newState);
+  ctkDicomAppHosting::State getState();
+  bool setState(ctkDicomAppHosting::State newState);
   bool bringToFront(const QRect& requestedScreenArea);
 
   // Exchange methods
-  bool notifyDataAvailable(ctkDicomWG23::AvailableData data, bool lastData);
-  QList<ctkDicomWG23::ObjectLocator>* getData(
+  bool notifyDataAvailable(ctkDicomAppHosting::AvailableData data, bool lastData);
+  QList<ctkDicomAppHosting::ObjectLocator>* getData(
     QList<QUuid> objectUUIDs, 
     QList<QString> acceptableTransferSyntaxUIDs, 
     bool includeBulkData);

Plugins/org.commontk.dah.host/ctkDicomHostServerPrivate.cpp

@@ -26,7 +26,7 @@
 #include <QHostAddress>
 
 #include <stdexcept>
-#include <ctkDicomWG23TypesHelper.h>
+#include <ctkDicomAppHostingTypesHelper.h>
 
 #include <ctkExchangeSoapMessageProcessor.h>
 #include "ctkHostSoapMessageProcessor_p.h"

Plugins/org.commontk.dah.host/ctkHostSoapMessageProcessor.cpp

@@ -21,7 +21,7 @@
 
 #include "ctkHostSoapMessageProcessor_p.h"
 
-#include <ctkDicomWG23TypesHelper.h>
+#include <ctkDicomAppHostingTypesHelper.h>
 
 
 ctkHostSoapMessageProcessor::ctkHostSoapMessageProcessor( ctkDicomHostInterface* inter )