Mercurial > hg > orthanc-stone
comparison Framework/Radiography/RadiographySceneReader.cpp @ 1224:37bc7f115f81 broker
integration mainline->broker
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 07 Dec 2019 18:45:37 +0100 |
parents | bdc6837d5917 9ee6b28f53e8 |
children | 7ec8fea061b9 |
comparison
equal
deleted
inserted
replaced
1222:21c2b0eee53c | 1224:37bc7f115f81 |
---|---|
96 scene_.LoadMask(corners, *dicomLayer, foreground, &geometry); | 96 scene_.LoadMask(corners, *dicomLayer, foreground, &geometry); |
97 } | 97 } |
98 else if (jsonLayer["type"].asString() == "text") | 98 else if (jsonLayer["type"].asString() == "text") |
99 { | 99 { |
100 ReadLayerGeometry(geometry, jsonLayer); | 100 ReadLayerGeometry(geometry, jsonLayer); |
101 scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry); | 101 scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["font"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry, false); |
102 } | 102 } |
103 else if (jsonLayer["type"].asString() == "alpha") | 103 else if (jsonLayer["type"].asString() == "alpha") |
104 { | 104 { |
105 ReadLayerGeometry(geometry, jsonLayer); | 105 ReadLayerGeometry(geometry, jsonLayer); |
106 | 106 |
173 scene_.LoadMask(corners, *dicomLayer, foreground, &geometry); | 173 scene_.LoadMask(corners, *dicomLayer, foreground, &geometry); |
174 } | 174 } |
175 else if (jsonLayer["type"].asString() == "text") | 175 else if (jsonLayer["type"].asString() == "text") |
176 { | 176 { |
177 ReadLayerGeometry(geometry, jsonLayer); | 177 ReadLayerGeometry(geometry, jsonLayer); |
178 scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry); | 178 scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["font"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry, false); |
179 } | 179 } |
180 else if (jsonLayer["type"].asString() == "alpha") | 180 else if (jsonLayer["type"].asString() == "alpha") |
181 { | 181 { |
182 ReadLayerGeometry(geometry, jsonLayer); | 182 ReadLayerGeometry(geometry, jsonLayer); |
183 | 183 |