Skip to content

Commit

Permalink
Added definition of new Storage SOP Class UID.
Browse files Browse the repository at this point in the history
Updated list of Storage SOP Class UIDs known to the DCMTK based on DICOM
2020e. This includes the Final Text version of Supplement 221 (Dermoscopy).
  • Loading branch information
jriesmeier committed Nov 25, 2020
1 parent 7841593 commit 7bb970f
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions dcmdata/include/dcmtk/dcmdata/dcuid.h
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ DCMTK_DCMDATA_EXPORT unsigned long dcmGuessModalityBytes(const char *sopClassUID
#define UID_OphthalmicOpticalCoherenceTomographyEnFaceImageStorage "1.2.840.10008.5.1.4.1.1.77.1.5.7"
#define UID_OphthalmicOpticalCoherenceTomographyBscanVolumeAnalysisStorage "1.2.840.10008.5.1.4.1.1.77.1.5.8"
#define UID_VLWholeSlideMicroscopyImageStorage "1.2.840.10008.5.1.4.1.1.77.1.6"
#define UID_DermoscopicPhotographyImageStorage "1.2.840.10008.5.1.4.1.1.77.1.7"
#define UID_RETIRED_VLMultiframeImageStorage "1.2.840.10008.5.1.4.1.1.77.2"
#define UID_LensometryMeasurementsStorage "1.2.840.10008.5.1.4.1.1.78.1"
#define UID_AutorefractionMeasurementsStorage "1.2.840.10008.5.1.4.1.1.78.2"
Expand Down
5 changes: 5 additions & 0 deletions dcmdata/libsrc/dcuid.cc
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ static const UIDNameMap uidNameMap[] = {
{ UID_CTImageStorage, "CTImageStorage" },
{ UID_CTPerformedProcedureProtocolStorage, "CTPerformedProcedureProtocolStorage" },
{ UID_DeformableSpatialRegistrationStorage, "DeformableSpatialRegistrationStorage" },
{ UID_DermoscopicPhotographyImageStorage, "DermoscopicPhotographyImageStorage" },
{ UID_DigitalIntraOralXRayImageStorageForPresentation, "DigitalIntraOralXRayImageStorageForPresentation" },
{ UID_DigitalIntraOralXRayImageStorageForProcessing, "DigitalIntraOralXRayImageStorageForProcessing" },
{ UID_DigitalMammographyXRayImageStorageForPresentation, "DigitalMammographyXRayImageStorageForPresentation" },
Expand Down Expand Up @@ -639,6 +640,7 @@ const char* dcmAllStorageSOPClassUIDs[] = {
UID_CTImageStorage,
UID_CTPerformedProcedureProtocolStorage,
UID_DeformableSpatialRegistrationStorage,
UID_DermoscopicPhotographyImageStorage,
UID_DigitalIntraOralXRayImageStorageForPresentation,
UID_DigitalIntraOralXRayImageStorageForProcessing,
UID_DigitalMammographyXRayImageStorageForPresentation,
Expand Down Expand Up @@ -947,6 +949,7 @@ const char* dcmLongSCUStorageSOPClassUIDs[] = {
// UID_ContentAssessmentResultsStorage,
// UID_CornealTopographyMapStorage,
// UID_CTPerformedProcedureProtocolStorage,
// UID_DermoscopicPhotographyImageStorage,
// UID_ElectromyogramWaveformStorage,
// UID_ElectrooculogramWaveformStorage,
// UID_EncapsulatedMTLStorage,
Expand Down Expand Up @@ -1134,6 +1137,7 @@ const char* dcmImageSOPClassUIDs[] = {
UID_ComputedRadiographyImageStorage,
UID_CTImageStorage,
UID_CornealTopographyMapStorage,
UID_DermoscopicPhotographyImageStorage,
UID_DigitalIntraOralXRayImageStorageForPresentation,
UID_DigitalIntraOralXRayImageStorageForProcessing,
UID_DigitalMammographyXRayImageStorageForPresentation,
Expand Down Expand Up @@ -1251,6 +1255,7 @@ static const DcmModalityTable modalities[] = {
{ UID_CTImageStorage, "CT", 512 * 512 * 2 },
{ UID_CTPerformedProcedureProtocolStorage, "PPp", 4096 },
{ UID_DeformableSpatialRegistrationStorage, "RGd", 4096 },
{ UID_DermoscopicPhotographyImageStorage, "VLd", 768 * 576 * 3 },
{ UID_DigitalIntraOralXRayImageStorageForPresentation, "DXo", 1024 * 1024 * 2 },
{ UID_DigitalIntraOralXRayImageStorageForProcessing, "DPo", 1024 * 1024 * 2 },
{ UID_DigitalMammographyXRayImageStorageForPresentation, "DXm", 4096 * 4096 * 2 },
Expand Down
1 change: 1 addition & 0 deletions dcmnet/docs/movescu.man
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@ WideFieldOphthalmicPhotogr.3DCoordinatesImageStorage 1.2.840.10008.5.1.4.1.1.77.
OphthalmicOpticalCoherenceTomogr.EnFaceImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.7
OphthalmicOpticalCoh.Tomogr.BscanVolumeAnalysisStor. 1.2.840.10008.5.1.4.1.1.77.1.5.8
VLWholeSlideMicroscopyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.6
DermoscopicPhotographyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.7
RETIRED_VLMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.77.2
LensometryMeasurementsStorage 1.2.840.10008.5.1.4.1.1.78.1
AutorefractionMeasurementsStorage 1.2.840.10008.5.1.4.1.1.78.2
Expand Down
1 change: 1 addition & 0 deletions dcmnet/docs/storescp.man
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,7 @@ WideFieldOphthalmicPhotogr.3DCoordinatesImageStorage 1.2.840.10008.5.1.4.1.1.77.
OphthalmicOpticalCoherenceTomogr.EnFaceImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.7
OphthalmicOpticalCoh.Tomogr.BscanVolumeAnalysisStor. 1.2.840.10008.5.1.4.1.1.77.1.5.8
VLWholeSlideMicroscopyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.6
DermoscopicPhotographyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.7
RETIRED_VLMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.77.2
LensometryMeasurementsStorage 1.2.840.10008.5.1.4.1.1.78.1
AutorefractionMeasurementsStorage 1.2.840.10008.5.1.4.1.1.78.2
Expand Down
2 changes: 2 additions & 0 deletions dcmnet/etc/storescp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib
# - ContentAssessmentResultsStorage
# - CTDefinedProcedureProtocolStorage
# - CTPerformedProcedureProtocolStorage
# - DermoscopicPhotographyImageStorage
# - ElectromyogramWaveformStorage
# - ElectrooculogramWaveformStorage
# - EncapsulatedMTLStorage
Expand Down Expand Up @@ -417,6 +418,7 @@ PresentationContext128 = XRayRadiationDoseSRStorage\UncompressedOrZlib
# - CArmPhotonElectronRadiationRecordStorage
# - CArmPhotonElectronRadiationStorage
# - ColorPaletteStorage
# - DermoscopicPhotographyImageStorage
# - ElectromyogramWaveformStorage
# - ElectrooculogramWaveformStorage
# - EncapsulatedMTLStorage
Expand Down
1 change: 1 addition & 0 deletions dcmnet/etc/storescu.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2
# - CTDefinedProcedureProtocolStorage
# - CTPerformedProcedureProtocolStorage
# - DeformableSpatialRegistrationStorage
# - DermoscopicPhotographyImageStorage
# - ElectromyogramWaveformStorage
# - ElectrooculogramWaveformStorage
# - EncapsulatedCDAStorage
Expand Down
1 change: 1 addition & 0 deletions dcmqrdb/docs/dcmqrscp.man
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,7 @@ WideFieldOphthalmicPhotogr.3DCoordinatesImageStorage 1.2.840.10008.5.1.4.1.1.77.
OphthalmicOpticalCoherenceTomogr.EnFaceImageStorage 1.2.840.10008.5.1.4.1.1.77.1.5.7
OphthalmicOpticalCoh.Tomogr.BscanVolumeAnalysisStor. 1.2.840.10008.5.1.4.1.1.77.1.5.8
VLWholeSlideMicroscopyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.6
DermoscopicPhotographyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.7
RETIRED_VLMultiframeImageStorage 1.2.840.10008.5.1.4.1.1.77.2
LensometryMeasurementsStorage 1.2.840.10008.5.1.4.1.1.78.1
AutorefractionMeasurementsStorage 1.2.840.10008.5.1.4.1.1.78.2
Expand Down
5 changes: 5 additions & 0 deletions dcmqrdb/etc/dcmqrprf.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ PresentationContext128 = DRAFT_WaveformStorage\UncompressedOrZlib
# - ContentAssessmentResultsStorage
# - CTDefinedProcedureProtocolStorage
# - CTPerformedProcedureProtocolStorage
# - DermoscopicPhotographyImageStorage
# - ElectromyogramWaveformStorage
# - ElectrooculogramWaveformStorage
# - EncapsulatedMTLStorage
Expand Down Expand Up @@ -442,6 +443,7 @@ PresentationContext128 = XRayRadiationDoseSRStorage\UncompressedOrZlib
# - CArmPhotonElectronRadiationRecordStorage
# - CArmPhotonElectronRadiationStorage
# - ColorPaletteStorage
# - DermoscopicPhotographyImageStorage
# - ElectromyogramWaveformStorage
# - ElectrooculogramWaveformStorage
# - EncapsulatedMTLStorage
Expand Down Expand Up @@ -666,6 +668,7 @@ PresentationContext128 = VideoPhotographicImageStorage\MPEG2
# - CTDefinedProcedureProtocolStorage
# - CTPerformedProcedureProtocolStorage
# - DeformableSpatialRegistrationStorage
# - DermoscopicPhotographyImageStorage
# - ElectromyogramWaveformStorage
# - ElectrooculogramWaveformStorage
# - EncapsulatedCDAStorage
Expand Down Expand Up @@ -918,6 +921,7 @@ Role127 = DRAFT_WaveformStorage\BOTH
# - ContentAssessmentResultsStorage
# - CTDefinedProcedureProtocolStorage
# - CTPerformedProcedureProtocolStorage
# - DermoscopicPhotographyImageStorage
# - ElectromyogramWaveformStorage
# - ElectrooculogramWaveformStorage
# - EncapsulatedMTLStorage
Expand Down Expand Up @@ -1108,6 +1112,7 @@ Role127 = XRayRadiationDoseSRStorage\BOTH
# - CArmPhotonElectronRadiationRecordStorage
# - CArmPhotonElectronRadiationStorage
# - ColorPaletteStorage
# - DermoscopicPhotographyImageStorage
# - ElectromyogramWaveformStorage
# - ElectrooculogramWaveformStorage
# - EncapsulatedMTLStorage
Expand Down

0 comments on commit 7bb970f

Please sign in to comment.