Mercurial > hg > orthanc

comparison OrthancServer/ParsedDicomFile.cpp @ 1686:14a32b2fa63e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 07 Oct 2015 13:57:26 +0200
parents 09be34b2f30e
children 26083d84d237
comparison
equal deleted inserted replaced
1685:22e7e2ba99db 1686:14a32b2fa63e
1362 1362
1363 std::string s = GetDicomSpecificCharacterSet(encoding); 1363 std::string s = GetDicomSpecificCharacterSet(encoding);
1364 Replace(DICOM_TAG_SPECIFIC_CHARACTER_SET, s, DicomReplaceMode_InsertIfAbsent); 1364 Replace(DICOM_TAG_SPECIFIC_CHARACTER_SET, s, DicomReplaceMode_InsertIfAbsent);
1365 } 1365 }
1366 1366
1367 void ParsedDicomFile::ToJson(Json::Value& target, bool simplify) 1367 void ParsedDicomFile::ToJson(Json::Value& target,
1368 { 1368 DicomToJsonFormat format,
1369 if (simplify) 1369 unsigned int maxStringLength)
1370 { 1370 {
1371 Json::Value tmp; 1371 FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset(), format, maxStringLength);
1372 FromDcmtkBridge::ToJson(tmp, *pimpl_->file_->getDataset());
1373 SimplifyTags(target, tmp);
1374 }
1375 else
1376 {
1377 FromDcmtkBridge::ToJson(target, *pimpl_->file_->getDataset());
1378 }
1379 } 1372 }
1380 1373
1381 1374
1382 bool ParsedDicomFile::HasTag(const DicomTag& tag) const 1375 bool ParsedDicomFile::HasTag(const DicomTag& tag) const
1383 { 1376 {