From d89b217e9b3957c0c594a82d0c9995b200212f6c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 20 Dec 2018 03:59:46 +0100 Subject: [PATCH] PQ parsing using "best guess" strategy as default plus renamings --- src/blackcore/context/contextnetworkimpl.cpp | 4 ++-- src/blackcore/vatsim/networkvatlib.cpp | 2 +- src/blackgui/components/flightplancomponent.cpp | 2 +- src/blackgui/components/interpolationlogdisplay.cpp | 2 +- src/blackgui/editors/coordinateform.cpp | 2 +- src/blackgui/editors/interpolationsetupform.cpp | 2 +- src/blackgui/editors/modelmappingform.cpp | 2 +- src/blackmisc/aviation/altitude.cpp | 2 +- src/blackmisc/aviation/altitude.h | 2 +- src/blackmisc/pq/physicalquantity.cpp | 2 +- src/blackmisc/pq/pqstring.cpp | 6 +++--- src/blackmisc/pq/pqstring.h | 12 ++++++------ src/blackmisc/simplecommandparser.cpp | 4 ++-- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index b04058bd8..db4a1eac1 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -328,7 +328,7 @@ namespace BlackCore } else { - const CFrequency radioFrequency = CComSystem::parseComFrequency(receiver, CPqString::SeparatorsBestGuess); + const CFrequency radioFrequency = CComSystem::parseComFrequency(receiver, CPqString::SeparatorBestGuess); if (!radioFrequency.isNull()) { if (CComSystem::isValidCivilAviationFrequency(radioFrequency)) @@ -383,7 +383,7 @@ namespace BlackCore CLength os(CLength::null()); if (parser.hasPart(2)) { - os.parseFromString(parser.part(2)); + os.parseFromString(parser.part(2), CPqString::SeparatorBestGuess); } const bool added = this->testAddAltitudeOffset(cs, os); diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index 2ff79be57..2466453cd 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -1445,7 +1445,7 @@ namespace BlackCore } } CAltitude cruiseAlt; - cruiseAlt.parseFromString(cruiseAltString, CPqString::SeparatorsBestGuess); + cruiseAlt.parseFromString(cruiseAltString, CPqString::SeparatorBestGuess); const QString depTimePlanned = QString("0000").append(QString::number(fp->departTime)).right(4); const QString depTimeActual = QString("0000").append(QString::number(fp->departTimeActual)).right(4); diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 68cd4b39c..db63bddd0 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -392,7 +392,7 @@ namespace BlackGui // TAS v = ui->le_CruiseTrueAirspeed->text(); CSpeed cruiseTAS; - cruiseTAS.parseFromString(v, CPqString::SeparatorsLocale); + cruiseTAS.parseFromString(v, CPqString::SeparatorBestGuess); if (cruiseTAS.isNull()) { messages.push_back(CStatusMessage(this).validationError("Wrong TAS, %1") << ui->lbl_CruiseTrueAirspeed->text()); diff --git a/src/blackgui/components/interpolationlogdisplay.cpp b/src/blackgui/components/interpolationlogdisplay.cpp index 8103ae607..6d646aed1 100644 --- a/src/blackgui/components/interpolationlogdisplay.cpp +++ b/src/blackgui/components/interpolationlogdisplay.cpp @@ -358,7 +358,7 @@ namespace BlackGui if (situations.isEmpty()) { return; } CAltitude alt; - alt.parseFromString(elv); + alt.parseFromString(elv, CPqString::SeparatorBestGuess); const CElevationPlane ep(situations.latestAdjustedObject(), alt, CElevationPlane::singlePointRadius()); // inject as received from simulator diff --git a/src/blackgui/editors/coordinateform.cpp b/src/blackgui/editors/coordinateform.cpp index 07f9451c0..56f964bf9 100644 --- a/src/blackgui/editors/coordinateform.cpp +++ b/src/blackgui/editors/coordinateform.cpp @@ -265,7 +265,7 @@ namespace BlackGui { const QString e = ui->le_Elevation->text().trimmed(); CAltitude a; - a.parseFromString(e); + a.parseFromString(e, CPqString::SeparatorBestGuess); ui->lblp_ElvCheck->setTicked(!e.isNull()); CCoordinateGeodetic c = m_coordinate; c.setGeodeticHeight(a); diff --git a/src/blackgui/editors/interpolationsetupform.cpp b/src/blackgui/editors/interpolationsetupform.cpp index 374434dec..9bda96e30 100644 --- a/src/blackgui/editors/interpolationsetupform.cpp +++ b/src/blackgui/editors/interpolationsetupform.cpp @@ -127,7 +127,7 @@ namespace BlackGui { CAngle pitch; const QString p = ui->le_PitchOnGround->text().trimmed(); - pitch.parseFromString(p, CPqString::SeparatorsBestGuess); + pitch.parseFromString(p, CPqString::SeparatorBestGuess); return pitch; } diff --git a/src/blackgui/editors/modelmappingform.cpp b/src/blackgui/editors/modelmappingform.cpp index 7a97d9c20..f9bb75a33 100644 --- a/src/blackgui/editors/modelmappingform.cpp +++ b/src/blackgui/editors/modelmappingform.cpp @@ -128,7 +128,7 @@ namespace BlackGui } CLength cg; - cg.parseFromString(v); + cg.parseFromString(v, CPqString::SeparatorBestGuess); return cg; } diff --git a/src/blackmisc/aviation/altitude.cpp b/src/blackmisc/aviation/altitude.cpp index b27c4e438..7f6bcefad 100644 --- a/src/blackmisc/aviation/altitude.cpp +++ b/src/blackmisc/aviation/altitude.cpp @@ -125,7 +125,7 @@ namespace BlackMisc void CAltitude::parseFromString(const QString &value) { - this->parseFromString(value, CPqString::SeparatorsBestGuess); + this->parseFromString(value, CPqString::SeparatorBestGuess); } void CAltitude::parseFromString(const QString &value, CPqString::SeparatorMode mode) diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h index f40de104c..877865fb2 100644 --- a/src/blackmisc/aviation/altitude.h +++ b/src/blackmisc/aviation/altitude.h @@ -101,7 +101,7 @@ namespace BlackMisc } //! Altitude as string - CAltitude(const QString &altitudeAsString, PhysicalQuantities::CPqString::SeparatorMode mode = PhysicalQuantities::CPqString::SeparatorsBestGuess); + CAltitude(const QString &altitudeAsString, PhysicalQuantities::CPqString::SeparatorMode mode = PhysicalQuantities::CPqString::SeparatorBestGuess); //! Constructor by CLength CAltitude(const PhysicalQuantities::CLength &altitude, ReferenceDatum datum) : CLength(altitude), m_datum(datum) {} diff --git a/src/blackmisc/pq/physicalquantity.cpp b/src/blackmisc/pq/physicalquantity.cpp index b683da2a9..b31f92069 100644 --- a/src/blackmisc/pq/physicalquantity.cpp +++ b/src/blackmisc/pq/physicalquantity.cpp @@ -448,7 +448,7 @@ namespace BlackMisc template void CPhysicalQuantity::parseFromString(const QString &value) { - *this = CPqString::parse(value, CPqString::SeparatorsCLocale); + *this = CPqString::parse(value, CPqString::SeparatorQtDefault); } template diff --git a/src/blackmisc/pq/pqstring.cpp b/src/blackmisc/pq/pqstring.cpp index b11cae6da..342ff5138 100644 --- a/src/blackmisc/pq/pqstring.cpp +++ b/src/blackmisc/pq/pqstring.cpp @@ -117,13 +117,13 @@ namespace BlackMisc double numberD = -1; switch (mode) { - case SeparatorsLocale: + case SeparatorLocale: numberD = QLocale::system().toDouble(number, &success); break; - case SeparatorsCLocale: + case SeparatorQtDefault: numberD = number.toDouble(&success); break; - case SeparatorsBestGuess: + case SeparatorBestGuess: numberD = number.toDouble(&success); if (!success) { numberD = QLocale::system().toDouble(number, &success); } break; diff --git a/src/blackmisc/pq/pqstring.h b/src/blackmisc/pq/pqstring.h index 6762fece3..a37bb849e 100644 --- a/src/blackmisc/pq/pqstring.h +++ b/src/blackmisc/pq/pqstring.h @@ -38,9 +38,9 @@ namespace BlackMisc //! Number separators / group separators enum SeparatorMode { - SeparatorsCLocale, //!< 100,000.00 - SeparatorsLocale, //!< depending on QLocale, e.g. 100.000,00 in Germany - SeparatorsBestGuess //!< try to figure out + SeparatorQtDefault, //!< 100000.00 no group separator + SeparatorLocale, //!< depending on QLocale, e.g. 100.000,00 in Germany + SeparatorBestGuess //!< try to figure out }; //! Group and digit separator @@ -57,10 +57,10 @@ namespace BlackMisc CPqString(const QString &value) : m_string(value) {} //! Parse a string value like "100m", "10.3Mhz" - static CVariant parseToVariant(const QString &value, SeparatorMode mode = SeparatorsCLocale); + static CVariant parseToVariant(const QString &value, SeparatorMode mode = SeparatorQtDefault); //! Parse into concrete type - template static PQ parse(const QString &value, SeparatorMode mode = SeparatorsCLocale) + template static PQ parse(const QString &value, SeparatorMode mode = SeparatorQtDefault) { if (value.isEmpty()) {return PQ::null(); } if (value.contains("null", Qt::CaseInsensitive)) { return PQ::null(); } @@ -73,7 +73,7 @@ namespace BlackMisc } //! Locale aware parsing - static double parseNumber(const QString &number, bool &success, SeparatorMode mode = SeparatorsCLocale); + static double parseNumber(const QString &number, bool &success, SeparatorMode mode = SeparatorBestGuess); private: QString m_string; diff --git a/src/blackmisc/simplecommandparser.cpp b/src/blackmisc/simplecommandparser.cpp index 66a7b7dc2..ad0693473 100644 --- a/src/blackmisc/simplecommandparser.cpp +++ b/src/blackmisc/simplecommandparser.cpp @@ -96,7 +96,7 @@ namespace BlackMisc const QString p = this->part(index); if (p.isEmpty()) { return false; } bool ok = false; - CPqString::parseNumber(p, ok, CPqString::SeparatorsBestGuess); + CPqString::parseNumber(p, ok, CPqString::SeparatorBestGuess); return ok; } @@ -122,7 +122,7 @@ namespace BlackMisc const QString p = this->part(index); if (p.isEmpty()) { return def; } bool ok = false; - double d = CPqString::parseNumber(p, ok, CPqString::SeparatorsBestGuess); + double d = CPqString::parseNumber(p, ok, CPqString::SeparatorBestGuess); return ok ? d : def; }