From a8aa3fcea5ac80da418d522c0fb8aa5f7ca76538 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Thu, 25 Aug 2022 12:33:46 +0200
Subject: [PATCH] FitParameterItem: simplify P_MAX
---
GUI/Model/Job/FitParameterItem.cpp | 37 ++++++++++++++----------------
GUI/Model/Job/FitParameterItem.h | 2 +-
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/GUI/Model/Job/FitParameterItem.cpp b/GUI/Model/Job/FitParameterItem.cpp
index b56b7102e4e..d6044a84622 100644
--- a/GUI/Model/Job/FitParameterItem.cpp
+++ b/GUI/Model/Job/FitParameterItem.cpp
@@ -56,7 +56,7 @@ FitParameterItem::FitParameterItem()
startValueItem()->setLimits(RealLimits::limitless());
minimumItem()->setLimits(RealLimits::limitless());
- getItem(P_MAX)->setLimits(RealLimits::limitless());
+ maximumItem()->setLimits(RealLimits::limitless());
onTypeChange();
}
@@ -84,8 +84,8 @@ void FitParameterItem::initMinMaxValues(const RealLimits& limits)
setMinimum(min);
minimumItem()->setLimits(limits);
- setItemValue(P_MAX, max);
- getItem(P_MAX)->setLimits(limits);
+ setMaximum(max);
+ maximumItem()->setLimits(limits);
startValueItem()->setLimits(limits);
}
@@ -218,41 +218,38 @@ void FitParameterItem::removeLink(const QString& link)
void FitParameterItem::onTypeChange()
{
if (isFixed()) {
- setLimitEnabled(P_MIN, false);
- setLimitEnabled(P_MAX, false);
+ setLimitEnabled(minimumItem(), false);
+ setLimitEnabled(maximumItem(), false);
}
else if (isLimited()) {
- setLimitEnabled(P_MIN, true);
- setLimitEnabled(P_MAX, true);
+ setLimitEnabled(minimumItem(), true);
+ setLimitEnabled(maximumItem(), true);
}
else if (isLowerLimited()) {
- setLimitEnabled(P_MIN, true);
- setLimitEnabled(P_MAX, false);
+ setLimitEnabled(minimumItem(), true);
+ setLimitEnabled(maximumItem(), false);
}
else if (isUpperLimited()) {
- setLimitEnabled(P_MIN, false);
- setLimitEnabled(P_MAX, true);
+ setLimitEnabled(minimumItem(), false);
+ setLimitEnabled(maximumItem(), true);
}
else if (isFree()) {
- setLimitEnabled(P_MIN, false);
- setLimitEnabled(P_MAX, false);
+ setLimitEnabled(minimumItem(), false);
+ setLimitEnabled(maximumItem(), false);
}
}
//! Set limit property with given name to the enabled state
-void FitParameterItem::setLimitEnabled(const QString& name, bool enabled)
+void FitParameterItem::setLimitEnabled(SessionItem* propertyItem, bool enabled)
{
- if (isTag(name)) {
- SessionItem* propertyItem = getItem(name);
- ASSERT(propertyItem);
- propertyItem->setEnabled(enabled);
- propertyItem->setEditable(enabled);
- }
+ ASSERT(propertyItem);
+ propertyItem->setEnabled(enabled);
+ propertyItem->setEditable(enabled);
}
bool FitParameterItem::isLimited() const
diff --git a/GUI/Model/Job/FitParameterItem.h b/GUI/Model/Job/FitParameterItem.h
index 53faf479a92..763af7d7408 100644
--- a/GUI/Model/Job/FitParameterItem.h
+++ b/GUI/Model/Job/FitParameterItem.h
@@ -70,7 +70,7 @@ public:
private:
void onTypeChange();
- void setLimitEnabled(const QString& name, bool enabled);
+ void setLimitEnabled(SessionItem *propertyItem, bool enabled);
bool isLimited() const;
bool isFree() const;
bool isLowerLimited() const;
--
GitLab