Merge branch 'reorg_dirs' into 'develop'

Reorg dirs: move widgets from GUI/Views/FitWidgets to GUI/Views/JobWidgets

See merge request !188

GUI/Views/FitWidgets/FitComparisonController.cpp → GUI/Views/JobWidgets/FitComparisonController.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitComparisonController.cpp
+//! @file      GUI/Views/JobWidgets/FitComparisonController.cpp
 //! @brief     Implements class FitComparisonController
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/FitWidgets/FitComparisonController.h"
+#include "GUI/Views/JobWidgets/FitComparisonController.h"
 #include "Device/Data/DataUtils.h"
 #include "GUI/Models/AxesItems.h"
 #include "GUI/Models/IntensityDataItem.h"

GUI/Views/FitWidgets/FitComparisonController.h → GUI/Views/JobWidgets/FitComparisonController.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitComparisonController.h
+//! @file      GUI/Views/JobWidgets/FitComparisonController.h
 //! @brief     Defines class FitComparisonController
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONCONTROLLER_H
+#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONCONTROLLER_H
 
 #include <QObject>
 
@@ -49,4 +49,4 @@ private:
     PropertyRepeater* m_zAxisRepeater;
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONCONTROLLER_H

GUI/Views/FitWidgets/FitComparisonViewController.cpp → GUI/Views/JobWidgets/FitComparisonViewController.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitComparisonViewController.cpp
+//! @file      GUI/Views/JobWidgets/FitComparisonViewController.cpp
 //! @brief     Implements classes DiffItemController, FitComparison1DViewController
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/FitWidgets/FitComparisonViewController.h"
+#include "GUI/Views/JobWidgets/FitComparisonViewController.h"
 #include "Device/Data/DataUtils.h"
 #include "GUI/Models/AxesItems.h"
 #include "GUI/Models/ComboProperty.h"

GUI/Views/FitWidgets/FitComparisonViewController.h → GUI/Views/JobWidgets/FitComparisonViewController.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitComparisonViewController.h
+//! @file      GUI/Views/JobWidgets/FitComparisonViewController.h
 //! @brief     Defines classes DiffItemController, FitComparison1DViewController
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
+#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
 
 #include <QObject>
 
@@ -63,4 +63,4 @@ private:
     PropertyRepeater* m_xAxisRepeater;
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONVIEWCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONVIEWCONTROLLER_H

GUI/Views/FitWidgets/FitComparisonWidget.cpp → GUI/Views/JobWidgets/FitComparisonWidget.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitComparisonWidget.cpp
+//! @file      GUI/Views/JobWidgets/FitComparisonWidget.cpp
 //! @brief     Implements class FitComparisonWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,17 +12,17 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/FitWidgets/FitComparisonWidget.h"
+#include "GUI/Views/JobWidgets/FitComparisonWidget.h"
 #include "GUI/Models/FitSuiteItem.h"
 #include "GUI/Models/IntensityDataItem.h"
 #include "GUI/Models/JobItem.h"
 #include "GUI/Models/RealDataItem.h"
-#include "GUI/Views/FitWidgets/FitComparisonController.h"
-#include "GUI/Views/FitWidgets/FitFlowWidget.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMap.h"
 #include "GUI/Views/IntensityDataWidgets/ColorMapCanvas.h"
 #include "GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
 #include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
+#include "GUI/Views/JobWidgets/FitComparisonController.h"
+#include "GUI/Views/JobWidgets/FitFlowWidget.h"
 #include <QAction>
 #include <QGridLayout>
 #include <QVBoxLayout>

GUI/Views/FitWidgets/FitComparisonWidget.h → GUI/Views/JobWidgets/FitComparisonWidget.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitComparisonWidget.h
+//! @file      GUI/Views/JobWidgets/FitComparisonWidget.h
 //! @brief     Defines class FitComparisonWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
+#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H
 
 #include "GUI/Views/CommonWidgets/SessionItemWidget.h"
 #include <QMap>
@@ -65,4 +65,4 @@ private:
     FitComparisonController2D* m_comparisonController;
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET_H
+#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET_H

GUI/Views/FitWidgets/FitComparisonWidget1D.cpp → GUI/Views/JobWidgets/FitComparisonWidget1D.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitComparisonWidget1D.cpp
+//! @file      GUI/Views/JobWidgets/FitComparisonWidget1D.cpp
 //! @brief     Implements class FitComparisonWidget1D
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,17 +12,17 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/FitWidgets/FitComparisonWidget1D.h"
+#include "GUI/Views/JobWidgets/FitComparisonWidget1D.h"
 #include "GUI/Models/Data1DViewItem.h"
 #include "GUI/Models/FitSuiteItem.h"
 #include "GUI/Models/JobItem.h"
 #include "GUI/Models/RealDataItem.h"
 #include "GUI/Models/SessionModel.h"
