From 1e92bf8044cf637d75e74d48ce0f8b4eacb3edf0 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Fri, 29 Jul 2022 18:54:41 +0200
Subject: [PATCH] BasicAxisItem: rename min/max setters
---
GUI/Model/Device/AxesItems.h | 4 ++--
GUI/View/Plot2D/IntensityDataPropertyWidget.cpp | 12 ++++++------
GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/GUI/Model/Device/AxesItems.h b/GUI/Model/Device/AxesItems.h
index f44c06e4deb..78265a0d7cf 100644
--- a/GUI/Model/Device/AxesItems.h
+++ b/GUI/Model/Device/AxesItems.h
@@ -45,11 +45,11 @@ public:
SessionItem* binsItem() const;
double min() const;
- void setLowerBound(double value);
+ void setMin(double value);
SessionItem* minItem() const;
double max() const;
- void setUpperBound(double value);
+ void setMax(double value);
SessionItem* maxItem() const;
QString title() const;
diff --git a/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp b/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
index 640e7da8575..2afc4961ec1 100644
--- a/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
@@ -75,12 +75,12 @@ void IntensityDataPropertyWidget::createPanelElements()
xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentIntensityDataItem()->xAxisItem()->min(); }, [=](double newValue) {
for(auto item : allIntensityDataItems())
- item->xAxisItem()->setLowerBound(newValue); }, &m_updaters));
+ item->xAxisItem()->setMin(newValue); }, &m_updaters));
xFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentIntensityDataItem()->xAxisItem()->max(); }, [=](double newValue) {
for(auto item : allIntensityDataItems())
- item->xAxisItem()->setUpperBound(newValue); }, &m_updaters));
+ item->xAxisItem()->setMax(newValue); }, &m_updaters));
xFormLayout->addRow("Title:", GUI::Util::createTextEdit(
[=]{ return currentIntensityDataItem()->xAxisItem()->title(); }, [=](QString newText) {
@@ -98,12 +98,12 @@ void IntensityDataPropertyWidget::createPanelElements()
yFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentIntensityDataItem()->yAxisItem()->min(); }, [=](double newValue) {
for(auto item : allIntensityDataItems())
- item->yAxisItem()->setLowerBound(newValue); }, &m_updaters));
+ item->yAxisItem()->setMin(newValue); }, &m_updaters));
yFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentIntensityDataItem()->yAxisItem()->max(); }, [=](double newValue) {
for(auto item : allIntensityDataItems())
- item->yAxisItem()->setUpperBound(newValue); }, &m_updaters));
+ item->yAxisItem()->setMax(newValue); }, &m_updaters));
yFormLayout->addRow("Title:", GUI::Util::createTextEdit(
[=]{ return currentIntensityDataItem()->yAxisItem()->title(); }, [=](QString newText) {
@@ -121,12 +121,12 @@ void IntensityDataPropertyWidget::createPanelElements()
zFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentIntensityDataItem()->zAxisItem()->min(); }, [=](double newValue) {
for(auto item : allIntensityDataItems())
- item->zAxisItem()->setLowerBound(newValue); }, &m_updaters));
+ item->zAxisItem()->setMin(newValue); }, &m_updaters));
yFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentIntensityDataItem()->zAxisItem()->max(); }, [=](double newValue) {
for(auto item : mainIntensityDataItems())
- item->zAxisItem()->setUpperBound(newValue); }, &m_updaters));
+ item->zAxisItem()->setMax(newValue); }, &m_updaters));
zFormLayout->addRow(GUI::Util::createCheckBox("log10",
[=]{ return currentIntensityDataItem()->zAxisItem()->isLogScale(); }, [=](bool b) {
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index e01b92a6673..7f3c5d5047c 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -57,12 +57,12 @@ void SpecularDataPropertyWidget::createPanelElements()
xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentSpecularDataItem()->xAxisItem()->min(); }, [=](double newValue) {
for(auto item : allSpecularDataItems())
- item->xAxisItem()->setLowerBound(newValue); }, &m_updaters));
+ item->xAxisItem()->setMin(newValue); }, &m_updaters));
xFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentSpecularDataItem()->xAxisItem()->max(); }, [=](double newValue) {
for(auto item : allSpecularDataItems())
- item->xAxisItem()->setUpperBound(newValue); }, &m_updaters));
+ item->xAxisItem()->setMax(newValue); }, &m_updaters));
xFormLayout->addRow("Title:", GUI::Util::createTextEdit(
[=]{ return currentSpecularDataItem()->xAxisItem()->title(); }, [=](QString newText) {
@@ -80,12 +80,12 @@ void SpecularDataPropertyWidget::createPanelElements()
yFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentSpecularDataItem()->yAxisItem()->min(); }, [=](double newValue) {
for(auto item : mainSpecularDataItems())
- item->yAxisItem()->setLowerBound(newValue); }, &m_updaters));
+ item->yAxisItem()->setMin(newValue); }, &m_updaters));
yFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
[=]{ return currentSpecularDataItem()->yAxisItem()->max(); }, [=](double newValue) {
for(auto item : mainSpecularDataItems())
- item->yAxisItem()->setUpperBound(newValue); }, &m_updaters));
+ item->yAxisItem()->setMax(newValue); }, &m_updaters));
yFormLayout->addRow("Title:", GUI::Util::createTextEdit(
[=]{ return currentSpecularDataItem()->yAxisItem()->title(); }, [=](QString newText) {
--
GitLab