Skip to content

Commit

Permalink
Added support for two new Storage SOP Classes.
Browse files Browse the repository at this point in the history 
Added definition of two new Storage SOP Class UIDs introduced with
Supplement 212 (XA Protocol Storage). Also extended the various network
tools accordingly.

This closes DCMTK Conformance #962.
  • Loading branch information
@jriesmeier
jriesmeier committed Feb 9, 2021
1 parent ab24c33 commit ddab862
Show file tree
Hide file tree
Showing 8 changed files with 221 additions and 192 deletions.
4 changes: 3 additions & 1 deletion dcmdata/include/dcmtk/dcmdata/dcuid.h
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (C) 1994-2020, OFFIS e.V.
* Copyright (C) 1994-2021, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
Expand Down Expand Up @@ -545,6 +545,8 @@ DCMTK_DCMDATA_EXPORT unsigned long dcmGuessModalityBytes(const char *sopClassUID
#define UID_CTDefinedProcedureProtocolStorage "1.2.840.10008.5.1.4.1.1.200.1"
#define UID_CTPerformedProcedureProtocolStorage "1.2.840.10008.5.1.4.1.1.200.2"
#define UID_ProtocolApprovalStorage "1.2.840.10008.5.1.4.1.1.200.3"
#define UID_XADefinedProcedureProtocolStorage "1.2.840.10008.5.1.4.1.1.200.7"
#define UID_XAPerformedProcedureProtocolStorage "1.2.840.10008.5.1.4.1.1.200.8"
#define UID_RTImageStorage "1.2.840.10008.5.1.4.1.1.481.1"
#define UID_RTDoseStorage "1.2.840.10008.5.1.4.1.1.481.2"
#define UID_RTStructureSetStorage "1.2.840.10008.5.1.4.1.1.481.3"
Expand Down
378 changes: 193 additions & 185 deletions dcmdata/libsrc/dcuid.cc
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dcmnet/docs/movescu.man
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,7 @@ RETIRED_StandalonePETCurveStorage 1.2.840.10008.5.1.4.1.1.129
EnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.130
BasicStructuredDisplayStorage 1.2.840.10008.5.1.4.1.1.131
CTPerformedProcedureProtocolStorage 1.2.840.10008.5.1.4.1.1.200.2
XAPerformedProcedureProtocolStorage 1.2.840.10008.5.1.4.1.1.200.8
RTImageStorage 1.2.840.10008.5.1.4.1.1.481.1
RTDoseStorage 1.2.840.10008.5.1.4.1.1.481.2
RTStructureSetStorage 1.2.840.10008.5.1.4.1.1.481.3
Expand Down Expand Up @@ -781,6 +782,6 @@ It is an error if no data dictionary can be loaded.

\section movescu_copyright COPYRIGHT

Copyright (C) 1994-2020 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
Copyright (C) 1994-2021 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.

*/
3 changes: 2 additions & 1 deletion dcmnet/docs/storescp.man
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,7 @@ RETIRED_StandalonePETCurveStorage 1.2.840.10008.5.1.4.1.1.129
EnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.130
BasicStructuredDisplayStorage 1.2.840.10008.5.1.4.1.1.131
CTPerformedProcedureProtocolStorage 1.2.840.10008.5.1.4.1.1.200.2
XAPerformedProcedureProtocolStorage 1.2.840.10008.5.1.4.1.1.200.8
RTImageStorage 1.2.840.10008.5.1.4.1.1.481.1
RTDoseStorage 1.2.840.10008.5.1.4.1.1.481.2
RTStructureSetStorage 1.2.840.10008.5.1.4.1.1.481.3
Expand Down Expand Up @@ -936,6 +937,6 @@ It is an error if no data dictionary can be loaded.

\section storescp_copyright COPYRIGHT

Copyright (C) 1996-2020 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
Copyright (C) 1996-2021 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.

*/
6 changes: 5 additions & 1 deletion dcmnet/etc/storescp.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2003-2020, OFFIS e.V.
# Copyright (C) 2003-2021, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
#
# This software and supporting documentation were developed by
Expand Down Expand Up @@ -255,6 +255,8 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib
# - VolumeRenderingVolumetricPresentationStateStorage
# - WideFieldOphthalmicPhotographyStereographicProjectionImageStorage
# - WideFieldOphthalmicPhotography3DCoordinatesImageStorage
# - XADefinedProcedureProtocolStorage
# - XAPerformedProcedureProtocolStorage
#
# - DICOS_2DAITStorage
# - DICOS_3DAITStorage
Expand Down Expand Up @@ -445,6 +447,8 @@ PresentationContext128 = XRayRadiationDoseSRStorage\UncompressedOrZlib
# - TomotherapeuticRadiationRecordStorage
# - TomotherapeuticRadiationStorage
# - VolumeRenderingVolumetricPresentationStateStorage
# - XADefinedProcedureProtocolStorage
# - XAPerformedProcedureProtocolStorage
#
# - RETIRED_HardcopyColorImageStorage
# - RETIRED_HardcopyGrayscaleImageStorage
Expand Down
4 changes: 3 additions & 1 deletion dcmnet/etc/storescu.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2003-2020, OFFIS e.V.
# Copyright (C) 2003-2021, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
#
# This software and supporting documentation were developed by
Expand Down Expand Up @@ -289,6 +289,8 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2
# - VolumeRenderingVolumetricPresentationStateStorage
# - WideFieldOphthalmicPhotographyStereographicProjectionImageStorage
# - WideFieldOphthalmicPhotography3DCoordinatesImageStorage
# - XADefinedProcedureProtocolStorage
# - XAPerformedProcedureProtocolStorage
# - XAXRFGrayscaleSoftcopyPresentationStateStorage
# - XRay3DAngiographicImageStorage
# - XRay3DCraniofacialImageStorage
Expand Down
3 changes: 2 additions & 1 deletion dcmqrdb/docs/dcmqrscp.man
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,7 @@ RETIRED_StandalonePETCurveStorage 1.2.840.10008.5.1.4.1.1.129
EnhancedPETImageStorage 1.2.840.10008.5.1.4.1.1.130
BasicStructuredDisplayStorage 1.2.840.10008.5.1.4.1.1.131
CTPerformedProcedureProtocolStorage 1.2.840.10008.5.1.4.1.1.200.2
XAPerformedProcedureProtocolStorage 1.2.840.10008.5.1.4.1.1.200.8
RTImageStorage 1.2.840.10008.5.1.4.1.1.481.1
RTDoseStorage 1.2.840.10008.5.1.4.1.1.481.2
RTStructureSetStorage 1.2.840.10008.5.1.4.1.1.481.3
Expand Down Expand Up @@ -1093,6 +1094,6 @@ It is an error if no data dictionary can be loaded.

\section dcmqrscp_copyright COPYRIGHT

Copyright (C) 1993-2020 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
Copyright (C) 1993-2021 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.

*/
12 changes: 11 additions & 1 deletion dcmqrdb/etc/dcmqrprf.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2017-2020, OFFIS e.V.
# Copyright (C) 2017-2021, OFFIS e.V.
# All rights reserved. See COPYRIGHT file for details.
#
# This software and supporting documentation were developed by
Expand Down Expand Up @@ -280,6 +280,8 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib
# - VolumeRenderingVolumetricPresentationStateStorage
# - WideFieldOphthalmicPhotographyStereographicProjectionImageStorage
# - WideFieldOphthalmicPhotography3DCoordinatesImageStorage
# - XADefinedProcedureProtocolStorage
# - XAPerformedProcedureProtocolStorage
#
# - DICOS_2DAITStorage
# - DICOS_3DAITStorage
Expand Down Expand Up @@ -470,6 +472,8 @@ PresentationContext128 = XRayRadiationDoseSRStorage\UncompressedOrZlib
# - TomotherapeuticRadiationRecordStorage
# - TomotherapeuticRadiationStorage
# - VolumeRenderingVolumetricPresentationStateStorage
# - XADefinedProcedureProtocolStorage
# - XAPerformedProcedureProtocolStorage
#
# - RETIRED_HardcopyColorImageStorage
# - RETIRED_HardcopyGrayscaleImageStorage
Expand Down Expand Up @@ -739,6 +743,8 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2
# - VolumeRenderingVolumetricPresentationStateStorage
# - WideFieldOphthalmicPhotographyStereographicProjectionImageStorage
# - WideFieldOphthalmicPhotography3DCoordinatesImageStorage
# - XADefinedProcedureProtocolStorage
# - XAPerformedProcedureProtocolStorage
# - XAXRFGrayscaleSoftcopyPresentationStateStorage
# - XRay3DAngiographicImageStorage
# - XRay3DCraniofacialImageStorage
Expand Down Expand Up @@ -961,6 +967,8 @@ Role127 = DRAFT_WaveformStorage\BOTH
# - VolumeRenderingVolumetricPresentationStateStorage
# - WideFieldOphthalmicPhotographyStereographicProjectionImageStorage
# - WideFieldOphthalmicPhotography3DCoordinatesImageStorage
# - XADefinedProcedureProtocolStorage
# - XAPerformedProcedureProtocolStorage
#
# - DICOS_2DAITStorage
# - DICOS_3DAITStorage
Expand Down Expand Up @@ -1139,6 +1147,8 @@ Role127 = XRayRadiationDoseSRStorage\BOTH
# - TomotherapeuticRadiationRecordStorage
# - TomotherapeuticRadiationStorage
# - VolumeRenderingVolumetricPresentationStateStorage
# - XADefinedProcedureProtocolStorage
# - XAPerformedProcedureProtocolStorage
#
# - RETIRED_HardcopyColorImageStorage
# - RETIRED_HardcopyGrayscaleImageStorage
Expand Down

0 comments on commit ddab862

Please sign in to comment.