Mercurial > hg > orthanc-stone

diff Framework/Radiography/RadiographySceneReader.cpp @ 1220:9ee6b28f53e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RadiographyTextLayer: support multiple fonts
author Alain Mazy <alain@mazy.be>
date Sat, 07 Dec 2019 17:47:23 +0100
parents f417a0ae282b
children 37bc7f115f81 69177b10e2b9
line wrap: on
line diff
--- a/Framework/Radiography/RadiographySceneReader.cpp	Sat Dec 07 17:46:25 2019 +0100
+++ b/Framework/Radiography/RadiographySceneReader.cpp	Sat Dec 07 17:47:23 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")
       {