Skip to content

Commit 3ee7c15

Browse files
jriesmeierjriesmeier
committed
Added support for the Context Group Keyword.
Added support for the official Context Group Keyword that was introduced for all Context Groups of the DICOM Content Mapping Resource (DCMR, see DICOM PS3.16) with CP-2181. This change required to regenerate all automatically generated Context Group classes (still based on DICOM 2024e). This closes DCMTK Feature #1033.
1 parent 2150e2d commit 3ee7c15

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+221
-177
lines changed

‎dcmsr/include/dcmtk/dcmsr/cmr/cid100.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID100_QuantitativeDiagnosticImagingProcedure
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:09 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:10 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid10013.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID10013_CTAcquisitionType
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:25 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:25 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid10033.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID10033_CTReconstructionAlgorithm
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:26 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:27 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid11.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID11_AdministrationRoute
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:06 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:07 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid218.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID218_QuantitativeImageFeature
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:10 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:11 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid244.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID244_Laterality
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:11 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:12 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid247.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID247_LateralityLeftRightOnly
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:12 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:12 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid29.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID29_AcquisitionModality
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:07 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:08 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid4020.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID4020_PETRadionuclide
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:13 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:13 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid4021.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID4021_PETRadiopharmaceutical
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:14 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:14 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid4031.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID4031_CommonAnatomicRegion
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:15 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:15 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid42.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID42_NumericValueQualifier
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:08 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:09 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid6147.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID6147_ResponseCriteria
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:16 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:16 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid7021.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID7021_MeasurementReportDocumentTitle
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:17 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:17 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid7181.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID7181_AbstractMultiDimensionalImageModelComponentUnit
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:18 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:18 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid7445.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID7445_DeviceParticipatingRole
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:19 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:18 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid7452.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID7452_OrganizationalRole
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:20 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:19 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid7453.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID7453_PerformingRole
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:21 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:20 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid7464.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID7464_GeneralRegionOfInterestMeasurementModifier
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:22 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:21 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid7469.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID7469_GenericIntensityAndSizeMeasurement
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:23 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:22 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/cmr/cid7551.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
*
3-
* Copyright (C) 2015-2024, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* Header file for class CID7551_GenericPurposeOfReferenceToImagesAndCoordinatesInMeasurement
77
*
8-
* Generated automatically from DICOM PS 3.16-2024d
9-
* File created on 2024-10-08 10:25:24 by J. Riesmeier
8+
* Generated automatically from DICOM PS 3.16-2024e
9+
* File created on 2025-01-25 20:32:24 by J. Riesmeier
1010
*
1111
*/
1212

‎dcmsr/include/dcmtk/dcmsr/dsrctxgr.h

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
*
3-
* Copyright (C) 2015-2016, J. Riesmeier, Oldenburg, Germany
3+
* Copyright (C) 2015-2025, J. Riesmeier, Oldenburg, Germany
44
* All rights reserved. See COPYRIGHT file for details.
55
*
66
* This software and supporting documentation are maintained by
@@ -86,6 +86,14 @@ class DCMTK_DCMSR_EXPORT DSRContextGroup
8686
return MappingResource;
8787
}
8888

89+
/** get context group keyword
90+
** @return keyword of the context group (might be empty)
91+
*/
92+
inline const OFString &getKeyword() const
93+
{
94+
return Keyword;
95+
}
96+
8997
/** get context group version (optional)
9098
** @return version of the context group (might be empty)
9199
*/
@@ -203,13 +211,15 @@ class DCMTK_DCMSR_EXPORT DSRContextGroup
203211
/** constructor
204212
** @param contextIdentifier identifier of the context group
205213
* @param mappingResource mapping resource that defines the context group
214+
* @param contextGroupKeyword keyword of the context group (optional)
206215
* @param contextGroupVersion version of the context group (optional)
207216
* @param contextGroupUID unique identifier of the context group (optional)
208217
* @param selectedValue coded entry to be selected as the current value
209218
* (optional)
210219
*/
211220
DSRContextGroup(const OFString &contextIdentifier,
212221
const OFString &mappingResource,
222+
const OFString &contextGroupKeyword = "",
213223
const OFString &contextGroupVersion = "",
214224
const OFString &contextGroupUID = "",
215225
const DSRCodedEntryValue &selectedValue = DSRCodedEntryValue());
@@ -265,6 +275,8 @@ class DCMTK_DCMSR_EXPORT DSRContextGroup
265275
const OFString Identifier;
266276
/// mapping resource (VR=CS, mandatory)
267277
const OFString MappingResource;
278+
/// context group keyword (optional)
279+
const OFString Keyword;
268280
/// context group version (VR=DT, optional)
269281
const OFString Version;
270282
/// context group UID (VR=UI, optional)

0 commit comments

Comments
 (0)