diff --git a/src/blackcore/vatsim/networkvatlib.cpp b/src/blackcore/vatsim/networkvatlib.cpp index 15e008177..d6e66d977 100644 --- a/src/blackcore/vatsim/networkvatlib.cpp +++ b/src/blackcore/vatsim/networkvatlib.cpp @@ -660,8 +660,8 @@ namespace BlackCore const QString route = flightPlan.getRoute(); const QString remarks = QString(flightPlan.getRemarks()); - const QString alt = flightPlan.getCruiseAltitude().asFpVatsimAltitudeString(); //! \fixme that would be the official string, can this be used? + const QString alt = flightPlan.getCruiseAltitude().asFpVatsimAltitudeString(); // const QString alt = flightPlan.getCruiseAltitude().asFpAltitudeString(); QString act = flightPlan.getCombinedPrefixIcaoSuffix(); diff --git a/src/blackmisc/aviation/altitude.cpp b/src/blackmisc/aviation/altitude.cpp index 4455f6072..4250186ca 100644 --- a/src/blackmisc/aviation/altitude.cpp +++ b/src/blackmisc/aviation/altitude.cpp @@ -373,7 +373,8 @@ namespace BlackMisc // as feed, as none of the other clients const CAltitude a = this->roundedToNearest100ft(false); - return a.valueRoundedWithUnit(CLengthUnit::ft(), 0); + // return a.valueRoundedWithUnit(CLengthUnit::ft(), 0); + return a.valueIntegerAsString(CLengthUnit::ft()); } const QRegularExpression &CAltitude::fpAltitudeRegExp() diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h index 8e017b47d..9b01343e9 100644 --- a/src/blackmisc/pq/physicalquantity.h +++ b/src/blackmisc/pq/physicalquantity.h @@ -104,11 +104,15 @@ namespace BlackMisc //! Set value in current unit void setCurrentUnitValue(double value); - //! As integer value + //! As integer value @{ int valueInteger(MU unit) const; + QString valueIntegerAsString(MU unit) const { return QString::number(this->valueInteger(unit)); } + // @} - //! As integer value in current unit + //! As integer value in current unit @{ int valueInteger() const; + QString valueIntegerAsString() const { return QString::number(this->valueInteger()); } + // @} //! Is value an integer bool isInteger() const; diff --git a/tests/blackmisc/aviation/testflightplan/testflightplan.cpp b/tests/blackmisc/aviation/testflightplan/testflightplan.cpp index 520a88d74..fbb082efb 100644 --- a/tests/blackmisc/aviation/testflightplan/testflightplan.cpp +++ b/tests/blackmisc/aviation/testflightplan/testflightplan.cpp @@ -96,7 +96,8 @@ namespace BlackMiscTest QVERIFY2(a.asFpVatsimAltitudeString() == "FL125", "Expect FL125"); a = CAltitude(15000, CAltitude::MeanSeaLevel, CLengthUnit::ft()); QVERIFY2(a.asFpICAOAltitudeString() == "A150", "Expect A150"); - QVERIFY2(a.asFpVatsimAltitudeString() == "15000ft", "Expect 15000"); + // QVERIFY2(a.asFpVatsimAltitudeString() == "15000ft", "Expect 15000"); + QVERIFY2(a.asFpVatsimAltitudeString() == "15000", "Expect 15000"); a = CAltitude(1500, CAltitude::FlightLevel, CLengthUnit::m()); QVERIFY2(a.asFpICAOAltitudeString() == "S0150", "Expect S0150"); a = CAltitude(1600, CAltitude::MeanSeaLevel, CLengthUnit::m());