From 7e34398a4aaf4f7d2a672e47cca815216949decb Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 26 Jun 2019 11:30:01 +0200 Subject: [PATCH] Send FP altitude without unit https://discordapp.com/channels/539048679160676382/539846348275449887/593211815559823367 https://discordapp.com/channels/539048679160676382/539846348275449887/593063154238619649 --- src/blackcore/vatsim/networkvatlib.cpp | 2 +- src/blackmisc/aviation/altitude.cpp | 3 ++- src/blackmisc/pq/physicalquantity.h | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) 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;