From 5bc09ed2c8e6c8f3fcab3f6c126de1ddc4302cc6 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 27 Mar 2020 18:09:05 +0100 Subject: [PATCH] [PQ] added static "parsedFromString" --- src/blackcore/airspacemonitor.cpp | 3 +-- src/blackmisc/pq/physicalquantity.cpp | 8 ++++++++ src/blackmisc/pq/physicalquantity.h | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/blackcore/airspacemonitor.cpp b/src/blackcore/airspacemonitor.cpp index d0910878f..4aa15079c 100644 --- a/src/blackcore/airspacemonitor.cpp +++ b/src/blackcore/airspacemonitor.cpp @@ -411,8 +411,7 @@ namespace BlackCore if (parser.matchesPart(1, "range") && parser.countParts() > 2) { const QString r = parser.part(2); - CLength d; - d.parseFromString(r); + const CLength d = CLength::parsedFromString(r); this->setMaxRange(d); } } diff --git a/src/blackmisc/pq/physicalquantity.cpp b/src/blackmisc/pq/physicalquantity.cpp index 97da59fd6..776f07323 100644 --- a/src/blackmisc/pq/physicalquantity.cpp +++ b/src/blackmisc/pq/physicalquantity.cpp @@ -455,6 +455,14 @@ namespace BlackMisc *this = CPqString::parse(value, CPqString::SeparatorQtDefault); } + template + PQ CPhysicalQuantity::parsedFromString(const QString &value, CPqString::SeparatorMode mode) + { + PQ pq; + pq.parseFromString(value, mode); + return pq; + } + template CVariant CPhysicalQuantity::propertyByIndex(const CPropertyIndex &index) const { diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h index 9b01343e9..1a2b0e658 100644 --- a/src/blackmisc/pq/physicalquantity.h +++ b/src/blackmisc/pq/physicalquantity.h @@ -276,6 +276,9 @@ namespace BlackMisc //! NULL PQ static const PQ &null(); + //! Parsed from given string + static PQ parsedFromString(const QString &value, CPqString::SeparatorMode mode = CPqString::SeparatorBestGuess); + protected: //! Constructor with double CPhysicalQuantity(double value, MU unit);