Mercurial > hg > orthanc-wsi
comparison Framework/Inputs/DicomPyramidInstance.cpp @ 87:3d83d34cd4db
sync, optimizations
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 16 Dec 2016 16:44:14 +0100 |
parents | f2c179294382 |
children | 61e629ce7c94 |
comparison
equal
deleted
inserted
replaced
86:319b8c45c231 | 87:3d83d34cd4db |
---|---|
38 static ImageCompression DetectImageCompression(OrthancPlugins::IOrthancConnection& orthanc, | 38 static ImageCompression DetectImageCompression(OrthancPlugins::IOrthancConnection& orthanc, |
39 const std::string& instanceId) | 39 const std::string& instanceId) |
40 { | 40 { |
41 using namespace OrthancPlugins; | 41 using namespace OrthancPlugins; |
42 | 42 |
43 DicomDatasetReader header(new FullOrthancDataset | 43 FullOrthancDataset dataset(orthanc, "/instances/" + instanceId + "/header"); |
44 (orthanc, "/instances/" + instanceId + "/header")); | 44 DicomDatasetReader header(dataset); |
45 | 45 |
46 std::string s = Orthanc::Toolbox::StripSpaces | 46 std::string s = Orthanc::Toolbox::StripSpaces |
47 (header.GetMandatoryStringValue(DICOM_TAG_TRANSFER_SYNTAX_UID)); | 47 (header.GetMandatoryStringValue(DICOM_TAG_TRANSFER_SYNTAX_UID)); |
48 | 48 |
49 if (s == "1.2.840.10008.1.2" || | 49 if (s == "1.2.840.10008.1.2" || |
129 void DicomPyramidInstance::Load(OrthancPlugins::IOrthancConnection& orthanc, | 129 void DicomPyramidInstance::Load(OrthancPlugins::IOrthancConnection& orthanc, |
130 const std::string& instanceId) | 130 const std::string& instanceId) |
131 { | 131 { |
132 using namespace OrthancPlugins; | 132 using namespace OrthancPlugins; |
133 | 133 |
134 DicomDatasetReader reader(new FullOrthancDataset(orthanc, "/instances/" + instanceId + "/tags")); | 134 FullOrthancDataset dataset(orthanc, "/instances/" + instanceId + "/tags"); |
135 DicomDatasetReader reader(dataset); | |
135 | 136 |
136 if (reader.GetMandatoryStringValue(DICOM_TAG_SOP_CLASS_UID) != "1.2.840.10008.5.1.4.1.1.77.1.6" || | 137 if (reader.GetMandatoryStringValue(DICOM_TAG_SOP_CLASS_UID) != "1.2.840.10008.5.1.4.1.1.77.1.6" || |
137 reader.GetMandatoryStringValue(DICOM_TAG_MODALITY) != "SM") | 138 reader.GetMandatoryStringValue(DICOM_TAG_MODALITY) != "SM") |
138 { | 139 { |
139 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | 140 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |