Fix decimal point char + locale on QT

vizzuhq · Sep 12, 2024 · 05d820c · 05d820c
1 parent c8ddf53
commit 05d820c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/base/conv/numtostr.cpp b/src/base/conv/numtostr.cpp
@@ -36,20 +36,22 @@ std::string NumberToString::convert(double number)
 	        ("%." + std::to_string(fractionDigitCount) + "f").c_str(),
 	        number));
 
-	auto decimalPoint =
-	    std::min(number_view.find('.'), number_view.size());
+	auto decimalPoint = std::min(number_view.find(decimalPointChar),
+	    number_view.size());
 	if (decimalPoint != number_view.size()) {
 		if (!fillFractionWithZero) {
 			number_view = number_view.substr(0,
 			    number_view.find_last_not_of('0') + 1);
 		}
-		if (number_view.ends_with('.')) {
+		if (number_view.ends_with(decimalPointChar)) {
 			number_view.remove_suffix(1);
 		}
 	}
 
 	if (number_view.starts_with('-')
-	    && number_view.find_last_not_of("0.") == 0) {
+	    && number_view.find_last_not_of(std::string_view{
+	           std::initializer_list{'0', decimalPointChar, '\0'}})
+	           == 0) {
 		number_view.remove_prefix(1);
 		++begin;
 		--decimalPoint;

diff --git a/src/chart/options/channel.h b/src/chart/options/channel.h
@@ -6,7 +6,6 @@
 #include <set>
 #include <string>
 
-#include "dataframe/old/datatable.h"
 #include "dataframe/old/types.h"
 
 #include "autoparam.h"

diff --git a/src/dataframe/old/datatable.h b/src/dataframe/old/datatable.h
@@ -5,9 +5,8 @@
 #ifndef DATAFRAME_OLD2_DATATABLE_H
 #define DATAFRAME_OLD2_DATATABLE_H
 
-#include <chart/options/channel.h>
-
 #include "../impl/dataframe.h"
+#include "chart/options/channel.h"
 
 #include "types.h"
 

diff --git a/test/qtest/window.cpp b/test/qtest/window.cpp
@@ -27,6 +27,7 @@ Window::Window(QWidget *parent) :
 	chart.run();
 	animStep();
 	installEventFilter(this);
+	setlocale(LC_NUMERIC, "C");
 }
 
 void Window::animStep()