From 112bd55362b3aaaee01c4bf005b201ebbf598a82 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 30 Apr 2014 01:15:30 +0200 Subject: [PATCH] Constructor for PQ by string (e.g. 100km/h), motivated by MS review https://dev.vatsim-germany.org/issues/212#note-6 refs #212 --- src/blackmisc/pqacceleration.h | 2 ++ src/blackmisc/pqangle.h | 3 +++ src/blackmisc/pqfrequency.h | 2 ++ src/blackmisc/pqlength.h | 3 +++ src/blackmisc/pqmass.h | 3 +++ src/blackmisc/pqpressure.h | 4 ++++ src/blackmisc/pqspeed.h | 2 ++ src/blackmisc/pqtemperature.h | 2 ++ 8 files changed, 21 insertions(+) diff --git a/src/blackmisc/pqacceleration.h b/src/blackmisc/pqacceleration.h index 6c1d7ebe0..974a834d6 100644 --- a/src/blackmisc/pqacceleration.h +++ b/src/blackmisc/pqacceleration.h @@ -23,6 +23,8 @@ namespace BlackMisc CAcceleration(double value, const CAccelerationUnit &unit) : CPhysicalQuantity(value, unit) {} //! \copydoc CPhysicalQuantity(const QString &unitString) + CAcceleration(const QString &unitString) : CPhysicalQuantity(unitString) {} + //! copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } diff --git a/src/blackmisc/pqangle.h b/src/blackmisc/pqangle.h index bc73e9b5c..055d1e454 100644 --- a/src/blackmisc/pqangle.h +++ b/src/blackmisc/pqangle.h @@ -25,6 +25,9 @@ namespace BlackMisc //! Init by double value CAngle(double value, const CAngleUnit &unit): CPhysicalQuantity(value, unit) {} + //! \copydoc CPhysicalQuantity(const QString &unitString) + CAngle(const QString &unitString) : CPhysicalQuantity(unitString) {} + /*! * \brief Init as sexagesimal degrees, minutes, seconds * The sign of all parameters must be the same, either all positive or all negative. diff --git a/src/blackmisc/pqfrequency.h b/src/blackmisc/pqfrequency.h index 44865ed88..8cabeb2b7 100644 --- a/src/blackmisc/pqfrequency.h +++ b/src/blackmisc/pqfrequency.h @@ -23,6 +23,8 @@ namespace BlackMisc //! Init by double value CFrequency(double value, const CFrequencyUnit &unit) : CPhysicalQuantity(value, unit) {} + //! \copydoc CPhysicalQuantity(const QString &unitString) + CFrequency(const QString &unitString) : CPhysicalQuantity(unitString) {} //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override diff --git a/src/blackmisc/pqlength.h b/src/blackmisc/pqlength.h index a0632402b..91b5ec90d 100644 --- a/src/blackmisc/pqlength.h +++ b/src/blackmisc/pqlength.h @@ -22,6 +22,9 @@ namespace BlackMisc //! Init by double value CLength(double value, const CLengthUnit &unit) : CPhysicalQuantity(value, unit) {} + //! \copydoc CPhysicalQuantity(const QString &unitString) + CLength(const QString &unitString) : CPhysicalQuantity(unitString) {} + //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { diff --git a/src/blackmisc/pqmass.h b/src/blackmisc/pqmass.h index d997d0d18..2c27494a0 100644 --- a/src/blackmisc/pqmass.h +++ b/src/blackmisc/pqmass.h @@ -24,6 +24,9 @@ namespace BlackMisc //! Init by double value CMass(double value, const CMassUnit &unit) : CPhysicalQuantity(value, unit) {} + //! \copydoc CPhysicalQuantity(const QString &unitString) + CMass(const QString &unitString) : CPhysicalQuantity(unitString) {} + //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { diff --git a/src/blackmisc/pqpressure.h b/src/blackmisc/pqpressure.h index f97a7d069..6cf2fc211 100644 --- a/src/blackmisc/pqpressure.h +++ b/src/blackmisc/pqpressure.h @@ -25,6 +25,10 @@ namespace BlackMisc //! Init by double value CPressure(double value, const CPressureUnit &unit) : CPhysicalQuantity(value, unit) {} + //! \copydoc CPhysicalQuantity(const QString &unitString) + CPressure(const QString &unitString) : CPhysicalQuantity(unitString) {} + + //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); diff --git a/src/blackmisc/pqspeed.h b/src/blackmisc/pqspeed.h index aec4af4c8..60ecb3c9a 100644 --- a/src/blackmisc/pqspeed.h +++ b/src/blackmisc/pqspeed.h @@ -25,6 +25,8 @@ namespace BlackMisc //! Init by double value CSpeed(double value, const CSpeedUnit &unit) : CPhysicalQuantity(value, unit) {} + //! \copydoc CPhysicalQuantity(const QString &unitString) + CSpeed(const QString &unitString) : CPhysicalQuantity(unitString) {} //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override diff --git a/src/blackmisc/pqtemperature.h b/src/blackmisc/pqtemperature.h index 616790355..2ed01460f 100644 --- a/src/blackmisc/pqtemperature.h +++ b/src/blackmisc/pqtemperature.h @@ -24,6 +24,8 @@ namespace BlackMisc //! Init by double value CTemperature(double value, const CTemperatureUnit &unit): CPhysicalQuantity(value, unit) {} + //! \copydoc CPhysicalQuantity(const QString &unitString) + CTemperature(const QString &unitString) : CPhysicalQuantity(unitString) {} //! \copydoc CValueObject::toQVariant virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }