diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.cpp b/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.cpp index b44f8cd7f54cfc0050a91e22862c39c07671c169..86573e0ddc5ae119894356898b11cbeac22c6097 100644 --- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.cpp +++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.cpp @@ -14,7 +14,7 @@ #include "FitComparisonWidget1D_New.h" #include "DataItem1DView.h" -#include "FitComparisonController.h" +#include "FitComparisonViewController.h" #include "FitFlowWidget.h" #include "FitSuiteItem.h" #include "IntensityDataPropertyWidget.h" @@ -24,9 +24,6 @@ #include "PlotStatusLabel.h" #include "RealDataItem.h" #include "SessionModel.h" -#include "SpecularDataItem.h" -#include "SpecularPlot.h" -#include "SpecularPlotCanvas.h" #include <QAction> #include <QGridLayout> #include <QVBoxLayout> @@ -34,12 +31,12 @@ FitComparisonWidget1D_New::FitComparisonWidget1D_New(QWidget* parent) : SessionItemWidget(parent) , m_data_plot(new Plot1DCanvas) - //, m_diff_plot(new SpecularPlotCanvas) + , m_diff_plot(new Plot1DCanvas) , m_fitFlowWidget(new FitFlowWidget) , m_statusLabel(new PlotStatusLabel(nullptr, this)) , m_propertyWidget(new IntensityDataPropertyWidget) , m_resetViewAction(new QAction(this)) - //, m_comparisonController(new FitComparisonController1D(this)) + , m_comparisonController(new FitComparison1DViewController(this)) { auto vlayout = new QVBoxLayout; vlayout->setMargin(0); @@ -50,8 +47,8 @@ FitComparisonWidget1D_New::FitComparisonWidget1D_New(QWidget* parent) gridLayout->setSpacing(0); gridLayout->addWidget(m_data_plot, 0, 0, 1, -1); - // gridLayout->addWidget(m_diff_plot, 1, 0); - gridLayout->addWidget(m_fitFlowWidget, 1, 1); + gridLayout->addWidget(m_diff_plot, 1, 0, 1, 2); + gridLayout->addWidget(m_fitFlowWidget, 1, 2, 1, 1); vlayout->addLayout(gridLayout); vlayout->addWidget(m_statusLabel); @@ -93,15 +90,15 @@ void FitComparisonWidget1D_New::subscribeToItem() }, this); - //m_comparisonController->setItem(jobItem()); + m_comparisonController->setItem(jobItem()); m_data_plot->setItem(viewItem()); - // m_diff_plot->setItem(m_comparisonController->diffItem()); + m_diff_plot->setItem(m_comparisonController->diffItemView()); m_fitFlowWidget->setItem(jobItem()->fitSuiteItem()); m_statusLabel->reset(); m_statusLabel->addPlot(m_data_plot->plot1D()); - // m_statusLabel->addPlot(m_diff_plot->specularPlot()); + m_statusLabel->addPlot(m_diff_plot->plot1D()); m_propertyWidget->setItem(viewItem()); } @@ -111,13 +108,13 @@ void FitComparisonWidget1D_New::unsubscribeFromItem() if (!currentItem()) return; - //m_comparisonController->clear(); + m_comparisonController->clear(); } void FitComparisonWidget1D_New::onResetViewAction() { viewItem()->resetView(); - //m_comparisonController->resetDiffItem(); + m_comparisonController->resetDiffView(); } JobItem* FitComparisonWidget1D_New::jobItem() diff --git a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.h b/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.h index d0045210c6bda35f8f47737c5632945c004f9ee6..6e735310fd3bf5c265ec6aa09677aad56f87e22a 100644 --- a/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.h +++ b/GUI/coregui/Views/FitWidgets/FitComparisonWidget1D_New.h @@ -18,15 +18,13 @@ #include "SessionItemWidget.h" class DataItem1DView; -class FitComparisonController1D; +class FitComparison1DViewController; class FitFlowWidget; class IntensityDataPropertyWidget; class JobItem; class Plot1DCanvas; class PlotStatusLabel; class QAction; -class SpecularDataItem; -class SpecularPlotCanvas; //! The FitComparisonWidget class plots realdata, simulated data and relative difference map //! during the course of the fit. @@ -52,13 +50,13 @@ private: DataItem1DView* viewItem(); Plot1DCanvas* m_data_plot; - //SpecularPlotCanvas* m_diff_plot; + Plot1DCanvas* m_diff_plot; FitFlowWidget* m_fitFlowWidget; PlotStatusLabel* m_statusLabel; IntensityDataPropertyWidget* m_propertyWidget; QAction* m_resetViewAction; - //FitComparisonController1D* m_comparisonController; + FitComparison1DViewController* m_comparisonController; }; #endif // FITCOMPARISONWIDGET1D_NEW_H