From e6011ec7cd302e99cf850c6966149ccfef09ea8f Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sat, 12 Dec 2015 18:29:30 +0000 Subject: [PATCH] refs #552 Style & doxygen. --- src/blackmisc/geo/coordinategeodetic.h | 1 + src/blackmisc/pq/measurementunit.h | 44 +++++++++++++------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h index 665c0cca4..d1ca9cf89 100644 --- a/src/blackmisc/geo/coordinategeodetic.h +++ b/src/blackmisc/geo/coordinategeodetic.h @@ -59,6 +59,7 @@ namespace BlackMisc virtual const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const = 0; //! Normal vector + //! \note QVector3D uses floats, so don't use if double precision is needed //! \sa https://en.wikipedia.org/wiki/N-vector //! \sa http://www.movable-type.co.uk/scripts/latlong-vectors.html virtual QVector3D normalVector() const = 0; diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h index 7a3086798..894ee09ba 100644 --- a/src/blackmisc/pq/measurementunit.h +++ b/src/blackmisc/pq/measurementunit.h @@ -53,11 +53,11 @@ namespace BlackMisc /*! * Convert from this unit to default unit. */ - virtual double toDefault(double factor) const = 0; + virtual double toDefault(double value) const = 0; /*! * Convert from default unit to this unit. */ - virtual double fromDefault(double factor) const = 0; + virtual double fromDefault(double value) const = 0; }; /*! @@ -74,8 +74,8 @@ namespace BlackMisc */ struct IdentityConverter : public Converter { - virtual double toDefault(double factor) const override { return factor; } - virtual double fromDefault(double factor) const override { return factor; } + virtual double toDefault(double value) const override { return value; } + virtual double fromDefault(double value) const override { return value; } }; /*! @@ -85,8 +85,8 @@ namespace BlackMisc template struct LinearConverter : public Converter { - virtual double toDefault(double factor) const override { return factor * Policy::factor(); } - virtual double fromDefault(double factor) const override { return factor / Policy::factor(); } + virtual double toDefault(double value) const override { return value * Policy::factor(); } + virtual double fromDefault(double value) const override { return value / Policy::factor(); } }; /*! @@ -96,8 +96,8 @@ namespace BlackMisc template struct AffineConverter : public Converter { - virtual double toDefault(double factor) const override { return (factor - Policy::offset()) * Policy::factor(); } - virtual double fromDefault(double factor) const override { return factor / Policy::factor() + Policy::offset(); } + virtual double toDefault(double value) const override { return (value - Policy::offset()) * Policy::factor(); } + virtual double fromDefault(double value) const override { return value / Policy::factor() + Policy::offset(); } }; /*! @@ -108,18 +108,18 @@ namespace BlackMisc template struct SubdivisionConverter : public Converter { - virtual double toDefault(double factor) const override + virtual double toDefault(double value) const override { using BlackMisc::Math::CMathUtils; - double part2 = CMathUtils::fract(factor) * SubdivPolicy::fraction(); - factor = CMathUtils::trunc(factor) + part2 / SubdivPolicy::subfactor(); - return factor * FactorPolicy::factor(); + double part2 = CMathUtils::fract(value) * SubdivPolicy::fraction(); + value = CMathUtils::trunc(value) + part2 / SubdivPolicy::subfactor(); + return value * FactorPolicy::factor(); } - virtual double fromDefault(double factor) const override + virtual double fromDefault(double value) const override { using BlackMisc::Math::CMathUtils; - double part1 = CMathUtils::trunc(factor / FactorPolicy::factor()); - double remaining = std::fmod(factor / FactorPolicy::factor(), 1.0); + double part1 = CMathUtils::trunc(value / FactorPolicy::factor()); + double remaining = std::fmod(value / FactorPolicy::factor(), 1.0); double part2 = remaining * SubdivPolicy::subfactor(); return part1 + part2 / SubdivPolicy::fraction(); } @@ -133,19 +133,19 @@ namespace BlackMisc template struct SubdivisionConverter2 : public Converter { - virtual double toDefault(double factor) const override + virtual double toDefault(double value) const override { using BlackMisc::Math::CMathUtils; - double part2 = CMathUtils::fract(factor) * SubdivPolicy::fraction(); + double part2 = CMathUtils::fract(value) * SubdivPolicy::fraction(); double part3 = CMathUtils::fract(part2) * SubdivPolicy::fraction(); - factor = CMathUtils::trunc(factor) + (CMathUtils::trunc(part2) + part3 / SubdivPolicy::subfactor()) / SubdivPolicy::subfactor(); - return factor * FactorPolicy::factor(); + value = CMathUtils::trunc(value) + (CMathUtils::trunc(part2) + part3 / SubdivPolicy::subfactor()) / SubdivPolicy::subfactor(); + return value * FactorPolicy::factor(); } - virtual double fromDefault(double factor) const override + virtual double fromDefault(double value) const override { using BlackMisc::Math::CMathUtils; - double part1 = CMathUtils::trunc(factor / FactorPolicy::factor()); - double remaining = std::fmod(factor / FactorPolicy::factor(), 1.0); + double part1 = CMathUtils::trunc(value / FactorPolicy::factor()); + double remaining = std::fmod(value / FactorPolicy::factor(), 1.0); double part2 = CMathUtils::trunc(remaining * SubdivPolicy::subfactor()); remaining = std::fmod(remaining * SubdivPolicy::subfactor(), 1.0); double part3 = remaining * SubdivPolicy::subfactor();