From b594f6570bf0d5f0832494276e4d4242c18cad7f Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Thu, 25 Aug 2022 12:02:58 +0200
Subject: [PATCH] FitParameterItem: simplify
---
GUI/Model/Job/FitParameterItem.cpp | 10 +++-------
GUI/Model/Job/FitSuiteItem.cpp | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/GUI/Model/Job/FitParameterItem.cpp b/GUI/Model/Job/FitParameterItem.cpp
index 49bbec78e8e..7b6c20e7e0d 100644
--- a/GUI/Model/Job/FitParameterItem.cpp
+++ b/GUI/Model/Job/FitParameterItem.cpp
@@ -112,15 +112,11 @@ bool FitParameterItem::isValid() const
if (isFixed() || isFree())
return true;
- double value = getItemValue(P_START_VALUE).toDouble();
- double min = getItemValue(P_MIN).toDouble();
- double max = getItemValue(P_MAX).toDouble();
-
if (isLowerLimited())
- return min <= value;
+ return minimum() <= startValue();
if (isUpperLimited())
- return value <= max;
- return min <= value && value <= max;
+ return startValue() <= maximum();
+ return minimum() <= startValue() && startValue() <= maximum();
}
double FitParameterItem::startValue() const
diff --git a/GUI/Model/Job/FitSuiteItem.cpp b/GUI/Model/Job/FitSuiteItem.cpp
index 56502cdb5c0..281311721c5 100644
--- a/GUI/Model/Job/FitSuiteItem.cpp
+++ b/GUI/Model/Job/FitSuiteItem.cpp
@@ -45,7 +45,7 @@ FitParameterContainerItem* FitSuiteItem::fitParameterContainerItem()
MinimizerContainerItem* FitSuiteItem::createMinimizerContainer()
{
- if (getItem(T_MINIMIZER))
+ if (minimizerContainerItem())
throw Error("FitSuiteItem::createMinimizerContainer() -> Error. Attempt to create "
"a second MinimizerContainer.");
--
GitLab