瀏覽代碼

Add DCMTK 3.6.0 support to CTK application.

Since the ctkDICOMUtil method have been updated in commit 12c052f to work
with DCMTK 3.6.0, this commit update the application code to use it.

See #405
Jean-Christophe Fillion-Robin 11 年之前
父節點
當前提交
9b1a037088

+ 2 - 2
Applications/ctkDICOMQueryRetrieve/ctkDICOMQueryRetrieveMain.cpp

@@ -26,6 +26,7 @@
 
 // CTK Core
 #include <ctkDICOMDatabase.h>
+#include <ctkDICOMUtil.h>
 
 // CTK widget includes
 #include <ctkDICOMQueryRetrieveWidget.h>
@@ -40,8 +41,7 @@
 int main(int argc, char** argv)
 {
   // Set the DCMTK log level to debug
-  dcmtk::log4cplus::Logger rootLogger = dcmtk::log4cplus::Logger::getRoot();
-  rootLogger.setLogLevel(dcmtk::log4cplus::DEBUG_LOG_LEVEL);
+  ctk::setDICOMLogLevel(ctkErrorLogLevel::Debug);
 
   QApplication app(argc, argv);
 

+ 2 - 2
Applications/ctkDICOMRetrieve/ctkDICOMRetrieveMain.cpp

@@ -24,6 +24,7 @@
 
 // CTK includes
 #include <ctkDICOMRetrieve.h>
+#include <ctkDICOMUtil.h>
 #include <ctkDICOMDatabase.h>
 #include "ctkLogger.h"
 
@@ -51,8 +52,7 @@ int main(int argc, char** argv)
   ctkLogger logger ( "org.commontk.dicom.DICOMRetieveApp" );
 
   // Set the DCMTK log level to debug
-  dcmtk::log4cplus::Logger rootLogger = dcmtk::log4cplus::Logger::getRoot();
-  rootLogger.setLogLevel(dcmtk::log4cplus::DEBUG_LOG_LEVEL);
+  ctk::setDICOMLogLevel(ctkErrorLogLevel::Debug);
 
   if (argc < 9)
   {

+ 3 - 3
Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -32,6 +32,7 @@
 
 // ctkDICOMCore includes
 #include "ctkDICOMQuery.h"
+#include "ctkDICOMUtil.h"
 #include "ctkLogger.h"
 
 // DCMTK includes
@@ -237,9 +238,8 @@ QStringList ctkDICOMQuery::studyInstanceUIDQueried()const
 //------------------------------------------------------------------------------
 bool ctkDICOMQuery::query(ctkDICOMDatabase& database )
 {
-  //// turn on logging if needed for debug:
-  //dcmtk::log4cplus::Logger log = dcmtk::log4cplus::Logger::getRoot();
-  //log.setLogLevel(OFLogger::DEBUG_LOG_LEVEL);
+  // turn on logging if needed for debug:
+  //ctk::setDICOMLogLevel(ctkErrorLogLevel::Debug);
 
   // ctkDICOMDatabase::setDatabase ( database );
   Q_D(ctkDICOMQuery);