diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorAbstractRule.h b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorAbstractRule.h index e120ae95bf..d0ab608114 100644 --- a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorAbstractRule.h +++ b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorAbstractRule.h @@ -53,32 +53,67 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMDisplayedFieldGeneratorAbstractRule /// Generate displayed fields for a certain instance based on its cached tags /// Each rule plugin has the chance to fill any field in the series, study, and patient fields. /// The way these generated fields will be used is defined by \sa mergeDisplayedFieldsForInstance - virtual void getDisplayedFieldsForInstance(const QMap &cachedTagsForInstance, QMap &displayedFieldsForCurrentSeries, - QMap &displayedFieldsForCurrentStudy, QMap &displayedFieldsForCurrentPatient) { }; + virtual void getDisplayedFieldsForInstance( + const QMap &cachedTagsForInstance, + QMap &displayedFieldsForCurrentSeries, + QMap &displayedFieldsForCurrentStudy, + QMap &displayedFieldsForCurrentPatient) + { + Q_UNUSED(cachedTagsForInstance); + Q_UNUSED(displayedFieldsForCurrentSeries); + Q_UNUSED(displayedFieldsForCurrentStudy); + Q_UNUSED(displayedFieldsForCurrentPatient); + } /// Define rules of merging initial database values with new values generated by the rule plugins /// Currently available options: /// - \sa mergeExpectSameValue Use the non-empty field value. If both initial and new are non-empty and different, then use the initial value /// - \sa mergeConcatenate Use the non-empty field value. If both initial and new are non-empty, then concatenate them using comma virtual void mergeDisplayedFieldsForInstance( - const QMap &initialFieldsSeries, const QMap &initialFieldsStudy, const QMap &initialFieldsPatient, - const QMap &newFieldsSeries, const QMap &newFieldsStudy, const QMap &newFieldsPatient, - QMap &mergedFieldsSeries, QMap &mergedFieldsStudy, QMap &mergedFieldsPatient, - const QMap &emptyFieldsSeries, const QMap &emptyFieldsStudy, const QMap &emptyFieldsPatient - ) { }; + const QMap &initialFieldsSeries, + const QMap &initialFieldsStudy, + const QMap &initialFieldsPatient, + const QMap &newFieldsSeries, + const QMap &newFieldsStudy, + const QMap &newFieldsPatient, + QMap &mergedFieldsSeries, + QMap &mergedFieldsStudy, + QMap &mergedFieldsPatient, + const QMap &emptyFieldsSeries, + const QMap &emptyFieldsStudy, + const QMap &emptyFieldsPatient) + { + Q_UNUSED(initialFieldsSeries); + Q_UNUSED(initialFieldsStudy); + Q_UNUSED(initialFieldsPatient); + Q_UNUSED(newFieldsSeries); + Q_UNUSED(newFieldsStudy); + Q_UNUSED(newFieldsPatient); + Q_UNUSED(mergedFieldsSeries); + Q_UNUSED(mergedFieldsStudy); + Q_UNUSED(mergedFieldsPatient); + Q_UNUSED(emptyFieldsSeries); + Q_UNUSED(emptyFieldsStudy); + Q_UNUSED(emptyFieldsPatient); + } /// Specify list of DICOM tags required by the rule. These tags will be included in the tag cache virtual QStringList getRequiredDICOMTags()=0; /// Start updating displayed fields (reset counters, etc.). No-op by default. - virtual void startUpdate() { }; + virtual void startUpdate() { } /// End updating displayed fields (accumulate stored variables, compute final result, etc.). No-op by default. /// Has a chance to update any field in the series, study, or patient field maps, based on /// the maps themselves or the database. virtual void endUpdate(QMap > &displayedFieldsMapSeries, QMap > &displayedFieldsMapStudy, - QMap > &displayedFieldsMapPatient) { }; + QMap > &displayedFieldsMapPatient) + { + Q_UNUSED(displayedFieldsMapSeries); + Q_UNUSED(displayedFieldsMapStudy); + Q_UNUSED(displayedFieldsMapPatient); + } /// Utility function to convert a DICOM tag enum to string static QString dicomTagToString(const DcmTagKey& tag) @@ -90,7 +125,14 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMDisplayedFieldGeneratorAbstractRule /// Used when merging the original database content with the displayed fields generated by the rules. /// Example: SeriesDescription -> Unnamed Series virtual void registerEmptyFieldNames( - QMap emptyFieldsSeries, QMap emptyFieldsStudies, QMap emptyFieldsPatients) { }; + QMap emptyFieldsSeries, + QMap emptyFieldsStudies, + QMap emptyFieldsPatients) + { + Q_UNUSED(emptyFieldsSeries); + Q_UNUSED(emptyFieldsStudies); + Q_UNUSED(emptyFieldsPatients); + } /// Set DICOM database to the rule in case it needs to use it e.g. in \sa end(). void setDatabase(ctkDICOMDatabase* database) { this->DICOMDatabase = database; } @@ -121,8 +163,11 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMDisplayedFieldGeneratorAbstractRule /// Merge function that only uses the new value if the initial value is empty and vice versa static void mergeExpectSameValue( - const QString &fieldName, const QMap &initialFields, const QMap &newFields, - QMap &mergedFields, const QMap &emptyValuesForEachField ) + const QString &fieldName, + const QMap &initialFields, + const QMap &newFields, + QMap &mergedFields, + const QMap &emptyValuesForEachField) { if (isFieldEmpty(fieldName, newFields, emptyValuesForEachField)) { @@ -150,8 +195,11 @@ class CTK_DICOM_CORE_EXPORT ctkDICOMDisplayedFieldGeneratorAbstractRule /// Merge function that sets merged value as a concatenation of the initial and new values /// Individual values in the concatenation are separated by comma static void mergeConcatenate( - const QString &fieldName, const QMap &initialFields, const QMap &newFields, - QMap &mergedFields, const QMap &emptyValuesForEachField ) + const QString &fieldName, + const QMap &initialFields, + const QMap &newFields, + QMap &mergedFields, + const QMap &emptyValuesForEachField) { if (isFieldEmpty(fieldName, newFields, emptyValuesForEachField)) { diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorLastStudyDateRule.cpp b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorLastStudyDateRule.cpp index 8af075c99c..5cdee49246 100644 --- a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorLastStudyDateRule.cpp +++ b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorLastStudyDateRule.cpp @@ -64,6 +64,9 @@ void ctkDICOMDisplayedFieldGeneratorLastStudyDateRule::getDisplayedFieldsForInst const QMap &cachedTagsForInstance, QMap &displayedFieldsForCurrentSeries, QMap &displayedFieldsForCurrentStudy, QMap &displayedFieldsForCurrentPatient ) { + Q_UNUSED(displayedFieldsForCurrentSeries); + Q_UNUSED(displayedFieldsForCurrentStudy); + Q_UNUSED(displayedFieldsForCurrentPatient); // Store patient information for the instances that of which displayed fields are updated in this run. QString patientID = cachedTagsForInstance[ctkDICOMItem::TagKeyStripped(DCM_PatientID)]; QString patientsBirthDate = cachedTagsForInstance[ctkDICOMItem::TagKeyStripped(DCM_PatientBirthDate)]; @@ -83,6 +86,8 @@ void ctkDICOMDisplayedFieldGeneratorLastStudyDateRule::endUpdate( QMap > &displayedFieldsMapStudy, QMap > &displayedFieldsMapPatient) { + Q_UNUSED(displayedFieldsMapSeries); + Q_UNUSED(displayedFieldsMapStudy); // Update last study date for each updated patient foreach (QString compositeID, this->UpdatedPatientCompositeIDs) { diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorPatientNumberOfStudiesRule.cpp b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorPatientNumberOfStudiesRule.cpp index 554895b51a..c5662d01e9 100644 --- a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorPatientNumberOfStudiesRule.cpp +++ b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorPatientNumberOfStudiesRule.cpp @@ -66,6 +66,9 @@ void ctkDICOMDisplayedFieldGeneratorPatientNumberOfStudiesRule::getDisplayedFiel const QMap &cachedTagsForInstance, QMap &displayedFieldsForCurrentSeries, QMap &displayedFieldsForCurrentStudy, QMap &displayedFieldsForCurrentPatient ) { + Q_UNUSED(displayedFieldsForCurrentSeries); + Q_UNUSED(displayedFieldsForCurrentStudy); + Q_UNUSED(displayedFieldsForCurrentPatient); // Store patient information for the instances that of which displayed fields are updated in this run. QString patientID = cachedTagsForInstance[ctkDICOMItem::TagKeyStripped(DCM_PatientID)]; QString patientsBirthDate = cachedTagsForInstance[ctkDICOMItem::TagKeyStripped(DCM_PatientBirthDate)]; @@ -81,10 +84,12 @@ void ctkDICOMDisplayedFieldGeneratorPatientNumberOfStudiesRule::startUpdate() //------------------------------------------------------------------------------ void ctkDICOMDisplayedFieldGeneratorPatientNumberOfStudiesRule::endUpdate( - QMap > &displayedFieldsMapSeries, + QMap > &, QMap > &displayedFieldsMapStudy, QMap > &displayedFieldsMapPatient) { + Q_UNUSED(displayedFieldsMapStudy); + Q_UNUSED(displayedFieldsMapPatient); // Update number of studies date for each updated patient foreach (QString compositeID, this->UpdatedPatientCompositeIDs) { diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorRadiotherapySeriesDescriptionRule.cpp b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorRadiotherapySeriesDescriptionRule.cpp index d394ef7b93..16adb1f74f 100644 --- a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorRadiotherapySeriesDescriptionRule.cpp +++ b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorRadiotherapySeriesDescriptionRule.cpp @@ -85,6 +85,8 @@ void ctkDICOMDisplayedFieldGeneratorRadiotherapySeriesDescriptionRule::getDispla const QMap &cachedTagsForInstance, QMap &displayedFieldsForCurrentSeries, QMap &displayedFieldsForCurrentStudy, QMap &displayedFieldsForCurrentPatient ) { + Q_UNUSED(displayedFieldsForCurrentStudy); + Q_UNUSED(displayedFieldsForCurrentPatient); QString modality = cachedTagsForInstance[dicomTagToString(DCM_Modality)]; if (!modality.compare("RTPLAN")) { diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorSeriesImageCountRule.cpp b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorSeriesImageCountRule.cpp index ca48a912fa..eedec035b9 100644 --- a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorSeriesImageCountRule.cpp +++ b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorSeriesImageCountRule.cpp @@ -60,6 +60,9 @@ void ctkDICOMDisplayedFieldGeneratorSeriesImageCountRule::getDisplayedFieldsForI const QMap &cachedTagsForInstance, QMap &displayedFieldsForCurrentSeries, QMap &displayedFieldsForCurrentStudy, QMap &displayedFieldsForCurrentPatient ) { + Q_UNUSED(displayedFieldsForCurrentSeries); + Q_UNUSED(displayedFieldsForCurrentStudy); + Q_UNUSED(displayedFieldsForCurrentPatient); // Store series identifiers for the instances that of which displayed fields are updated in this run. this->UpdatedSeriesInstanceUIDs.insert(cachedTagsForInstance[dicomTagToString(DCM_SeriesInstanceUID)]); } @@ -76,6 +79,8 @@ void ctkDICOMDisplayedFieldGeneratorSeriesImageCountRule::endUpdate( QMap > &displayedFieldsMapStudy, QMap > &displayedFieldsMapPatient) { + Q_UNUSED(displayedFieldsMapStudy); + Q_UNUSED(displayedFieldsMapPatient); // Update image count for each updated series foreach (QString currentSeriesInstanceUid, this->UpdatedSeriesInstanceUIDs) { diff --git a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorStudyNumberOfSeriesRule.cpp b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorStudyNumberOfSeriesRule.cpp index 1aa2f74fa1..ec7d5565f0 100644 --- a/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorStudyNumberOfSeriesRule.cpp +++ b/Libs/DICOM/Core/ctkDICOMDisplayedFieldGeneratorStudyNumberOfSeriesRule.cpp @@ -60,6 +60,9 @@ void ctkDICOMDisplayedFieldGeneratorStudyNumberOfSeriesRule::getDisplayedFieldsF const QMap &cachedTagsForInstance, QMap &displayedFieldsForCurrentSeries, QMap &displayedFieldsForCurrentStudy, QMap &displayedFieldsForCurrentPatient ) { + Q_UNUSED(displayedFieldsForCurrentSeries); + Q_UNUSED(displayedFieldsForCurrentStudy); + Q_UNUSED(displayedFieldsForCurrentPatient); // Store study identifiers for the instances that of which displayed fields are updated in this run. this->UpdatedStudyInstanceUIDs.insert(cachedTagsForInstance[dicomTagToString(DCM_StudyInstanceUID)]); } @@ -76,6 +79,8 @@ void ctkDICOMDisplayedFieldGeneratorStudyNumberOfSeriesRule::endUpdate( QMap > &displayedFieldsMapStudy, QMap > &displayedFieldsMapPatient) { + Q_UNUSED(displayedFieldsMapSeries); + Q_UNUSED(displayedFieldsMapPatient); // Update number of series for each updated study foreach (QString currentStudyInstanceUid, this->UpdatedStudyInstanceUIDs) {