Use DCMTK 3.6.1 snapshot from 22/02/2012.

Applications/ctkDICOMDemoSCU/ctkDICOMDemoSCUMain.cpp

@@ -19,7 +19,8 @@
 =========================================================================*/
 
 #include "dcmtk/config/osconfig.h"    /* make sure OS specific configuration is included first */
-#include "ctkDcmSCU.h"
+
+#include "dcmtk/dcmnet/scu.h"
 
 // STD includes
 #include <cstdlib>
@@ -53,7 +54,7 @@ int main(int argc, char** argv)
   }
 
   // Setup SCU
-  ctkDcmSCU scu;
+  DcmSCU scu;
   scu.setPeerHostName(host);
   scu.setPeerPort(port);
   OFString verificationSOP = UID_VerificationSOPClass;

CMakeExternals/DCMTK.cmake

@@ -23,7 +23,7 @@ if(${add_project})
   if(CTK_SUPERBUILD)
 
     if(NOT DEFINED DCMTK_DIR)
-      set(revision_tag 085525e643cab5ac82)
+      set(revision_tag ae3b946f6e6231)
       if(${proj}_REVISION_TAG)
         set(revision_tag ${${proj}_REVISION_TAG})
       endif()
@@ -50,6 +50,8 @@ if(${add_project})
         BUILD_COMMAND ""
         CMAKE_CACHE_ARGS
           ${ep_common_cache_args}
+          -DBUILD_SHARED_LIBS:BOOL=OFF
+          -DDCMTK_WITH_DOXYGEN:BOOL=OFF
           -DDCMTK_WITH_ZLIB:BOOL=OFF # see github issue #25
           -DDCMTK_WITH_OPENSSL:BOOL=OFF # see github issue #25
           -DDCMTK_WITH_PNG:BOOL=OFF # see github issue #25

Libs/DICOM/Core/CMakeLists.txt

@@ -29,11 +29,6 @@ set(KIT_SRCS
   ctkDICOMRetrieve.h
   ctkDICOMTester.cpp
   ctkDICOMTester.h
-  # enhanced DcmSCU class - to be removed when
-  # corresponding functionality is in a 
-  # DCMKT release - see notes in header file.
-  ctkDcmSCU.cc
-
 )
 
 # Abstract class should not be wrapped !

Libs/DICOM/Core/ctkDICOMDataset.cpp

@@ -980,7 +980,7 @@ bool ctkDICOMDataset::SaveToFile(const QString& filePath) const
 {
   Q_D(const ctkDICOMDataset);
   DcmFileFormat* fileformat = new DcmFileFormat ( d->m_DcmDataset );
-  OFCondition status = fileformat->saveFile ( QDir::toNativeSeparators( filePath).toAscii()  );
+  OFCondition status = fileformat->saveFile ( qPrintable(QDir::toNativeSeparators( filePath)) );
   delete fileformat;
   return status.good();
 }

Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -37,6 +37,7 @@
 // DCMTK includes
 #include "dcmtk/dcmnet/dimse.h"
 #include "dcmtk/dcmnet/diutil.h"
+#include <dcmtk/dcmnet/scu.h>
 
 #include <dcmtk/dcmdata/dcfilefo.h>
 #include <dcmtk/dcmdata/dcfilefo.h>
@@ -47,17 +48,13 @@
 #include <dcmtk/ofstd/ofstd.h>        /* for class OFStandard */
 #include <dcmtk/dcmdata/dcddirif.h>   /* for class DicomDirInterface */
 
-// NOTE: using ctk stand-in class for now - switch back
-// to dcmtk's scu.h when cget support is in a release version
-//#include <dcmtk/dcmnet/scu.h>
-#include <ctkDcmSCU.h>
 
 static ctkLogger logger ( "org.commontk.dicom.DICOMQuery" );
 
 //------------------------------------------------------------------------------
 // A customized implemenation so that Qt signals can be emitted
 // when query results are obtained
-class ctkDICOMQuerySCUPrivate : public ctkDcmSCU
+class ctkDICOMQuerySCUPrivate : public DcmSCU
 {
 public:
   ctkDICOMQuery *query;
@@ -74,7 +71,7 @@ class ctkDICOMQuerySCUPrivate : public ctkDcmSCU
         {
         logger.debug ( "FIND RESPONSE" );
         emit this->query->debug("Got a find response!");
-        return this->ctkDcmSCU::handleFINDResponse(presID, response, waitForNextResponse);
+        return this->DcmSCU::handleFINDResponse(presID, response, waitForNextResponse);
         }
       return DIMSE_NULLKEY;
     };

Libs/DICOM/Core/ctkDICOMRetrieve.cpp

@@ -29,6 +29,7 @@
 // DCMTK includes
 #include "dcmtk/dcmnet/dimse.h"
 #include "dcmtk/dcmnet/diutil.h"
+#include <dcmtk/dcmnet/scu.h>
 
 #include <dcmtk/dcmdata/dcfilefo.h>
 #include <dcmtk/dcmdata/dcfilefo.h>
@@ -44,19 +45,14 @@
 #include <dcmtk/dcmdata/dcrledrg.h>  /* for DcmRLEDecoderRegistration */
 #include <dcmtk/dcmdata/dcrleerg.h>  /* for DcmRLEEncoderRegistration */
 
-// NOTE: using ctk stand-in class for now - switch back
-// to dcmtk's scu.h when cget support is in a release version
-//#include <dcmtk/dcmnet/scu.h>
-#include <ctkDcmSCU.h>
-
 #include "dcmtk/oflog/oflog.h"
 
 static ctkLogger logger("org.commontk.dicom.DICOMRetrieve");
 
 //------------------------------------------------------------------------------
 // A customized local implemenation of the DcmSCU so that Qt signals can be emitted
 // when retrieve results are obtained
-class ctkDICOMRetrieveSCUPrivate : public ctkDcmSCU
+class ctkDICOMRetrieveSCUPrivate : public DcmSCU
 {
 public:
   ctkDICOMRetrieve *retrieve;
@@ -76,10 +72,11 @@ class ctkDICOMRetrieveSCUPrivate : public ctkDcmSCU
         {
         emit this->retrieve->progress("Got move request");
         emit this->retrieve->progress(0);
-        return this->ctkDcmSCU::handleMOVEResponse(
+        return this->DcmSCU::handleMOVEResponse(
                         presID, response, waitForNextResponse);
         }
-      return false;
+      //return false;
+      return EC_IllegalCall;
     };
 
   // called when a data set is coming in from a server in
@@ -100,15 +97,16 @@ class ctkDICOMRetrieveSCUPrivate : public ctkDcmSCU
         if (this->retrieve && this->retrieve->database())
           {
           this->retrieve->database()->insert(incomingObject);
-          return ECC_Normal;
+          return EC_Normal;
           }
         else
           {
-          return this->ctkDcmSCU::handleSTORERequest(
+          return this->DcmSCU::handleSTORERequest(
                           presID, incomingObject, continueCGETSession, cStoreReturnStatus);
           }
         }
-      return false;
+      //return false;
+      return EC_IllegalCall;
     };
 
   // called when status information from remote server
@@ -122,9 +120,10 @@ class ctkDICOMRetrieveSCUPrivate : public ctkDcmSCU
         emit this->retrieve->progress("Got CGET response");
         emit this->retrieve->progress(0);
         continueCGETSession = !this->retrieve->wasCanceled();
-        return this->ctkDcmSCU::handleCGETResponse(presID, response, continueCGETSession);
+        return this->DcmSCU::handleCGETResponse(presID, response, continueCGETSession);
         }
-      return false;
+      //return false;
+      return EC_IllegalCall;
     };
 };