Mercurial > hg > orthanc-stone
comparison Framework/Radiography/RadiographySceneReader.cpp @ 1070:d7887f88710f broker
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 15 Oct 2019 21:28:46 +0200 |
parents | 9889c819db01 |
children | bdc6837d5917 |
comparison
equal
deleted
inserted
replaced
1069:5d1b0d2f4b15 | 1070:d7887f88710f |
---|---|
48 } | 48 } |
49 | 49 |
50 | 50 |
51 RadiographyDicomLayer* RadiographySceneReader::LoadDicom(const std::string& instanceId, unsigned int frame, RadiographyLayer::Geometry* geometry) | 51 RadiographyDicomLayer* RadiographySceneReader::LoadDicom(const std::string& instanceId, unsigned int frame, RadiographyLayer::Geometry* geometry) |
52 { | 52 { |
53 return dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomFrame(orthancApiClient_, instanceId, frame, false, geometry))); | 53 return dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomFrame(*orthancApiClient_, instanceId, frame, false, geometry))); |
54 } | 54 } |
55 | 55 |
56 void RadiographySceneBuilder::Read(const Json::Value& input) | 56 void RadiographySceneBuilder::Read(const Json::Value& input) |
57 { | 57 { |
58 unsigned int version = input["version"].asUInt(); | 58 unsigned int version = input["version"].asUInt(); |
159 RadiographyLayer::Geometry geometry; | 159 RadiographyLayer::Geometry geometry; |
160 | 160 |
161 if (jsonLayer["type"].asString() == "dicom") | 161 if (jsonLayer["type"].asString() == "dicom") |
162 { | 162 { |
163 ReadLayerGeometry(geometry, jsonLayer); | 163 ReadLayerGeometry(geometry, jsonLayer); |
164 dicomLayer = dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomFrame(orthancApiClient_, jsonLayer["instanceId"].asString(), jsonLayer["frame"].asUInt(), false, &geometry))); | 164 dicomLayer = dynamic_cast<RadiographyDicomLayer*>(&(scene_.LoadDicomFrame(*orthancApiClient_, jsonLayer["instanceId"].asString(), jsonLayer["frame"].asUInt(), false, &geometry))); |
165 } | 165 } |
166 else if (jsonLayer["type"].asString() == "mask") | 166 else if (jsonLayer["type"].asString() == "mask") |
167 { | 167 { |
168 if (dicomLayer == NULL) | 168 if (dicomLayer == NULL) |
169 { | 169 { |