Mercurial > hg > orthanc-stone
diff 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 |
line wrap: on
line diff
--- a/Framework/Radiography/RadiographySceneReader.cpp Sat Dec 07 18:18:07 2019 +0100 +++ b/Framework/Radiography/RadiographySceneReader.cpp Sat Dec 07 18:45:37 2019 +0100 @@ -98,7 +98,7 @@ else if (jsonLayer["type"].asString() == "text") { ReadLayerGeometry(geometry, jsonLayer); - scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry); + scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["font"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry, false); } else if (jsonLayer["type"].asString() == "alpha") { @@ -175,7 +175,7 @@ else if (jsonLayer["type"].asString() == "text") { ReadLayerGeometry(geometry, jsonLayer); - scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry); + scene_.LoadText(jsonLayer["text"].asString(), jsonLayer["font"].asString(), jsonLayer["fontSize"].asUInt(), static_cast<uint8_t>(jsonLayer["foreground"].asUInt()), &geometry, false); } else if (jsonLayer["type"].asString() == "alpha") {