changeset 402:787c1d774b27

conversion of transfer syntaxes from Orthanc to GDCM
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 06 Mar 2020 17:41:17 +0100
parents 0503e835c77d
children 598e66637b87
files Plugin/WadoRsRetrieveFrames.cpp Resources/GenerateTransferSyntaxes.py Resources/Orthanc/LinuxStandardBaseToolchain.cmake
diffstat 3 files changed, 117 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Plugin/WadoRsRetrieveFrames.cpp	Wed Mar 04 10:18:04 2020 +0100
+++ b/Plugin/WadoRsRetrieveFrames.cpp	Fri Mar 06 17:41:17 2020 +0100
@@ -36,6 +36,58 @@
 
 
 
+// This function is autogenerated by the script
+// "Resources/GenerateTransferSyntaxes.py"
+static gdcm::TransferSyntax GetGdcmTransferSyntax(Orthanc::DicomTransferSyntax syntax)
+{
+  switch (syntax)
+  {
+    case Orthanc::DicomTransferSyntax_LittleEndianImplicit:
+      return gdcm::TransferSyntax::ImplicitVRLittleEndian;
+
+    case Orthanc::DicomTransferSyntax_LittleEndianExplicit:
+      return gdcm::TransferSyntax::ExplicitVRLittleEndian;
+
+    case Orthanc::DicomTransferSyntax_JPEGProcess1:
+      return gdcm::TransferSyntax::JPEGBaselineProcess1;
+
+    case Orthanc::DicomTransferSyntax_JPEGProcess2_4:
+      return gdcm::TransferSyntax::JPEGExtendedProcess2_4;
+
+    case Orthanc::DicomTransferSyntax_JPEGProcess14:
+      return gdcm::TransferSyntax::JPEGLosslessProcess14;
+
+    case Orthanc::DicomTransferSyntax_JPEGProcess14SV1:
+      return gdcm::TransferSyntax::JPEGLosslessProcess14_1;
+
+    case Orthanc::DicomTransferSyntax_JPEGLSLossless:
+      return gdcm::TransferSyntax::JPEGLSLossless;
+
+    case Orthanc::DicomTransferSyntax_JPEGLSLossy:
+      return gdcm::TransferSyntax::JPEGLSNearLossless;
+
+    case Orthanc::DicomTransferSyntax_JPEG2000LosslessOnly:
+      return gdcm::TransferSyntax::JPEG2000Lossless;
+
+    case Orthanc::DicomTransferSyntax_JPEG2000:
+      return gdcm::TransferSyntax::JPEG2000;
+
+    case Orthanc::DicomTransferSyntax_JPEG2000MulticomponentLosslessOnly:
+      return gdcm::TransferSyntax::JPEG2000Part2Lossless;
+
+    case Orthanc::DicomTransferSyntax_JPEG2000Multicomponent:
+      return gdcm::TransferSyntax::JPEG2000Part2;
+
+    case Orthanc::DicomTransferSyntax_RLELossless:
+      return gdcm::TransferSyntax::RLELossless;
+
+    default:
+      throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
+  }
+}
+
+
+
 static void TokenizeAndNormalize(std::vector<std::string>& tokens,
                                  const std::string& source,
                                  char separator)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/GenerateTransferSyntaxes.py	Fri Mar 06 17:41:17 2020 +0100
@@ -0,0 +1,64 @@
+#!/usr/bin/python
+
+# Orthanc - A Lightweight, RESTful DICOM Store
+# Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+# Department, University Hospital of Liege, Belgium
+# Copyright (C) 2017-2020 Osimis S.A., Belgium
+#
+# This program is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# In addition, as a special exception, the copyright holders of this
+# program give permission to link the code of its release with the
+# OpenSSL project's "OpenSSL" library (or with modified versions of it
+# that use the same license as the "OpenSSL" library), and distribute
+# the linked executables. You must obey the GNU General Public License
+# in all respects for all of the code used other than "OpenSSL". If you
+# modify file(s) with this exception, you may extend this exception to
+# your version of the file(s), but you are not obligated to do so. If
+# you do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source files
+# in the program, then also delete it here.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+import json
+import os
+import re
+import sys
+
+ORTHANC_ROOT = '/home/jodogne/Subversion/orthanc/'
+BASE = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+
+
+with open(os.path.join(ORTHANC_ROOT, 'Resources', 'DicomTransferSyntaxes.json'), 'r') as f:
+    SYNTAXES = json.loads(f.read())
+
+
+
+##
+## Generate the "GetGdcmTransferSyntax()" function
+##
+
+path = os.path.join(BASE, 'Plugin', 'WadoRsRetrieveFrames.cpp')
+with open(path, 'r') as f:
+    a = f.read()
+
+def Format(x):
+    return '    case Orthanc::DicomTransferSyntax_%s:\n      return %s;' % (x['Value'], x['GDCM'])
+
+s = '\n\n'.join(map(Format, filter(lambda x: 'GDCM' in x, SYNTAXES)))
+a = re.sub('(GetGdcmTransferSyntax\(Orthanc::DicomTransferSyntax.*?\)\s*{\s*switch \([^)]*?\)\s*{)[^}]*?(\s*default:)',
+           r'\1\n%s\2' % s, a, re.DOTALL)
+
+with open(path, 'w') as f:
+    f.write(a)
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Wed Mar 04 10:18:04 2020 +0100
+++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Fri Mar 06 17:41:17 2020 +0100
@@ -1,4 +1,4 @@
-# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu
+# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -G Ninja
 
 INCLUDE(CMakeForceCompiler)