DICOM Retrieve working.

Changed from QApplication to QCoreApplication for command line DICOM programs.  This will allow true command line operation without having a connection to an X server or other GUI.

Applications/ctkDICOMIndexer/ctkDICOMIndexerMain.cpp

@@ -59,7 +59,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  QApplication app(argc, argv);
+  QCoreApplication app(argc, argv);
   QTextStream out(stdout);
 
   ctkDICOMIndexer idx;

Applications/ctkDICOMQuery/ctkDICOMQueryMain.cpp

@@ -55,7 +55,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  QApplication app(argc, argv);
+  QCoreApplication app(argc, argv);
   QTextStream out(stdout);
 
   ctkDICOM myCTK;

Applications/ctkDICOMRetrieve/ctkDICOMRetrieveMain.cpp

@@ -55,7 +55,7 @@ int main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  QApplication app(argc, argv);
+  QCoreApplication app(argc, argv);
   QTextStream out(stdout);
 
   QString SeriesUID ( argv[1] );
@@ -90,10 +90,10 @@ int main(int argc, char** argv)
   logger.info ( "SeriesUID: " + SeriesUID + "\n" 
                 + "OutputDirectory: " + OutputDirectory.absolutePath() + "\n"
                 + "CallingAETitle: " + CallingAETitle + "\n"
-                + "CallingPort: " + QString ( CallingPort ) + "\n"
+                + "CallingPort: " + QString::number ( CallingPort ) + "\n"
                 + "CalledAEtitle: " + CalledAETitle + "\n"
                 + "Host: " + Host + "\n"
-                + "CalledPort: " + QString ( CalledPort ) + "\n" );
+                + "CalledPort: " + QString::number ( CalledPort ) + "\n" );
 
 
   logger.info ( "Starting to retrieve" );

Libs/DICOM/Core/ctkDICOMQuery.cpp

@@ -189,9 +189,8 @@ void ctkDICOMQuery::query(QSqlDatabase database )
   // Clean it out
   for ( unsigned long i = 0; i < elements; i++ ) 
     {
-    d->query->remove ( (unsigned long) 0 );
+    d->query->remove ( 0ul );
     }
-//  d->query->insertEmptyElement ( DCM_QueryRetrieveLevel );
   d->query->insertEmptyElement ( DCM_PatientID );
   d->query->insertEmptyElement ( DCM_PatientsName );
   d->query->insertEmptyElement ( DCM_PatientsBirthDate );

Libs/DICOM/Core/ctkDICOMRetrieve.cpp

@@ -74,6 +74,12 @@ public:
   int CalledPort;
   DcmSCU SCU;
   DcmDataset* parameters;
+
+  // do the retrieve, handling both series and study retrieves
+  enum RetrieveType { RetrieveSeries, RetrieveStudy };
+  void retrieve ( QString UID, QDir directory, RetrieveType retriveType );
+  
+
 };
 
 //------------------------------------------------------------------------------
@@ -91,80 +97,7 @@ ctkDICOMRetrievePrivate::~ctkDICOMRetrievePrivate()
   delete parameters;
 }
 
