Added "Waveform Annotation SR" to list.

Added the Waveform Annotation SR IOD / SOP Class, which was introduced only recently with Supplement 239, to the list of known (but not yet supported) document types. Full support for this IOD / SOP Class will follow in a future commit.
DCMTK · Jul 10, 2024 · ca7d304 · ca7d304
1 parent d0614c1
commit ca7d304
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/dcmsr/data/dsr2xml.xsd b/dcmsr/data/dsr2xml.xsd
@@ -742,6 +742,7 @@
       <xsd:enumeration value="Performed Imaging Agent Administration SR"/>
       <xsd:enumeration value="Planned Imaging Agent Administration SR"/>
       <xsd:enumeration value="Rendition Selection Document"/>
+      <xsd:enumeration value="Waveform Annotation SR"/>
     </xsd:restriction>
   </xsd:simpleType>
 

diff --git a/dcmsr/include/dcmtk/dcmsr/dsrtypes.h b/dcmsr/include/dcmtk/dcmsr/dsrtypes.h
@@ -547,8 +547,10 @@ class DCMTK_DCMSR_EXPORT DSRTypes
         DT_PlannedImagingAgentAdministrationSR,
         /// DICOM IOD: Rendition Selection Document
         DT_RenditionSelectionDocument,
+        /// DICOM IOD: Waveform Annotation SR
+        DT_WaveformAnnotationSR,
         /// internal type used to mark the last entry
-        DT_last = DT_RenditionSelectionDocument
+        DT_last = DT_WaveformAnnotationSR
     };
 
     /** SR relationship types

diff --git a/dcmsr/libsrc/dsrtypes.cc b/dcmsr/libsrc/dsrtypes.cc
@@ -342,7 +342,8 @@ static const S_DocumentTypeNameMap DocumentTypeNameMap[] =
     {DSRTypes::DT_PatientRadiationDoseSR,                UID_PatientRadiationDoseSRStorage,                   EM_EnhancedEquipment,                                             "SR", "Patient Radiation Dose SR"},
     {DSRTypes::DT_PerformedImagingAgentAdministrationSR, UID_PerformedImagingAgentAdministrationSRStorage,    EM_EnhancedEquipment | EM_Synchronization,                        "SR", "Performed Imaging Agent Administration SR"},
     {DSRTypes::DT_PlannedImagingAgentAdministrationSR,   UID_PlannedImagingAgentAdministrationSRStorage,      EM_EnhancedEquipment,                                             "SR", "Planned Imaging Agent Administration SR"},
-    {DSRTypes::DT_RenditionSelectionDocument,            UID_RenditionSelectionDocumentRealTimeCommunication, EM_EnhancedEquipment | EM_Synchronization | EM_KeyObjectDocument, "KO", "Rendition Selection Document"}
+    {DSRTypes::DT_RenditionSelectionDocument,            UID_RenditionSelectionDocumentRealTimeCommunication, EM_EnhancedEquipment | EM_Synchronization | EM_KeyObjectDocument, "KO", "Rendition Selection Document"},
+    {DSRTypes::DT_WaveformAnnotationSR,                  UID_WaveformAnnotationSRStorage,                     EM_EnhancedEquipment,                                             "SR", "Waveform Annotation SR"}
 };
 
 
@@ -954,7 +955,8 @@ DSRTypes::E_CharacterSet DSRTypes::definedTermToCharacterSet(const OFString &def
 
 OFBool DSRTypes::isDocumentTypeSupported(const E_DocumentType documentType)
 {
-    return (documentType != DT_invalid) && (documentType != DT_ExtensibleSR) && (documentType != DT_EnhancedXRayRadiationDoseSR);
+    return (documentType != DT_invalid) && (documentType != DT_ExtensibleSR) &&
+        (documentType != DT_EnhancedXRayRadiationDoseSR) && (documentType != DT_WaveformAnnotationSR);
 }
 
 
@@ -1563,6 +1565,7 @@ DSRIODConstraintChecker *DSRTypes::createIODConstraintChecker(const E_DocumentTy
             checker = new DSRRenditionSelectionDocumentConstraintChecker();
             break;
         case DT_EnhancedXRayRadiationDoseSR:
+        case DT_WaveformAnnotationSR:
             /* not yet supported */
             break;
         case DT_invalid: