Fix issue with strings output in TrikPrintTextBlock (#1801)

* Fix issue with print strings * Use regular expressions to remove the zeros on the right of a double after alignment
trikset · Oct 24, 2024 · b61826c · b61826c
1 parent 1387445
commit b61826c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/plugins/robots/common/trikKit/src/blocks/details/trikPrintTextBlock.cpp b/plugins/robots/common/trikKit/src/blocks/details/trikPrintTextBlock.cpp
@@ -14,6 +14,7 @@
 
 #include "trikPrintTextBlock.h"
 #include "trikKit/robotModel/parts/trikDisplay.h"
+#include <QRegularExpression>
 
 using namespace trik;
 using namespace blocks::details;
@@ -30,9 +31,17 @@ void TrikPrintTextBlock::doJob(kitBase::robotModel::robotParts::Display &display
 	const int x = eval<int>("XCoordinateText");
 	const int y = eval<int>("YCoordinateText");
 	const int fontSize = eval<int>("FontSize");
-	const QString result = boolProperty("Evaluate")
-			? QString::number(QString::number(eval<qreal>("PrintText"), 'f', 6).toDouble())
-			: stringProperty("PrintText");
+
+	QString result = stringProperty("PrintText");
+	if (boolProperty("Evaluate")) {
+	     result = eval<QString>("PrintText");
+	     bool ok;
+	     auto doubleResult = result.toDouble(&ok);
+	     if (ok) {
+		     result = QString::number(doubleResult, 'f', 6).remove(QRegularExpression("\\.?0+$"));
+	     }
+	}
+
 	const bool redraw = boolProperty("Redraw");
 
 	if (!errorsOccured()) {

diff --git a/plugins/robots/interpreters/interpreterCore/src/coreBlocks/details/printTextBlock.cpp b/plugins/robots/interpreters/interpreterCore/src/coreBlocks/details/printTextBlock.cpp
@@ -16,6 +16,7 @@
 
 #include <kitBase/robotModel/robotModelUtils.h>
 #include <kitBase/robotModel/robotParts/display.h>
+#include <QRegularExpression>
 
 using namespace interpreterCore::coreBlocks::details;
 
@@ -28,11 +29,18 @@ void PrintTextBlock::doJob(kitBase::robotModel::robotParts::Display &display)
 {
 	const int x = eval<int>("XCoordinateText");
 	const int y = eval<int>("YCoordinateText");
-	const QString result = boolProperty("Evaluate")
-			? QString::number(QString::number(eval<qreal>("PrintText"), 'f', 6).toDouble())
-			: stringProperty("PrintText");
-	const bool redraw = boolProperty("Redraw");
 
+	QString result = stringProperty("PrintText");
+	if (boolProperty("Evaluate")) {
+	     result = eval<QString>("PrintText");
+	     bool ok;
+	     auto doubleResult = result.toDouble(&ok);
+	     if (ok) {
+		     result = QString::number(doubleResult, 'f', 6).remove(QRegularExpression("\\.?0+$"));
+	     }
+	}
+
+	const bool redraw = boolProperty("Redraw");
 	if (!errorsOccured()) {
 		display.printText(x, y, result);
 		if (redraw) {