Mercurial > hg > orthanc
comparison OrthancServer/ParsedDicomFile.cpp @ 2131:bb199bccdc45
reorganization
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 08 Nov 2016 10:49:45 +0100 |
parents | 9329ba17a069 |
children | aa4b8895cd23 |
comparison
equal
deleted
inserted
replaced
2130:72cb107a7346 | 2131:bb199bccdc45 |
---|---|
1150 DicomToJsonFormat format, | 1150 DicomToJsonFormat format, |
1151 DicomToJsonFlags flags, | 1151 DicomToJsonFlags flags, |
1152 unsigned int maxStringLength) | 1152 unsigned int maxStringLength) |
1153 { | 1153 { |
1154 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(), | 1154 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(), |
1155 format, flags, maxStringLength); | 1155 format, flags, maxStringLength, Configuration::GetDefaultEncoding()); |
1156 } | 1156 } |
1157 | 1157 |
1158 | 1158 |
1159 void ParsedDicomFile::DatasetToJson(Json::Value& target) | 1159 void ParsedDicomFile::DatasetToJson(Json::Value& target) |
1160 { | 1160 { |
1161 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset()); | 1161 Configuration::ExtractDicomAsJson(target, *pimpl_->file_->getDataset()); |
1162 } | 1162 } |
1163 | 1163 |
1164 | 1164 |
1165 void ParsedDicomFile::HeaderToJson(Json::Value& target, | 1165 void ParsedDicomFile::HeaderToJson(Json::Value& target, |
1166 DicomToJsonFormat format) | 1166 DicomToJsonFormat format) |
1261 } | 1261 } |
1262 | 1262 |
1263 | 1263 |
1264 void ParsedDicomFile::Convert(DicomMap& tags) | 1264 void ParsedDicomFile::Convert(DicomMap& tags) |
1265 { | 1265 { |
1266 FromDcmtkBridge::ExtractDicomSummary(tags, *pimpl_->file_->getDataset()); | 1266 Configuration::ExtractDicomSummary(tags, *pimpl_->file_->getDataset()); |
1267 } | 1267 } |
1268 | 1268 |
1269 | 1269 |
1270 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json, | 1270 ParsedDicomFile* ParsedDicomFile::CreateFromJson(const Json::Value& json, |
1271 DicomFromJsonFlags flags) | 1271 DicomFromJsonFlags flags) |