Mercurial > hg > orthanc

changeset 732:b79eda29896d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dcm4chee manufacturer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 25 Feb 2014 15:39:13 +0100
parents be0dadf5b3d4
children 29982cfc5009 55b945749bed
files NEWS OrthancServer/DicomProtocol/DicomUserConnection.cpp OrthancServer/ServerEnumerations.cpp OrthancServer/ServerEnumerations.h Resources/Configuration.json
diffstat 5 files changed, 14 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Tue Feb 25 15:31:07 2014 +0100
+++ b/NEWS	Tue Feb 25 15:39:13 2014 +0100
@@ -2,6 +2,7 @@
 ===============================
 
 * Better logging about nonexistent tags
+* Dcm4Chee manufacturer
 
 
 Version 0.7.3 (2014/02/14)
--- a/OrthancServer/DicomProtocol/DicomUserConnection.cpp	Tue Feb 25 15:31:07 2014 +0100
+++ b/OrthancServer/DicomProtocol/DicomUserConnection.cpp	Tue Feb 25 15:39:13 2014 +0100
@@ -335,7 +335,8 @@
       break;
 
     case FindRootModel_Instance:
-      if (manufacturer_ == ModalityManufacturer_ClearCanvas)
+      if (manufacturer_ == ModalityManufacturer_ClearCanvas ||
+          manufacturer_ == ModalityManufacturer_Dcm4Chee)
       {
         // This is a particular case for ClearCanvas, thanks to Peter Somlo <peter.somlo@gmail.com>.
         // https://groups.google.com/d/msg/orthanc-users/j-6C3MAVwiw/iolB9hclom8J
--- a/OrthancServer/ServerEnumerations.cpp	Tue Feb 25 15:31:07 2014 +0100
+++ b/OrthancServer/ServerEnumerations.cpp	Tue Feb 25 15:39:13 2014 +0100
@@ -282,6 +282,9 @@
       
       case ModalityManufacturer_MedInria:
         return "MedInria";
+
+      case ModalityManufacturer_Dcm4Chee:
+        return "Dcm4Chee";
       
       default:
         throw OrthancException(ErrorCode_ParameterOutOfRange);
@@ -335,6 +338,10 @@
     {
       return ModalityManufacturer_MedInria;
     }
+    else if (manufacturer == "Dcm4Chee")
+    {
+      return ModalityManufacturer_Dcm4Chee;
+    }
     else
     {
       throw OrthancException(ErrorCode_ParameterOutOfRange);
--- a/OrthancServer/ServerEnumerations.h	Tue Feb 25 15:31:07 2014 +0100
+++ b/OrthancServer/ServerEnumerations.h	Tue Feb 25 15:39:13 2014 +0100
@@ -57,7 +57,8 @@
   {
     ModalityManufacturer_Generic,
     ModalityManufacturer_ClearCanvas,
-    ModalityManufacturer_MedInria
+    ModalityManufacturer_MedInria,
+    ModalityManufacturer_Dcm4Chee
   };
 
   enum DicomRequestType
--- a/Resources/Configuration.json	Tue Feb 25 15:31:07 2014 +0100
+++ b/Resources/Configuration.json	Tue Feb 25 15:39:13 2014 +0100
@@ -100,8 +100,8 @@
     /**
      * A fourth parameter is available to enable patches for a
      * specific PACS manufacturer. The allowed values are currently
-     * "Generic" (default value), "ClearCanvas" and "MedInria". This
-     * parameter is case-sensitive.
+     * "Generic" (default value), "ClearCanvas", "MedInria" and
+     * "Dcm4Chee". This parameter is case-sensitive.
      **/
     // "clearcanvas" : [ "CLEARCANVAS", "192.168.1.1", 104, "ClearCanvas" ]
   },