Mercurial > hg > orthanc-stone
comparison Framework/Loaders/DicomResourcesLoader.cpp @ 1484:121d01aa328e
SeriesThumbnailsLoader working on raw dicom files
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 22 Jun 2020 17:46:40 +0200 |
parents | 474360793956 |
children |
comparison
equal
deleted
inserted
replaced
1483:6abd819aa534 | 1484:121d01aa328e |
---|---|
25 # error The macro ORTHANC_ENABLE_DCMTK must be defined | 25 # error The macro ORTHANC_ENABLE_DCMTK must be defined |
26 #endif | 26 #endif |
27 | 27 |
28 #if ORTHANC_ENABLE_DCMTK == 1 | 28 #if ORTHANC_ENABLE_DCMTK == 1 |
29 # include "../Oracle/ParseDicomFromFileCommand.h" | 29 # include "../Oracle/ParseDicomFromFileCommand.h" |
30 # include <DicomParsing/ParsedDicomDir.h> | |
30 # include <DicomParsing/ParsedDicomFile.h> | 31 # include <DicomParsing/ParsedDicomFile.h> |
31 #endif | 32 #endif |
32 | 33 |
33 #include <boost/filesystem/path.hpp> | 34 #include <boost/filesystem/path.hpp> |
34 | 35 |
862 Orthanc::IDynamicObject* userPayload) | 863 Orthanc::IDynamicObject* userPayload) |
863 { | 864 { |
864 boost::shared_ptr<Orthanc::IDynamicObject> protection(userPayload); | 865 boost::shared_ptr<Orthanc::IDynamicObject> protection(userPayload); |
865 | 866 |
866 #if ORTHANC_ENABLE_DCMTK == 1 | 867 #if ORTHANC_ENABLE_DCMTK == 1 |
867 std::unique_ptr<ParseDicomFromFileCommand> command(new ParseDicomFromFileCommand(path)); | 868 std::unique_ptr<ParseDicomFromFileCommand> command(new ParseDicomFromFileCommand(source, path)); |
868 command->SetPixelDataIncluded(includePixelData); | 869 command->SetPixelDataIncluded(includePixelData); |
869 command->AcquirePayload(new Handler(shared_from_this(), target, priority, source, protection)); | 870 command->AcquirePayload(new Handler(shared_from_this(), target, priority, source, protection)); |
870 | 871 |
871 { | 872 { |
872 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); | 873 std::unique_ptr<ILoadersContext::ILock> lock(context_.Lock()); |