-#include "GUI/Views/FitWidgets/FitComparisonViewController.h"
-#include "GUI/Views/FitWidgets/FitFlowWidget.h"
 #include "GUI/Views/IntensityDataWidgets/IntensityDataPropertyWidget.h"
 #include "GUI/Views/IntensityDataWidgets/Plot1D.h"
 #include "GUI/Views/IntensityDataWidgets/PlotStatusLabel.h"
+#include "GUI/Views/JobWidgets/FitComparisonViewController.h"
+#include "GUI/Views/JobWidgets/FitFlowWidget.h"
 #include "GUI/Views/SpecularDataWidgets/Plot1DCanvas.h"
 #include <QAction>
 #include <QGridLayout>

GUI/Views/FitWidgets/FitComparisonWidget1D.h → GUI/Views/JobWidgets/FitComparisonWidget1D.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitComparisonWidget1D.h
+//! @file      GUI/Views/JobWidgets/FitComparisonWidget1D.h
 //! @brief     Defines class FitComparisonWidget1D
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET1D_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET1D_H
+#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
+#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H
 
 #include "GUI/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -58,4 +58,4 @@ private:
     FitComparison1DViewController* m_comparisonController;
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITCOMPARISONWIDGET1D_H
+#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITCOMPARISONWIDGET1D_H

GUI/Views/FitWidgets/FitFlowWidget.cpp → GUI/Views/JobWidgets/FitFlowWidget.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitFlowWidget.cpp
+//! @file      GUI/Views/JobWidgets/FitFlowWidget.cpp
 //! @brief     Implement class FitFlowWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,9 +12,9 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/FitWidgets/FitFlowWidget.h"
+#include "GUI/Views/JobWidgets/FitFlowWidget.h"
 #include "GUI/Models/FitSuiteItem.h"
-#include "GUI/Views/FitWidgets/HistogramPlot.h"
+#include "GUI/Views/JobWidgets/HistogramPlot.h"
 #include <QVBoxLayout>
 
 FitFlowWidget::FitFlowWidget(QWidget* parent)

GUI/Views/FitWidgets/FitFlowWidget.h → GUI/Views/JobWidgets/FitFlowWidget.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/FitFlowWidget.h
+//! @file      GUI/Views/JobWidgets/FitFlowWidget.h
 //! @brief     Defines class FitFlowWidget
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITFLOWWIDGET_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITFLOWWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
+#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H
 
 #include "GUI/Views/CommonWidgets/SessionItemWidget.h"
 
@@ -40,4 +40,4 @@ private:
     QVector<double> m_y;
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_FITFLOWWIDGET_H
+#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_FITFLOWWIDGET_H

GUI/Views/FitWidgets/HistogramPlot.cpp → GUI/Views/JobWidgets/HistogramPlot.cpp

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/HistogramPlot.cpp
+//! @file      GUI/Views/JobWidgets/HistogramPlot.cpp
 //! @brief     Implements class HistogramPlot
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/Views/FitWidgets/HistogramPlot.h"
+#include "GUI/Views/JobWidgets/HistogramPlot.h"
 #include "GUI/Views/IntensityDataWidgets/plot_constants.h"
 
 HistogramPlot::HistogramPlot(QWidget* parent) : QWidget(parent), m_customPlot(new QCustomPlot)

GUI/Views/FitWidgets/HistogramPlot.h → GUI/Views/JobWidgets/HistogramPlot.h

@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/Views/FitWidgets/HistogramPlot.h
+//! @file      GUI/Views/JobWidgets/HistogramPlot.h
 //! @brief     Defines class HistogramPlot
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEWS_FITWIDGETS_HISTOGRAMPLOT_H
-#define BORNAGAIN_GUI_VIEWS_FITWIDGETS_HISTOGRAMPLOT_H
+#ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_HISTOGRAMPLOT_H
+#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_HISTOGRAMPLOT_H
 
 #include <QWidget>
 #include <qcustomplot.h>
@@ -35,4 +35,4 @@ private:
     QCustomPlot* m_customPlot;
 };
 
-#endif // BORNAGAIN_GUI_VIEWS_FITWIDGETS_HISTOGRAMPLOT_H
+#endif // BORNAGAIN_GUI_VIEWS_JOBWIDGETS_HISTOGRAMPLOT_H

GUI/Views/JobWidgets/JobResultsPresenter.cpp

@@ -15,8 +15,8 @@
 #include "GUI/Views/JobWidgets/JobResultsPresenter.h"
 #include "GUI/Models/InstrumentItems.h"
 #include "GUI/Models/JobItem.h"
-#include "GUI/Views/FitWidgets/FitComparisonWidget.h"
-#include "GUI/Views/FitWidgets/FitComparisonWidget1D.h"
+#include "GUI/Views/JobWidgets/FitComparisonWidget.h"
+#include "GUI/Views/JobWidgets/FitComparisonWidget1D.h"
 #include "GUI/Views/IntensityDataWidgets/IntensityDataProjectionsWidget.h"
 #include "GUI/Views/IntensityDataWidgets/IntensityDataWidget.h"
 #include "GUI/Views/SpecularDataWidgets/SpecularDataWidget.h"