Skip to content

Commit

Permalink
Added support for new Storage SOP Classes.
Browse files Browse the repository at this point in the history 
Added definition of new Storage SOP Class UIDs introduced with Supplement
226 (Cutaneous Confocal Microscopy). Also added support for these Storage
SOP Classes to the various networking tools.
  • Loading branch information
@jriesmeier
jriesmeier committed Feb 22, 2024
1 parent 1a2b2b8 commit d95c56c
Show file tree
Hide file tree
Showing 8 changed files with 792 additions and 761 deletions.
2 changes: 2 additions & 0 deletions dcmdata/include/dcmtk/dcmdata/dcuid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,8 @@ DCMTK_DCMDATA_EXPORT unsigned long dcmGuessModalityBytes(const char *sopClassUID
#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_ConfocalMicroscopyImageStorage "1.2.840.10008.5.1.4.1.1.77.1.8"
#define UID_ConfocalMicroscopyTiledPyramidalImageStorage "1.2.840.10008.5.1.4.1.1.77.1.9"
#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
10 changes: 10 additions & 0 deletions dcmdata/libsrc/dcuid.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ static const UIDNameMap uidNameMap[] = {
{ UID_Comprehensive3DSRStorage, "Comprehensive3DSRStorage", "Comprehensive3DSRStorage", { EUS_DICOM, EUV_Standard, EUT_SOPClass, EUST_Storage, EUIT_StructuredReport, UID_PROP_NONE } },
{ UID_ComprehensiveSRStorage, "ComprehensiveSRStorage", "ComprehensiveSRStorage", { EUS_DICOM, EUV_Standard, EUT_SOPClass, EUST_Storage, EUIT_StructuredReport, UID_PROP_NONE } },
{ UID_ComputedRadiographyImageStorage, "ComputedRadiographyImageStorage", "ComputedRadiographyImageStorage", { EUS_DICOM, EUV_Standard, EUT_SOPClass, EUST_Storage, EUIT_Image, UID_PROP_NONE } },
{ UID_ConfocalMicroscopyImageStorage, "ConfocalMicroscopyImageStorage", "ConfocalMicroscopyImageStorage", { EUS_DICOM, EUV_Standard, EUT_SOPClass, EUST_Storage, EUIT_Image, UID_PROP_ENHANCED_MF } },
{ UID_ConfocalMicroscopyTiledPyramidalImageStorage, "ConfocalMicroscopyTiledPyramidalImageStorage", "ConfocalMicroscopyTiledPyramidalImageStorage", { EUS_DICOM, EUV_Standard, EUT_SOPClass, EUST_Storage, EUIT_Image, UID_PROP_ENHANCED_MF } },
{ UID_ContentAssessmentResultsStorage, "ContentAssessmentResultsStorage", "ContentAssessmentResultsStorage", { EUS_DICOM, EUV_Standard, EUT_SOPClass, EUST_Storage, EUIT_other, UID_PROP_NONE } },
{ UID_CornealTopographyMapStorage, "CornealTopographyMapStorage", "CornealTopographyMapStorage", { EUS_DICOM, EUV_Standard, EUT_SOPClass, EUST_Storage, EUIT_other, UID_PROP_NONE } },
{ UID_CTDefinedProcedureProtocolStorage, "CTDefinedProcedureProtocolStorage", "CTDefinedProcedureProtocolStorage", { EUS_DICOM, EUV_Standard, EUT_SOPClass, EUST_Storage, EUIT_other, UID_PROP_NON_PATIENT | UID_PROP_NO_DIR_RECORD } },
Expand Down Expand Up @@ -669,6 +671,8 @@ const char* dcmAllStorageSOPClassUIDs[] = {
UID_Comprehensive3DSRStorage,
UID_ComprehensiveSRStorage,
UID_ComputedRadiographyImageStorage,
UID_ConfocalMicroscopyImageStorage,
UID_ConfocalMicroscopyTiledPyramidalImageStorage,
UID_ContentAssessmentResultsStorage,
UID_CornealTopographyMapStorage,
UID_CTImageStorage,
Expand Down Expand Up @@ -993,6 +997,8 @@ const char* dcmLongSCUStorageSOPClassUIDs[] = {
// UID_CArmPhotonElectronRadiationRecordStorage,
// UID_CArmPhotonElectronRadiationStorage,
// UID_CompositingPlanarMPRVolumetricPresentationStateStorage,
// UID_ConfocalMicroscopyImageStorage,
// UID_ConfocalMicroscopyTiledPyramidalImageStorage,
// UID_ContentAssessmentResultsStorage,
// UID_CornealTopographyMapStorage,
// UID_CTPerformedProcedureProtocolStorage,
Expand Down Expand Up @@ -1195,6 +1201,8 @@ const char* dcmImageSOPClassUIDs[] = {
UID_BreastProjectionXRayImageStorageForProcessing,
UID_BreastTomosynthesisImageStorage,
UID_ComputedRadiographyImageStorage,
UID_ConfocalMicroscopyImageStorage,
UID_ConfocalMicroscopyTiledPyramidalImageStorage,
UID_CTImageStorage,
UID_CornealTopographyMapStorage,
UID_DermoscopicPhotographyImageStorage,
Expand Down Expand Up @@ -1313,6 +1321,8 @@ static const DcmModalityTable modalities[] = {
{ UID_Comprehensive3DSRStorage, "SR3", 4096 },
{ UID_ComprehensiveSRStorage, "SRc", 4096 },
{ UID_ComputedRadiographyImageStorage, "CR", 2048 * 2048 * 2 },
{ UID_ConfocalMicroscopyImageStorage, "CFm", 1024 * 1024 },
{ UID_ConfocalMicroscopyTiledPyramidalImageStorage, "CFt", 1024 * 1024 * 10 },
{ UID_ContentAssessmentResultsStorage, "AS", 4096 },
{ UID_CornealTopographyMapStorage, "CM", 512 * 512 },
{ UID_CTDefinedProcedureProtocolStorage, "PPcd", 4096 }, /* was PPd */
Expand Down
2 changes: 2 additions & 0 deletions dcmnet/docs/movescu.man
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,8 @@ OphthalmicOpticalCoherenceTomogr.EnFaceImageStorage 1.2.840.10008.5.1.4.1.1.77.
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
ConfocalMicroscopyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.8
ConfocalMicroscopyTiledPyramidalImageStorage 1.2.840.10008.5.1.4.1.1.77.1.9
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
6 changes: 4 additions & 2 deletions dcmnet/docs/storescp.man
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,9 +573,9 @@ The specified command line is executed as a separate process, so that the
execution of \b storescp will not be held back. This behavior can be influenced
with the \e --exec-sync option.

Note that the application entity titles (\#a and \#c) will be 'sanitized'
Note that the application entity titles ('\#a' and '\#c') will be 'sanitized'
to avoid undesirable behavior when the parameters are passed to the shell.
Unusual characters will be mapped to the '_' character. A warning is printed
Unusual characters will be mapped to the '_' character. A warning is printed
to the logger in this case.

Option \e --exec-on-eostudy allows one to execute a certain command line when
Expand Down Expand Up @@ -738,6 +738,8 @@ OphthalmicOpticalCoherenceTomogr.EnFaceImageStorage 1.2.840.10008.5.1.4.1.1.77.
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
ConfocalMicroscopyImageStorage 1.2.840.10008.5.1.4.1.1.77.1.8
ConfocalMicroscopyTiledPyramidalImageStorage 1.2.840.10008.5.1.4.1.1.77.1.9
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
Loading

0 comments on commit d95c56c

Please sign in to comment.