From be88184f7ce1cd2c591638c9667c7dd9668751a9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 6 Oct 2023 08:56:10 +0300 Subject: [PATCH] Fix handling dimension values. --- src/app/tape/mapplication.cpp | 18 +++++++++--------- src/app/tape/mapplication.h | 6 +++--- src/app/tape/tmainwindow.cpp | 6 +++--- src/app/tape/tmainwindow.h | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index 548b0c0f1..45e43419d 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -851,9 +851,9 @@ auto MApplication::StartWithFiles(QCommandLineParser &parser) -> bool bool flagDimensionC = false; bool flagUnits = false; - int dimensionAValue = 0; - int dimensionBValue = 0; - int dimensionCValue = 0; + qreal dimensionAValue = 0; + qreal dimensionBValue = 0; + qreal dimensionCValue = 0; Unit unit = Unit::Cm; ParseDimensionAOption(parser, dimensionAValue, flagDimensionA); @@ -916,14 +916,14 @@ auto MApplication::SingleStart(QCommandLineParser &parser) -> bool } //--------------------------------------------------------------------------------------------------------------------- -void MApplication::ParseDimensionAOption(QCommandLineParser &parser, int &dimensionAValue, bool &flagDimensionA) +void MApplication::ParseDimensionAOption(QCommandLineParser &parser, qreal &dimensionAValue, bool &flagDimensionA) { if (parser.isSet(*LONG_OPTION_DIMENSION_A)) { const QString value = parser.value(*LONG_OPTION_DIMENSION_A); bool ok = false; - dimensionAValue = value.toInt(&ok); + dimensionAValue = value.toDouble(&ok); if (ok && dimensionAValue > 0) { flagDimensionA = true; @@ -937,14 +937,14 @@ void MApplication::ParseDimensionAOption(QCommandLineParser &parser, int &dimens } //--------------------------------------------------------------------------------------------------------------------- -void MApplication::ParseDimensionBOption(QCommandLineParser &parser, int &dimensionBValue, bool &flagDimensionB) +void MApplication::ParseDimensionBOption(QCommandLineParser &parser, qreal &dimensionBValue, bool &flagDimensionB) { if (parser.isSet(*LONG_OPTION_DIMENSION_B)) { const QString value = parser.value(*LONG_OPTION_DIMENSION_B); bool ok = false; - dimensionBValue = value.toInt(&ok); + dimensionBValue = value.toDouble(&ok); if (ok && dimensionBValue > 0) { flagDimensionB = true; @@ -958,14 +958,14 @@ void MApplication::ParseDimensionBOption(QCommandLineParser &parser, int &dimens } //--------------------------------------------------------------------------------------------------------------------- -void MApplication::ParseDimensionCOption(QCommandLineParser &parser, int &dimensionCValue, bool &flagDimensionC) +void MApplication::ParseDimensionCOption(QCommandLineParser &parser, qreal &dimensionCValue, bool &flagDimensionC) { if (parser.isSet(*LONG_OPTION_DIMENSION_C)) { const QString value = parser.value(*LONG_OPTION_DIMENSION_C); bool ok = false; - dimensionCValue = value.toInt(&ok); + dimensionCValue = value.toDouble(&ok); if (ok && dimensionCValue > 0) { flagDimensionC = true; diff --git a/src/app/tape/mapplication.h b/src/app/tape/mapplication.h index b4a8796b6..c2b848c8f 100644 --- a/src/app/tape/mapplication.h +++ b/src/app/tape/mapplication.h @@ -107,9 +107,9 @@ private: auto StartWithFiles(QCommandLineParser &parser) -> bool; auto SingleStart(QCommandLineParser &parser) -> bool; - static void ParseDimensionAOption(QCommandLineParser &parser, int &dimensionAValue, bool &flagDimensionA); - static void ParseDimensionBOption(QCommandLineParser &parser, int &dimensionBValue, bool &flagDimensionB); - static void ParseDimensionCOption(QCommandLineParser &parser, int &dimensionCValue, bool &flagDimensionC); + static void ParseDimensionAOption(QCommandLineParser &parser, qreal &dimensionAValue, bool &flagDimensionA); + static void ParseDimensionBOption(QCommandLineParser &parser, qreal &dimensionBValue, bool &flagDimensionB); + static void ParseDimensionCOption(QCommandLineParser &parser, qreal &dimensionCValue, bool &flagDimensionC); static void ParseUnitsOption(QCommandLineParser &parser, Unit &unit, bool &flagUnits); }; diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index e93f42218..5f5479ac5 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -337,7 +337,7 @@ void TMainWindow::RetranslateTable() } //--------------------------------------------------------------------------------------------------------------------- -void TMainWindow::SetDimensionABase(int base) +void TMainWindow::SetDimensionABase(qreal base) { const QList dimensions = m_m->Dimensions().values(); @@ -361,7 +361,7 @@ void TMainWindow::SetDimensionABase(int base) } //--------------------------------------------------------------------------------------------------------------------- -void TMainWindow::SetDimensionBBase(int base) +void TMainWindow::SetDimensionBBase(qreal base) { const QList dimensions = m_m->Dimensions().values(); @@ -385,7 +385,7 @@ void TMainWindow::SetDimensionBBase(int base) } //--------------------------------------------------------------------------------------------------------------------- -void TMainWindow::SetDimensionCBase(int base) +void TMainWindow::SetDimensionCBase(qreal base) { const QList dimensions = m_m->Dimensions().values(); diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index d236bcbf8..42f5693c8 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -58,9 +58,9 @@ public: void RetranslateTable(); - void SetDimensionABase(int base); - void SetDimensionBBase(int base); - void SetDimensionCBase(int base); + void SetDimensionABase(qreal base); + void SetDimensionBBase(qreal base); + void SetDimensionCBase(qreal base); void SetPUnit(Unit unit); auto LoadFile(const QString &path) -> bool;