diff --git a/GUI/View/Combo/ItemComboWidget.cpp b/GUI/View/Combo/ItemComboWidget.cpp
index 58964042bcbd450fa5e871a120e731174611ef1c..e018581c63292a583620892116570512424956f0 100644
--- a/GUI/View/Combo/ItemComboWidget.cpp
+++ b/GUI/View/Combo/ItemComboWidget.cpp
@@ -105,7 +105,7 @@ void ItemComboWidget::setJobOrDatafileItem(QObject* job_or_real_item)
//! Returns list of active presentations. Active presentation is the one
//! which is present in QComboBox selector and can be selected. For example, if JobItem
-//! is fittable, the list will contain "Fitpair2DWidgetName".
+//! is fittable, the list will contain "Fit2DFrameName".
QStringList ItemComboWidget::activePresentationList() const
{
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index 5b7ce539168a5373cef8c382577f65577f38a2b5..e682e9045639733c91896eea0f35e5eed5a7796d 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -133,7 +133,7 @@ void FitSessionController::onFittingFinished()
if (m_jobItem->isCompleted())
m_fitlog->append("Done", FitLogLevel::Success);
- // TODO: notify Fitpair2DWidget/Fitpair1DWidget in a proper way by fittingFinished();
+ // TODO: notify Fit2DFrame/Fit1DFrame in a proper way by fittingFinished();
// emit fittingFinished();
emit m_jobItem->simulatedDataItem()->datafieldChanged();
}
diff --git a/GUI/View/PlotComparison/Fitpair1DWidget.cpp b/GUI/View/Frame/Fit1DFrame.cpp
similarity index 88%
rename from GUI/View/PlotComparison/Fitpair1DWidget.cpp
rename to GUI/View/Frame/Fit1DFrame.cpp
index 16298da91c6b6e1b5673d872a50091743eea7c06..32a9868e5d327ee3bf048a7ea1296ff842407d33 100644
--- a/GUI/View/PlotComparison/Fitpair1DWidget.cpp
+++ b/GUI/View/Frame/Fit1DFrame.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/PlotComparison/Fitpair1DWidget.cpp
-//! @brief Implements class Fitpair1DWidget.
+//! @file GUI/View/Frame/Fit1DFrame.cpp
+//! @brief Implements class Fit1DFrame.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/PlotComparison/Fitpair1DWidget.h"
+#include "GUI/View/Frame/Fit1DFrame.h"
#include "Base/Util/Assert.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DiffUtil.h"
@@ -30,7 +30,7 @@
#include "GUI/View/PlotSpecular/SpecularPlotCanvas.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
-Fitpair1DWidget::Fitpair1DWidget(QWidget* parent)
+Fit1DFrame::Fit1DFrame(QWidget* parent)
: DataAccessWidget(parent)
, m_data_canvas(new SpecularPlotCanvas(this))
, m_diff_canvas(new SpecularPlotCanvas(this))
@@ -67,7 +67,7 @@ Fitpair1DWidget::Fitpair1DWidget(QWidget* parent)
m_resetViewAction->setText("Center view");
m_resetViewAction->setIcon(QIcon(":/images/camera-metering-center.svg"));
m_resetViewAction->setToolTip("Reset View");
- connect(m_resetViewAction, &QAction::triggered, this, &Fitpair1DWidget::onResetViewAction,
+ connect(m_resetViewAction, &QAction::triggered, this, &Fit1DFrame::onResetViewAction,
Qt::UniqueConnection);
m_togglePropertiesAction =
@@ -75,10 +75,10 @@ Fitpair1DWidget::Fitpair1DWidget(QWidget* parent)
m_propertyWidget->setVisible(false);
connect(m_propertyWidget, &DataPropertyWidget::axesRangeResetRequested, this,
- &Fitpair1DWidget::onResetViewAction, Qt::UniqueConnection);
+ &Fit1DFrame::onResetViewAction, Qt::UniqueConnection);
}
-void Fitpair1DWidget::setJobOrDatafileItem(QObject* job_item)
+void Fit1DFrame::setJobOrDatafileItem(QObject* job_item)
{
JobItem* oldJob = jobItem();
@@ -96,12 +96,12 @@ void Fitpair1DWidget::setJobOrDatafileItem(QObject* job_item)
m_propertyWidget->setJobOrDatafileItem(job_item);
}
-QList<QAction*> Fitpair1DWidget::actionList()
+QList<QAction*> Fit1DFrame::actionList()
{
return QList<QAction*>() << m_resetViewAction << m_togglePropertiesAction;
}
-void Fitpair1DWidget::onResetViewAction()
+void Fit1DFrame::onResetViewAction()
{
ASSERT(simuData1DItem() && diffData1DItem() && realData1DItem());
simuData1DItem()->resetView();
@@ -113,7 +113,7 @@ void Fitpair1DWidget::onResetViewAction()
gProjectDocument.value()->setModified();
}
-void Fitpair1DWidget::connectItems()
+void Fit1DFrame::connectItems()
{
// sync X axis view area between simulated and difference plots
// simu --> diff
@@ -124,11 +124,11 @@ void Fitpair1DWidget::connectItems()
&DataItem::checkXranges, Qt::UniqueConnection);
// update diff data if simulation data changes
- connect(simuData1DItem(), &Data1DItem::datafieldChanged, this, &Fitpair1DWidget::updateDiffData,
+ connect(simuData1DItem(), &Data1DItem::datafieldChanged, this, &Fit1DFrame::updateDiffData,
Qt::UniqueConnection);
}
-void Fitpair1DWidget::updateDiffData()
+void Fit1DFrame::updateDiffData()
{
ASSERT(simuData1DItem() && diffData1DItem() && realData1DItem());
if (!simuData1DItem()->c_field() || !realData1DItem()->c_field())
diff --git a/GUI/View/PlotComparison/Fitpair1DWidget.h b/GUI/View/Frame/Fit1DFrame.h
similarity index 71%
rename from GUI/View/PlotComparison/Fitpair1DWidget.h
rename to GUI/View/Frame/Fit1DFrame.h
index 47561e18aa7bbe4f144f88a0ba4af1b08fac10e4..54fac3e54fb3fb2d043a6add3f86e2dadca0e200 100644
--- a/GUI/View/PlotComparison/Fitpair1DWidget.h
+++ b/GUI/View/Frame/Fit1DFrame.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/PlotComparison/Fitpair1DWidget.h
-//! @brief Defines class Fitpair1DWidget.
+//! @file GUI/View/Frame/Fit1DFrame.h
+//! @brief Defines class Fit1DFrame.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITPAIR1DWIDGET_H
-#define BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITPAIR1DWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FRAME_FIT1DFRAME_H
+#define BORNAGAIN_GUI_VIEW_FRAME_FIT1DFRAME_H
#include "GUI/View/Access/DataAccessWidget.h"
@@ -24,13 +24,13 @@ class QAction;
class SpecularDataPropertyWidget;
class SpecularPlotCanvas;
-//! The Fitpair2DWidget class plots real data, simulated data and their relative difference
+//! The Fit2DFrame class plots real data, simulated data and their relative difference
//! during the course of the fit.
-class Fitpair1DWidget : public DataAccessWidget {
+class Fit1DFrame : public DataAccessWidget {
Q_OBJECT
public:
- explicit Fitpair1DWidget(QWidget* parent = nullptr);
+ explicit Fit1DFrame(QWidget* parent = nullptr);
void setJobOrDatafileItem(QObject* job_item) override;
@@ -51,4 +51,4 @@ private:
QAction* m_togglePropertiesAction;
};
-#endif // BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITPAIR1DWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FRAME_FIT1DFRAME_H
diff --git a/GUI/View/PlotComparison/Fitpair2DWidget.cpp b/GUI/View/Frame/Fit2DFrame.cpp
similarity index 88%
rename from GUI/View/PlotComparison/Fitpair2DWidget.cpp
rename to GUI/View/Frame/Fit2DFrame.cpp
index d07ddee6731c2e3ab7187620ba3d1ed8190d2a46..f1a235aa4a74ad837effe027ffbc24b51d79060b 100644
--- a/GUI/View/PlotComparison/Fitpair2DWidget.cpp
+++ b/GUI/View/Frame/Fit2DFrame.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/PlotComparison/Fitpair2DWidget.cpp
-//! @brief Implements class Fitpair2DWidget.
+//! @file GUI/View/Frame/Fit2DFrame.cpp
+//! @brief Implements class Fit2DFrame.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/PlotComparison/Fitpair2DWidget.h"
+#include "GUI/View/Frame/Fit2DFrame.h"
#include "Base/Util/Assert.h"
#include "Device/Data/Datafield.h"
#include "Device/IO/DiffUtil.h"
@@ -29,7 +29,7 @@
#include <QAction>
#include <QVBoxLayout>
-Fitpair2DWidget::Fitpair2DWidget(QWidget* parent)
+Fit2DFrame::Fit2DFrame(QWidget* parent)
: DataAccessWidget(parent)
, m_realCanvas(new ColorMapCanvas(this))
, m_simuCanvas(new ColorMapCanvas(this))
@@ -69,7 +69,7 @@ Fitpair2DWidget::Fitpair2DWidget(QWidget* parent)
m_resetViewAction->setText("Center view");
m_resetViewAction->setIcon(QIcon(":/images/camera-metering-center.svg"));
m_resetViewAction->setToolTip("Reset View");
- connect(m_resetViewAction, &QAction::triggered, this, &Fitpair2DWidget::onResetViewAction,
+ connect(m_resetViewAction, &QAction::triggered, this, &Fit2DFrame::onResetViewAction,
Qt::UniqueConnection);
m_togglePropertiesAction =
@@ -77,10 +77,10 @@ Fitpair2DWidget::Fitpair2DWidget(QWidget* parent)
m_propertyWidget->setVisible(false);
connect(m_propertyWidget, &DataPropertyWidget::axesRangeResetRequested, this,
- &Fitpair2DWidget::onResetViewAction, Qt::UniqueConnection);
+ &Fit2DFrame::onResetViewAction, Qt::UniqueConnection);
}
-void Fitpair2DWidget::setJobOrDatafileItem(QObject* job_item)
+void Fit2DFrame::setJobOrDatafileItem(QObject* job_item)
{
JobItem* oldJob = jobItem();
@@ -100,12 +100,12 @@ void Fitpair2DWidget::setJobOrDatafileItem(QObject* job_item)
m_propertyWidget->setJobOrDatafileItem(job_item);
}
-QList<QAction*> Fitpair2DWidget::actionList()
+QList<QAction*> Fit2DFrame::actionList()
{
return {m_resetViewAction, m_togglePropertiesAction};
}
-void Fitpair2DWidget::onResetViewAction()
+void Fit2DFrame::onResetViewAction()
{
ASSERT(simuData2DItem() && diffData2DItem() && realData2DItem());
simuData2DItem()->resetView();
@@ -117,7 +117,7 @@ void Fitpair2DWidget::onResetViewAction()
gProjectDocument.value()->setModified();
}
-void Fitpair2DWidget::connectItems()
+void Fit2DFrame::connectItems()
{
// sync XY view area between simulated, real and difference plots
for (auto senderItem : allData2DItems())
@@ -139,11 +139,11 @@ void Fitpair2DWidget::connectItems()
&Data2DItem::copyZRangeFromItem, Qt::UniqueConnection);
// update diff data if simulation data changes
- connect(simuData2DItem(), &Data1DItem::datafieldChanged, this, &Fitpair2DWidget::updateDiffData,
+ connect(simuData2DItem(), &Data1DItem::datafieldChanged, this, &Fit2DFrame::updateDiffData,
Qt::UniqueConnection);
}
-void Fitpair2DWidget::updateDiffData()
+void Fit2DFrame::updateDiffData()
{
ASSERT(simuData2DItem() && diffData2DItem() && realData2DItem());
if (!simuData2DItem()->c_field() || !realData2DItem()->c_field())
diff --git a/GUI/View/PlotComparison/Fitpair2DWidget.h b/GUI/View/Frame/Fit2DFrame.h
similarity index 76%
rename from GUI/View/PlotComparison/Fitpair2DWidget.h
rename to GUI/View/Frame/Fit2DFrame.h
index fe01a9a4402ade0828257b634c5530ffe86868a1..31fc2a662c2db6be3c4515f83bd5c2243b053649 100644
--- a/GUI/View/PlotComparison/Fitpair2DWidget.h
+++ b/GUI/View/Frame/Fit2DFrame.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/PlotComparison/Fitpair2DWidget.h
-//! @brief Defines class Fitpair2DWidget.
+//! @file GUI/View/Frame/Fit2DFrame.h
+//! @brief Defines class Fit2DFrame.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITPAIR2DWIDGET_H
-#define BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITPAIR2DWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FRAME_FIT2DFRAME_H
+#define BORNAGAIN_GUI_VIEW_FRAME_FIT2DFRAME_H
#include "GUI/View/Access/DataAccessWidget.h"
@@ -25,10 +25,10 @@ class QAction;
//! Plots realdata, simulated data and relative difference map during the course of the fit.
-class Fitpair2DWidget : public DataAccessWidget {
+class Fit2DFrame : public DataAccessWidget {
Q_OBJECT
public:
- explicit Fitpair2DWidget(QWidget* parent = nullptr);
+ explicit Fit2DFrame(QWidget* parent = nullptr);
void setJobOrDatafileItem(QObject* job_item) override;
@@ -50,4 +50,4 @@ private:
QAction* m_togglePropertiesAction;
};
-#endif // BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_FITPAIR2DWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FRAME_FIT2DFRAME_H
diff --git a/GUI/View/Job/JobResultsPresenter.cpp b/GUI/View/Job/JobResultsPresenter.cpp
index bbae05feb1f9b83d34c9fd5d9596bebd05298501..e7ed989803492ceca5b00e96584bdacfb19ef8fd 100644
--- a/GUI/View/Job/JobResultsPresenter.cpp
+++ b/GUI/View/Job/JobResultsPresenter.cpp
@@ -14,12 +14,12 @@
#include "GUI/View/Job/JobResultsPresenter.h"
#include "GUI/Model/Job/JobItem.h"
+#include "GUI/View/Frame/Fit1DFrame.h"
+#include "GUI/View/Frame/Fit2DFrame.h"
#include "GUI/View/Frame/Plot2+ProjnFrame.h"
#include "GUI/View/Frame/Plot2DFrame.h"
#include "GUI/View/Frame/SpecularFrame.h"
#include "GUI/View/Job/JobViewActivities.h"
-#include "GUI/View/PlotComparison/Fitpair1DWidget.h"
-#include "GUI/View/PlotComparison/Fitpair2DWidget.h"
namespace {
@@ -51,8 +51,8 @@ JobResultsPresenter::JobResultsPresenter(QWidget* parent)
registerWidget("Heat Map", create_new<Plot2DFrame>);
registerWidget("Projections", create_new<Plot2DWithProjectionFrame>);
- registerWidget("Fit 1D Data", create_new<Fitpair1DWidget>);
- registerWidget("Fit 2D Data", create_new<Fitpair2DWidget>);
+ registerWidget("Fit 1D Data", create_new<Fit1DFrame>);
+ registerWidget("Fit 2D Data", create_new<Fit2DFrame>);
registerWidget("Reflectometry", create_new<SpecularFrame>);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
@@ -102,7 +102,7 @@ void JobResultsPresenter::setPresentationForActivity(JobViewActivity activity)
}
//! Returns list of presentation types, available for given item. JobItem with fitting abilities
-//! is valid for Plot2DFrame and Fitpair2DWidget.
+//! is valid for Plot2DFrame and Fit2DFrame.
QStringList JobResultsPresenter::activePresentationList() const
{
diff --git a/GUI/View/PlotComparison/FitFlowWidget.h b/GUI/View/PlotComparison/FitFlowWidget.h
index 9a27ac88aa9734242a1f5da52a680f5f310018a0..70e9136f5f460938fa05975ba74fc9208bd19e8a 100644
--- a/GUI/View/PlotComparison/FitFlowWidget.h
+++ b/GUI/View/PlotComparison/FitFlowWidget.h
@@ -20,7 +20,7 @@
class HistogramPlot;
//! Intended for showing chi2 .vs interation count dependency.
-//! The main goal is to fill vacant place in Fitpair2DWidget.
+//! The main goal is to fill vacant place in Fit2DFrame.
class FitFlowWidget : public DataAccessWidget {
Q_OBJECT