-
-
-//------------------------------------------------------------------------------
-// ctkDICOMRetrieve methods
-
-//------------------------------------------------------------------------------
-ctkDICOMRetrieve::ctkDICOMRetrieve()
-{
-}
-
-//------------------------------------------------------------------------------
-ctkDICOMRetrieve::~ctkDICOMRetrieve()
-{
-}
-
-/// Set methods for connectivity
-void ctkDICOMRetrieve::setCallingAETitle ( QString callingAETitle )
-{
-  CTK_D(ctkDICOMRetrieve);
-  d->CallingAETitle = callingAETitle;
-}
-const QString& ctkDICOMRetrieve::callingAETitle() 
-{
-  CTK_D(ctkDICOMRetrieve);
-  return d->CallingAETitle;
-}
-void ctkDICOMRetrieve::setCalledAETitle ( QString calledAETitle )
-{
-  CTK_D(ctkDICOMRetrieve);
-  d->CalledAETitle = calledAETitle;
-}
-const QString& ctkDICOMRetrieve::calledAETitle()
-{
-  CTK_D(ctkDICOMRetrieve);
-  return d->CalledAETitle;
-}
-void ctkDICOMRetrieve::setHost ( QString host )
-{
-  CTK_D(ctkDICOMRetrieve);
-  d->Host = host;
-}
-const QString& ctkDICOMRetrieve::host()
-{
-  CTK_D(ctkDICOMRetrieve);
-  return d->Host;
-}
-void ctkDICOMRetrieve::setCallingPort ( int port ) 
-{
-  CTK_D(ctkDICOMRetrieve);
-  d->CallingPort = port;
-}
-int ctkDICOMRetrieve::callingPort()
-{
-  CTK_D(ctkDICOMRetrieve);
-  return d->CallingPort;
-}
-
-void ctkDICOMRetrieve::setCalledPort ( int port ) 
-{
-  CTK_D(ctkDICOMRetrieve);
-  d->CalledPort = port;
-}
-int ctkDICOMRetrieve::calledPort()
-{
-  CTK_D(ctkDICOMRetrieve);
-  return d->CalledPort;
-}
-
-
-
-//------------------------------------------------------------------------------
-void ctkDICOMRetrieve::retrieveSeries ( QString seriesInstanceUID, QDir directory ) {
-  CTK_D(ctkDICOMRetrieve);
-  logger.info ( "Starting retrieveSeries" );
+void ctkDICOMRetrievePrivate::retrieve ( QString UID, QDir directory, RetrieveType retriveType ) {
 
   // Register the JPEG libraries in case we need them
   //   (registration only happens once, so it's okay to call repeatedly)
@@ -182,11 +115,11 @@ void ctkDICOMRetrieve::retrieveSeries ( QString seriesInstanceUID, QDir director
   rootLogger.setLogLevel(log4cplus::DEBUG_LOG_LEVEL);
 
   DcmSCU scu;
-  scu.setAETitle ( this->callingAETitle().toStdString() );
-  scu.setPort ( this->callingPort() );
-  scu.setPeerAETitle ( this->calledAETitle().toStdString() );
-  scu.setPeerHostName ( this->host().toStdString() );
-  scu.setPeerPort ( this->calledPort() );
+  scu.setAETitle ( CallingAETitle.toStdString() );
+  scu.setPort ( CallingPort );
+  scu.setPeerAETitle ( CalledAETitle.toStdString() );
+  scu.setPeerHostName ( Host.toStdString() );
+  scu.setPeerPort ( CalledPort );
 
   logger.error ( "Setting Transfer Syntaxes" );
   OFList<OFString> transferSyntaxes;
@@ -209,17 +142,25 @@ void ctkDICOMRetrieve::retrieveSeries ( QString seriesInstanceUID, QDir director
     return;
     }
   // Clear the query
-  unsigned long elements = d->parameters->card();
+  unsigned long elements = this->parameters->card();
   // Clean it out
   for ( unsigned long i = 0; i < elements; i++ ) 
     {
-    d->parameters->remove ( (unsigned long) 0 );
+    this->parameters->remove ( 0ul );
+    }
+  if ( retriveType == RetrieveSeries )
+    {
+    this->parameters->putAndInsertString ( DCM_QueryRetrieveLevel, "SERIES" );
+    this->parameters->putAndInsertString ( DCM_SeriesInstanceUID, UID.toStdString().c_str() );
+    } 
+  else
+    {
+    this->parameters->putAndInsertString ( DCM_QueryRetrieveLevel, "STUDY" );
+    this->parameters->putAndInsertString ( DCM_StudyInstanceUID, UID.toStdString().c_str() );  
     }
-  d->parameters->putAndInsertString ( DCM_QueryRetrieveLevel, "SERIES" );
-  d->parameters->putAndInsertString ( DCM_SeriesInstanceUID, seriesInstanceUID.toStdString().c_str() );
 
   MOVEResponses *responses = new MOVEResponses();
-  OFCondition status = scu.sendMOVERequest ( 0, d->parameters, responses );
+  OFCondition status = scu.sendMOVERequest ( 0, this->parameters, responses );
   if ( status.good() )
     {
     logger.debug ( "Find succeded" );
@@ -270,9 +211,91 @@ void ctkDICOMRetrieve::retrieveSeries ( QString seriesInstanceUID, QDir director
     logger.error ( "MOVE Request failed: " + QString ( status.text() ) );
     }
   delete responses;
+}
+
+
+
+
+//------------------------------------------------------------------------------
+// ctkDICOMRetrieve methods
+
+//------------------------------------------------------------------------------
+ctkDICOMRetrieve::ctkDICOMRetrieve()
+{
+}
+
+//------------------------------------------------------------------------------
+ctkDICOMRetrieve::~ctkDICOMRetrieve()
+{
+}
+
+/// Set methods for connectivity
+void ctkDICOMRetrieve::setCallingAETitle ( QString callingAETitle )
+{
+  CTK_D(ctkDICOMRetrieve);
+  d->CallingAETitle = callingAETitle;
+}
+const QString& ctkDICOMRetrieve::callingAETitle() 
+{
+  CTK_D(ctkDICOMRetrieve);
+  return d->CallingAETitle;
+}
+void ctkDICOMRetrieve::setCalledAETitle ( QString calledAETitle )
+{
+  CTK_D(ctkDICOMRetrieve);
+  d->CalledAETitle = calledAETitle;
+}
+const QString& ctkDICOMRetrieve::calledAETitle()
+{
+  CTK_D(ctkDICOMRetrieve);
+  return d->CalledAETitle;
+}
+void ctkDICOMRetrieve::setHost ( QString host )
+{
+  CTK_D(ctkDICOMRetrieve);
+  d->Host = host;
+}
+const QString& ctkDICOMRetrieve::host()
+{
+  CTK_D(ctkDICOMRetrieve);
+  return d->Host;
+}
+void ctkDICOMRetrieve::setCallingPort ( int port ) 
+{
+  CTK_D(ctkDICOMRetrieve);
+  d->CallingPort = port;
+}
+int ctkDICOMRetrieve::callingPort()
+{
+  CTK_D(ctkDICOMRetrieve);
+  return d->CallingPort;
+}
+
+void ctkDICOMRetrieve::setCalledPort ( int port ) 
+{
+  CTK_D(ctkDICOMRetrieve);
+  d->CalledPort = port;
+}
+int ctkDICOMRetrieve::calledPort()
+{
+  CTK_D(ctkDICOMRetrieve);
+  return d->CalledPort;
+}
+
+
+
+//------------------------------------------------------------------------------
+void ctkDICOMRetrieve::retrieveSeries ( QString seriesInstanceUID, QDir directory ) {
+  CTK_D(ctkDICOMRetrieve);
+  logger.info ( "Starting retrieveSeries" );
+  d->retrieve ( seriesInstanceUID, directory, ctkDICOMRetrievePrivate::RetrieveSeries );
   return;
 }
 
 void ctkDICOMRetrieve::retrieveStudy ( QString studyInstanceUID, QDir directory ) {
+  CTK_D(ctkDICOMRetrieve);
+  logger.info ( "Starting retrieveStudy" );
+  d->retrieve ( studyInstanceUID, directory, ctkDICOMRetrievePrivate::RetrieveStudy );
+  return;
 }
 

Libs/DICOM/Core/ctkDICOMRetrieve.h

@@ -24,7 +24,6 @@
 
 // Qt includes 
 #include <QObject>
-#include <QSqlDatabase>
 #include <QDir>
 
 // CTK includes