Corrected type of acceptableTransferSyntaxUIDs to ArrayOfUID

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

@@ -38,7 +38,7 @@ struct ctkDicomExchangeInterface
 
   virtual QList<ctkDicomAppHosting::ObjectLocator> getData(
     const QList<QUuid>& objectUUIDs,
-    const QList<QString>& acceptableTransferSyntaxUIDs,
+    const QList<QUuid>& acceptableTransferSyntaxUIDs,
     bool includeBulkData) = 0;
 
   virtual void releaseData(const QList<QUuid>& objectUUIDs) = 0;

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

@@ -52,13 +52,13 @@ bool ctkDicomExchangeService::notifyDataAvailable(
 //----------------------------------------------------------------------------
 QList<ctkDicomAppHosting::ObjectLocator> ctkDicomExchangeService::getData(
     const QList<QUuid>& objectUUIDs,
-    const QList<QString>& acceptableTransferSyntaxUIDs, bool includeBulkData)
+    const QList<QUuid>& acceptableTransferSyntaxUIDs, bool includeBulkData)
 {
   //Q_D(ctkDicomService);
   QList<QtSoapType*> list;
 
   list << new ctkDicomSoapArrayOfUUIDS("objects",objectUUIDs);
-  list << new ctkDicomSoapArrayOfStringType("UID","acceptableTransferSyntaxes", acceptableTransferSyntaxUIDs);
+  list << new ctkDicomSoapArrayOfUUIDS("acceptableTransferSyntaxes", acceptableTransferSyntaxUIDs);
   list << new ctkDicomSoapBool("includeBulkData", includeBulkData);
   const QtSoapType & result = submitSoapRequest("GetData",list);
 //QtSoapType *tt;

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

@@ -41,7 +41,7 @@ public:
 
   QList<ctkDicomAppHosting::ObjectLocator> getData(
     const QList<QUuid>& objectUUIDs,
-    const QList<QString>& acceptableTransferSyntaxUIDs,
+    const QList<QUuid>& acceptableTransferSyntaxUIDs,
     bool includeBulkData);
 
   void releaseData(const QList<QUuid>& objectUUIDs);

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

@@ -96,7 +96,7 @@ void ctkExchangeSoapMessageProcessor::processGetData(
   const QtSoapType& inputType = message.method()["objects"];
   const QList<QUuid> objectUUIDs = ctkDicomSoapArrayOfUUIDS::getArray(inputType);
   const QtSoapType& inputType2 = message.method()["acceptableTransferSyntaxes"];
-  const QStringList acceptableTransferSyntaxUIDs = ctkDicomSoapArrayOfStringType::getArray(inputType2);
+  const QList<QUuid> acceptableTransferSyntaxUIDs = ctkDicomSoapArrayOfUUIDS::getArray(inputType2);
   const QtSoapType& inputType3 = message.method()["includeBulkData"];
   const bool includeBulkData = ctkDicomSoapBool::getBool(inputType3);
   // query interface

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

@@ -229,7 +229,7 @@ void ctkExampleDicomAppLogic::onLoadDataClicked()
   QList<QUuid> uuidlist;
   uuidlist.append(uuid);
   QString transfersyntax("1.2.840.10008.1.2.1");
-  QList<QString> transfersyntaxlist;
+  QList<QUuid> transfersyntaxlist;
   transfersyntaxlist.append(transfersyntax);
   QList<ctkDicomAppHosting::ObjectLocator> locators;
   locators = getHostInterface()->getData(uuidlist, transfersyntaxlist, false);

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

@@ -194,4 +194,4 @@ QString ctkExampleDicomHost::getOutputLocation(const QStringList& preferredProto
     return QDir::temp().absolutePath();
 
   return ""; 
-}
+}

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

@@ -114,7 +114,7 @@ ctkDicomAppInterface* ctkDicomAbstractHost::getDicomAppService() const
 //----------------------------------------------------------------------------
 QList<ctkDicomAppHosting::ObjectLocator> ctkDicomAbstractHost::getData(
   const QList<QUuid>& objectUUIDs,
-  const QList<QString>& acceptableTransferSyntaxUIDs,
+  const QList<QUuid>& acceptableTransferSyntaxUIDs,
   bool includeBulkData)
 {
   Q_UNUSED(acceptableTransferSyntaxUIDs);
@@ -218,5 +218,6 @@ void ctkDicomAbstractHost::notifyStateChanged(ctkDicomAppHosting::State newState
 
 ctkDicomAppHosting::State ctkDicomAbstractHost::getApplicationState()const
 {
+  // todo: probably move code from ctkExampleHostControlWidget::getApplicationState() here
   return d_ptr->AppState;
 }

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

@@ -112,7 +112,7 @@ public:
   */
   virtual QList<ctkDicomAppHosting::ObjectLocator> getData(
     const QList<QUuid>& objectUUIDs,
-    const QList<QString>& acceptableTransferSyntaxUIDs,
+    const QList<QUuid>& acceptableTransferSyntaxUIDs,
     bool includeBulkData);
 
   /**

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

@@ -72,7 +72,7 @@ bool ctkDicomAppService::notifyDataAvailable(const ctkDicomAppHosting::Available
 //----------------------------------------------------------------------------
 QList<ctkDicomAppHosting::ObjectLocator> ctkDicomAppService::getData(
   const QList<QUuid>& objectUUIDs,
-  const QList<QString>& acceptableTransferSyntaxUIDs,
+  const QList<QUuid>& acceptableTransferSyntaxUIDs,
   bool includeBulkData)
 {
   return ctkDicomExchangeService::getData(objectUUIDs, acceptableTransferSyntaxUIDs, includeBulkData);

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

@@ -42,7 +42,7 @@ public:
 
   virtual QList<ctkDicomAppHosting::ObjectLocator> getData(
     const QList<QUuid>& objectUUIDs,
-    const QList<QString>& acceptableTransferSyntaxUIDs,
+    const QList<QUuid>& acceptableTransferSyntaxUIDs,
     bool includeBulkData);
 
   virtual void releaseData(const QList<QUuid>& objectUUIDs);

Plugins/org.commontk.dah.hostedapp/ctkDicomAbstractApp.cpp

@@ -160,7 +160,7 @@ void ctkDicomAbstractApp::setInternalState(ctkDicomAppHosting::State state)
 //----------------------------------------------------------------------------
 QList<ctkDicomAppHosting::ObjectLocator> ctkDicomAbstractApp::getData(
   const QList<QUuid>& objectUUIDs,
-  const QList<QString>& acceptableTransferSyntaxUIDs,
+  const QList<QUuid>& acceptableTransferSyntaxUIDs,
   bool includeBulkData)
 {
   Q_UNUSED(acceptableTransferSyntaxUIDs);

Plugins/org.commontk.dah.hostedapp/ctkDicomAbstractApp.h

@@ -89,7 +89,7 @@ public:
   */
   virtual QList<ctkDicomAppHosting::ObjectLocator> getData(
     const QList<QUuid>& objectUUIDs,
-    const QList<QString>& acceptableTransferSyntaxUIDs,
+    const QList<QUuid>& acceptableTransferSyntaxUIDs,
     bool includeBulkData);
 
   /**

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

@@ -89,7 +89,7 @@ bool ctkDicomHostService::notifyDataAvailable(const ctkDicomAppHosting::Availabl
 //----------------------------------------------------------------------------
 QList<ctkDicomAppHosting::ObjectLocator> ctkDicomHostService::getData(
   const QList<QUuid>& objectUUIDs,
-  const QList<QString>& acceptableTransferSyntaxUIDs,
+  const QList<QUuid>& acceptableTransferSyntaxUIDs,
   bool includeBulkData)
 {
   return ctkDicomExchangeService::getData(objectUUIDs, acceptableTransferSyntaxUIDs, includeBulkData);

Plugins/org.commontk.dah.hostedapp/ctkDicomHostService_p.h

@@ -47,7 +47,7 @@ public:
 
   virtual QList<ctkDicomAppHosting::ObjectLocator> getData(
     const QList<QUuid>& objectUUIDs,
-    const QList<QString>& acceptableTransferSyntaxUIDs,
+    const QList<QUuid>& acceptableTransferSyntaxUIDs,
     bool includeBulkData);
 
   virtual void releaseData(const QList<QUuid>& objectUUIDs);