Skip to content
Snippets Groups Projects
Commit 242ec75a authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename class and sources GUI/View/Data/RealDataPresenter -> GUI/View/Data/DatafilePresenter

parent 1b3addf6
No related branches found
No related tags found
1 merge request!2142numerous renamings for clearer layering of GUI/View
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// //
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file GUI/View/Data/RealDataPresenter.cpp //! @file GUI/View/Data/DatafilePresenter.cpp
//! @brief Implements class RealDataPresenter. //! @brief Implements class DatafilePresenter.
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// //
// ************************************************************************************************ // ************************************************************************************************
#include "GUI/View/Data/RealDataPresenter.h" #include "GUI/View/Data/DatafilePresenter.h"
#include "Base/Util/Assert.h" #include "Base/Util/Assert.h"
#include "GUI/Model/Device/DatafileItem.h" #include "GUI/Model/Device/DatafileItem.h"
#include "GUI/View/Frame/MaskEditingFrame.h" #include "GUI/View/Frame/MaskEditingFrame.h"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "GUI/View/Frame/Plot2DWithProjectionFrame.h" #include "GUI/View/Frame/Plot2DWithProjectionFrame.h"
#include "GUI/View/Frame/SpecularFrame.h" #include "GUI/View/Frame/SpecularFrame.h"
RealDataPresenter::RealDataPresenter(QWidget* parent) DatafilePresenter::DatafilePresenter(QWidget* parent)
: ItemComboWidget(parent) : ItemComboWidget(parent)
{ {
registerWidget("Heat Map", create_new<Plot2DFrame>); registerWidget("Heat Map", create_new<Plot2DFrame>);
...@@ -29,7 +29,7 @@ RealDataPresenter::RealDataPresenter(QWidget* parent) ...@@ -29,7 +29,7 @@ RealDataPresenter::RealDataPresenter(QWidget* parent)
registerWidget("Reflectometry (Graph only)", create_new<SpecularFrame>); registerWidget("Reflectometry (Graph only)", create_new<SpecularFrame>);
} }
QString RealDataPresenter::itemPresentation() const QString DatafilePresenter::itemPresentation() const
{ {
if (!realItem()) if (!realItem())
return ItemComboWidget::selectedPresentation(); return ItemComboWidget::selectedPresentation();
...@@ -40,14 +40,14 @@ QString RealDataPresenter::itemPresentation() const ...@@ -40,14 +40,14 @@ QString RealDataPresenter::itemPresentation() const
return realItem()->presentationType(); return realItem()->presentationType();
} }
void RealDataPresenter::setPresentation(const QString& presentationType) void DatafilePresenter::setPresentation(const QString& presentationType)
{ {
ItemComboWidget::setPresentation(presentationType); ItemComboWidget::setPresentation(presentationType);
if (realItem() && !presentationType.isEmpty()) if (realItem() && !presentationType.isEmpty())
realItem()->setPresentationType(presentationType); realItem()->setPresentationType(presentationType);
} }
QStringList RealDataPresenter::activePresentationList() const QStringList DatafilePresenter::activePresentationList() const
{ {
ASSERT(realItem()); ASSERT(realItem());
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// //
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file GUI/View/Data/RealDataPresenter.h //! @file GUI/View/Data/DatafilePresenter.h
//! @brief Defines class RealDataPresenter. //! @brief Defines class DatafilePresenter.
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
...@@ -12,18 +12,18 @@ ...@@ -12,18 +12,18 @@
// //
// ************************************************************************************************ // ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_DATA_REALDATAPRESENTER_H #ifndef BORNAGAIN_GUI_VIEW_DATA_DATAFILEPRESENTER_H
#define BORNAGAIN_GUI_VIEW_DATA_REALDATAPRESENTER_H #define BORNAGAIN_GUI_VIEW_DATA_DATAFILEPRESENTER_H
#include "GUI/View/Combo/ItemComboWidget.h" #include "GUI/View/Combo/ItemComboWidget.h"
//! Presents imported data (DatafileItem) using stack of different widgets and combo box in the //! Presents imported data (DatafileItem) using stack of different widgets and combo box in the
//! right top corner of DataView, to switch between widgets. //! right top corner of DataView, to switch between widgets.
class RealDataPresenter : public ItemComboWidget { class DatafilePresenter : public ItemComboWidget {
Q_OBJECT Q_OBJECT
public: public:
explicit RealDataPresenter(QWidget* parent = nullptr); explicit DatafilePresenter(QWidget* parent = nullptr);
void setPresentation(const QString& presentationType) override; void setPresentation(const QString& presentationType) override;
void setModel(QObject*) {} void setModel(QObject*) {}
...@@ -33,4 +33,4 @@ private: ...@@ -33,4 +33,4 @@ private:
QString itemPresentation() const override; QString itemPresentation() const override;
}; };
#endif // BORNAGAIN_GUI_VIEW_DATA_REALDATAPRESENTER_H #endif // BORNAGAIN_GUI_VIEW_DATA_DATAFILEPRESENTER_H
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
// ************************************************************************************************ // ************************************************************************************************
#include "GUI/View/Data/DatafilesStack.h" #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) void DatafilesStack::setItem(QObject* item, QObject* model)
{ {
...@@ -22,10 +22,10 @@ void DatafilesStack::setItem(QObject* item, QObject* model) ...@@ -22,10 +22,10 @@ void DatafilesStack::setItem(QObject* item, QObject* model)
return; return;
} }
RealDataPresenter* widget = itemWidget(item); DatafilePresenter* widget = itemWidget(item);
if (!widget) { if (!widget) {
widget = new RealDataPresenter(); widget = new DatafilePresenter();
m_stackedWidget->addWidget(widget); m_stackedWidget->addWidget(widget);
m_itemToWidget[item] = widget; m_itemToWidget[item] = widget;
} }
...@@ -38,7 +38,7 @@ void DatafilesStack::setItem(QObject* item, QObject* model) ...@@ -38,7 +38,7 @@ void DatafilesStack::setItem(QObject* item, QObject* model)
widget->setJobOrDatafileItem(item); widget->setJobOrDatafileItem(item);
} }
RealDataPresenter* DatafilesStack::itemWidget(QObject* /*item*/) DatafilePresenter* DatafilesStack::itemWidget(QObject* /*item*/)
{ {
if (!m_itemToWidget.empty()) if (!m_itemToWidget.empty())
return m_itemToWidget.first(); return m_itemToWidget.first();
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "GUI/View/Item/ItemStackWidget.h" #include "GUI/View/Item/ItemStackWidget.h"
#include <QMap> #include <QMap>
class RealDataPresenter; class DatafilePresenter;
class DatafilesStack : public ItemStackWidget { class DatafilesStack : public ItemStackWidget {
public: public:
...@@ -26,10 +26,10 @@ public: ...@@ -26,10 +26,10 @@ public:
//! If no widget yet exists, it will be created. //! If no widget yet exists, it will be created.
void setItem(QObject* item, QObject* model = nullptr); void setItem(QObject* item, QObject* model = nullptr);
RealDataPresenter* itemWidget(QObject* item); DatafilePresenter* itemWidget(QObject* item);
private: private:
QMap<QObject*, RealDataPresenter*> m_itemToWidget; QMap<QObject*, DatafilePresenter*> m_itemToWidget;
}; };
#endif // BORNAGAIN_GUI_VIEW_DATA_DATAFILESSTACK_H #endif // BORNAGAIN_GUI_VIEW_DATA_DATAFILESSTACK_H
...@@ -24,7 +24,7 @@ class ProjectionsToolbar; ...@@ -24,7 +24,7 @@ class ProjectionsToolbar;
class ProjectionsWidget; class ProjectionsWidget;
//! Main widget to embed projections editor for Data2DItem. //! Main widget to embed projections editor for Data2DItem.
//! Part of RealDataPresenter and JobResultsPresenter. //! Part of DatafilePresenter and JobResultsPresenter.
class Plot2DWithProjectionFrame : public DataAccessWidget { class Plot2DWithProjectionFrame : public DataAccessWidget {
public: public:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment