Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerContext.cpp @ 4140:0ddc5297a8ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
centralization of default parameters for JSON/DicomMap conversions from DCMTK
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 07 Aug 2020 10:46:50 +0200
parents 7aa92c87fdc2
children 1ec3e1e18f50
comparison
equal deleted inserted replaced
4139:a4f28efdfccf 4140:0ddc5297a8ab
692 << instancePublicId; 692 << instancePublicId;
693 693
694 ParsedDicomFile parsed(dicom); 694 ParsedDicomFile parsed(dicom);
695 695
696 Json::Value summary; 696 Json::Value summary;
697 parsed.DatasetToJson(summary); 697 OrthancConfiguration::DefaultDicomDatasetToJson(summary, parsed);
698 698
699 result = summary.toStyledString(); 699 result = summary.toStyledString();
700 700
701 if (!AddAttachment(instancePublicId, FileContentType_DicomAsJson, 701 if (!AddAttachment(instancePublicId, FileContentType_DicomAsJson,
702 result.c_str(), result.size())) 702 result.c_str(), result.size()))
746 // "too long". We are forced to re-parse the DICOM file. 746 // "too long". We are forced to re-parse the DICOM file.
747 std::string dicom; 747 std::string dicom;
748 ReadDicom(dicom, instancePublicId); 748 ReadDicom(dicom, instancePublicId);
749 749
750 ParsedDicomFile parsed(dicom); 750 ParsedDicomFile parsed(dicom);
751 parsed.DatasetToJson(result, ignoreTagLength); 751 OrthancConfiguration::DefaultDicomDatasetToJson(result, parsed, ignoreTagLength);
752 } 752 }
753 } 753 }
754 754
755 755
756 void ServerContext::ReadAttachment(std::string& result, 756 void ServerContext::ReadAttachment(std::string& result,