Merge pull request #844 from MediaArea/locale

Force LC_NUMERIC to C
bavc · Dec 17, 2024 · 0e4dbdd · 0e4dbdd
2 parents e2832ad + f2a0ec0
commit 0e4dbdd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Source/Cli/cli.cpp b/Source/Cli/cli.cpp
@@ -5,6 +5,7 @@
 #include "Core/FileInformation.h"
 #include <QDir>
 #include <Core/logging.h>
+#include <clocale>
 
 Cli::Cli() : indexOfStreamWithKnownFrameCount(0), statsFileBytesWritten(0), statsFileBytesTotal(0), statsFileBytesUploaded(0), statsFileBytesToUpload(0)
 {
@@ -37,6 +38,7 @@ int Cli::exec(QCoreApplication &a)
     bool forceUploadToSignalServer = false;
 
     QString checkUploadFileName;
+    std::setlocale(LC_NUMERIC, "C");
 
     for(int i = 1; i < a.arguments().length(); ++i)
     {

diff --git a/Source/GUI/Plots.cpp b/Source/GUI/Plots.cpp
@@ -24,7 +24,6 @@
 #include <qwt_plot_layout.h>
 #include <qwt_plot_canvas.h>
 #include <cmath>
-#include <clocale>
 #include <unordered_set>
 #include <QMouseEvent>
 #include <QInputDialog>
@@ -145,7 +144,6 @@ Plots::Plots( QWidget *parent, FileInformation* fileInformation ) :
     m_dataTypeIndex( Plots::AxisSeconds ),
     m_commentsPlot(nullptr)
 {
-    setlocale(LC_NUMERIC, "C");
     QGridLayout* layout = new QGridLayout( this );
     layout->setSpacing( 1 );
     layout->setContentsMargins( 0, 0, 0, 0 );

diff --git a/Source/GUI/mainwindow.cpp b/Source/GUI/mainwindow.cpp
@@ -34,6 +34,7 @@
 #include <QScreen>
 #include <QClipboard>
 #include <QGuiApplication>
+#include <clocale>
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QDesktopWidget>
@@ -82,6 +83,8 @@ MainWindow::MainWindow(QWidget *parent) :
     DragDrop_Image=NULL;
     DragDrop_Text=NULL;
 
+    std::setlocale(LC_NUMERIC, "C");
+
     m_plotsChooser = new PlotsChooser();
     connect(m_plotsChooser, &PlotsChooser::orderChanged, [&]() {
         QList<std::tuple<quint64, quint64>> filtersSelectors = m_plotsChooser->getFilterSelectorsOrder();