Mercurial > hg > orthanc-wsi
comparison Applications/Dicomizer.cpp @ 43:9621fd6f17c9
sync
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 09 Nov 2016 17:34:20 +0100 |
parents | 8e1dfd531335 |
children | 91fc9583b2de |
comparison
equal
deleted
inserted
replaced
42:ee25d35663ac | 43:9621fd6f17c9 |
---|---|
29 #include "../Framework/Inputs/TiledPngImage.h" | 29 #include "../Framework/Inputs/TiledPngImage.h" |
30 #include "../Framework/Inputs/TiledPyramidStatistics.h" | 30 #include "../Framework/Inputs/TiledPyramidStatistics.h" |
31 #include "../Framework/Orthanc/Core/HttpClient.h" | 31 #include "../Framework/Orthanc/Core/HttpClient.h" |
32 #include "../Framework/Orthanc/Core/Logging.h" | 32 #include "../Framework/Orthanc/Core/Logging.h" |
33 #include "../Framework/Orthanc/Core/MultiThreading/BagOfTasksProcessor.h" | 33 #include "../Framework/Orthanc/Core/MultiThreading/BagOfTasksProcessor.h" |
34 #include "../Framework/Orthanc/Core/Toolbox.h" | 34 #include "../Framework/Orthanc/Core/SystemToolbox.h" |
35 #include "../Framework/Orthanc/OrthancServer/FromDcmtkBridge.h" | 35 #include "../Framework/Orthanc/OrthancServer/FromDcmtkBridge.h" |
36 #include "../Framework/Outputs/DicomPyramidWriter.h" | 36 #include "../Framework/Outputs/DicomPyramidWriter.h" |
37 #include "../Framework/Outputs/TruncatedPyramidWriter.h" | 37 #include "../Framework/Outputs/TruncatedPyramidWriter.h" |
38 | 38 |
39 #include "ApplicationToolbox.h" | 39 #include "ApplicationToolbox.h" |
208 json = Json::objectValue; // Empty dataset => TODO EMBED | 208 json = Json::objectValue; // Empty dataset => TODO EMBED |
209 } | 209 } |
210 else | 210 else |
211 { | 211 { |
212 std::string content; | 212 std::string content; |
213 Orthanc::Toolbox::ReadFile(content, path); | 213 Orthanc::SystemToolbox::ReadFile(content, path); |
214 | 214 |
215 Json::Reader reader; | 215 Json::Reader reader; |
216 if (!reader.parse(content, json, false)) | 216 if (!reader.parse(content, json, false)) |
217 { | 217 { |
218 LOG(ERROR) << "Cannot parse the JSON file in: " << path; | 218 LOG(ERROR) << "Cannot parse the JSON file in: " << path; |
239 // Some basic coordinate information | 239 // Some basic coordinate information |
240 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_VolumetricProperties, "VOLUME"); | 240 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_VolumetricProperties, "VOLUME"); |
241 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_ImageOrientationSlide, "0\\-1\\0\\-1\\0\\0"); | 241 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_ImageOrientationSlide, "0\\-1\\0\\-1\\0\\0"); |
242 | 242 |
243 std::string date, time; | 243 std::string date, time; |
244 Orthanc::Toolbox::GetNowDicom(date, time); | 244 Orthanc::SystemToolbox::GetNowDicom(date, time); |
245 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_StudyDate, date); | 245 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_StudyDate, date); |
246 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_StudyTime, time); | 246 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_StudyTime, time); |
247 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_SeriesDate, date); | 247 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_SeriesDate, date); |
248 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_SeriesTime, time); | 248 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_SeriesTime, time); |
249 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_ContentDate, date); | 249 OrthancWSI::DicomToolbox::SetStringTag(*dataset, DCM_ContentDate, date); |
408 { | 408 { |
409 Orthanc::EmbeddedResources::GetFileResource(profile, Orthanc::EmbeddedResources::SRGB_ICC_PROFILE); | 409 Orthanc::EmbeddedResources::GetFileResource(profile, Orthanc::EmbeddedResources::SRGB_ICC_PROFILE); |
410 } | 410 } |
411 else | 411 else |
412 { | 412 { |
413 Orthanc::Toolbox::ReadFile(profile, parameters.GetIccProfilePath()); | 413 Orthanc::SystemToolbox::ReadFile(profile, parameters.GetIccProfilePath()); |
414 } | 414 } |
415 | 415 |
416 | 416 |
417 DcmItem* opticalPath = OrthancWSI::DicomToolbox::ExtractSingleSequenceItem(dataset, DCM_OpticalPathSequence); | 417 DcmItem* opticalPath = OrthancWSI::DicomToolbox::ExtractSingleSequenceItem(dataset, DCM_OpticalPathSequence); |
418 if (opticalPath == NULL) | 418 if (opticalPath == NULL) |