Refactored text svg transformation into function towards solving #3186 …

…for power labels.
fritzing · Apr 25, 2023 · 5d9c6df · 5d9c6df
1 parent 0f1ddb6
commit 5d9c6df
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/items/symbolpaletteitem.cpp b/src/items/symbolpaletteitem.cpp
@@ -335,6 +335,24 @@ QString SymbolPaletteItem::replaceTextElement(QString svg) {
 	return TextUtils::replaceTextElement(svg, "label", QString::number(v) + "V");
 }
 
+QString SymbolPaletteItem::transformTextSvg(const QString & testSvg) {
+	QString svg = testSvg;
+	SchematicTextLayerKinPaletteItem * schemItem = nullptr;
+	Q_FOREACH (ItemBase * lkpi, m_layerKin) {
+		auto * schemLayerItem = qobject_cast<SchematicTextLayerKinPaletteItem *>(lkpi);
+		if (schemLayerItem != nullptr) {
+			schemItem = schemLayerItem;
+			break;
+		}
+	}
+
+	if (schemItem != nullptr) {
+		double rotation;
+		svg = schemItem->getTransformedSvg(svg, rotation);
+	}
+	return svg;
+}
+
 QString SymbolPaletteItem::getProperty(const QString & key) {
 	if (key.compare("voltage", Qt::CaseInsensitive) == 0) {
 		return QString::number(m_voltage);
@@ -619,19 +637,7 @@ QString NetLabel::makeSvg(ViewLayer::ViewLayerID viewLayerID) {
 	svg += "</g>\n</svg>\n";
 
 	if (viewLayerID == ViewLayer::SchematicText) {
-		SchematicTextLayerKinPaletteItem * schemItem = nullptr;
-		Q_FOREACH (ItemBase * lkpi, m_layerKin) {
-			auto * schemLayerItem = qobject_cast<SchematicTextLayerKinPaletteItem *>(lkpi);
-			if (schemLayerItem != nullptr) {
-				schemItem = schemLayerItem;
-				break;
-			}
-		}
-
-		if (schemItem != nullptr) {
-			double rotation;
-			svg = schemItem->getTransformedSvg(svg, rotation);
-		}
+		svg = transformTextSvg(svg);
 	}
 
 	return svg;

diff --git a/src/items/symbolpaletteitem.h b/src/items/symbolpaletteitem.h
@@ -87,6 +87,7 @@ public Q_SLOTS:
 	double useVoltage(ConnectorItem * connectorItem);
 	virtual QString makeSvg(ViewLayer::ViewLayerID);
 	QString replaceTextElement(QString svg);
+	QString transformTextSvg(const QString & testSvg);
 	ViewLayer::ViewID useViewIDForPixmap(ViewLayer::ViewID, bool swappingEnabled);
 	void resetLayerKin();