Mercurial > hg > orthanc
comparison OrthancServer/ParsedDicomFile.cpp @ 2126:03b065778fc3
cleaning up
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 07 Nov 2016 13:47:21 +0100 |
parents | b9bd52c72ba2 |
children | 9329ba17a069 |
comparison
equal
deleted
inserted
replaced
2125:b9bd52c72ba2 | 2126:03b065778fc3 |
---|---|
1149 void ParsedDicomFile::ToJson(Json::Value& target, | 1149 void ParsedDicomFile::ToJson(Json::Value& target, |
1150 DicomToJsonFormat format, | 1150 DicomToJsonFormat format, |
1151 DicomToJsonFlags flags, | 1151 DicomToJsonFlags flags, |
1152 unsigned int maxStringLength) | 1152 unsigned int maxStringLength) |
1153 { | 1153 { |
1154 FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset(), | 1154 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(), |
1155 format, flags, maxStringLength, | 1155 format, flags, maxStringLength); |
1156 Configuration::GetDefaultEncoding()); | |
1157 } | 1156 } |
1158 | 1157 |
1159 | 1158 |
1160 void ParsedDicomFile::HeaderToJson(Json::Value& target, | 1159 void ParsedDicomFile::HeaderToJson(Json::Value& target, |
1161 DicomToJsonFormat format) | 1160 DicomToJsonFormat format) |
1162 { | 1161 { |
1163 FromDcmtkBridge::ToJson(target, *pimpl_->file_->getMetaInfo(), format, DicomToJsonFlags_None, 0); | 1162 FromDcmtkBridge::ExtractHeaderAsJson(target, *pimpl_->file_->getMetaInfo(), format, DicomToJsonFlags_None, 0); |
1164 } | 1163 } |
1165 | 1164 |
1166 | 1165 |
1167 bool ParsedDicomFile::HasTag(const DicomTag& tag) const | 1166 bool ParsedDicomFile::HasTag(const DicomTag& tag) const |
1168 { | 1167 { |