Mercurial > hg > orthanc
comparison OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h @ 4105:c02a2d9efbc2
move FromDcmtkBridge::ExecuteToDicom() to LuaFunctionCall, to remove dependency of DCMTK on Lua
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 06 Jul 2020 13:48:10 +0200 |
parents | d25f4c0fa160 |
children | bf7b9edf6b81 |
comparison
equal
deleted
inserted
replaced
4104:d5c09b5f882f | 4105:c02a2d9efbc2 |
---|---|
41 #include <dcmtk/dcmdata/dcmetinf.h> | 41 #include <dcmtk/dcmdata/dcmetinf.h> |
42 #include <dcmtk/dcmdata/dcpixseq.h> | 42 #include <dcmtk/dcmdata/dcpixseq.h> |
43 #include <dcmtk/dcmdata/dcfilefo.h> | 43 #include <dcmtk/dcmdata/dcfilefo.h> |
44 #include <json/json.h> | 44 #include <json/json.h> |
45 | 45 |
46 #if !defined(ORTHANC_ENABLE_LUA) | |
47 # error The macro ORTHANC_ENABLE_LUA must be defined | |
48 #endif | |
49 | |
50 #if ORTHANC_ENABLE_DCMTK != 1 | 46 #if ORTHANC_ENABLE_DCMTK != 1 |
51 # error The macro ORTHANC_ENABLE_DCMTK must be set to 1 | 47 # error The macro ORTHANC_ENABLE_DCMTK must be set to 1 |
52 #endif | 48 #endif |
53 | 49 |
54 #if ORTHANC_BUILD_UNIT_TESTS == 1 | 50 #if ORTHANC_BUILD_UNIT_TESTS == 1 |
55 # include <gtest/gtest_prod.h> | 51 # include <gtest/gtest_prod.h> |
56 #endif | |
57 | |
58 #if ORTHANC_ENABLE_LUA == 1 | |
59 # include "../Lua/LuaFunctionCall.h" | |
60 #endif | 52 #endif |
61 | 53 |
62 #if !defined(ORTHANC_ENABLE_DCMTK_JPEG) | 54 #if !defined(ORTHANC_ENABLE_DCMTK_JPEG) |
63 # error The macro ORTHANC_ENABLE_DCMTK_JPEG must be defined | 55 # error The macro ORTHANC_ENABLE_DCMTK_JPEG must be defined |
64 #endif | 56 #endif |
242 size_t size); | 234 size_t size); |
243 | 235 |
244 static void FromJson(DicomMap& values, | 236 static void FromJson(DicomMap& values, |
245 const Json::Value& result); | 237 const Json::Value& result); |
246 | 238 |
247 #if ORTHANC_ENABLE_LUA == 1 | |
248 static void ExecuteToDicom(DicomMap& target, | |
249 LuaFunctionCall& call); | |
250 #endif | |
251 | |
252 static void ExtractDicomSummary(DicomMap& target, | 239 static void ExtractDicomSummary(DicomMap& target, |
253 DcmItem& dataset, | 240 DcmItem& dataset, |
254 const std::set<DicomTag>& ignoreTagLength); | 241 const std::set<DicomTag>& ignoreTagLength); |
255 | 242 |
256 static void ExtractDicomSummary(DicomMap& target, | 243 static void ExtractDicomSummary(DicomMap& target, |