|
|
@@ -21,16 +21,6 @@
|
|
|
#include <stdexcept>
|
|
|
|
|
|
// Qt includes
|
|
|
-#include <QSqlQuery>
|
|
|
-#include <QSqlRecord>
|
|
|
-#include <QVariant>
|
|
|
-#include <QDate>
|
|
|
-#include <QStringList>
|
|
|
-#include <QSet>
|
|
|
-#include <QFile>
|
|
|
-#include <QDirIterator>
|
|
|
-#include <QFileInfo>
|
|
|
-#include <QDebug>
|
|
|
|
|
|
// ctkDICOMCore includes
|
|
|
#include "ctkDICOMRetrieve.h"
|
|
|
@@ -54,28 +44,109 @@
|
|
|
#include <dcmtk/dcmdata/dcrledrg.h> /* for DcmRLEDecoderRegistration */
|
|
|
#include <dcmtk/dcmdata/dcrleerg.h> /* for DcmRLEEncoderRegistration */
|
|
|
|
|
|
-#include <dcmtk/dcmnet/scu.h>
|
|
|
+// 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
|
|
|
+{
|
|
|
+public:
|
|
|
+ ctkDICOMRetrieve *retrieve;
|
|
|
+ ctkDICOMRetrieveSCUPrivate()
|
|
|
+ {
|
|
|
+ this->retrieve = 0;
|
|
|
+ };
|
|
|
+ ~ctkDICOMRetrieveSCUPrivate() {};
|
|
|
+
|
|
|
+ // called when a move reponse comes in: indicates that the
|
|
|
+ // move request is being handled by the remote server.
|
|
|
+ virtual OFCondition handleMOVEResponse(const T_ASC_PresentationContextID presID,
|
|
|
+ RetrieveResponse *response,
|
|
|
+ OFBool &waitForNextResponse)
|
|
|
+ {
|
|
|
+ if (this->retrieve)
|
|
|
+ {
|
|
|
+ emit this->retrieve->moveResponseHandled("Got one!");
|
|
|
+ return this->ctkDcmSCU::handleMOVEResponse(
|
|
|
+ presID, response, waitForNextResponse);
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ };
|
|
|
+
|
|
|
+ // called when a data set is coming in from a server in
|
|
|
+ // response to a CGET
|
|
|
+ virtual OFCondition handleSTORERequest(const T_ASC_PresentationContextID presID,
|
|
|
+ DcmDataset *incomingObject,
|
|
|
+ OFBool& continueCGETSession,
|
|
|
+ Uint16& cStoreReturnStatus)
|
|
|
+ {
|
|
|
+ if (this->retrieve)
|
|
|
+ {
|
|
|
+ emit this->retrieve->storeRequested("Got a store request!");
|
|
|
+ if (this->retrieve && this->retrieve->database())
|
|
|
+ {
|
|
|
+ this->retrieve->database()->insert(incomingObject);
|
|
|
+ return ECC_Normal;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ return this->ctkDcmSCU::handleSTORERequest(
|
|
|
+ presID, incomingObject, continueCGETSession, cStoreReturnStatus);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ };
|
|
|
+
|
|
|
+ // called when status information from remote server
|
|
|
+ // comes in from CGET
|
|
|
+ virtual OFCondition handleCGETResponse(const T_ASC_PresentationContextID presID,
|
|
|
+ RetrieveResponse* response,
|
|
|
+ OFBool& continueCGETSession)
|
|
|
+ {
|
|
|
+ if (this->retrieve)
|
|
|
+ {
|
|
|
+ emit this->retrieve->retrieveStatusChanged("Got a cget response!");
|
|
|
+ return this->ctkDcmSCU::handleCGETResponse(presID, response, continueCGETSession);
|
|
|
+ }
|
|
|
+ return false;
|
|
|
+ };
|
|
|
+};
|
|
|
+
|
|
|
+
|
|
|
+//------------------------------------------------------------------------------
|
|
|
class ctkDICOMRetrievePrivate
|
|
|
{
|
|
|
public:
|
|
|
ctkDICOMRetrievePrivate();
|
|
|
~ctkDICOMRetrievePrivate();
|
|
|
+ /// Keep the currently negotiated connection to the
|
|
|
+ /// peer host open unless the connection parameters change
|
|
|
bool KeepAssociationOpen;
|
|
|
bool ConnectionParamsChanged;
|
|
|
- QSharedPointer<ctkDICOMDatabase> RetrieveDatabase;
|
|
|
- DcmSCU scu;
|
|
|
+ bool LastRetrieveType;
|
|
|
+ QSharedPointer<ctkDICOMDatabase> Database;
|
|
|
+ ctkDICOMRetrieveSCUPrivate SCU;
|
|
|
QString MoveDestinationAETitle;
|
|
|
// do the retrieve, handling both series and study retrieves
|
|
|
- enum RetrieveType { RetrieveSeries, RetrieveStudy };
|
|
|
- bool retrieve ( const QString& studyInstanceUID,
|
|
|
+ enum RetrieveType { RetrieveNone, RetrieveSeries, RetrieveStudy };
|
|
|
+ bool initializeSCU(const QString& studyInstanceUID,
|
|
|
const QString& seriesInstanceUID,
|
|
|
- const RetrieveType rType );
|
|
|
+ const RetrieveType retrieveType,
|
|
|
+ DcmDataset *retrieveParameters);
|
|
|
+ bool move ( const QString& studyInstanceUID,
|
|
|
+ const QString& seriesInstanceUID,
|
|
|
+ const RetrieveType retrieveType );
|
|
|
+ bool get ( const QString& studyInstanceUID,
|
|
|
+ const QString& seriesInstanceUID,
|
|
|
+ const RetrieveType retrieveType );
|
|
|
};
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
@@ -84,57 +155,68 @@ public:
|
|
|
//------------------------------------------------------------------------------
|
|
|
ctkDICOMRetrievePrivate::ctkDICOMRetrievePrivate()
|
|
|
{
|
|
|
- this->RetrieveDatabase = QSharedPointer<ctkDICOMDatabase> (0);
|
|
|
- KeepAssociationOpen = true;
|
|
|
- ConnectionParamsChanged = false;
|
|
|
+ this->Database = QSharedPointer<ctkDICOMDatabase> (0);
|
|
|
+ this->KeepAssociationOpen = true;
|
|
|
+ this->ConnectionParamsChanged = false;
|
|
|
+ this->LastRetrieveType = RetrieveNone;
|
|
|
+
|
|
|
+ // Register the JPEG libraries in case we need them
|
|
|
+ // (registration only happens once, so it's okay to call repeatedly)
|
|
|
+ // register global JPEG decompression codecs
|
|
|
+ DJDecoderRegistration::registerCodecs();
|
|
|
+ // register global JPEG compression codecs
|
|
|
+ DJEncoderRegistration::registerCodecs();
|
|
|
+ // register RLE compression codec
|
|
|
+ DcmRLEEncoderRegistration::registerCodecs();
|
|
|
+ // register RLE decompression codec
|
|
|
+ DcmRLEDecoderRegistration::registerCodecs();
|
|
|
+
|
|
|
logger.info ( "Setting Transfer Syntaxes" );
|
|
|
OFList<OFString> transferSyntaxes;
|
|
|
transferSyntaxes.push_back ( UID_LittleEndianExplicitTransferSyntax );
|
|
|
transferSyntaxes.push_back ( UID_BigEndianExplicitTransferSyntax );
|
|
|
transferSyntaxes.push_back ( UID_LittleEndianImplicitTransferSyntax );
|
|
|
- scu.addPresentationContext ( UID_MOVEStudyRootQueryRetrieveInformationModel, transferSyntaxes );
|
|
|
+ this->SCU.addPresentationContext (
|
|
|
+ UID_MOVEStudyRootQueryRetrieveInformationModel, transferSyntaxes );
|
|
|
+ this->SCU.addPresentationContext (
|
|
|
+ UID_GETStudyRootQueryRetrieveInformationModel, transferSyntaxes );
|
|
|
+
|
|
|
+ for (Uint16 i = 0; i < numberOfDcmLongSCUStorageSOPClassUIDs; i++)
|
|
|
+ {
|
|
|
+ this->SCU.addPresentationContext(dcmLongSCUStorageSOPClassUIDs[i],
|
|
|
+ transferSyntaxes, ASC_SC_ROLE_SCP);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
ctkDICOMRetrievePrivate::~ctkDICOMRetrievePrivate()
|
|
|
{
|
|
|
// At least now be kind to the server and release association
|
|
|
- scu.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
+ this->SCU.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
-bool ctkDICOMRetrievePrivate::retrieve ( const QString& studyInstanceUID,
|
|
|
+bool ctkDICOMRetrievePrivate::initializeSCU( const QString& studyInstanceUID,
|
|
|
const QString& seriesInstanceUID,
|
|
|
- const RetrieveType rType )
|
|
|
+ const RetrieveType retrieveType,
|
|
|
+ DcmDataset *retrieveParameters)
|
|
|
{
|
|
|
-
|
|
|
- if ( !this->RetrieveDatabase )
|
|
|
+ if ( !this->Database )
|
|
|
{
|
|
|
- logger.error ( "No RetrieveDatabase for retrieve transaction" );
|
|
|
+ logger.error ( "No Database for retrieve transaction" );
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
- // Register the JPEG libraries in case we need them
|
|
|
- // (registration only happens once, so it's okay to call repeatedly)
|
|
|
- // register global JPEG decompression codecs
|
|
|
- DJDecoderRegistration::registerCodecs();
|
|
|
- // register global JPEG compression codecs
|
|
|
- DJEncoderRegistration::registerCodecs();
|
|
|
- // register RLE compression codec
|
|
|
- DcmRLEEncoderRegistration::registerCodecs();
|
|
|
- // register RLE decompression codec
|
|
|
- DcmRLEDecoderRegistration::registerCodecs();
|
|
|
-
|
|
|
// If we like to query another server than before, be sure to disconnect first
|
|
|
- if (scu.isConnected() && ConnectionParamsChanged)
|
|
|
+ if (this->SCU.isConnected() && this->ConnectionParamsChanged)
|
|
|
{
|
|
|
- scu.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
+ this->SCU.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
}
|
|
|
// Connect to server if not already connected
|
|
|
- if (!scu.isConnected())
|
|
|
+ if (!this->SCU.isConnected())
|
|
|
{
|
|
|
// Check and initialize networking parameters in DCMTK
|
|
|
- if ( !scu.initNetwork().good() )
|
|
|
+ if ( !this->SCU.initNetwork().good() )
|
|
|
{
|
|
|
logger.error ( "Error initializing the network" );
|
|
|
return false;
|
|
|
@@ -142,48 +224,74 @@ bool ctkDICOMRetrievePrivate::retrieve ( const QString& studyInstanceUID,
|
|
|
// Negotiate (i.e. start the) association
|
|
|
logger.debug ( "Negotiating Association" );
|
|
|
|
|
|
- if ( !scu.negotiateAssociation().good() )
|
|
|
+ if ( !this->SCU.negotiateAssociation().good() )
|
|
|
{
|
|
|
logger.error ( "Error negotiating association" );
|
|
|
return false;;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- ConnectionParamsChanged = false;
|
|
|
+ this->ConnectionParamsChanged = false;
|
|
|
// Setup query about what to be received from the PACS
|
|
|
logger.debug ( "Setting Retrieve Parameters" );
|
|
|
- DcmDataset *retrieveParameters = new DcmDataset();
|
|
|
- if ( rType == RetrieveSeries )
|
|
|
+ if ( retrieveType == RetrieveSeries )
|
|
|
{
|
|
|
retrieveParameters->putAndInsertString ( DCM_QueryRetrieveLevel, "SERIES" );
|
|
|
- retrieveParameters->putAndInsertString ( DCM_SeriesInstanceUID, seriesInstanceUID.toStdString().c_str() );
|
|
|
+ retrieveParameters->putAndInsertString ( DCM_SeriesInstanceUID,
|
|
|
+ seriesInstanceUID.toStdString().c_str() );
|
|
|
// Always required to send all highler level unique keys, so add study here (we are in Study Root)
|
|
|
- retrieveParameters->putAndInsertString ( DCM_StudyInstanceUID, studyInstanceUID.toStdString().c_str() ); //TODO
|
|
|
+ retrieveParameters->putAndInsertString ( DCM_StudyInstanceUID,
|
|
|
+ studyInstanceUID.toStdString().c_str() ); //TODO
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
retrieveParameters->putAndInsertString ( DCM_QueryRetrieveLevel, "STUDY" );
|
|
|
- retrieveParameters->putAndInsertString ( DCM_StudyInstanceUID, studyInstanceUID.toStdString().c_str() );
|
|
|
+ retrieveParameters->putAndInsertString ( DCM_StudyInstanceUID,
|
|
|
+ studyInstanceUID.toStdString().c_str() );
|
|
|
}
|
|
|
+ return true;
|
|
|
+}
|
|
|
+
|
|
|
+//------------------------------------------------------------------------------
|
|
|
+bool ctkDICOMRetrievePrivate::move ( const QString& studyInstanceUID,
|
|
|
+ const QString& seriesInstanceUID,
|
|
|
+ const RetrieveType retrieveType )
|
|
|
+{
|
|
|
+
|
|
|
+ DcmDataset *retrieveParameters = new DcmDataset();
|
|
|
+ if (! this->initializeSCU(studyInstanceUID, seriesInstanceUID, retrieveType, retrieveParameters) )
|
|
|
+ {
|
|
|
+ delete retrieveParameters;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
// Issue request
|
|
|
logger.debug ( "Sending Move Request" );
|
|
|
- MOVEResponses responses;
|
|
|
- T_ASC_PresentationContextID presID = scu.findPresentationContextID(UID_MOVEStudyRootQueryRetrieveInformationModel, "" /* don't care about transfer syntax */ );
|
|
|
+ OFList<RetrieveResponse*> responses;
|
|
|
+ T_ASC_PresentationContextID presID = this->SCU.findPresentationContextID(
|
|
|
+ UID_MOVEStudyRootQueryRetrieveInformationModel,
|
|
|
+ "" /* don't care about transfer syntax */ );
|
|
|
if (presID == 0)
|
|
|
{
|
|
|
logger.error ( "MOVE Request failed: No valid Study Root MOVE Presentation Context available" );
|
|
|
- if (!KeepAssociationOpen)
|
|
|
+ if (!this->KeepAssociationOpen)
|
|
|
{
|
|
|
- scu.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
+ this->SCU.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
}
|
|
|
+ delete retrieveParameters;
|
|
|
return false;
|
|
|
}
|
|
|
- OFCondition status = scu.sendMOVERequest ( presID, this->MoveDestinationAETitle.toStdString().c_str(), retrieveParameters, &responses );
|
|
|
+
|
|
|
+ // do the actual move request
|
|
|
+ OFCondition status = this->SCU.sendMOVERequest (
|
|
|
+ presID, this->MoveDestinationAETitle.toStdString().c_str(),
|
|
|
+ retrieveParameters, &responses );
|
|
|
+
|
|
|
// Close association if we do not want to explicitly keep it open
|
|
|
- if (!KeepAssociationOpen)
|
|
|
+ if (!this->KeepAssociationOpen)
|
|
|
{
|
|
|
- scu.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
+ this->SCU.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
}
|
|
|
// Free some (little) memory
|
|
|
delete retrieveParameters;
|
|
|
@@ -192,7 +300,8 @@ bool ctkDICOMRetrievePrivate::retrieve ( const QString& studyInstanceUID,
|
|
|
if ( responses.begin() == responses.end() )
|
|
|
{
|
|
|
logger.error ( "No responses received at all! (at least one empty response always expected)" );
|
|
|
- throw std::runtime_error( std::string("No responses received from server!") );
|
|
|
+ //throw std::runtime_error( std::string("No responses received from server!") );
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
/* The server is permitted to acknowledge every image that was received, or
|
|
|
@@ -203,16 +312,20 @@ bool ctkDICOMRetrievePrivate::retrieve ( const QString& studyInstanceUID,
|
|
|
* 3) Error code, i.e. no images transferred
|
|
|
* 4) Warning (one or more failures, i.e. some images transferred)
|
|
|
*/
|
|
|
- if ( responses.numResults() == 1 )
|
|
|
+ if ( responses.size() == 1 )
|
|
|
{
|
|
|
- MOVEResponse* rsp = *responses.begin();
|
|
|
- logger.debug ( "MOVE response receveid with status: " + QString(DU_cmoveStatusString(rsp->m_status)) );
|
|
|
- if ((rsp->m_status == STATUS_Success) || (rsp->m_status == STATUS_MOVE_Warning_SubOperationsCompleteOneOrMoreFailures))
|
|
|
+ RetrieveResponse* rsp = *responses.begin();
|
|
|
+ logger.debug ( "MOVE response receveid with status: " +
|
|
|
+ QString(DU_cmoveStatusString(rsp->m_status)) );
|
|
|
+
|
|
|
+ if ( (rsp->m_status == STATUS_Success)
|
|
|
+ || (rsp->m_status == STATUS_MOVE_Warning_SubOperationsCompleteOneOrMoreFailures))
|
|
|
{
|
|
|
if (rsp->m_numberOfCompletedSubops == 0)
|
|
|
{
|
|
|
logger.error ( "No images transferred by PACS!" );
|
|
|
- throw std::runtime_error( std::string("No images transferred by PACS!") );
|
|
|
+ //throw std::runtime_error( std::string("No images transferred by PACS!") );
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -227,63 +340,133 @@ bool ctkDICOMRetrievePrivate::retrieve ( const QString& studyInstanceUID,
|
|
|
}
|
|
|
statusDetail.prepend("MOVE request failed: ");
|
|
|
logger.error(statusDetail);
|
|
|
- throw std::runtime_error( statusDetail.toStdString() );
|
|
|
+ //throw std::runtime_error( statusDetail.toStdString() );
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
- // Select the last MOVE response to output meaningful status information
|
|
|
- OFListIterator(MOVEResponse*) it = responses.begin();
|
|
|
- Uint32 numResults = responses.numResults();
|
|
|
+ // Select the last MOVE response to output meaningful status information
|
|
|
+ OFIterator<RetrieveResponse*> it = responses.begin();
|
|
|
+ Uint32 numResults = responses.size();
|
|
|
for (Uint32 i = 1; i < numResults; i++)
|
|
|
{
|
|
|
it++;
|
|
|
}
|
|
|
logger.debug ( "MOVE responses report for study: " + studyInstanceUID +"\n"
|
|
|
- + QString::number(static_cast<unsigned int>((*it)->m_numberOfCompletedSubops)) + " images transferred, and\n"
|
|
|
- + QString::number(static_cast<unsigned int>((*it)->m_numberOfWarningSubops)) + " images transferred with warning, and\n"
|
|
|
- + QString::number(static_cast<unsigned int>((*it)->m_numberOfFailedSubops)) + " images transfers failed");
|
|
|
-
|
|
|
- /* Comment from Michael: The code below does not make sense. Using MOVE you never
|
|
|
- * receive the image here but only status information; thus, rsp->m_dataset is _not_
|
|
|
- * an image. I leave it inside since it might be moved to a location which makes more
|
|
|
- * sense.
|
|
|
+ + QString::number(static_cast<unsigned int>((*it)->m_numberOfCompletedSubops))
|
|
|
+ + " images transferred, and\n"
|
|
|
+ + QString::number(static_cast<unsigned int>((*it)->m_numberOfWarningSubops))
|
|
|
+ + " images transferred with warning, and\n"
|
|
|
+ + QString::number(static_cast<unsigned int>((*it)->m_numberOfFailedSubops))
|
|
|
+ + " images transfers failed");
|
|
|
+
|
|
|
+ return true;
|
|
|
+}
|
|
|
+
|
|
|
+//------------------------------------------------------------------------------
|
|
|
+bool ctkDICOMRetrievePrivate::get ( const QString& studyInstanceUID,
|
|
|
+ const QString& seriesInstanceUID,
|
|
|
+ const RetrieveType retrieveType )
|
|
|
+{
|
|
|
+ DcmDataset *retrieveParameters = new DcmDataset();
|
|
|
+ if (! this->initializeSCU(studyInstanceUID, seriesInstanceUID, retrieveType, retrieveParameters) )
|
|
|
+ {
|
|
|
+ delete retrieveParameters;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ // Issue request
|
|
|
+ logger.debug ( "Sending Get Request" );
|
|
|
+ OFList<RetrieveResponse*> responses;
|
|
|
+ T_ASC_PresentationContextID presID = this->SCU.findPresentationContextID(
|
|
|
+ UID_GETStudyRootQueryRetrieveInformationModel,
|
|
|
+ "" /* don't care about transfer syntax */ );
|
|
|
+ if (presID == 0)
|
|
|
+ {
|
|
|
+ logger.error ( "GET Request failed: No valid Study Root GET Presentation Context available" );
|
|
|
+ if (!this->KeepAssociationOpen)
|
|
|
+ {
|
|
|
+ this->SCU.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
+ }
|
|
|
+ delete retrieveParameters;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ // do the actual move request
|
|
|
+ OFCondition status = this->SCU.sendCGETRequest (
|
|
|
+ presID, retrieveParameters, &responses );
|
|
|
+
|
|
|
+ // Close association if we do not want to explicitly keep it open
|
|
|
+ if (!this->KeepAssociationOpen)
|
|
|
+ {
|
|
|
+ this->SCU.closeAssociation(DCMSCU_RELEASE_ASSOCIATION);
|
|
|
+ }
|
|
|
+ // Free some (little) memory
|
|
|
+ delete retrieveParameters;
|
|
|
+
|
|
|
+ // If we do not receive a single response, something is fishy
|
|
|
+ if ( responses.begin() == responses.end() )
|
|
|
+ {
|
|
|
+ logger.error ( "No responses received at all! (at least one empty response always expected)" );
|
|
|
+ //throw std::runtime_error( std::string("No responses received from server!") );
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* The server is permitted to acknowledge every image that was received, or
|
|
|
+ * to send a single move response.
|
|
|
+ * If there is only a single response, this can mean the following:
|
|
|
+ * 1) No images to transfer (Status Success and Number of Completed Subops = 0)
|
|
|
+ * 2) All images transferred (Status Success and Number of Completed Subops > 0)
|
|
|
+ * 3) Error code, i.e. no images transferred
|
|
|
+ * 4) Warning (one or more failures, i.e. some images transferred)
|
|
|
*/
|
|
|
+ if ( responses.size() == 1 )
|
|
|
+ {
|
|
|
+ RetrieveResponse* rsp = *responses.begin();
|
|
|
+ logger.debug ( "GET response receveid with status: " +
|
|
|
+ QString(DU_cmoveStatusString(rsp->m_status)) );
|
|
|
+
|
|
|
+ if ( (rsp->m_status == STATUS_Success)
|
|
|
+ || (rsp->m_status == STATUS_GET_Warning_SubOperationsCompleteOneOrMoreFailures))
|
|
|
+ {
|
|
|
+ if (rsp->m_numberOfCompletedSubops == 0)
|
|
|
+ {
|
|
|
+ logger.error ( "No images transferred by PACS!" );
|
|
|
+ //throw std::runtime_error( std::string("No images transferred by PACS!") );
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ logger.error("GET request failed, server does report error");
|
|
|
+ QString statusDetail("No details");
|
|
|
+ if (rsp->m_statusDetail != NULL)
|
|
|
+ {
|
|
|
+ std::ostringstream out;
|
|
|
+ rsp->m_statusDetail->print(out);
|
|
|
+ statusDetail = "Status Detail: " + statusDetail.fromStdString(out.str());
|
|
|
+ }
|
|
|
+ statusDetail.prepend("GET request failed: ");
|
|
|
+ logger.error(statusDetail);
|
|
|
+ //throw std::runtime_error( statusDetail.toStdString() );
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // Select the last GET response to output meaningful status information
|
|
|
+ OFIterator<RetrieveResponse*> it = responses.begin();
|
|
|
+ Uint32 numResults = responses.size();
|
|
|
+ for (Uint32 i = 1; i < numResults; i++)
|
|
|
+ {
|
|
|
+ it++;
|
|
|
+ }
|
|
|
+ logger.debug ( "GET responses report for study: " + studyInstanceUID +"\n"
|
|
|
+ + QString::number(static_cast<unsigned int>((*it)->m_numberOfCompletedSubops))
|
|
|
+ + " images transferred, and\n"
|
|
|
+ + QString::number(static_cast<unsigned int>((*it)->m_numberOfWarningSubops))
|
|
|
+ + " images transferred with warning, and\n"
|
|
|
+ + QString::number(static_cast<unsigned int>((*it)->m_numberOfFailedSubops))
|
|
|
+ + " images transfers failed");
|
|
|
|
|
|
- // for ( OFListIterator(MOVEResponse*) it = responses.begin(); it != responses.end(); it++ )
|
|
|
- // {
|
|
|
- // DcmDataset *dataset = (*it)->m_dataset;
|
|
|
- // if ( dataset != NULL )
|
|
|
- // {
|
|
|
- // logger.debug ( "Got a valid dataset" );
|
|
|
- // // Save in correct directory
|
|
|
- // E_TransferSyntax output_transfersyntax = dataset->getOriginalXfer();
|
|
|
- // dataset->chooseRepresentation( output_transfersyntax, NULL );
|
|
|
- //
|
|
|
- // if ( !dataset->canWriteXfer( output_transfersyntax ) )
|
|
|
- // {
|
|
|
- // // Pick EXS_LittleEndianExplicit as our default
|
|
|
- // output_transfersyntax = EXS_LittleEndianExplicit;
|
|
|
- // }
|
|
|
- //
|
|
|
- // DcmXfer opt_oxferSyn( output_transfersyntax );
|
|
|
- // if ( !dataset->chooseRepresentation( opt_oxferSyn.getXfer(), NULL ).bad() )
|
|
|
- // {
|
|
|
- // DcmFileFormat fileformat( dataset );
|
|
|
- //
|
|
|
- // // Follow dcmdjpeg example
|
|
|
- // OFString SOPInstanceUID;
|
|
|
- // dataset->findAndGetOFString ( DCM_SOPInstanceUID, SOPInstanceUID );
|
|
|
- // QFileInfo fi ( directory, QString ( SOPInstanceUID.c_str() ) );
|
|
|
- // logger.debug ( "Saving file: " + fi.absoluteFilePath() );
|
|
|
- // status = fileformat.saveFile ( fi.absoluteFilePath().toStdString().c_str(), opt_oxferSyn.getXfer() );
|
|
|
- // if ( !status.good() )
|
|
|
- // {
|
|
|
- // logger.error ( "Error saving file: " + fi.absoluteFilePath() + " Error is " + status.text() );
|
|
|
- // }
|
|
|
- // // Insert into our local database
|
|
|
- // RetrieveDatabase->insert( dataset, true );
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
@@ -294,6 +477,8 @@ bool ctkDICOMRetrievePrivate::retrieve ( const QString& studyInstanceUID,
|
|
|
ctkDICOMRetrieve::ctkDICOMRetrieve()
|
|
|
: d_ptr(new ctkDICOMRetrievePrivate)
|
|
|
{
|
|
|
+ Q_D(ctkDICOMRetrieve);
|
|
|
+ d->SCU.retrieve = this; // give the dcmtk level access to this for emitting signals
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
@@ -306,9 +491,9 @@ ctkDICOMRetrieve::~ctkDICOMRetrieve()
|
|
|
void ctkDICOMRetrieve::setCallingAETitle( const QString& callingAETitle )
|
|
|
{
|
|
|
Q_D(ctkDICOMRetrieve);
|
|
|
- if (strcmp(callingAETitle.toStdString().c_str(), d->scu.getAETitle().c_str()))
|
|
|
+ if (strcmp(callingAETitle.toStdString().c_str(), d->SCU.getAETitle().c_str()))
|
|
|
{
|
|
|
- d->scu.setAETitle(callingAETitle.toStdString().c_str());
|
|
|
+ d->SCU.setAETitle(callingAETitle.toStdString().c_str());
|
|
|
d->ConnectionParamsChanged = true;
|
|
|
}
|
|
|
}
|
|
|
@@ -317,16 +502,16 @@ void ctkDICOMRetrieve::setCallingAETitle( const QString& callingAETitle )
|
|
|
QString ctkDICOMRetrieve::callingAETitle() const
|
|
|
{
|
|
|
Q_D(const ctkDICOMRetrieve);
|
|
|
- return d->scu.getAETitle().c_str();
|
|
|
+ return d->SCU.getAETitle().c_str();
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
void ctkDICOMRetrieve::setCalledAETitle( const QString& calledAETitle )
|
|
|
{
|
|
|
Q_D(ctkDICOMRetrieve);
|
|
|
- if (strcmp(calledAETitle.toStdString().c_str(),d->scu.getPeerAETitle().c_str()))
|
|
|
+ if (strcmp(calledAETitle.toStdString().c_str(),d->SCU.getPeerAETitle().c_str()))
|
|
|
{
|
|
|
- d->scu.setPeerAETitle(calledAETitle.toStdString().c_str());
|
|
|
+ d->SCU.setPeerAETitle(calledAETitle.toStdString().c_str());
|
|
|
d->ConnectionParamsChanged = true;
|
|
|
}
|
|
|
}
|
|
|
@@ -335,16 +520,16 @@ void ctkDICOMRetrieve::setCalledAETitle( const QString& calledAETitle )
|
|
|
QString ctkDICOMRetrieve::calledAETitle()const
|
|
|
{
|
|
|
Q_D(const ctkDICOMRetrieve);
|
|
|
- return d->scu.getPeerAETitle().c_str();
|
|
|
+ return d->SCU.getPeerAETitle().c_str();
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
void ctkDICOMRetrieve::setHost( const QString& host )
|
|
|
{
|
|
|
Q_D(ctkDICOMRetrieve);
|
|
|
- if (strcmp(host.toStdString().c_str(), d->scu.getPeerHostName().c_str()))
|
|
|
+ if (strcmp(host.toStdString().c_str(), d->SCU.getPeerHostName().c_str()))
|
|
|
{
|
|
|
- d->scu.setPeerHostName(host.toStdString().c_str());
|
|
|
+ d->SCU.setPeerHostName(host.toStdString().c_str());
|
|
|
d->ConnectionParamsChanged = true;
|
|
|
}
|
|
|
}
|
|
|
@@ -353,25 +538,25 @@ void ctkDICOMRetrieve::setHost( const QString& host )
|
|
|
QString ctkDICOMRetrieve::host()const
|
|
|
{
|
|
|
Q_D(const ctkDICOMRetrieve);
|
|
|
- return d->scu.getPeerHostName().c_str();
|
|
|
+ return d->SCU.getPeerHostName().c_str();
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
-void ctkDICOMRetrieve::setCalledPort( int port )
|
|
|
+void ctkDICOMRetrieve::setPort( int port )
|
|
|
{
|
|
|
Q_D(ctkDICOMRetrieve);
|
|
|
- if (d->scu.getPeerPort() != port)
|
|
|
+ if (d->SCU.getPeerPort() != port)
|
|
|
{
|
|
|
- d->scu.setPeerPort(port);
|
|
|
+ d->SCU.setPeerPort(port);
|
|
|
d->ConnectionParamsChanged = true;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
-int ctkDICOMRetrieve::calledPort()const
|
|
|
+int ctkDICOMRetrieve::port()const
|
|
|
{
|
|
|
Q_D(const ctkDICOMRetrieve);
|
|
|
- return d->scu.getPeerPort();
|
|
|
+ return d->SCU.getPeerPort();
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
@@ -392,18 +577,17 @@ QString ctkDICOMRetrieve::moveDestinationAETitle()const
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
-void ctkDICOMRetrieve::setRetrieveDatabase(QSharedPointer<ctkDICOMDatabase> dicomDatabase)
|
|
|
+void ctkDICOMRetrieve::setDatabase(QSharedPointer<ctkDICOMDatabase> dicomDatabase)
|
|
|
{
|
|
|
Q_D(ctkDICOMRetrieve);
|
|
|
- d->RetrieveDatabase = dicomDatabase;
|
|
|
- // (server parameters do not have to be changed)
|
|
|
+ d->Database = dicomDatabase;
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
-QSharedPointer<ctkDICOMDatabase> ctkDICOMRetrieve::retrieveDatabase()const
|
|
|
+QSharedPointer<ctkDICOMDatabase> ctkDICOMRetrieve::database()const
|
|
|
{
|
|
|
Q_D(const ctkDICOMRetrieve);
|
|
|
- return d->RetrieveDatabase;
|
|
|
+ return d->Database;
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
@@ -421,7 +605,33 @@ bool ctkDICOMRetrieve::keepAssociationOpen()
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
-bool ctkDICOMRetrieve::retrieveSeries(const QString& studyInstanceUID,
|
|
|
+bool ctkDICOMRetrieve::moveStudy(const QString& studyInstanceUID)
|
|
|
+{
|
|
|
+ if (studyInstanceUID.isEmpty())
|
|
|
+ {
|
|
|
+ logger.error("Cannot receive series: Study Instance UID empty.");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ Q_D(ctkDICOMRetrieve);
|
|
|
+ logger.info ( "Starting moveStudy" );
|
|
|
+ return d->move ( studyInstanceUID, "", ctkDICOMRetrievePrivate::RetrieveStudy );
|
|
|
+}
|
|
|
+
|
|
|
+//------------------------------------------------------------------------------
|
|
|
+bool ctkDICOMRetrieve::getStudy(const QString& studyInstanceUID)
|
|
|
+{
|
|
|
+ if (studyInstanceUID.isEmpty())
|
|
|
+ {
|
|
|
+ logger.error("Cannot receive series: Study Instance UID empty.");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ Q_D(ctkDICOMRetrieve);
|
|
|
+ logger.info ( "Starting getStudy" );
|
|
|
+ return d->get ( studyInstanceUID, "", ctkDICOMRetrievePrivate::RetrieveStudy );
|
|
|
+}
|
|
|
+
|
|
|
+//------------------------------------------------------------------------------
|
|
|
+bool ctkDICOMRetrieve::moveSeries(const QString& studyInstanceUID,
|
|
|
const QString& seriesInstanceUID)
|
|
|
{
|
|
|
if (studyInstanceUID.isEmpty() || seriesInstanceUID.isEmpty())
|
|
|
@@ -430,19 +640,21 @@ bool ctkDICOMRetrieve::retrieveSeries(const QString& studyInstanceUID,
|
|
|
return false;
|
|
|
}
|
|
|
Q_D(ctkDICOMRetrieve);
|
|
|
- logger.info ( "Starting retrieveSeries" );
|
|
|
- return d->retrieve ( studyInstanceUID, seriesInstanceUID, ctkDICOMRetrievePrivate::RetrieveSeries );
|
|
|
+ logger.info ( "Starting moveSeries" );
|
|
|
+ return d->move ( studyInstanceUID, seriesInstanceUID, ctkDICOMRetrievePrivate::RetrieveSeries );
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------
|
|
|
-bool ctkDICOMRetrieve::retrieveStudy( const QString& studyInstanceUID )
|
|
|
+bool ctkDICOMRetrieve::getSeries(const QString& studyInstanceUID,
|
|
|
+ const QString& seriesInstanceUID)
|
|
|
{
|
|
|
- if (studyInstanceUID.isEmpty())
|
|
|
+ if (studyInstanceUID.isEmpty() || seriesInstanceUID.isEmpty())
|
|
|
{
|
|
|
logger.error("Cannot receive series: Either Study or Series Instance UID empty.");
|
|
|
return false;
|
|
|
}
|
|
|
Q_D(ctkDICOMRetrieve);
|
|
|
- logger.info ( "Starting retrieveStudy" );
|
|
|
- return d->retrieve ( studyInstanceUID, "", ctkDICOMRetrievePrivate::RetrieveStudy );
|
|
|
+ logger.info ( "Starting getSeries" );
|
|
|
+ return d->get ( studyInstanceUID, seriesInstanceUID, ctkDICOMRetrievePrivate::RetrieveSeries );
|
|
|
}
|
|
|
+
|
Steve Pieper