Mercurial > hg > orthanc-stone
comparison Framework/Oracle/ParseDicomFromFileCommand.h @ 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 | 0ca50d275b9a |
children |
comparison
equal
deleted
inserted
replaced
1483:6abd819aa534 | 1484:121d01aa328e |
---|---|
20 | 20 |
21 | 21 |
22 #pragma once | 22 #pragma once |
23 | 23 |
24 #include "OracleCommandBase.h" | 24 #include "OracleCommandBase.h" |
25 #include "../Loaders/DicomSource.h" | |
25 | 26 |
26 #include <string> | 27 #include <string> |
27 | 28 |
28 namespace OrthancStone | 29 namespace OrthancStone |
29 { | 30 { |
30 class ParseDicomFromFileCommand : public OracleCommandBase | 31 class ParseDicomFromFileCommand : public OracleCommandBase |
31 { | 32 { |
32 private: | 33 private: |
34 DicomSource source_; | |
33 std::string path_; | 35 std::string path_; |
34 bool pixelDataIncluded_; | 36 bool pixelDataIncluded_; |
35 | 37 |
36 ParseDicomFromFileCommand(const ParseDicomFromFileCommand& other) : | 38 ParseDicomFromFileCommand(const ParseDicomFromFileCommand& other) : |
39 source_(other.source_), | |
37 path_(other.path_), | 40 path_(other.path_), |
38 pixelDataIncluded_(other.pixelDataIncluded_) | 41 pixelDataIncluded_(other.pixelDataIncluded_) |
39 { | 42 { |
40 } | 43 } |
41 | 44 |
42 public: | 45 public: |
43 ParseDicomFromFileCommand(const std::string& path) : | 46 ParseDicomFromFileCommand(const DicomSource& source, |
47 const std::string& path) : | |
48 source_(source), | |
44 path_(path), | 49 path_(path), |
45 pixelDataIncluded_(true) | 50 pixelDataIncluded_(true) |
46 { | 51 { |
47 } | 52 } |
48 | 53 |
49 ParseDicomFromFileCommand(const std::string& dicomDirPath, | 54 ParseDicomFromFileCommand(const DicomSource& source, |
55 const std::string& dicomDirPath, | |
50 const std::string& file) : | 56 const std::string& file) : |
57 source_(source), | |
51 path_(GetDicomDirPath(dicomDirPath, file)), | 58 path_(GetDicomDirPath(dicomDirPath, file)), |
52 pixelDataIncluded_(true) | 59 pixelDataIncluded_(true) |
53 { | 60 { |
54 } | 61 } |
55 | 62 |
64 virtual IOracleCommand* Clone() const | 71 virtual IOracleCommand* Clone() const |
65 { | 72 { |
66 return new ParseDicomFromFileCommand(*this); | 73 return new ParseDicomFromFileCommand(*this); |
67 } | 74 } |
68 | 75 |
76 const DicomSource& GetSource() const | |
77 { | |
78 return source_; | |
79 } | |
80 | |
69 const std::string& GetPath() const | 81 const std::string& GetPath() const |
70 { | 82 { |
71 return path_; | 83 return path_; |
72 } | 84 } |
73 | 85 |