Mercurial > hg > orthanc-stone
diff 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 |
line wrap: on
line diff
--- a/Framework/Oracle/ParseDicomFromFileCommand.h Sat Jun 20 11:16:55 2020 +0200 +++ b/Framework/Oracle/ParseDicomFromFileCommand.h Mon Jun 22 17:46:40 2020 +0200 @@ -22,6 +22,7 @@ #pragma once #include "OracleCommandBase.h" +#include "../Loaders/DicomSource.h" #include <string> @@ -30,24 +31,30 @@ class ParseDicomFromFileCommand : public OracleCommandBase { private: + DicomSource source_; std::string path_; bool pixelDataIncluded_; ParseDicomFromFileCommand(const ParseDicomFromFileCommand& other) : + source_(other.source_), path_(other.path_), pixelDataIncluded_(other.pixelDataIncluded_) { } public: - ParseDicomFromFileCommand(const std::string& path) : + ParseDicomFromFileCommand(const DicomSource& source, + const std::string& path) : + source_(source), path_(path), pixelDataIncluded_(true) { } - ParseDicomFromFileCommand(const std::string& dicomDirPath, + ParseDicomFromFileCommand(const DicomSource& source, + const std::string& dicomDirPath, const std::string& file) : + source_(source), path_(GetDicomDirPath(dicomDirPath, file)), pixelDataIncluded_(true) { @@ -66,6 +73,11 @@ return new ParseDicomFromFileCommand(*this); } + const DicomSource& GetSource() const + { + return source_; + } + const std::string& GetPath() const { return path_;