From 78a3e10a80fb85fd200b3c954e70bc8e63478c71 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Fri, 12 Jun 2020 09:35:59 -0700 Subject: [PATCH] Fix min/max tests --- src/FactSystem/FactMetaData.h | 38 +++-------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/src/FactSystem/FactMetaData.h b/src/FactSystem/FactMetaData.h index 6c555f225..31f4fbec1 100644 --- a/src/FactSystem/FactMetaData.h +++ b/src/FactSystem/FactMetaData.h @@ -201,12 +201,7 @@ private: void _setAppSettingsTranslators(void); - /** - * @brief Clamp a value based in the cookedMin and CookedMax values - * - * @tparam T - * @param variantValue - */ + /// Clamp a value to be within cookedMin and cookedMax template void clamp(QVariant& variantValue) const { if (cookedMin().value() > variantValue.value()) { @@ -216,44 +211,17 @@ private: } } - /** - * @brief Check if value is inside cooked limits - * - * @tparam T - * @param variantValue - */ template bool isInCookedLimit(const QVariant& variantValue) const { - return cookedMin().value() < variantValue.value() && variantValue.value() < cookedMax().value(); + return cookedMin().value() <= variantValue.value() && variantValue.value() <= cookedMax().value(); } - /** - * @brief Check if value is inside raw limits - * - * @tparam T - * @param variantValue - */ template bool isInRawLimit(const QVariant& variantValue) const { - return rawMin().value() <= variantValue.value() && variantValue.value() < rawMax().value(); + return rawMin().value() <= variantValue.value() && variantValue.value() <= rawMax().value(); } - /** - * @brief Check if value if over min limit - * - * @param variantValue - * @return true - * @return false - */ bool isInRawMinLimit(const QVariant& variantValue) const; - - /** - * @brief Check if value is lower than upper limit - * - * @param variantValue - * @return true - * @return false - */ bool isInRawMaxLimit(const QVariant& variantValue) const; // Built in translators -- 2.22.0