From a08db2121af789f84d9229161f05c4182116e1c2 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Mon, 15 Jan 2018 14:03:23 -0800 Subject: [PATCH] Fix incorrect min/max value usage --- src/FactSystem/FactMetaData.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/FactSystem/FactMetaData.cc b/src/FactSystem/FactMetaData.cc index e8c603d99..56d06bd64 100644 --- a/src/FactSystem/FactMetaData.cc +++ b/src/FactSystem/FactMetaData.cc @@ -314,7 +314,7 @@ bool FactMetaData::convertAndValidateRaw(const QVariant& rawValue, bool convertO typedValue = QVariant(rawValue.toInt(&convertOk)); if (!convertOnly && convertOk) { if (typedValue < rawMin() || typedValue > rawMax()) { - errorString = tr("Value must be within %1 and %2").arg(cookedMin().toInt()).arg(cookedMax().toInt()); + errorString = tr("Value must be within %1 and %2").arg(rawMin().toInt()).arg(rawMax().toInt()); } } break; @@ -324,7 +324,7 @@ bool FactMetaData::convertAndValidateRaw(const QVariant& rawValue, bool convertO typedValue = QVariant(rawValue.toUInt(&convertOk)); if (!convertOnly && convertOk) { if (typedValue < rawMin() || typedValue > rawMax()) { - errorString = tr("Value must be within %1 and %2").arg(cookedMin().toUInt()).arg(cookedMax().toUInt()); + errorString = tr("Value must be within %1 and %2").arg(rawMin().toUInt()).arg(rawMax().toUInt()); } } break; @@ -332,7 +332,7 @@ bool FactMetaData::convertAndValidateRaw(const QVariant& rawValue, bool convertO typedValue = QVariant(rawValue.toFloat(&convertOk)); if (!convertOnly && convertOk) { if (typedValue < rawMin() || typedValue > rawMax()) { - errorString = tr("Value must be within %1 and %2").arg(cookedMin().toFloat()).arg(cookedMax().toFloat()); + errorString = tr("Value must be within %1 and %2").arg(rawMin().toFloat()).arg(rawMax().toFloat()); } } break; @@ -341,7 +341,7 @@ bool FactMetaData::convertAndValidateRaw(const QVariant& rawValue, bool convertO typedValue = QVariant(rawValue.toDouble(&convertOk)); if (!convertOnly && convertOk) { if (typedValue < rawMin() || typedValue > rawMax()) { - errorString = tr("Value must be within %1 and %2").arg(cookedMin().toDouble()).arg(cookedMax().toDouble()); + errorString = tr("Value must be within %1 and %2").arg(rawMin().toDouble()).arg(rawMax().toDouble()); } } break; -- 2.22.0