Mercurial > hg > orthanc
comparison Core/DicomParsing/ParsedDicomFile.cpp @ 2409:e4045b3c9772
ignore-length argument if retrieving DICOM tags
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 27 Sep 2017 17:36:13 +0200 |
parents | 75c779ca948c |
children | 6e5bc5c6d1a4 |
comparison
equal
deleted
inserted
replaced
2408:26a0cc24d48d | 2409:e4045b3c9772 |
---|---|
840 element == NULL) | 840 element == NULL) |
841 { | 841 { |
842 return false; | 842 return false; |
843 } | 843 } |
844 | 844 |
845 std::set<DicomTag> tmp; | |
845 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement | 846 std::auto_ptr<DicomValue> v(FromDcmtkBridge::ConvertLeafElement |
846 (*element, DicomToJsonFlags_Default, | 847 (*element, DicomToJsonFlags_Default, |
847 ORTHANC_MAXIMUM_TAG_LENGTH, GetEncoding())); | 848 0, GetEncoding(), tmp)); |
848 | 849 |
849 if (v.get() == NULL || | 850 if (v.get() == NULL || |
850 v->IsNull()) | 851 v->IsNull()) |
851 { | 852 { |
852 value = ""; | 853 value = ""; |
1239 void ParsedDicomFile::DatasetToJson(Json::Value& target, | 1240 void ParsedDicomFile::DatasetToJson(Json::Value& target, |
1240 DicomToJsonFormat format, | 1241 DicomToJsonFormat format, |
1241 DicomToJsonFlags flags, | 1242 DicomToJsonFlags flags, |
1242 unsigned int maxStringLength) | 1243 unsigned int maxStringLength) |
1243 { | 1244 { |
1245 std::set<DicomTag> ignoreTagLength; | |
1244 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(), | 1246 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(), |
1245 format, flags, maxStringLength, GetDefaultDicomEncoding()); | 1247 format, flags, maxStringLength, |
1248 GetDefaultDicomEncoding(), ignoreTagLength); | |
1249 } | |
1250 | |
1251 | |
1252 void ParsedDicomFile::DatasetToJson(Json::Value& target, | |
1253 DicomToJsonFormat format, | |
1254 DicomToJsonFlags flags, | |
1255 unsigned int maxStringLength, | |
1256 const std::set<DicomTag>& ignoreTagLength) | |
1257 { | |
1258 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(), | |
1259 format, flags, maxStringLength, | |
1260 GetDefaultDicomEncoding(), ignoreTagLength); | |
1261 } | |
1262 | |
1263 | |
1264 void ParsedDicomFile::DatasetToJson(Json::Value& target, | |
1265 const std::set<DicomTag>& ignoreTagLength) | |
1266 { | |
1267 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(), ignoreTagLength); | |
1246 } | 1268 } |
1247 | 1269 |
1248 | 1270 |
1249 void ParsedDicomFile::DatasetToJson(Json::Value& target) | 1271 void ParsedDicomFile::DatasetToJson(Json::Value& target) |
1250 { | 1272 { |
1251 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset()); | 1273 const std::set<DicomTag> ignoreTagLength; |
1274 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset(), ignoreTagLength); | |
1252 } | 1275 } |
1253 | 1276 |
1254 | 1277 |
1255 void ParsedDicomFile::HeaderToJson(Json::Value& target, | 1278 void ParsedDicomFile::HeaderToJson(Json::Value& target, |
1256 DicomToJsonFormat format) | 1279 DicomToJsonFormat format) |
1447 { | 1470 { |
1448 FromDcmtkBridge::ExtractDicomSummary(target, *pimpl_->file_->getDataset()); | 1471 FromDcmtkBridge::ExtractDicomSummary(target, *pimpl_->file_->getDataset()); |
1449 } | 1472 } |
1450 | 1473 |
1451 | 1474 |
1452 void ParsedDicomFile::ExtractDicomAsJson(Json::Value& target) const | |
1453 { | |
1454 FromDcmtkBridge::ExtractDicomAsJson(target, *pimpl_->file_->getDataset()); | |
1455 } | |
1456 | |
1457 | |
1458 bool ParsedDicomFile::LookupTransferSyntax(std::string& result) | 1475 bool ParsedDicomFile::LookupTransferSyntax(std::string& result) |
1459 { | 1476 { |
1460 return FromDcmtkBridge::LookupTransferSyntax(result, *pimpl_->file_); | 1477 return FromDcmtkBridge::LookupTransferSyntax(result, *pimpl_->file_); |
1461 } | 1478 } |
1462 | 1479 |