From 242ec75a18f87064076eb36520bf31211a822327 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 19 Nov 2023 13:02:47 +0100
Subject: [PATCH] rename class and sources GUI/View/Data/RealDataPresenter ->
GUI/View/Data/DatafilePresenter
---
...RealDataPresenter.cpp => DatafilePresenter.cpp} | 14 +++++++-------
.../{RealDataPresenter.h => DatafilePresenter.h} | 14 +++++++-------
GUI/View/Data/DatafilesStack.cpp | 8 ++++----
GUI/View/Data/DatafilesStack.h | 6 +++---
GUI/View/Frame/Plot2DWithProjectionFrame.h | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
rename GUI/View/Data/{RealDataPresenter.cpp => DatafilePresenter.cpp} (82%)
rename GUI/View/Data/{RealDataPresenter.h => DatafilePresenter.h} (72%)
diff --git a/GUI/View/Data/RealDataPresenter.cpp b/GUI/View/Data/DatafilePresenter.cpp
similarity index 82%
rename from GUI/View/Data/RealDataPresenter.cpp
rename to GUI/View/Data/DatafilePresenter.cpp
index 35b9d405364..4df16840f60 100644
--- a/GUI/View/Data/RealDataPresenter.cpp
+++ b/GUI/View/Data/DatafilePresenter.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Data/RealDataPresenter.cpp
-//! @brief Implements class RealDataPresenter.
+//! @file GUI/View/Data/DatafilePresenter.cpp
+//! @brief Implements class DatafilePresenter.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Data/RealDataPresenter.h"
+#include "GUI/View/Data/DatafilePresenter.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Device/DatafileItem.h"
#include "GUI/View/Frame/MaskEditingFrame.h"
@@ -20,7 +20,7 @@
#include "GUI/View/Frame/Plot2DWithProjectionFrame.h"
#include "GUI/View/Frame/SpecularFrame.h"
-RealDataPresenter::RealDataPresenter(QWidget* parent)
+DatafilePresenter::DatafilePresenter(QWidget* parent)
: ItemComboWidget(parent)
{
registerWidget("Heat Map", create_new<Plot2DFrame>);
@@ -29,7 +29,7 @@ RealDataPresenter::RealDataPresenter(QWidget* parent)
registerWidget("Reflectometry (Graph only)", create_new<SpecularFrame>);
}
-QString RealDataPresenter::itemPresentation() const
+QString DatafilePresenter::itemPresentation() const
{
if (!realItem())
return ItemComboWidget::selectedPresentation();
@@ -40,14 +40,14 @@ QString RealDataPresenter::itemPresentation() const
return realItem()->presentationType();
}
-void RealDataPresenter::setPresentation(const QString& presentationType)
+void DatafilePresenter::setPresentation(const QString& presentationType)
{
ItemComboWidget::setPresentation(presentationType);
if (realItem() && !presentationType.isEmpty())
realItem()->setPresentationType(presentationType);
}
-QStringList RealDataPresenter::activePresentationList() const
+QStringList DatafilePresenter::activePresentationList() const
{
ASSERT(realItem());
diff --git a/GUI/View/Data/RealDataPresenter.h b/GUI/View/Data/DatafilePresenter.h
similarity index 72%
rename from GUI/View/Data/RealDataPresenter.h
rename to GUI/View/Data/DatafilePresenter.h
index cbc62444fb6..aebc97bfe87 100644
--- a/GUI/View/Data/RealDataPresenter.h
+++ b/GUI/View/Data/DatafilePresenter.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Data/RealDataPresenter.h
-//! @brief Defines class RealDataPresenter.
+//! @file GUI/View/Data/DatafilePresenter.h
+//! @brief Defines class DatafilePresenter.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,18 +12,18 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_DATA_REALDATAPRESENTER_H
-#define BORNAGAIN_GUI_VIEW_DATA_REALDATAPRESENTER_H
+#ifndef BORNAGAIN_GUI_VIEW_DATA_DATAFILEPRESENTER_H
+#define BORNAGAIN_GUI_VIEW_DATA_DATAFILEPRESENTER_H
#include "GUI/View/Combo/ItemComboWidget.h"
//! Presents imported data (DatafileItem) using stack of different widgets and combo box in the
//! right top corner of DataView, to switch between widgets.
-class RealDataPresenter : public ItemComboWidget {
+class DatafilePresenter : public ItemComboWidget {
Q_OBJECT
public:
- explicit RealDataPresenter(QWidget* parent = nullptr);
+ explicit DatafilePresenter(QWidget* parent = nullptr);
void setPresentation(const QString& presentationType) override;
void setModel(QObject*) {}
@@ -33,4 +33,4 @@ private:
QString itemPresentation() const override;
};
-#endif // BORNAGAIN_GUI_VIEW_DATA_REALDATAPRESENTER_H
+#endif // BORNAGAIN_GUI_VIEW_DATA_DATAFILEPRESENTER_H
diff --git a/GUI/View/Data/DatafilesStack.cpp b/GUI/View/Data/DatafilesStack.cpp
index 1295f43ae1a..fb89b788a3c 100644
--- a/GUI/View/Data/DatafilesStack.cpp
+++ b/GUI/View/Data/DatafilesStack.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/Data/DatafilesStack.h"
-#include "GUI/View/Data/RealDataPresenter.h"
+#include "GUI/View/Data/DatafilePresenter.h"
void DatafilesStack::setItem(QObject* item, QObject* model)
{
@@ -22,10 +22,10 @@ void DatafilesStack::setItem(QObject* item, QObject* model)
return;
}
- RealDataPresenter* widget = itemWidget(item);
+ DatafilePresenter* widget = itemWidget(item);
if (!widget) {
- widget = new RealDataPresenter();
+ widget = new DatafilePresenter();
m_stackedWidget->addWidget(widget);
m_itemToWidget[item] = widget;
}
@@ -38,7 +38,7 @@ void DatafilesStack::setItem(QObject* item, QObject* model)
widget->setJobOrDatafileItem(item);
}
-RealDataPresenter* DatafilesStack::itemWidget(QObject* /*item*/)
+DatafilePresenter* DatafilesStack::itemWidget(QObject* /*item*/)
{
if (!m_itemToWidget.empty())
return m_itemToWidget.first();
diff --git a/GUI/View/Data/DatafilesStack.h b/GUI/View/Data/DatafilesStack.h
index 58446088d4a..3a06be30cb3 100644
--- a/GUI/View/Data/DatafilesStack.h
+++ b/GUI/View/Data/DatafilesStack.h
@@ -18,7 +18,7 @@
#include "GUI/View/Item/ItemStackWidget.h"
#include <QMap>
-class RealDataPresenter;
+class DatafilePresenter;
class DatafilesStack : public ItemStackWidget {
public:
@@ -26,10 +26,10 @@ public:
//! If no widget yet exists, it will be created.
void setItem(QObject* item, QObject* model = nullptr);
- RealDataPresenter* itemWidget(QObject* item);
+ DatafilePresenter* itemWidget(QObject* item);
private:
- QMap<QObject*, RealDataPresenter*> m_itemToWidget;
+ QMap<QObject*, DatafilePresenter*> m_itemToWidget;
};
#endif // BORNAGAIN_GUI_VIEW_DATA_DATAFILESSTACK_H
diff --git a/GUI/View/Frame/Plot2DWithProjectionFrame.h b/GUI/View/Frame/Plot2DWithProjectionFrame.h
index 53fb95e0577..9f06be5d2a5 100644
--- a/GUI/View/Frame/Plot2DWithProjectionFrame.h
+++ b/GUI/View/Frame/Plot2DWithProjectionFrame.h
@@ -24,7 +24,7 @@ class ProjectionsToolbar;
class ProjectionsWidget;
//! Main widget to embed projections editor for Data2DItem.
-//! Part of RealDataPresenter and JobResultsPresenter.
+//! Part of DatafilePresenter and JobResultsPresenter.
class Plot2DWithProjectionFrame : public DataAccessWidget {
public:
--
GitLab