From 6f3ae2621d61f041fe45f3cc13d572e2fa980655 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 20 Nov 2023 17:41:50 +0100
Subject: [PATCH] rename class and sources
GUI/View/Canvas/SpecularDataPropertyWidget -> GUI/View/Setup/Scale1DEditor
---
GUI/View/Access/DataPropertyWidget.h | 2 +-
GUI/View/Frame/Fit1DFrame.cpp | 4 ++--
GUI/View/Frame/Fit1DFrame.h | 4 ++--
GUI/View/Frame/SpecularFrame.cpp | 4 ++--
GUI/View/Frame/SpecularFrame.h | 4 ++--
.../Scale1DEditor.cpp} | 16 ++++++++--------
.../Scale1DEditor.h} | 14 +++++++-------
7 files changed, 24 insertions(+), 24 deletions(-)
rename GUI/View/{Canvas/SpecularDataPropertyWidget.cpp => Setup/Scale1DEditor.cpp} (92%)
rename GUI/View/{Canvas/SpecularDataPropertyWidget.h => Setup/Scale1DEditor.h} (61%)
diff --git a/GUI/View/Access/DataPropertyWidget.h b/GUI/View/Access/DataPropertyWidget.h
index 0a72bdabfa3..76a6db03ce4 100644
--- a/GUI/View/Access/DataPropertyWidget.h
+++ b/GUI/View/Access/DataPropertyWidget.h
@@ -21,7 +21,7 @@ class DataItem;
class InstrumentItem;
class QFormLayout;
-//! Base class for Scale2DEditor and SpecularDataPropertyWidget.
+//! Base class for Scale2DEditor and Scale1DEditor.
class DataPropertyWidget : public DataAccessWidget {
Q_OBJECT
diff --git a/GUI/View/Frame/Fit1DFrame.cpp b/GUI/View/Frame/Fit1DFrame.cpp
index 922cf52d8e5..737ae1fabcb 100644
--- a/GUI/View/Frame/Fit1DFrame.cpp
+++ b/GUI/View/Frame/Fit1DFrame.cpp
@@ -23,11 +23,11 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Canvas/ProgressCanvas.h"
-#include "GUI/View/Canvas/SpecularDataPropertyWidget.h"
#include "GUI/View/Canvas/SpecularPlotCanvas.h"
#include "GUI/View/Plotter/PlotStatusLabel.h"
#include "GUI/View/Plotter/RangeUtil.h"
#include "GUI/View/Plotter/SpecularPlot.h"
+#include "GUI/View/Setup/Scale1DEditor.h"
#include "GUI/View/Tool/ActionFactory.h"
Fit1DFrame::Fit1DFrame(QWidget* parent)
@@ -36,7 +36,7 @@ Fit1DFrame::Fit1DFrame(QWidget* parent)
, m_diff_canvas(new SpecularPlotCanvas(this))
, m_fitFlowWidget(new ProgressCanvas(this))
, m_statusLabel(new PlotStatusLabel(nullptr, this))
- , m_propertyWidget(new SpecularDataPropertyWidget(this))
+ , m_propertyWidget(new Scale1DEditor(this))
, m_resetViewAction(new QAction(this))
{
m_propertyWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
diff --git a/GUI/View/Frame/Fit1DFrame.h b/GUI/View/Frame/Fit1DFrame.h
index 39a12513c52..0419f3ea460 100644
--- a/GUI/View/Frame/Fit1DFrame.h
+++ b/GUI/View/Frame/Fit1DFrame.h
@@ -21,7 +21,7 @@ class ProgressCanvas;
class JobRealBase;
class PlotStatusLabel;
class QAction;
-class SpecularDataPropertyWidget;
+class Scale1DEditor;
class SpecularPlotCanvas;
//! The Fit2DFrame class plots real data, simulated data and their relative difference
@@ -45,7 +45,7 @@ private:
SpecularPlotCanvas* m_diff_canvas;
ProgressCanvas* m_fitFlowWidget;
PlotStatusLabel* m_statusLabel;
- SpecularDataPropertyWidget* m_propertyWidget;
+ Scale1DEditor* m_propertyWidget;
QAction* m_resetViewAction;
QAction* m_togglePropertiesAction;
diff --git a/GUI/View/Frame/SpecularFrame.cpp b/GUI/View/Frame/SpecularFrame.cpp
index cc7107d3fc1..e672de89247 100644
--- a/GUI/View/Frame/SpecularFrame.cpp
+++ b/GUI/View/Frame/SpecularFrame.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Frame/SpecularFrame.h"
#include "GUI/Model/Data/Data1DItem.h"
#include "GUI/View/Canvas/SpecularDataCanvas.h"
-#include "GUI/View/Canvas/SpecularDataPropertyWidget.h"
+#include "GUI/View/Setup/Scale1DEditor.h"
#include "GUI/View/Tool/ActionFactory.h"
#include <QBoxLayout>
#include <QMenu>
@@ -23,7 +23,7 @@
SpecularFrame::SpecularFrame(QWidget* parent)
: DataAccessWidget(parent)
, m_specular_canvas(new SpecularDataCanvas)
- , m_propertyWidget(new SpecularDataPropertyWidget(this))
+ , m_propertyWidget(new Scale1DEditor(this))
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
m_propertyWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
diff --git a/GUI/View/Frame/SpecularFrame.h b/GUI/View/Frame/SpecularFrame.h
index 1523842b63c..a9c6c430a6d 100644
--- a/GUI/View/Frame/SpecularFrame.h
+++ b/GUI/View/Frame/SpecularFrame.h
@@ -18,7 +18,7 @@
#include "GUI/View/Access/DataAccessWidget.h"
class SpecularDataCanvas;
-class SpecularDataPropertyWidget;
+class Scale1DEditor;
class SpecularFrame : public DataAccessWidget {
Q_OBJECT
@@ -34,7 +34,7 @@ private slots:
private:
SpecularDataCanvas* m_specular_canvas;
- SpecularDataPropertyWidget* m_propertyWidget;
+ Scale1DEditor* m_propertyWidget;
QAction* m_togglePropertiesAction;
};
diff --git a/GUI/View/Canvas/SpecularDataPropertyWidget.cpp b/GUI/View/Setup/Scale1DEditor.cpp
similarity index 92%
rename from GUI/View/Canvas/SpecularDataPropertyWidget.cpp
rename to GUI/View/Setup/Scale1DEditor.cpp
index 744db50fed5..673121b8436 100644
--- a/GUI/View/Canvas/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/Setup/Scale1DEditor.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Canvas/SpecularDataPropertyWidget.cpp
-//! @brief Implements class SpecularDataPropertyWidget.
+//! @file GUI/View/Setup/Scale1DEditor.cpp
+//! @brief Implements class Scale1DEditor.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Canvas/SpecularDataPropertyWidget.h"
+#include "GUI/View/Setup/Scale1DEditor.h"
#include "GUI/Model/Axis/AmplitudeAxisItem.h"
#include "GUI/Model/Axis/BasicAxisItem.h"
#include "GUI/Model/Data/Data1DItem.h"
@@ -27,12 +27,12 @@
#include <QFormLayout>
#include <QLineEdit>
-SpecularDataPropertyWidget::SpecularDataPropertyWidget(QWidget* parent)
+Scale1DEditor::Scale1DEditor(QWidget* parent)
: DataPropertyWidget(parent)
{
}
-void SpecularDataPropertyWidget::createPanelElements()
+void Scale1DEditor::createPanelElements()
{
if (allData1DItems().size() == 0)
return;
@@ -142,10 +142,10 @@ void SpecularDataPropertyWidget::createPanelElements()
// react on external changes (e.g. zooming in customplot shall update the axis values)
connect(currentData1DItem(), &DataItem::itemAxesRangeChanged, this,
- &SpecularDataPropertyWidget::updateUIValues, Qt::UniqueConnection);
+ &Scale1DEditor::updateUIValues, Qt::UniqueConnection);
// update coordinates on axes units change
for (auto item : allData1DItems())
- connect(item, &DataItem::axesUnitsChanged, this,
- &SpecularDataPropertyWidget::updateItemCoords, Qt::UniqueConnection);
+ connect(item, &DataItem::axesUnitsChanged, this, &Scale1DEditor::updateItemCoords,
+ Qt::UniqueConnection);
}
diff --git a/GUI/View/Canvas/SpecularDataPropertyWidget.h b/GUI/View/Setup/Scale1DEditor.h
similarity index 61%
rename from GUI/View/Canvas/SpecularDataPropertyWidget.h
rename to GUI/View/Setup/Scale1DEditor.h
index 3a987c0706b..2294d35082c 100644
--- a/GUI/View/Canvas/SpecularDataPropertyWidget.h
+++ b/GUI/View/Setup/Scale1DEditor.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Canvas/SpecularDataPropertyWidget.h
-//! @brief Defines class SpecularDataPropertyWidget.
+//! @file GUI/View/Setup/Scale1DEditor.h
+//! @brief Defines class Scale1DEditor.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,20 +12,20 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_CANVAS_SPECULARDATAPROPERTYWIDGET_H
-#define BORNAGAIN_GUI_VIEW_CANVAS_SPECULARDATAPROPERTYWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SETUP_SCALE1DEDITOR_H
+#define BORNAGAIN_GUI_VIEW_SETUP_SCALE1DEDITOR_H
#include "GUI/View/Access/DataPropertyWidget.h"
//! Widget to edit properties of a Data1DItem.
-class SpecularDataPropertyWidget : public DataPropertyWidget {
+class Scale1DEditor : public DataPropertyWidget {
Q_OBJECT
public:
- explicit SpecularDataPropertyWidget(QWidget* parent = nullptr);
+ explicit Scale1DEditor(QWidget* parent = nullptr);
private:
void createPanelElements() override;
};
-#endif // BORNAGAIN_GUI_VIEW_CANVAS_SPECULARDATAPROPERTYWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SETUP_SCALE1DEDITOR_H
--
GitLab