Renamed FitComparisonWidget1D_New --> FitComparisonWidget1D

Redmine: #2106

GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.cpp → GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.cpp

@@ -12,7 +12,7 @@
 //
 // ************************************************************************** //
 
-#include "FitComparisonWidget1D_New.h"
+#include "FitComparisonWidget1D.h"
 #include "Data1DViewItem.h"
 #include "FitComparisonViewController.h"
 #include "FitFlowWidget.h"
@@ -28,7 +28,7 @@
 #include <QGridLayout>
 #include <QVBoxLayout>
 
-FitComparisonWidget1D_New::FitComparisonWidget1D_New(QWidget* parent)
+FitComparisonWidget1D::FitComparisonWidget1D(QWidget* parent)
     : SessionItemWidget(parent)
     , m_data_plot(new Plot1DCanvas)
     , m_diff_plot(new Plot1DCanvas)
@@ -64,19 +64,19 @@ FitComparisonWidget1D_New::FitComparisonWidget1D_New(QWidget* parent)
     m_resetViewAction->setIcon(QIcon(":/images/toolbar16light_refresh.svg"));
     m_resetViewAction->setToolTip("Reset View");
     connect(m_resetViewAction, &QAction::triggered, this,
-            &FitComparisonWidget1D_New::onResetViewAction);
+            &FitComparisonWidget1D::onResetViewAction);
 
     m_propertyWidget->setVisible(false);
 }
 
-FitComparisonWidget1D_New::~FitComparisonWidget1D_New() = default;
+FitComparisonWidget1D::~FitComparisonWidget1D() = default;
 
-QList<QAction*> FitComparisonWidget1D_New::actionList()
+QList<QAction*> FitComparisonWidget1D::actionList()
 {
     return QList<QAction*>() << m_resetViewAction << m_propertyWidget->actionList();
 }
 
-void FitComparisonWidget1D_New::subscribeToItem()
+void FitComparisonWidget1D::subscribeToItem()
 {
     if (!jobItem()->isValidForFitting())
         return;
@@ -103,7 +103,7 @@ void FitComparisonWidget1D_New::subscribeToItem()
     m_propertyWidget->setItem(viewItem());
 }
 
-void FitComparisonWidget1D_New::unsubscribeFromItem()
+void FitComparisonWidget1D::unsubscribeFromItem()
 {
     if (!currentItem())
         return;
@@ -111,19 +111,19 @@ void FitComparisonWidget1D_New::unsubscribeFromItem()
     m_comparisonController->clear();
 }
 
-void FitComparisonWidget1D_New::onResetViewAction()
+void FitComparisonWidget1D::onResetViewAction()
 {
     viewItem()->resetView();
     m_comparisonController->resetDiffView();
 }
 
-JobItem* FitComparisonWidget1D_New::jobItem()
+JobItem* FitComparisonWidget1D::jobItem()
 {
     JobItem* jobItem = dynamic_cast<JobItem*>(currentItem());
     return jobItem;
 }
 
-Data1DViewItem* FitComparisonWidget1D_New::viewItem()
+Data1DViewItem* FitComparisonWidget1D::viewItem()
 {
     auto view_item = dynamic_cast<Data1DViewItem*>(jobItem()->dataItemView());
     assert(view_item);

GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.h → GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.h
+//! @file      GUI/coregui/Views/FitWidgets/FitComparisonWidget1D.h
 //! @brief     Defines class FitComparisonWidget1D
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -29,12 +29,12 @@ class QAction;
 //! The FitComparisonWidget class plots realdata, simulated data and relative difference map
 //! during the course of the fit.
 
-class BA_CORE_API_ FitComparisonWidget1D_New : public SessionItemWidget
+class BA_CORE_API_ FitComparisonWidget1D : public SessionItemWidget
 {
     Q_OBJECT
 public:
-    explicit FitComparisonWidget1D_New(QWidget* parent = nullptr);
-    ~FitComparisonWidget1D_New() override;
+    explicit FitComparisonWidget1D(QWidget* parent = nullptr);
+    ~FitComparisonWidget1D() override;
 
     virtual QList<QAction*> actionList() override;
 

GUI/coregui/Views/JobWidgets/JobResultsPresenter.cpp

@@ -14,7 +14,7 @@
 
 #include "JobResultsPresenter.h"
 #include "FitComparisonWidget.h"
-#include "FitComparisonWidget1D_New.h"
+#include "FitComparisonWidget1D.h"
 #include "GUIHelpers.h"
 #include "IntensityDataProjectionsWidget.h"
 #include "IntensityDataWidget.h"
@@ -65,7 +65,7 @@ JobResultsPresenter::JobResultsPresenter(QWidget* parent)
     registerWidget(Constants::IntensityProjectionsPresentation,
                    create_new<IntensityDataProjectionsWidget>);
 
-    registerWidget(Constants::FitComparisonPresentation1D, create_new<FitComparisonWidget1D_New>);
+    registerWidget(Constants::FitComparisonPresentation1D, create_new<FitComparisonWidget1D>);
     registerWidget(Constants::FitComparisonPresentation2D, create_new<FitComparisonWidget>);
 
     registerWidget(Constants::SpecularDataPresentation, create_new<SpecularDataWidget>);