From f18f498bee84790b72ffb02e381d2a6f401ba0d7 Mon Sep 17 00:00:00 2001 From: Joerg Riesmeier Date: Fri, 6 Sep 2024 15:05:24 +0200 Subject: [PATCH] Minor fixes to formatting and API documentation. Minor fixes to source code formatting and API documentation of some SR IOD constraint checker classes. --- dcmsr/include/dcmtk/dcmsr/dsrchecc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrcolcc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrimpcc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrkeycc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrmaccc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrmamcc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrpficc.h | 9 ++++----- dcmsr/include/dcmtk/dcmsr/dsrplicc.h | 9 ++++----- dcmsr/include/dcmtk/dcmsr/dsrprdcc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrrsdcc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrsaecc.h | 7 +++---- dcmsr/include/dcmtk/dcmsr/dsrspecc.h | 7 +++---- dcmsr/libsrc/dsrplicc.cc | 2 +- 13 files changed, 39 insertions(+), 51 deletions(-) diff --git a/dcmsr/include/dcmtk/dcmsr/dsrchecc.h b/dcmsr/include/dcmtk/dcmsr/dsrchecc.h index b1b775c67a..bc849d4957 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrchecc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrchecc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2015, OFFIS e.V. + * Copyright (C) 2003-2024, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -63,10 +63,9 @@ class DCMTK_DCMSR_EXPORT DSRChestCadSRConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrcolcc.h b/dcmsr/include/dcmtk/dcmsr/dsrcolcc.h index 7daa2424e8..fab47fbbd1 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrcolcc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrcolcc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2010-2015, OFFIS e.V. + * Copyright (C) 2010-2024, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -61,10 +61,9 @@ class DCMTK_DCMSR_EXPORT DSRColonCadSRConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrimpcc.h b/dcmsr/include/dcmtk/dcmsr/dsrimpcc.h index 5c72fe9b7b..75d5cc97a4 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrimpcc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrimpcc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2010-2015, OFFIS e.V. + * Copyright (C) 2010-2024, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRImplantationPlanSRDocumentConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrkeycc.h b/dcmsr/include/dcmtk/dcmsr/dsrkeycc.h index 4ad2836075..e35090807f 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrkeycc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrkeycc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2015, OFFIS e.V. + * Copyright (C) 2003-2024, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRKeyObjectSelectionDocumentConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrmaccc.h b/dcmsr/include/dcmtk/dcmsr/dsrmaccc.h index 66c742ba22..1717fc58f4 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrmaccc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrmaccc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2010-2015, OFFIS e.V. + * Copyright (C) 2010-2024, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRMacularGridThicknessAndVolumeReportConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrmamcc.h b/dcmsr/include/dcmtk/dcmsr/dsrmamcc.h index 7335f37060..defea9b55c 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrmamcc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrmamcc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2003-2015, OFFIS e.V. + * Copyright (C) 2003-2024, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -64,10 +64,9 @@ class DCMTK_DCMSR_EXPORT DSRMammographyCadSRConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrpficc.h b/dcmsr/include/dcmtk/dcmsr/dsrpficc.h index 7c648dd3f5..0391e2ff4b 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrpficc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrpficc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2019, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2019-2024, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -34,7 +34,7 @@ *---------------------*/ /** Class for checking the relationship content constraints of the Performed Imaging Agent - * Administration SR IOD. + * Administration SR IOD. * According to DICOM PS 3.3: "The document shall be constructed from TID 11020 * (Performed Imaging Agent Administration) invoked at the root node." */ @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRPerformedImagingAgentAdministrationSRConstraintCheck */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrplicc.h b/dcmsr/include/dcmtk/dcmsr/dsrplicc.h index 716a2b728a..c5877621b9 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrplicc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrplicc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2019, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2019-2024, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -34,7 +34,7 @@ *---------------------*/ /** Class for checking the relationship content constraints of the Planned Imaging Agent - * Administration SR IOD. + * Administration SR IOD. * According to DICOM PS 3.3: "The document shall be constructed from TID 11001 * (Planned Imaging Agent Administration) invoked at the root node." */ @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRPlannedImagingAgentAdministrationSRConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrprdcc.h b/dcmsr/include/dcmtk/dcmsr/dsrprdcc.h index 5b36055d7d..31545a5f00 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrprdcc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrprdcc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2017, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2017-2024, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRPatientRadiationDoseSRConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrrsdcc.h b/dcmsr/include/dcmtk/dcmsr/dsrrsdcc.h index 6704449454..983c1be377 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrrsdcc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrrsdcc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2020, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2020-2024, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRRenditionSelectionDocumentConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrsaecc.h b/dcmsr/include/dcmtk/dcmsr/dsrsaecc.h index 903fbbb34a..60e95bc1c8 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrsaecc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrsaecc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2016, J. Riesmeier, Oldenburg, Germany + * Copyright (C) 2016-2024, J. Riesmeier, Oldenburg, Germany * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation are maintained by @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRSimplifiedAdultEchoSRConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/include/dcmtk/dcmsr/dsrspecc.h b/dcmsr/include/dcmtk/dcmsr/dsrspecc.h index ca723c3993..2b34a04d46 100644 --- a/dcmsr/include/dcmtk/dcmsr/dsrspecc.h +++ b/dcmsr/include/dcmtk/dcmsr/dsrspecc.h @@ -1,6 +1,6 @@ /* * - * Copyright (C) 2010-2015, OFFIS e.V. + * Copyright (C) 2010-2024, OFFIS e.V. * All rights reserved. See COPYRIGHT file for details. * * This software and supporting documentation were developed by @@ -62,10 +62,9 @@ class DCMTK_DCMSR_EXPORT DSRSpectaclePrescriptionReportConstraintChecker */ virtual OFBool isTemplateSupportRequired() const; - /** get identifier and mapping resource of the root template (if any) - ** @param templateIdentifier identifier of the root template (might be empty) + /** get identifier and mapping resource of the root template + ** @param templateIdentifier identifier of the root template * @param mappingResource mapping resource that defines the root template - * (might be empty) ** @return status, EC_Normal if successful, an error code otherwise */ virtual OFCondition getRootTemplateIdentification(OFString &templateIdentifier, diff --git a/dcmsr/libsrc/dsrplicc.cc b/dcmsr/libsrc/dsrplicc.cc index c91aa09b78..526625ceac 100644 --- a/dcmsr/libsrc/dsrplicc.cc +++ b/dcmsr/libsrc/dsrplicc.cc @@ -121,7 +121,7 @@ OFBool DSRPlannedImagingAgentAdministrationSRConstraintChecker::checkContentRela else if ((relationshipType == RT_hasProperties) && (sourceValueType == VT_PName)) { result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_DateTime) || - (targetValueType == VT_Date) || (targetValueType == VT_UIDRef) ||(targetValueType == VT_PName); + (targetValueType == VT_Date) || (targetValueType == VT_UIDRef) || (targetValueType == VT_PName); } /* row 8 of the table */ else if ((relationshipType == RT_inferredFrom) &&