Skip to content

Commit

Permalink
BUG: Fix filtering for ctkDICOMQuery
Browse files Browse the repository at this point in the history
  • Loading branch information
@Punzo
Punzo committed Apr 17, 2024
1 parent 176f272 commit 9f725e2
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 45 deletions.
100 changes: 56 additions & 44 deletions Libs/DICOM/Core/ctkDICOMQuery.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,9 @@ bool ctkDICOMQuery::query(ctkDICOMDatabase& database)

// Make clear we define our search values in ISO Latin 1 (default would be ASCII)
d->QueryDcmDataset->putAndInsertOFStringArray(DCM_SpecificCharacterSet, "ISO_IR 100");

d->QueryDcmDataset->putAndInsertString (DCM_QueryRetrieveLevel, "STUDY");

QString seriesDescription = this->applyFilters();
QString seriesDescription = this->applyFilters(d->Filters);
if (d->Canceled)
{
return false;
Expand Down Expand Up @@ -512,21 +511,15 @@ bool ctkDICOMQuery::queryPatients()
d->QueryDcmDataset->insertEmptyElement(DCM_PatientID);
d->QueryDcmDataset->insertEmptyElement(DCM_PatientName);
d->QueryDcmDataset->insertEmptyElement(DCM_PatientBirthDate);
d->QueryDcmDataset->insertEmptyElement(DCM_StudyID);
d->QueryDcmDataset->insertEmptyElement(DCM_StudyInstanceUID);
d->QueryDcmDataset->insertEmptyElement(DCM_StudyDescription);
d->QueryDcmDataset->insertEmptyElement(DCM_StudyDate);
d->QueryDcmDataset->insertEmptyElement(DCM_StudyTime);
d->QueryDcmDataset->insertEmptyElement(DCM_ModalitiesInStudy);
d->QueryDcmDataset->insertEmptyElement(DCM_AccessionNumber);
d->QueryDcmDataset->insertEmptyElement(DCM_NumberOfStudyRelatedSeries); // Number of series in the study

// Make clear we define our search values in ISO Latin 1 (default would be ASCII)
d->QueryDcmDataset->putAndInsertOFStringArray(DCM_SpecificCharacterSet, "ISO_IR 100");

d->QueryDcmDataset->putAndInsertString(DCM_QueryRetrieveLevel, "PATIENT");

QString seriesDescription = this->applyFilters();
QMap<QString,QVariant> filters;
filters["Name"] = d->Filters["Name"];
filters["ID"] = d->Filters["ID"];
this->applyFilters(filters);
if (d->Canceled)
{
return false;
Expand Down Expand Up @@ -651,10 +644,17 @@ bool ctkDICOMQuery::queryStudies(const QString& patientID)

// Make clear we define our search values in ISO Latin 1 (default would be ASCII)
d->QueryDcmDataset->putAndInsertOFStringArray(DCM_SpecificCharacterSet, "ISO_IR 100");

d->QueryDcmDataset->putAndInsertString(DCM_QueryRetrieveLevel, "STUDY");

QString seriesDescription = this->applyFilters();
QMap<QString,QVariant> filters;
filters["Name"] = d->Filters["Name"];
filters["ID"] = d->Filters["ID"];
filters["Study"] = d->Filters["Study"];
filters["AccessionNumber"] = d->Filters["AccessionNumber"];
filters["Modalities"] = d->Filters["Modalities"];
filters["StartDate"] = d->Filters["StartDate"];
filters["EndDate"] = d->Filters["EndDate"];
this->applyFilters(filters);
if (d->Canceled)
{
return false;
Expand Down Expand Up @@ -768,16 +768,22 @@ bool ctkDICOMQuery::querySeries(const QString& patientID,
d->QueryDcmDataset->insertEmptyElement(DCM_Modality);
d->QueryDcmDataset->insertEmptyElement(DCM_NumberOfSeriesRelatedInstances); // Number of images in the series

QString seriesDescription = this->applyFilters();
QMap<QString,QVariant> filters;
filters["Name"] = d->Filters["Name"];
filters["ID"] = d->Filters["ID"];
filters["Study"] = d->Filters["Study"];
filters["AccessionNumber"] = d->Filters["AccessionNumber"];
filters["StartDate"] = d->Filters["StartDate"];
filters["EndDate"] = d->Filters["EndDate"];
filters["Series"] = d->Filters["Series"];
QString seriesDescription = this->applyFilters(filters);
if (d->Canceled)
{
return false;
}

/* Add user-defined filters */
d->QueryDcmDataset->putAndInsertOFStringArray(DCM_SeriesDescription, seriesDescription.toLatin1().data());

// Now search each within each Study that was identified
d->QueryDcmDataset->putAndInsertString(DCM_QueryRetrieveLevel, "SERIES");

Uint16 presentationContext = 0;
Expand Down Expand Up @@ -888,16 +894,22 @@ bool ctkDICOMQuery::queryInstances(const QString& patientID,
d->QueryDcmDataset->insertEmptyElement(DCM_Rows);
d->QueryDcmDataset->insertEmptyElement(DCM_Columns);

QString seriesDescription = this->applyFilters();
QMap<QString,QVariant> filters;
filters["Name"] = d->Filters["Name"];
filters["ID"] = d->Filters["ID"];
filters["Study"] = d->Filters["Study"];
filters["AccessionNumber"] = d->Filters["AccessionNumber"];
filters["StartDate"] = d->Filters["StartDate"];
filters["EndDate"] = d->Filters["EndDate"];
filters["Series"] = d->Filters["Series"];
QString seriesDescription = this->applyFilters(filters);
if (d->Canceled)
{
return false;
}

/* Add user-defined filters */
d->QueryDcmDataset->putAndInsertOFStringArray(DCM_SeriesDescription, seriesDescription.toLatin1().data());

// Now search each within each Study that was identified
d->QueryDcmDataset->putAndInsertString(DCM_QueryRetrieveLevel, "IMAGE");

// Check for any accepted presentation context for FIND in study root (don't care about transfer syntax)
Expand Down Expand Up @@ -1049,7 +1061,7 @@ bool ctkDICOMQuery::initializeSCU()
}

//----------------------------------------------------------------------------
QString ctkDICOMQuery::applyFilters()
QString ctkDICOMQuery::applyFilters(QMap<QString,QVariant> filters)
{
Q_D(ctkDICOMQuery);

Expand All @@ -1058,62 +1070,62 @@ QString ctkDICOMQuery::applyFilters()
* Study Description, Modalities in Study, and Study Date are used.
*/
QString seriesDescription;
foreach(QString key, d->Filters.keys())
foreach(QString key, filters.keys())
{
if ( key == QString("Name") && !d->Filters[key].toString().isEmpty())
if (key == QString("Name") && !filters[key].toString().isEmpty())
{
// make the filter a wildcard in dicom style
d->QueryDcmDataset->putAndInsertString( DCM_PatientName,
(QString("*") + d->Filters[key].toString() + QString("*")).toLatin1().data());
d->QueryDcmDataset->putAndInsertString(DCM_PatientName,
(QString("*") + filters[key].toString() + QString("*")).toLatin1().data());
}
else if ( key == QString("Study") && !d->Filters[key].toString().isEmpty())
else if (key == QString("ID") && !filters[key].toString().isEmpty())
{
// make the filter a wildcard in dicom style
d->QueryDcmDataset->putAndInsertString( DCM_StudyDescription,
(QString("*") + d->Filters[key].toString() + QString("*")).toLatin1().data());
d->QueryDcmDataset->putAndInsertString(DCM_PatientID,
(QString("*") + filters[key].toString() + QString("*")).toLatin1().data());
}
else if ( key == QString("ID") && !d->Filters[key].toString().isEmpty())
else if (key == QString("Study") && !filters[key].toString().isEmpty())
{
// make the filter a wildcard in dicom style
d->QueryDcmDataset->putAndInsertString( DCM_PatientID,
(QString("*") + d->Filters[key].toString() + QString("*")).toLatin1().data());
d->QueryDcmDataset->putAndInsertString(DCM_StudyDescription,
(QString("*") + filters[key].toString() + QString("*")).toLatin1().data());
}
else if (key == QString("AccessionNumber") && !d->Filters[key].toString().isEmpty())
else if (key == QString("AccessionNumber") && !filters[key].toString().isEmpty())
{
// make the filter a wildcard in dicom style
d->QueryDcmDataset->putAndInsertString(DCM_AccessionNumber,
(QString("*") + d->Filters[key].toString() + QString("*")).toLatin1().data());
// make the filter a wildcard in dicom style
d->QueryDcmDataset->putAndInsertString(DCM_AccessionNumber,
(QString("*") + filters[key].toString() + QString("*")).toLatin1().data());
}
else if ( key == QString("Modalities") && !d->Filters[key].toString().isEmpty())
else if (key == QString("Modalities") && filters[key].toStringList().count() != 0)
{
// make the filter be an "OR" of modalities using backslash (dicom-style)
QString modalitySearch("");
foreach (const QString& modality, d->Filters[key].toStringList())
foreach (const QString& modality, filters[key].toStringList())
{
modalitySearch += modality + QString("\\");
}
modalitySearch.chop(1); // remove final backslash
logger.debug("modalityInStudySearch " + modalitySearch);
d->QueryDcmDataset->putAndInsertString( DCM_ModalitiesInStudy, modalitySearch.toLatin1().data() );
d->QueryDcmDataset->putAndInsertString(DCM_ModalitiesInStudy, modalitySearch.toLatin1().data());
}
// Remember Series Description for later series query if we go through the keys now
else if ( key == QString("Series") && !d->Filters[key].toString().isEmpty())
else if (key == QString("Series") && !filters[key].toString().isEmpty())
{
// make the filter a wildcard in dicom style
seriesDescription = "*" + d->Filters[key].toString() + "*";
seriesDescription = "*" + filters[key].toString() + "*";
}
else
{
logger.debug("Ignoring unknown search key: " + key);
}
}

if ( d->Filters.keys().contains("StartDate") && d->Filters.keys().contains("EndDate") )
if (filters.keys().contains("StartDate") && filters.keys().contains("EndDate"))
{
QString dateRange = d->Filters["StartDate"].toString() +
QString dateRange = filters["StartDate"].toString() +
QString("-") +
d->Filters["EndDate"].toString();
d->QueryDcmDataset->putAndInsertString ( DCM_StudyDate, dateRange.toLatin1().data() );
filters["EndDate"].toString();
d->QueryDcmDataset->putAndInsertString (DCM_StudyDate, dateRange.toLatin1().data());
logger.debug("Query on study date " + dateRange);
}

Expand Down
2 changes: 1 addition & 1 deletion Libs/DICOM/Core/ctkDICOMQuery.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public Q_SLOTS:
Q_INVOKABLE void releaseAssociation();

protected:
QString applyFilters();
QString applyFilters(QMap<QString,QVariant>);
bool initializeSCU();

QScopedPointer<ctkDICOMQueryPrivate> d_ptr;
Expand Down

0 comments on commit 9f725e2

Please sign in to comment.