Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-22 18:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2942 Escape SVG text labels

Browse Source
This commit is contained in:
Thomas Krijnen
2023-06-09 11:34:50 +02:00
parent f31132b24e
commit 01ad84901c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/serializers/SvgSerializer.cpp
+8 -4
View File
@@ -1344,7 +1344,8 @@ void SvgSerializer::write(const geometry_data& data) {
labels.push_back(ss.str() + "m"); labels.push_back(ss.str() + "m");
for (auto lit = labels.begin(); lit != labels.end(); ++lit) { for (auto lit = labels.begin(); lit != labels.end(); ++lit) {
const auto& l = *lit; auto l = *lit;
IfcUtil::escape_xml(l);
double dy = labels.begin() == lit double dy = labels.begin() == lit
? 0.35 - (labels.size() - 1.) / 2. ? 0.35 - (labels.size() - 1.) / 2.
: 1.0; // <- dy is relative to the previous text element, so : 1.0; // <- dy is relative to the previous text element, so
@@ -1512,7 +1513,8 @@ void SvgSerializer::write(const geometry_data& data) {
ycoords.push_back(path.add(anchor_pt->Y())); ycoords.push_back(path.add(anchor_pt->Y()));
path.add("\">"); path.add("\">");
for (auto lit = labels.begin(); lit != labels.end(); ++lit) { for (auto lit = labels.begin(); lit != labels.end(); ++lit) {
const auto& l = *lit; auto l = *lit;
IfcUtil::escape_xml(l);
double dy = labels.begin() == lit double dy = labels.begin() == lit
? 0.35 - (labels.size() - 1.) / 2. ? 0.35 - (labels.size() - 1.) / 2.
: 1.0; // <- dy is relative to the previous text element, so : 1.0; // <- dy is relative to the previous text element, so
@@ -1629,7 +1631,8 @@ void SvgSerializer::write(const geometry_data& data) {
} }
path.add(">"); path.add(">");
for (auto lit = labels.begin(); lit != labels.end(); ++lit) { for (auto lit = labels.begin(); lit != labels.end(); ++lit) {
const auto& l = *lit; auto l = *lit;
IfcUtil::escape_xml(l);
double dy = labels.begin() == lit double dy = labels.begin() == lit
? 0.35 - (labels.size() - 1.) / 2. ? 0.35 - (labels.size() - 1.) / 2.
: 1.0; // <- dy is relative to the previous text element, so : 1.0; // <- dy is relative to the previous text element, so
@@ -1967,7 +1970,8 @@ void SvgSerializer::addTextAnnotations(const drawing_key& k) {
std::vector<std::string> labels{ desc }; std::vector<std::string> labels{ desc };
for (auto lit = labels.begin(); lit != labels.end(); ++lit) { for (auto lit = labels.begin(); lit != labels.end(); ++lit) {
const auto& l = *lit; auto l = *lit;
IfcUtil::escape_xml(l);
double dy = labels.begin() == lit double dy = labels.begin() == lit
? 0.0 // align bottom ? 0.0 // align bottom
: 1.0; // <- dy is relative to the previous text element, so : 1.0; // <- dy is relative to the previous text element, so