Mercurial > hg > orthanc

changeset 2317:5b7556568fa4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Incoming C-Find request: removing group-length for all manufacturer -> removed EFilm2 manufacturer that is now useless
author amazy
date Thu, 13 Jul 2017 11:35:57 +0200
parents 8bca2c8eaead
children e5fc5db6a84b
files OrthancServer/OrthancFindRequestHandler.cpp OrthancServer/ServerEnumerations.cpp OrthancServer/ServerEnumerations.h
diffstat 3 files changed, 9 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancServer/OrthancFindRequestHandler.cpp	Wed Jul 12 22:39:28 2017 +0200
+++ b/OrthancServer/OrthancFindRequestHandler.cpp	Thu Jul 13 11:35:57 2017 +0200
@@ -451,19 +451,14 @@
                                                  const DicomTag& tag,
                                                  ModalityManufacturer manufacturer)
   {
+    // wathever the manufacturer, remote the GenericGroupLength tags (http://dicom.nema.org/medical/dicom/current/output/chtml/part05/sect_7.2.html)
+    if (tag.GetGroup() == 0x0000)
+    {
+      return false;
+    }
+
     switch (manufacturer)
     {
-      case ModalityManufacturer_EFilm2:
-        // Following Denis Nesterov's mail on 2015-11-30
-        if (tag == DicomTag(0x0008, 0x0000) ||  // "GenericGroupLength"
-            tag == DicomTag(0x0010, 0x0000) ||  // "GenericGroupLength"
-            tag == DicomTag(0x0020, 0x0000))    // "GenericGroupLength"
-        {
-          return false;
-        }
-
-        break;
-
       case ModalityManufacturer_Vitrea:
         // Following Denis Nesterov's mail on 2015-11-30
         if (tag == DicomTag(0x5653, 0x0010))  // "PrivateCreator = Vital Images SW 3.4"
--- a/OrthancServer/ServerEnumerations.cpp	Wed Jul 12 22:39:28 2017 +0200
+++ b/OrthancServer/ServerEnumerations.cpp	Thu Jul 13 11:35:57 2017 +0200
@@ -343,9 +343,6 @@
       case ModalityManufacturer_AgfaImpax:
         return "AgfaImpax";
       
-      case ModalityManufacturer_EFilm2:
-        return "EFilm2";
-      
       case ModalityManufacturer_Vitrea:
         return "Vitrea";
       
@@ -422,7 +419,9 @@
     }
     else if (manufacturer == "EFilm2")
     {
-      return ModalityManufacturer_EFilm2;
+      LOG(WARNING) << "The " << manufacturer << " manufacturer is obsolete since Orthanc 1.2.1.  To guarantee compatibility with future Orthanc version, you should remove it from your configuration file.";
+
+      return ModalityManufacturer_Generic;
     }
     else
     {
--- a/OrthancServer/ServerEnumerations.h	Wed Jul 12 22:39:28 2017 +0200
+++ b/OrthancServer/ServerEnumerations.h	Thu Jul 13 11:35:57 2017 +0200
@@ -65,7 +65,6 @@
     ModalityManufacturer_Dcm4Chee,
     ModalityManufacturer_SyngoVia,
     ModalityManufacturer_AgfaImpax,
-    ModalityManufacturer_EFilm2,
     ModalityManufacturer_Vitrea
   };