From 149fc1f8f4769ebd57d4b5ab9949f235a589f60f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sun, 7 Nov 2021 13:39:21 +0100
Subject: [PATCH] rm last 'Widgets' from GUI/View subdirectory names
---
GUI/View/Compare/FitComparisonWidget1D.cpp | 2 +-
.../{FitWidgets => Fit}/FitActivityPanel.cpp | 14 +++++++-------
GUI/View/{FitWidgets => Fit}/FitActivityPanel.h | 8 ++++----
GUI/View/{FitWidgets => Fit}/FitLog.cpp | 4 ++--
GUI/View/{FitWidgets => Fit}/FitLog.h | 8 ++++----
.../{FitWidgets => Fit}/FitObjectiveBuilder.cpp | 6 +++---
.../{FitWidgets => Fit}/FitObjectiveBuilder.h | 8 ++++----
.../{FitWidgets => Fit}/FitParameterWidget.cpp | 6 +++---
.../{FitWidgets => Fit}/FitParameterWidget.h | 8 ++++----
GUI/View/{FitWidgets => Fit}/FitProgressInfo.cpp | 4 ++--
GUI/View/{FitWidgets => Fit}/FitProgressInfo.h | 8 ++++----
.../{FitWidgets => Fit}/FitResultsWidget.cpp | 4 ++--
GUI/View/{FitWidgets => Fit}/FitResultsWidget.h | 8 ++++----
.../{FitWidgets => Fit}/FitSessionController.cpp | 12 ++++++------
.../{FitWidgets => Fit}/FitSessionController.h | 8 ++++----
.../{FitWidgets => Fit}/FitSessionManager.cpp | 8 ++++----
GUI/View/{FitWidgets => Fit}/FitSessionManager.h | 8 ++++----
.../{FitWidgets => Fit}/FitSessionWidget.cpp | 14 +++++++-------
GUI/View/{FitWidgets => Fit}/FitSessionWidget.h | 10 +++++-----
GUI/View/{FitWidgets => Fit}/FitWorker.cpp | 6 +++---
GUI/View/{FitWidgets => Fit}/FitWorker.h | 8 ++++----
.../{FitWidgets => Fit}/FitWorkerLauncher.cpp | 6 +++---
GUI/View/{FitWidgets => Fit}/FitWorkerLauncher.h | 8 ++++----
GUI/View/{FitWidgets => Fit}/GUIFitObserver.cpp | 4 ++--
GUI/View/{FitWidgets => Fit}/GUIFitObserver.h | 10 +++++-----
GUI/View/{FitWidgets => Fit}/JobMessagePanel.cpp | 4 ++--
GUI/View/{FitWidgets => Fit}/JobMessagePanel.h | 10 +++++-----
.../{FitWidgets => Fit}/JobRealTimeToolBar.cpp | 4 ++--
.../{FitWidgets => Fit}/JobRealTimeToolBar.h | 8 ++++----
.../{FitWidgets => Fit}/JobRealTimeWidget.cpp | 6 +++---
GUI/View/{FitWidgets => Fit}/JobRealTimeWidget.h | 8 ++++----
.../MinimizerSettingsWidget.cpp | 4 ++--
.../MinimizerSettingsWidget.h | 8 ++++----
.../ParameterTuningDelegate.cpp | 4 ++--
.../ParameterTuningDelegate.h | 8 ++++----
.../ParameterTuningWidget.cpp | 10 +++++-----
.../{FitWidgets => Fit}/ParameterTuningWidget.h | 8 ++++----
.../{FitWidgets => Fit}/RunFitControlWidget.cpp | 4 ++--
.../{FitWidgets => Fit}/RunFitControlWidget.h | 8 ++++----
.../{FitWidgets => Fit}/SliderSettingsWidget.cpp | 4 ++--
.../{FitWidgets => Fit}/SliderSettingsWidget.h | 8 ++++----
GUI/View/Import/RealDataPresenter.cpp | 4 ++--
GUI/View/Job/JobResultsPresenter.cpp | 2 +-
GUI/View/Job/JobView.cpp | 6 +++---
.../IPositionBuilder.cpp | 6 +++---
.../IPositionBuilder.h | 8 ++++----
.../Particle3DContainer.cpp | 4 ++--
.../Particle3DContainer.h | 8 ++++----
.../RealSpace2DParacrystalUtils.cpp | 4 ++--
.../RealSpace2DParacrystalUtils.h | 8 ++++----
.../RealSpaceActions.cpp | 4 ++--
.../RealSpaceActions.h | 8 ++++----
.../RealSpaceBuilder.cpp | 16 ++++++++--------
.../RealSpaceBuilder.h | 8 ++++----
.../RealSpaceBuilderUtils.cpp | 14 +++++++-------
.../RealSpaceBuilderUtils.h | 8 ++++----
.../RealSpaceCanvas.cpp | 10 +++++-----
.../RealSpaceCanvas.h | 8 ++++----
.../RealSpaceMesoCrystalUtils.cpp | 10 +++++-----
.../RealSpaceMesoCrystalUtils.h | 8 ++++----
.../RealSpaceModel.h | 8 ++++----
.../RealSpacePositionBuilder.cpp | 6 +++---
.../RealSpacePositionBuilder.h | 8 ++++----
.../RealSpaceToolBar.cpp | 4 ++--
.../RealSpaceToolBar.h | 8 ++++----
.../RealSpaceView.cpp | 6 +++---
.../RealSpaceView.h | 8 ++++----
.../RealSpaceWidget.cpp | 10 +++++-----
.../RealSpaceWidget.h | 8 ++++----
.../TransformTo3D.cpp | 6 +++---
.../TransformTo3D.h | 8 ++++----
GUI/View/SampleDesigner/RealSpacePanel.cpp | 2 +-
.../Plot1DCanvas.cpp | 4 ++--
.../Plot1DCanvas.h | 8 ++++----
.../SpecularDataCanvas.cpp | 6 +++---
.../SpecularDataCanvas.h | 8 ++++----
.../SpecularDataImportWidget.cpp | 4 ++--
.../SpecularDataImportWidget.h | 8 ++++----
.../SpecularDataImportWidget.ui | 2 +-
.../SpecularDataWidget.cpp | 6 +++---
.../SpecularDataWidget.h | 8 ++++----
.../SpecularPlot.cpp | 4 ++--
.../SpecularPlot.h | 8 ++++----
.../SpecularPlotCanvas.cpp | 6 +++---
.../SpecularPlotCanvas.h | 8 ++++----
GUI/View/Toplevel/TestView.cpp | 6 +++---
Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp | 10 +++++-----
87 files changed, 309 insertions(+), 309 deletions(-)
rename GUI/View/{FitWidgets => Fit}/FitActivityPanel.cpp (88%)
rename GUI/View/{FitWidgets => Fit}/FitActivityPanel.h (87%)
rename GUI/View/{FitWidgets => Fit}/FitLog.cpp (91%)
rename GUI/View/{FitWidgets => Fit}/FitLog.h (86%)
rename GUI/View/{FitWidgets => Fit}/FitObjectiveBuilder.cpp (96%)
rename GUI/View/{FitWidgets => Fit}/FitObjectiveBuilder.h (87%)
rename GUI/View/{FitWidgets => Fit}/FitParameterWidget.cpp (98%)
rename GUI/View/{FitWidgets => Fit}/FitParameterWidget.h (92%)
rename GUI/View/{FitWidgets => Fit}/FitProgressInfo.cpp (85%)
rename GUI/View/{FitWidgets => Fit}/FitProgressInfo.h (85%)
rename GUI/View/{FitWidgets => Fit}/FitResultsWidget.cpp (86%)
rename GUI/View/{FitWidgets => Fit}/FitResultsWidget.h (77%)
rename GUI/View/{FitWidgets => Fit}/FitSessionController.cpp (95%)
rename GUI/View/{FitWidgets => Fit}/FitSessionController.h (88%)
rename GUI/View/{FitWidgets => Fit}/FitSessionManager.cpp (90%)
rename GUI/View/{FitWidgets => Fit}/FitSessionManager.h (84%)
rename GUI/View/{FitWidgets => Fit}/FitSessionWidget.cpp (89%)
rename GUI/View/{FitWidgets => Fit}/FitSessionWidget.h (85%)
rename GUI/View/{FitWidgets => Fit}/FitWorker.cpp (86%)
rename GUI/View/{FitWidgets => Fit}/FitWorker.h (83%)
rename GUI/View/{FitWidgets => Fit}/FitWorkerLauncher.cpp (93%)
rename GUI/View/{FitWidgets => Fit}/FitWorkerLauncher.h (85%)
rename GUI/View/{FitWidgets => Fit}/GUIFitObserver.cpp (96%)
rename GUI/View/{FitWidgets => Fit}/GUIFitObserver.h (84%)
rename GUI/View/{FitWidgets => Fit}/JobMessagePanel.cpp (96%)
rename GUI/View/{FitWidgets => Fit}/JobMessagePanel.h (79%)
rename GUI/View/{FitWidgets => Fit}/JobRealTimeToolBar.cpp (91%)
rename GUI/View/{FitWidgets => Fit}/JobRealTimeToolBar.h (79%)
rename GUI/View/{FitWidgets => Fit}/JobRealTimeWidget.cpp (92%)
rename GUI/View/{FitWidgets => Fit}/JobRealTimeWidget.h (84%)
rename GUI/View/{FitWidgets => Fit}/MinimizerSettingsWidget.cpp (93%)
rename GUI/View/{FitWidgets => Fit}/MinimizerSettingsWidget.h (81%)
rename GUI/View/{FitWidgets => Fit}/ParameterTuningDelegate.cpp (98%)
rename GUI/View/{FitWidgets => Fit}/ParameterTuningDelegate.h (91%)
rename GUI/View/{FitWidgets => Fit}/ParameterTuningWidget.cpp (96%)
rename GUI/View/{FitWidgets => Fit}/ParameterTuningWidget.h (90%)
rename GUI/View/{FitWidgets => Fit}/RunFitControlWidget.cpp (98%)
rename GUI/View/{FitWidgets => Fit}/RunFitControlWidget.h (88%)
rename GUI/View/{FitWidgets => Fit}/SliderSettingsWidget.cpp (96%)
rename GUI/View/{FitWidgets => Fit}/SliderSettingsWidget.h (81%)
rename GUI/View/{RealSpaceWidgets => Realspace}/IPositionBuilder.cpp (98%)
rename GUI/View/{RealSpaceWidgets => Realspace}/IPositionBuilder.h (94%)
rename GUI/View/{RealSpaceWidgets => Realspace}/Particle3DContainer.cpp (96%)
rename GUI/View/{RealSpaceWidgets => Realspace}/Particle3DContainer.h (89%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpace2DParacrystalUtils.cpp (98%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpace2DParacrystalUtils.h (73%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceActions.cpp (84%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceActions.h (74%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceBuilder.cpp (94%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceBuilder.h (90%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceBuilderUtils.cpp (97%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceBuilderUtils.h (93%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceCanvas.cpp (96%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceCanvas.h (92%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceMesoCrystalUtils.cpp (98%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceMesoCrystalUtils.h (79%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceModel.h (72%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpacePositionBuilder.cpp (90%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpacePositionBuilder.h (83%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceToolBar.cpp (97%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceToolBar.h (83%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceView.cpp (88%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceView.h (80%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceWidget.cpp (89%)
rename GUI/View/{RealSpaceWidgets => Realspace}/RealSpaceWidget.h (83%)
rename GUI/View/{RealSpaceWidgets => Realspace}/TransformTo3D.cpp (98%)
rename GUI/View/{RealSpaceWidgets => Realspace}/TransformTo3D.h (85%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/Plot1DCanvas.cpp (93%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/Plot1DCanvas.h (83%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularDataCanvas.cpp (95%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularDataCanvas.h (86%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularDataImportWidget.cpp (98%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularDataImportWidget.h (87%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularDataImportWidget.ui (99%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularDataWidget.cpp (92%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularDataWidget.h (80%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularPlot.cpp (98%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularPlot.h (93%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularPlotCanvas.cpp (90%)
rename GUI/View/{SpecularDataWidgets => SpecularData}/SpecularPlotCanvas.h (82%)
diff --git a/GUI/View/Compare/FitComparisonWidget1D.cpp b/GUI/View/Compare/FitComparisonWidget1D.cpp
index f7e653ff2fd..46a5974ed26 100644
--- a/GUI/View/Compare/FitComparisonWidget1D.cpp
+++ b/GUI/View/Compare/FitComparisonWidget1D.cpp
@@ -23,7 +23,7 @@
#include "GUI/View/Intensity/IntensityDataPropertyWidget.h"
#include "GUI/View/Intensity/Plot1D.h"
#include "GUI/View/Intensity/PlotStatusLabel.h"
-#include "GUI/View/SpecularDataWidgets/Plot1DCanvas.h"
+#include "GUI/View/SpecularData/Plot1DCanvas.h"
#include <QAction>
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/GUI/View/FitWidgets/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
similarity index 88%
rename from GUI/View/FitWidgets/FitActivityPanel.cpp
rename to GUI/View/Fit/FitActivityPanel.cpp
index b47af46ad91..45e65e9eeec 100644
--- a/GUI/View/FitWidgets/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitActivityPanel.cpp
+//! @file GUI/View/Fit/FitActivityPanel.cpp
//! @brief Implements class FitActivityPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,15 +12,15 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitActivityPanel.h"
+#include "GUI/View/Fit/FitActivityPanel.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/View/FitWidgets/FitSessionController.h"
-#include "GUI/View/FitWidgets/FitSessionManager.h"
-#include "GUI/View/FitWidgets/FitSessionWidget.h"
-#include "GUI/View/FitWidgets/JobRealTimeWidget.h"
-#include "GUI/View/FitWidgets/RunFitControlWidget.h"
+#include "GUI/View/Fit/FitSessionController.h"
+#include "GUI/View/Fit/FitSessionManager.h"
+#include "GUI/View/Fit/FitSessionWidget.h"
+#include "GUI/View/Fit/JobRealTimeWidget.h"
+#include "GUI/View/Fit/RunFitControlWidget.h"
#include <QLabel>
#include <QPushButton>
#include <QStackedWidget>
diff --git a/GUI/View/FitWidgets/FitActivityPanel.h b/GUI/View/Fit/FitActivityPanel.h
similarity index 87%
rename from GUI/View/FitWidgets/FitActivityPanel.h
rename to GUI/View/Fit/FitActivityPanel.h
index 8be98f2c4b5..5b34882e894 100644
--- a/GUI/View/FitWidgets/FitActivityPanel.h
+++ b/GUI/View/Fit/FitActivityPanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitActivityPanel.h
+//! @file GUI/View/Fit/FitActivityPanel.h
//! @brief Defines class FitActivityPanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITACTIVITYPANEL_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITACTIVITYPANEL_H
#include <QWidget>
@@ -58,4 +58,4 @@ private:
FitSessionManager* m_fitSessionManager;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITACTIVITYPANEL_H
diff --git a/GUI/View/FitWidgets/FitLog.cpp b/GUI/View/Fit/FitLog.cpp
similarity index 91%
rename from GUI/View/FitWidgets/FitLog.cpp
rename to GUI/View/Fit/FitLog.cpp
index 9b3cb8887b2..1b8cebf143a 100644
--- a/GUI/View/FitWidgets/FitLog.cpp
+++ b/GUI/View/Fit/FitLog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitLog.cpp
+//! @file GUI/View/Fit/FitLog.cpp
//! @brief Implements class FitLog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitLog.h"
+#include "GUI/View/Fit/FitLog.h"
FitLog::FitLog(QObject* parent) : QObject(parent) {}
diff --git a/GUI/View/FitWidgets/FitLog.h b/GUI/View/Fit/FitLog.h
similarity index 86%
rename from GUI/View/FitWidgets/FitLog.h
rename to GUI/View/Fit/FitLog.h
index ce078a6ada0..b29b06832a4 100644
--- a/GUI/View/FitWidgets/FitLog.h
+++ b/GUI/View/Fit/FitLog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitLog.h
+//! @file GUI/View/Fit/FitLog.h
//! @brief Defines class FitLog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
#include <QObject>
@@ -46,4 +46,4 @@ private:
std::vector<Message> m_messages;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
diff --git a/GUI/View/FitWidgets/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
similarity index 96%
rename from GUI/View/FitWidgets/FitObjectiveBuilder.cpp
rename to GUI/View/Fit/FitObjectiveBuilder.cpp
index 3cefe10bb16..6dae4682b0c 100644
--- a/GUI/View/FitWidgets/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitObjectiveBuilder.cpp
+//! @file GUI/View/Fit/FitObjectiveBuilder.cpp
//! @brief Implements class SimulationBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitObjectiveBuilder.h"
+#include "GUI/View/Fit/FitObjectiveBuilder.h"
#include "Core/Fitting/FitObjective.h"
#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Simulation/ISimulation.h"
@@ -27,7 +27,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
-#include "GUI/View/FitWidgets/GUIFitObserver.h"
+#include "GUI/View/Fit/GUIFitObserver.h"
FitObjectiveBuilder::FitObjectiveBuilder(JobItem* jobItem) : m_jobItem(jobItem)
{
diff --git a/GUI/View/FitWidgets/FitObjectiveBuilder.h b/GUI/View/Fit/FitObjectiveBuilder.h
similarity index 87%
rename from GUI/View/FitWidgets/FitObjectiveBuilder.h
rename to GUI/View/Fit/FitObjectiveBuilder.h
index a527c88c499..e62d663a768 100644
--- a/GUI/View/FitWidgets/FitObjectiveBuilder.h
+++ b/GUI/View/Fit/FitObjectiveBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitObjectiveBuilder.h
+//! @file GUI/View/Fit/FitObjectiveBuilder.h
//! @brief Defines class FitObjectiveBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
#include <memory>
@@ -57,4 +57,4 @@ private:
std::unique_ptr<FitObjective> m_fit_objective;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
diff --git a/GUI/View/FitWidgets/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
similarity index 98%
rename from GUI/View/FitWidgets/FitParameterWidget.cpp
rename to GUI/View/Fit/FitParameterWidget.cpp
index c0ffd707fa2..7662e1b5a97 100644
--- a/GUI/View/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitParameterWidget.cpp
+//! @file GUI/View/Fit/FitParameterWidget.cpp
//! @brief Implements class FitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitParameterWidget.h"
+#include "GUI/View/Fit/FitParameterWidget.h"
#include "GUI/Model/Fit/FitParameterHelper.h"
#include "GUI/Model/Fit/FitParameterItems.h"
#include "GUI/Model/Fit/FitParameterProxyModel.h"
@@ -22,7 +22,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
+#include "GUI/View/Fit/ParameterTuningWidget.h"
#include "GUI/View/Info/OverlayLabelController.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
diff --git a/GUI/View/FitWidgets/FitParameterWidget.h b/GUI/View/Fit/FitParameterWidget.h
similarity index 92%
rename from GUI/View/FitWidgets/FitParameterWidget.h
rename to GUI/View/Fit/FitParameterWidget.h
index d1f54346b16..ae806b527b7 100644
--- a/GUI/View/FitWidgets/FitParameterWidget.h
+++ b/GUI/View/Fit/FitParameterWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitParameterWidget.h
+//! @file GUI/View/Fit/FitParameterWidget.h
//! @brief Defines class FitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
#include "GUI/View/Common/SessionItemWidget.h"
#include <memory>
@@ -95,4 +95,4 @@ private:
OverlayLabelController* m_infoLabel;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
diff --git a/GUI/View/FitWidgets/FitProgressInfo.cpp b/GUI/View/Fit/FitProgressInfo.cpp
similarity index 85%
rename from GUI/View/FitWidgets/FitProgressInfo.cpp
rename to GUI/View/Fit/FitProgressInfo.cpp
index 4118256fee6..390d7c525d0 100644
--- a/GUI/View/FitWidgets/FitProgressInfo.cpp
+++ b/GUI/View/Fit/FitProgressInfo.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitProgressInfo.cpp
+//! @file GUI/View/Fit/FitProgressInfo.cpp
//! @brief Implements class FitProgressInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,6 +12,6 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitProgressInfo.h"
+#include "GUI/View/Fit/FitProgressInfo.h"
FitProgressInfo::FitProgressInfo() : m_chi2(0.0), m_iteration_count(0) {}
diff --git a/GUI/View/FitWidgets/FitProgressInfo.h b/GUI/View/Fit/FitProgressInfo.h
similarity index 85%
rename from GUI/View/FitWidgets/FitProgressInfo.h
rename to GUI/View/Fit/FitProgressInfo.h
index c74c0199b76..af2d0ab1f82 100644
--- a/GUI/View/FitWidgets/FitProgressInfo.h
+++ b/GUI/View/Fit/FitProgressInfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitProgressInfo.h
+//! @file GUI/View/Fit/FitProgressInfo.h
//! @brief Defines class FitProgressInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
#include <string>
#include <vector>
@@ -41,4 +41,4 @@ private:
std::vector<double> m_sim_values;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
diff --git a/GUI/View/FitWidgets/FitResultsWidget.cpp b/GUI/View/Fit/FitResultsWidget.cpp
similarity index 86%
rename from GUI/View/FitWidgets/FitResultsWidget.cpp
rename to GUI/View/Fit/FitResultsWidget.cpp
index dfd8ddea138..b6b47596d16 100644
--- a/GUI/View/FitWidgets/FitResultsWidget.cpp
+++ b/GUI/View/Fit/FitResultsWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitResultsWidget.cpp
+//! @file GUI/View/Fit/FitResultsWidget.cpp
//! @brief Implements class FitResultsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitResultsWidget.h"
+#include "GUI/View/Fit/FitResultsWidget.h"
FitResultsWidget::FitResultsWidget(QWidget* parent) : QWidget(parent)
{
diff --git a/GUI/View/FitWidgets/FitResultsWidget.h b/GUI/View/Fit/FitResultsWidget.h
similarity index 77%
rename from GUI/View/FitWidgets/FitResultsWidget.h
rename to GUI/View/Fit/FitResultsWidget.h
index 68a436470d7..921a4600c8b 100644
--- a/GUI/View/FitWidgets/FitResultsWidget.h
+++ b/GUI/View/Fit/FitResultsWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitResultsWidget.h
+//! @file GUI/View/Fit/FitResultsWidget.h
//! @brief Defines class FitResultsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITRESULTSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITRESULTSWIDGET_H
#include <QWidget>
@@ -26,4 +26,4 @@ public:
FitResultsWidget(QWidget* parent = 0);
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITRESULTSWIDGET_H
diff --git a/GUI/View/FitWidgets/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
similarity index 95%
rename from GUI/View/FitWidgets/FitSessionController.cpp
rename to GUI/View/Fit/FitSessionController.cpp
index fcb56d5ce2f..c9c2a5e1017 100644
--- a/GUI/View/FitWidgets/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitSessionController.cpp
+//! @file GUI/View/Fit/FitSessionController.cpp
//! @brief Implements class FitSessionController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,17 +12,17 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitSessionController.h"
+#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Fit/FitParameterItems.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
-#include "GUI/View/FitWidgets/FitLog.h"
-#include "GUI/View/FitWidgets/FitObjectiveBuilder.h"
-#include "GUI/View/FitWidgets/FitWorkerLauncher.h"
-#include "GUI/View/FitWidgets/GUIFitObserver.h"
+#include "GUI/View/Fit/FitLog.h"
+#include "GUI/View/Fit/FitObjectiveBuilder.h"
+#include "GUI/View/Fit/FitWorkerLauncher.h"
+#include "GUI/View/Fit/GUIFitObserver.h"
namespace {
const bool use_fit_objective = true;
diff --git a/GUI/View/FitWidgets/FitSessionController.h b/GUI/View/Fit/FitSessionController.h
similarity index 88%
rename from GUI/View/FitWidgets/FitSessionController.h
rename to GUI/View/Fit/FitSessionController.h
index 0b77c066b2a..97930a3a176 100644
--- a/GUI/View/FitWidgets/FitSessionController.h
+++ b/GUI/View/Fit/FitSessionController.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitSessionController.h
+//! @file GUI/View/Fit/FitSessionController.h
//! @brief Defines class FitSessionController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITSESSIONCONTROLLER_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITSESSIONCONTROLLER_H
#include <QObject>
#include <memory>
@@ -65,4 +65,4 @@ private:
bool m_block_progress_update;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITSESSIONCONTROLLER_H
diff --git a/GUI/View/FitWidgets/FitSessionManager.cpp b/GUI/View/Fit/FitSessionManager.cpp
similarity index 90%
rename from GUI/View/FitWidgets/FitSessionManager.cpp
rename to GUI/View/Fit/FitSessionManager.cpp
index 125e8e7b1e9..cd2c19ccf58 100644
--- a/GUI/View/FitWidgets/FitSessionManager.cpp
+++ b/GUI/View/Fit/FitSessionManager.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitSessionManager.cpp
+//! @file GUI/View/Fit/FitSessionManager.cpp
//! @brief Implements class FitSessionManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitSessionManager.h"
+#include "GUI/View/Fit/FitSessionManager.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/Error.h"
-#include "GUI/View/FitWidgets/FitLog.h"
-#include "GUI/View/FitWidgets/FitSessionController.h"
+#include "GUI/View/Fit/FitLog.h"
+#include "GUI/View/Fit/FitSessionController.h"
FitSessionManager::FitSessionManager(QObject* parent) : QObject(parent), m_activeController(nullptr)
{
diff --git a/GUI/View/FitWidgets/FitSessionManager.h b/GUI/View/Fit/FitSessionManager.h
similarity index 84%
rename from GUI/View/FitWidgets/FitSessionManager.h
rename to GUI/View/Fit/FitSessionManager.h
index 564181b25f9..a87c7a27e71 100644
--- a/GUI/View/FitWidgets/FitSessionManager.h
+++ b/GUI/View/Fit/FitSessionManager.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitSessionManager.h
+//! @file GUI/View/Fit/FitSessionManager.h
//! @brief Defines class FitSessionManager
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITSESSIONMANAGER_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITSESSIONMANAGER_H
#include <QMap>
#include <QObject>
@@ -41,4 +41,4 @@ private:
QMap<SessionItem*, FitSessionController*> m_item_to_controller;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITSESSIONMANAGER_H
diff --git a/GUI/View/FitWidgets/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
similarity index 89%
rename from GUI/View/FitWidgets/FitSessionWidget.cpp
rename to GUI/View/Fit/FitSessionWidget.cpp
index 853aa3e9a41..e68f3691484 100644
--- a/GUI/View/FitWidgets/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitSessionWidget.cpp
+//! @file GUI/View/Fit/FitSessionWidget.cpp
//! @brief Implements class FitSessionWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitSessionWidget.h"
+#include "GUI/View/Fit/FitSessionWidget.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/View/FitWidgets/FitParameterWidget.h"
-#include "GUI/View/FitWidgets/FitResultsWidget.h"
-#include "GUI/View/FitWidgets/FitSessionController.h"
-#include "GUI/View/FitWidgets/MinimizerSettingsWidget.h"
-#include "GUI/View/FitWidgets/RunFitControlWidget.h"
+#include "GUI/View/Fit/FitParameterWidget.h"
+#include "GUI/View/Fit/FitResultsWidget.h"
+#include "GUI/View/Fit/FitSessionController.h"
+#include "GUI/View/Fit/MinimizerSettingsWidget.h"
+#include "GUI/View/Fit/RunFitControlWidget.h"
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/View/FitWidgets/FitSessionWidget.h b/GUI/View/Fit/FitSessionWidget.h
similarity index 85%
rename from GUI/View/FitWidgets/FitSessionWidget.h
rename to GUI/View/Fit/FitSessionWidget.h
index 792ac69db52..c2760f08f36 100644
--- a/GUI/View/FitWidgets/FitSessionWidget.h
+++ b/GUI/View/Fit/FitSessionWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitSessionWidget.h
+//! @file GUI/View/Fit/FitSessionWidget.h
//! @brief Defines class FitSessionWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITSESSIONWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITSESSIONWIDGET_H
-#include "GUI/View/FitWidgets/FitProgressInfo.h"
+#include "GUI/View/Fit/FitProgressInfo.h"
#include <QWidget>
class QTabWidget;
@@ -55,4 +55,4 @@ private:
FitSessionController* m_sessionController;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITSESSIONWIDGET_H
diff --git a/GUI/View/FitWidgets/FitWorker.cpp b/GUI/View/Fit/FitWorker.cpp
similarity index 86%
rename from GUI/View/FitWidgets/FitWorker.cpp
rename to GUI/View/Fit/FitWorker.cpp
index d73c9fca362..9c98526fd42 100644
--- a/GUI/View/FitWidgets/FitWorker.cpp
+++ b/GUI/View/Fit/FitWorker.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitWorker.cpp
+//! @file GUI/View/Fit/FitWorker.cpp
//! @brief Implements class FitWorker
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitWorker.h"
-#include "GUI/View/FitWidgets/FitObjectiveBuilder.h"
+#include "GUI/View/Fit/FitWorker.h"
+#include "GUI/View/Fit/FitObjectiveBuilder.h"
#include <QDateTime>
void FitWorker::startFit()
diff --git a/GUI/View/FitWidgets/FitWorker.h b/GUI/View/Fit/FitWorker.h
similarity index 83%
rename from GUI/View/FitWidgets/FitWorker.h
rename to GUI/View/Fit/FitWorker.h
index e354e7a1499..d774bd75b3f 100644
--- a/GUI/View/FitWidgets/FitWorker.h
+++ b/GUI/View/Fit/FitWorker.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitWorker.h
+//! @file GUI/View/Fit/FitWorker.h
//! @brief Implements class FitWorker
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKER_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKER_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
#include <QObject>
#include <memory>
@@ -44,4 +44,4 @@ private:
std::shared_ptr<FitObjectiveBuilder> m_fit_objective;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKER_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
diff --git a/GUI/View/FitWidgets/FitWorkerLauncher.cpp b/GUI/View/Fit/FitWorkerLauncher.cpp
similarity index 93%
rename from GUI/View/FitWidgets/FitWorkerLauncher.cpp
rename to GUI/View/Fit/FitWorkerLauncher.cpp
index ce63f868c86..ad43927e344 100644
--- a/GUI/View/FitWidgets/FitWorkerLauncher.cpp
+++ b/GUI/View/Fit/FitWorkerLauncher.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitWorkerLauncher.cpp
+//! @file GUI/View/Fit/FitWorkerLauncher.cpp
//! @brief Implements class FitWorkerLauncher
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/FitWorkerLauncher.h"
-#include "GUI/View/FitWidgets/FitWorker.h"
+#include "GUI/View/Fit/FitWorkerLauncher.h"
+#include "GUI/View/Fit/FitWorker.h"
#include <QThread>
FitWorkerLauncher::FitWorkerLauncher(QObject* parent) : QObject(parent), m_is_fit_running(false) {}
diff --git a/GUI/View/FitWidgets/FitWorkerLauncher.h b/GUI/View/Fit/FitWorkerLauncher.h
similarity index 85%
rename from GUI/View/FitWidgets/FitWorkerLauncher.h
rename to GUI/View/Fit/FitWorkerLauncher.h
index 27b32b32c15..1a98237955c 100644
--- a/GUI/View/FitWidgets/FitWorkerLauncher.h
+++ b/GUI/View/Fit/FitWorkerLauncher.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/FitWorkerLauncher.h
+//! @file GUI/View/Fit/FitWorkerLauncher.h
//! @brief Implements class FitWorkerLauncher
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKERLAUNCHER_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKERLAUNCHER_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
+#define BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
#include <QDateTime>
#include <QObject>
@@ -56,4 +56,4 @@ private:
QDateTime m_fit_end;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITWORKERLAUNCHER_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
diff --git a/GUI/View/FitWidgets/GUIFitObserver.cpp b/GUI/View/Fit/GUIFitObserver.cpp
similarity index 96%
rename from GUI/View/FitWidgets/GUIFitObserver.cpp
rename to GUI/View/Fit/GUIFitObserver.cpp
index 6aeb221adaf..55849651b79 100644
--- a/GUI/View/FitWidgets/GUIFitObserver.cpp
+++ b/GUI/View/Fit/GUIFitObserver.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/GUIFitObserver.cpp
+//! @file GUI/View/Fit/GUIFitObserver.cpp
//! @brief Implements class GUIFitObserver
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/GUIFitObserver.h"
+#include "GUI/View/Fit/GUIFitObserver.h"
#include "Core/Fitting/FitObjective.h"
#include "Core/Fitting/IterationInfo.h"
#include "Core/Fitting/SimDataPair.h"
diff --git a/GUI/View/FitWidgets/GUIFitObserver.h b/GUI/View/Fit/GUIFitObserver.h
similarity index 84%
rename from GUI/View/FitWidgets/GUIFitObserver.h
rename to GUI/View/Fit/GUIFitObserver.h
index bf92d41acde..ecf7acc911d 100644
--- a/GUI/View/FitWidgets/GUIFitObserver.h
+++ b/GUI/View/Fit/GUIFitObserver.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/GUIFitObserver.h
+//! @file GUI/View/Fit/GUIFitObserver.h
//! @brief Implements class GUIFitObserver
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_GUIFITOBSERVER_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_GUIFITOBSERVER_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
+#define BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
-#include "GUI/View/FitWidgets/FitProgressInfo.h"
+#include "GUI/View/Fit/FitProgressInfo.h"
#include <QObject>
#include <condition_variable>
#include <mutex>
@@ -57,4 +57,4 @@ private:
FitProgressInfo m_iteration_info;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_GUIFITOBSERVER_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
diff --git a/GUI/View/FitWidgets/JobMessagePanel.cpp b/GUI/View/Fit/JobMessagePanel.cpp
similarity index 96%
rename from GUI/View/FitWidgets/JobMessagePanel.cpp
rename to GUI/View/Fit/JobMessagePanel.cpp
index 9c0522df589..7d2f5c9a069 100644
--- a/GUI/View/FitWidgets/JobMessagePanel.cpp
+++ b/GUI/View/Fit/JobMessagePanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/JobMessagePanel.cpp
+//! @file GUI/View/Fit/JobMessagePanel.cpp
//! @brief Implements class JobMessagePanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/JobMessagePanel.h"
+#include "GUI/View/Fit/JobMessagePanel.h"
#include "GUI/Util/mainwindow_constants.h"
#include <QScrollBar>
#include <QStackedWidget>
diff --git a/GUI/View/FitWidgets/JobMessagePanel.h b/GUI/View/Fit/JobMessagePanel.h
similarity index 79%
rename from GUI/View/FitWidgets/JobMessagePanel.h
rename to GUI/View/Fit/JobMessagePanel.h
index 00cc118244b..28f1c8b47d6 100644
--- a/GUI/View/FitWidgets/JobMessagePanel.h
+++ b/GUI/View/Fit/JobMessagePanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/JobMessagePanel.h
+//! @file GUI/View/Fit/JobMessagePanel.h
//! @brief Defines class JobMessagePanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBMESSAGEPANEL_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBMESSAGEPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
+#define BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
#include "GUI/View/Common/InfoPanel.h"
-#include "GUI/View/FitWidgets/FitLog.h"
+#include "GUI/View/Fit/FitLog.h"
#include <QColor>
class QTextEdit;
@@ -39,4 +39,4 @@ private:
QTextEdit* m_plainLog;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBMESSAGEPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
diff --git a/GUI/View/FitWidgets/JobRealTimeToolBar.cpp b/GUI/View/Fit/JobRealTimeToolBar.cpp
similarity index 91%
rename from GUI/View/FitWidgets/JobRealTimeToolBar.cpp
rename to GUI/View/Fit/JobRealTimeToolBar.cpp
index 86422bb7bcf..9880d1786e6 100644
--- a/GUI/View/FitWidgets/JobRealTimeToolBar.cpp
+++ b/GUI/View/Fit/JobRealTimeToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/JobRealTimeToolBar.cpp
+//! @file GUI/View/Fit/JobRealTimeToolBar.cpp
//! @brief Implements class JobRealTimeToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/JobRealTimeToolBar.h"
+#include "GUI/View/Fit/JobRealTimeToolBar.h"
#include <QToolButton>
JobRealTimeToolBar::JobRealTimeToolBar(QWidget* parent)
diff --git a/GUI/View/FitWidgets/JobRealTimeToolBar.h b/GUI/View/Fit/JobRealTimeToolBar.h
similarity index 79%
rename from GUI/View/FitWidgets/JobRealTimeToolBar.h
rename to GUI/View/Fit/JobRealTimeToolBar.h
index 4fc8cd81d4f..194b42ec354 100644
--- a/GUI/View/FitWidgets/JobRealTimeToolBar.h
+++ b/GUI/View/Fit/JobRealTimeToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/JobRealTimeToolBar.h
+//! @file GUI/View/Fit/JobRealTimeToolBar.h
//! @brief Defines class JobRealTimeToolBar
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMETOOLBAR_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMETOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMETOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMETOOLBAR_H
#include "GUI/View/Common/StyledToolBar.h"
@@ -34,4 +34,4 @@ private:
QToolButton* m_resetParametersButton;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMETOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMETOOLBAR_H
diff --git a/GUI/View/FitWidgets/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp
similarity index 92%
rename from GUI/View/FitWidgets/JobRealTimeWidget.cpp
rename to GUI/View/Fit/JobRealTimeWidget.cpp
index 4116a582272..fab732a7d0b 100644
--- a/GUI/View/FitWidgets/JobRealTimeWidget.cpp
+++ b/GUI/View/Fit/JobRealTimeWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/JobRealTimeWidget.cpp
+//! @file GUI/View/Fit/JobRealTimeWidget.cpp
//! @brief Implements class JobRealTimeWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/JobRealTimeWidget.h"
+#include "GUI/View/Fit/JobRealTimeWidget.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Util/mainwindow_constants.h"
-#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
+#include "GUI/View/Fit/ParameterTuningWidget.h"
#include <QVBoxLayout>
namespace {
diff --git a/GUI/View/FitWidgets/JobRealTimeWidget.h b/GUI/View/Fit/JobRealTimeWidget.h
similarity index 84%
rename from GUI/View/FitWidgets/JobRealTimeWidget.h
rename to GUI/View/Fit/JobRealTimeWidget.h
index 98c2d288fef..b2a9d313da3 100644
--- a/GUI/View/FitWidgets/JobRealTimeWidget.h
+++ b/GUI/View/Fit/JobRealTimeWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/JobRealTimeWidget.h
+//! @file GUI/View/Fit/JobRealTimeWidget.h
//! @brief Defines class JobRealTimeWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMEWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMEWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMEWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMEWIDGET_H
#include "GUI/View/Common/ItemStackPresenter.h"
@@ -43,4 +43,4 @@ private:
ItemStackPresenter<ParameterTuningWidget>* m_stackedWidget;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_JOBREALTIMEWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_JOBREALTIMEWIDGET_H
diff --git a/GUI/View/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp
similarity index 93%
rename from GUI/View/FitWidgets/MinimizerSettingsWidget.cpp
rename to GUI/View/Fit/MinimizerSettingsWidget.cpp
index b863d501910..4f41f0d29db 100644
--- a/GUI/View/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/MinimizerSettingsWidget.cpp
+//! @file GUI/View/Fit/MinimizerSettingsWidget.cpp
//! @brief Implements class MinimizerSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/MinimizerSettingsWidget.h"
+#include "GUI/View/Fit/MinimizerSettingsWidget.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Job/JobItem.h"
diff --git a/GUI/View/FitWidgets/MinimizerSettingsWidget.h b/GUI/View/Fit/MinimizerSettingsWidget.h
similarity index 81%
rename from GUI/View/FitWidgets/MinimizerSettingsWidget.h
rename to GUI/View/Fit/MinimizerSettingsWidget.h
index 9c5c5d77f0b..f34c195853f 100644
--- a/GUI/View/FitWidgets/MinimizerSettingsWidget.h
+++ b/GUI/View/Fit/MinimizerSettingsWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/MinimizerSettingsWidget.h
+//! @file GUI/View/Fit/MinimizerSettingsWidget.h
//! @brief Defines class MinimizerSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
#include <QWidget>
@@ -41,4 +41,4 @@ private:
ComponentEditor* m_componentEditor;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_MINIMIZERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
diff --git a/GUI/View/FitWidgets/ParameterTuningDelegate.cpp b/GUI/View/Fit/ParameterTuningDelegate.cpp
similarity index 98%
rename from GUI/View/FitWidgets/ParameterTuningDelegate.cpp
rename to GUI/View/Fit/ParameterTuningDelegate.cpp
index 1c9533713e6..cb69526ef82 100644
--- a/GUI/View/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/View/Fit/ParameterTuningDelegate.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/ParameterTuningDelegate.cpp
+//! @file GUI/View/Fit/ParameterTuningDelegate.cpp
//! @brief Implements class ParameterTuningDelegate
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/ParameterTuningDelegate.h"
+#include "GUI/View/Fit/ParameterTuningDelegate.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Fit/ParameterTuningModel.h"
#include "GUI/Model/Job/ModelPath.h"
diff --git a/GUI/View/FitWidgets/ParameterTuningDelegate.h b/GUI/View/Fit/ParameterTuningDelegate.h
similarity index 91%
rename from GUI/View/FitWidgets/ParameterTuningDelegate.h
rename to GUI/View/Fit/ParameterTuningDelegate.h
index 84f2f596c5e..692f51f455a 100644
--- a/GUI/View/FitWidgets/ParameterTuningDelegate.h
+++ b/GUI/View/Fit/ParameterTuningDelegate.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/ParameterTuningDelegate.h
+//! @file GUI/View/Fit/ParameterTuningDelegate.h
//! @brief Defines class ParameterTuningDelegate
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
#include "Fit/Param/RealLimits.h"
#include <QItemDelegate>
@@ -86,4 +86,4 @@ private:
bool m_isReadOnly;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
diff --git a/GUI/View/FitWidgets/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp
similarity index 96%
rename from GUI/View/FitWidgets/ParameterTuningWidget.cpp
rename to GUI/View/Fit/ParameterTuningWidget.cpp
index 0ebc5d424c5..f9c08bae0ba 100644
--- a/GUI/View/FitWidgets/ParameterTuningWidget.cpp
+++ b/GUI/View/Fit/ParameterTuningWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/ParameterTuningWidget.cpp
+//! @file GUI/View/Fit/ParameterTuningWidget.cpp
//! @brief Implements class ParameterTuningWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,16 +12,16 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
+#include "GUI/View/Fit/ParameterTuningWidget.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Fit/ParameterTuningModel.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Util/Error.h"
-#include "GUI/View/FitWidgets/JobRealTimeToolBar.h"
-#include "GUI/View/FitWidgets/ParameterTuningDelegate.h"
-#include "GUI/View/FitWidgets/SliderSettingsWidget.h"
+#include "GUI/View/Fit/JobRealTimeToolBar.h"
+#include "GUI/View/Fit/ParameterTuningDelegate.h"
+#include "GUI/View/Fit/SliderSettingsWidget.h"
#include "GUI/View/Info/CautionSign.h"
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/View/FitWidgets/ParameterTuningWidget.h b/GUI/View/Fit/ParameterTuningWidget.h
similarity index 90%
rename from GUI/View/FitWidgets/ParameterTuningWidget.h
rename to GUI/View/Fit/ParameterTuningWidget.h
index 999bfa89b8b..a054a656d56 100644
--- a/GUI/View/FitWidgets/ParameterTuningWidget.h
+++ b/GUI/View/Fit/ParameterTuningWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/ParameterTuningWidget.h
+//! @file GUI/View/Fit/ParameterTuningWidget.h
//! @brief Defines class ParameterTuningWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
#include "GUI/View/Common/SessionItemWidget.h"
@@ -77,4 +77,4 @@ private:
CautionSign* m_cautionSign;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_PARAMETERTUNINGWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
diff --git a/GUI/View/FitWidgets/RunFitControlWidget.cpp b/GUI/View/Fit/RunFitControlWidget.cpp
similarity index 98%
rename from GUI/View/FitWidgets/RunFitControlWidget.cpp
rename to GUI/View/Fit/RunFitControlWidget.cpp
index 6b65619b5a4..06ff242acfb 100644
--- a/GUI/View/FitWidgets/RunFitControlWidget.cpp
+++ b/GUI/View/Fit/RunFitControlWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/RunFitControlWidget.cpp
+//! @file GUI/View/Fit/RunFitControlWidget.cpp
//! @brief Implements class RunFitControlWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/RunFitControlWidget.h"
+#include "GUI/View/Fit/RunFitControlWidget.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/mainwindow_constants.h"
diff --git a/GUI/View/FitWidgets/RunFitControlWidget.h b/GUI/View/Fit/RunFitControlWidget.h
similarity index 88%
rename from GUI/View/FitWidgets/RunFitControlWidget.h
rename to GUI/View/Fit/RunFitControlWidget.h
index 1fef84cfabf..6e2e94af923 100644
--- a/GUI/View/FitWidgets/RunFitControlWidget.h
+++ b/GUI/View/Fit/RunFitControlWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/RunFitControlWidget.h
+//! @file GUI/View/Fit/RunFitControlWidget.h
//! @brief Defines class RunFitControlWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_RUNFITCONTROLWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_RUNFITCONTROLWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
#include "GUI/View/Common/SessionItemWidget.h"
#include <QWidget>
@@ -67,4 +67,4 @@ private:
CautionSign* m_cautionSign;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_RUNFITCONTROLWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
diff --git a/GUI/View/FitWidgets/SliderSettingsWidget.cpp b/GUI/View/Fit/SliderSettingsWidget.cpp
similarity index 96%
rename from GUI/View/FitWidgets/SliderSettingsWidget.cpp
rename to GUI/View/Fit/SliderSettingsWidget.cpp
index 93ef6aeef03..c55254658b2 100644
--- a/GUI/View/FitWidgets/SliderSettingsWidget.cpp
+++ b/GUI/View/Fit/SliderSettingsWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/SliderSettingsWidget.cpp
+//! @file GUI/View/Fit/SliderSettingsWidget.cpp
//! @brief Implements class SliderSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitWidgets/SliderSettingsWidget.h"
+#include "GUI/View/Fit/SliderSettingsWidget.h"
#include <QCheckBox>
#include <QGroupBox>
#include <QHBoxLayout>
diff --git a/GUI/View/FitWidgets/SliderSettingsWidget.h b/GUI/View/Fit/SliderSettingsWidget.h
similarity index 81%
rename from GUI/View/FitWidgets/SliderSettingsWidget.h
rename to GUI/View/Fit/SliderSettingsWidget.h
index 009ea18864e..fab3172ab68 100644
--- a/GUI/View/FitWidgets/SliderSettingsWidget.h
+++ b/GUI/View/Fit/SliderSettingsWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitWidgets/SliderSettingsWidget.h
+//! @file GUI/View/Fit/SliderSettingsWidget.h
//! @brief Defines class SliderSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_SLIDERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FITWIDGETS_SLIDERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
#include <QWidget>
@@ -42,4 +42,4 @@ private:
QCheckBox* m_lockzCheckBox;
};
-#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_SLIDERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
diff --git a/GUI/View/Import/RealDataPresenter.cpp b/GUI/View/Import/RealDataPresenter.cpp
index 61c31dfd481..e527b9c44e0 100644
--- a/GUI/View/Import/RealDataPresenter.cpp
+++ b/GUI/View/Import/RealDataPresenter.cpp
@@ -18,8 +18,8 @@
#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/View/Intensity/IntensityDataWidget.h"
#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
-#include "GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h"
-#include "GUI/View/SpecularDataWidgets/SpecularDataWidget.h"
+#include "GUI/View/SpecularData/SpecularDataImportWidget.h"
+#include "GUI/View/SpecularData/SpecularDataWidget.h"
#include <QAction>
RealDataPresenter::RealDataPresenter(QWidget* parent) : ItemComboWidget(parent)
diff --git a/GUI/View/Job/JobResultsPresenter.cpp b/GUI/View/Job/JobResultsPresenter.cpp
index 51f8803fbb2..adb1cd53394 100644
--- a/GUI/View/Job/JobResultsPresenter.cpp
+++ b/GUI/View/Job/JobResultsPresenter.cpp
@@ -20,7 +20,7 @@
#include "GUI/View/Intensity/IntensityDataWidget.h"
#include "GUI/View/Job/JobViewActivities.h"
#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
-#include "GUI/View/SpecularDataWidgets/SpecularDataWidget.h"
+#include "GUI/View/SpecularData/SpecularDataWidget.h"
JobResultsPresenter::JobResultsPresenter(QWidget* parent) : ItemComboWidget(parent)
{
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index 588d0f92a39..aef625d1dc6 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -16,9 +16,9 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/View/Common/DocksController.h"
-#include "GUI/View/FitWidgets/FitActivityPanel.h"
-#include "GUI/View/FitWidgets/JobMessagePanel.h"
-#include "GUI/View/FitWidgets/JobRealTimeWidget.h"
+#include "GUI/View/Fit/FitActivityPanel.h"
+#include "GUI/View/Fit/JobMessagePanel.h"
+#include "GUI/View/Fit/JobRealTimeWidget.h"
#include "GUI/View/Job/JobProgressAssistant.h"
#include "GUI/View/Job/JobResultsPresenter.h"
#include "GUI/View/Job/JobSelectorWidget.h"
diff --git a/GUI/View/RealSpaceWidgets/IPositionBuilder.cpp b/GUI/View/Realspace/IPositionBuilder.cpp
similarity index 98%
rename from GUI/View/RealSpaceWidgets/IPositionBuilder.cpp
rename to GUI/View/Realspace/IPositionBuilder.cpp
index e1d7ad9595e..488f1a472c2 100644
--- a/GUI/View/RealSpaceWidgets/IPositionBuilder.cpp
+++ b/GUI/View/Realspace/IPositionBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/IPositionBuilder.cpp
+//! @file GUI/View/Realspace/IPositionBuilder.cpp
//! @brief Implements subclasses of IPositionBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/IPositionBuilder.h"
-#include "GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h"
+#include "GUI/View/Realspace/IPositionBuilder.h"
+#include "GUI/View/Realspace/RealSpace2DParacrystalUtils.h"
#include "Sample/Aggregate/Interferences.h"
#include <cmath>
#include <random>
diff --git a/GUI/View/RealSpaceWidgets/IPositionBuilder.h b/GUI/View/Realspace/IPositionBuilder.h
similarity index 94%
rename from GUI/View/RealSpaceWidgets/IPositionBuilder.h
rename to GUI/View/Realspace/IPositionBuilder.h
index ac88c68c7ad..601ce5778d0 100644
--- a/GUI/View/RealSpaceWidgets/IPositionBuilder.h
+++ b/GUI/View/Realspace/IPositionBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/IPositionBuilder.h
+//! @file GUI/View/Realspace/IPositionBuilder.h
//! @brief Declares interface IPositionBuilder and subclasses
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_IPOSITIONBUILDER_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_IPOSITIONBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_IPOSITIONBUILDER_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_IPOSITIONBUILDER_H
#include <memory>
#include <vector>
@@ -123,4 +123,4 @@ private:
std::unique_ptr<InterferenceRadialParaCrystal> m_iff;
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_IPOSITIONBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_IPOSITIONBUILDER_H
diff --git a/GUI/View/RealSpaceWidgets/Particle3DContainer.cpp b/GUI/View/Realspace/Particle3DContainer.cpp
similarity index 96%
rename from GUI/View/RealSpaceWidgets/Particle3DContainer.cpp
rename to GUI/View/Realspace/Particle3DContainer.cpp
index 3a2922e911f..863fd8699d3 100644
--- a/GUI/View/RealSpaceWidgets/Particle3DContainer.cpp
+++ b/GUI/View/Realspace/Particle3DContainer.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/Particle3DContainer.cpp
+//! @file GUI/View/Realspace/Particle3DContainer.cpp
//! @brief Implements namespace GUI::View::TransformTo3D
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/Particle3DContainer.h"
+#include "GUI/View/Realspace/Particle3DContainer.h"
#include "GUI/ba3d/model/particles.h"
// copy constructor
diff --git a/GUI/View/RealSpaceWidgets/Particle3DContainer.h b/GUI/View/Realspace/Particle3DContainer.h
similarity index 89%
rename from GUI/View/RealSpaceWidgets/Particle3DContainer.h
rename to GUI/View/Realspace/Particle3DContainer.h
index 8226c38f42b..30ab5f49f73 100644
--- a/GUI/View/RealSpaceWidgets/Particle3DContainer.h
+++ b/GUI/View/Realspace/Particle3DContainer.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/Particle3DContainer.h
+//! @file GUI/View/Realspace/Particle3DContainer.h
//! @brief Implements namespace GUI::View::TransformTo3D
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_PARTICLE3DCONTAINER_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_PARTICLE3DCONTAINER_H
#include <QString>
#include <memory>
@@ -54,4 +54,4 @@ private:
std::vector<bool> m_containerParticlesBlend;
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_PARTICLE3DCONTAINER_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_PARTICLE3DCONTAINER_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp b/GUI/View/Realspace/RealSpace2DParacrystalUtils.cpp
similarity index 98%
rename from GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
rename to GUI/View/Realspace/RealSpace2DParacrystalUtils.cpp
index 8e6563dc8f9..a63352a1262 100644
--- a/GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
+++ b/GUI/View/Realspace/RealSpace2DParacrystalUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.cpp
+//! @file GUI/View/Realspace/RealSpace2DParacrystalUtils.cpp
//! @brief Defines GUI::RealSpace::BuilderUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h"
+#include "GUI/View/Realspace/RealSpace2DParacrystalUtils.h"
#include "Sample/Aggregate/Interference2DParaCrystal.h"
namespace {
diff --git a/GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h b/GUI/View/Realspace/RealSpace2DParacrystalUtils.h
similarity index 73%
rename from GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
rename to GUI/View/Realspace/RealSpace2DParacrystalUtils.h
index bd00d04d3ca..7e37f847005 100644
--- a/GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
+++ b/GUI/View/Realspace/RealSpace2DParacrystalUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpace2DParacrystalUtils.h
+//! @file GUI/View/Realspace/RealSpace2DParacrystalUtils.h
//! @brief Defines namespace GUI::RealSpace::Paracrystal2D.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACE2DPARACRYSTALUTILS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACE2DPARACRYSTALUTILS_H
#include <vector>
@@ -26,4 +26,4 @@ std::vector<std::vector<double>> latticePositions(const Interference2DParaCrysta
}
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACE2DPARACRYSTALUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACE2DPARACRYSTALUTILS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceActions.cpp b/GUI/View/Realspace/RealSpaceActions.cpp
similarity index 84%
rename from GUI/View/RealSpaceWidgets/RealSpaceActions.cpp
rename to GUI/View/Realspace/RealSpaceActions.cpp
index 02011893012..d85ae9beb33 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceActions.cpp
+++ b/GUI/View/Realspace/RealSpaceActions.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceActions.cpp
+//! @file GUI/View/Realspace/RealSpaceActions.cpp
//! @brief Implements class RealSpaceActions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,6 +12,6 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpaceActions.h"
+#include "GUI/View/Realspace/RealSpaceActions.h"
RealSpaceActions::RealSpaceActions(QObject* parent) : QObject(parent) {}
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceActions.h b/GUI/View/Realspace/RealSpaceActions.h
similarity index 74%
rename from GUI/View/RealSpaceWidgets/RealSpaceActions.h
rename to GUI/View/Realspace/RealSpaceActions.h
index b45d4d51969..bfc6e3e753b 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceActions.h
+++ b/GUI/View/Realspace/RealSpaceActions.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceActions.h
+//! @file GUI/View/Realspace/RealSpaceActions.h
//! @brief Defines class RealSpaceActions
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEACTIONS_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEACTIONS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEACTIONS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEACTIONS_H
#include <QObject>
@@ -26,4 +26,4 @@ public:
RealSpaceActions(QObject* parent = 0);
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEACTIONS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEACTIONS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceBuilder.cpp b/GUI/View/Realspace/RealSpaceBuilder.cpp
similarity index 94%
rename from GUI/View/RealSpaceWidgets/RealSpaceBuilder.cpp
rename to GUI/View/Realspace/RealSpaceBuilder.cpp
index c834d36f662..77e797f4a04 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceBuilder.cpp
+++ b/GUI/View/Realspace/RealSpaceBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceBuilder.cpp
+//! @file GUI/View/Realspace/RealSpaceBuilder.cpp
//! @brief Implements class RealSpaceBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpaceBuilder.h"
+#include "GUI/View/Realspace/RealSpaceBuilder.h"
#include "GUI/Model/Sample/InterferenceItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
@@ -22,12 +22,12 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
-#include "GUI/View/RealSpaceWidgets/Particle3DContainer.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceCanvas.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceModel.h"
-#include "GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h"
-#include "GUI/View/RealSpaceWidgets/TransformTo3D.h"
+#include "GUI/View/Realspace/Particle3DContainer.h"
+#include "GUI/View/Realspace/RealSpaceBuilderUtils.h"
+#include "GUI/View/Realspace/RealSpaceCanvas.h"
+#include "GUI/View/Realspace/RealSpaceModel.h"
+#include "GUI/View/Realspace/RealSpacePositionBuilder.h"
+#include "GUI/View/Realspace/TransformTo3D.h"
#include "Sample/Aggregate/Interferences.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceBuilder.h b/GUI/View/Realspace/RealSpaceBuilder.h
similarity index 90%
rename from GUI/View/RealSpaceWidgets/RealSpaceBuilder.h
rename to GUI/View/Realspace/RealSpaceBuilder.h
index bee59b854af..67210df3723 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceBuilder.h
+++ b/GUI/View/Realspace/RealSpaceBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceBuilder.h
+//! @file GUI/View/Realspace/RealSpaceBuilder.h
//! @brief Defines class RealSpaceBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDER_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDER_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDER_H
#include "GUI/ba3d/view/camera.h"
#include <QVector3D>
@@ -61,4 +61,4 @@ public:
const QVector3D& lattice_position = {}) const;
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDER_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.cpp b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
similarity index 97%
rename from GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
rename to GUI/View/Realspace/RealSpaceBuilderUtils.cpp
index c171e73d79f..1a9a64225a7 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+++ b/GUI/View/Realspace/RealSpaceBuilderUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.cpp
+//! @file GUI/View/Realspace/RealSpaceBuilderUtils.cpp
//! @brief Implements GUI::RealSpace::BuilderUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h"
+#include "GUI/View/Realspace/RealSpaceBuilderUtils.h"
#include "Base/Const/Units.h"
#include "GUI/Model/Material/MaterialItem.h"
#include "GUI/Model/Material/MaterialModel.h"
@@ -23,11 +23,11 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Types/DoubleDescriptor.h"
-#include "GUI/View/RealSpaceWidgets/Particle3DContainer.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceBuilder.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceCanvas.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h"
-#include "GUI/View/RealSpaceWidgets/TransformTo3D.h"
+#include "GUI/View/Realspace/Particle3DContainer.h"
+#include "GUI/View/Realspace/RealSpaceBuilder.h"
+#include "GUI/View/Realspace/RealSpaceCanvas.h"
+#include "GUI/View/Realspace/RealSpaceMesoCrystalUtils.h"
+#include "GUI/View/Realspace/TransformTo3D.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h b/GUI/View/Realspace/RealSpaceBuilderUtils.h
similarity index 93%
rename from GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h
rename to GUI/View/Realspace/RealSpaceBuilderUtils.h
index 29a5ce025d0..3939e9518ea 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h
+++ b/GUI/View/Realspace/RealSpaceBuilderUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h
+//! @file GUI/View/Realspace/RealSpaceBuilderUtils.h
//! @brief Defines GUI::RealSpace::BuilderUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDERUTILS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDERUTILS_H
#include "Sample/Scattering/Rotations.h"
#include <QVector3D>
@@ -89,4 +89,4 @@ Particle3DContainer mesoCrystal3DContainer(const MesoCrystalItem& mesoCrystalIte
} // namespace GUI::RealSpace::BuilderUtils
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEBUILDERUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEBUILDERUTILS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/View/Realspace/RealSpaceCanvas.cpp
similarity index 96%
rename from GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp
rename to GUI/View/Realspace/RealSpaceCanvas.cpp
index 1801f5fe780..3de3a16e3bc 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/View/Realspace/RealSpaceCanvas.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceCanvas.cpp
+//! @file GUI/View/Realspace/RealSpaceCanvas.cpp
//! @brief Implements class RealSpaceScene
//!
//! @homepage http://www.bornagainproject.org
@@ -12,16 +12,16 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpaceCanvas.h"
+#include "GUI/View/Realspace/RealSpaceCanvas.h"
#include "GUI/Application/GlobalSettings.h"
#include "GUI/Model/Group/FilterPropertyProxy.h"
#include "GUI/Model/Sample/SampleModel.h"
#include "GUI/Model/Session/SessionItemUtils.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/View/Info/CautionSign.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceBuilder.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceModel.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceView.h"
+#include "GUI/View/Realspace/RealSpaceBuilder.h"
+#include "GUI/View/Realspace/RealSpaceModel.h"
+#include "GUI/View/Realspace/RealSpaceView.h"
#include <QApplication>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceCanvas.h b/GUI/View/Realspace/RealSpaceCanvas.h
similarity index 92%
rename from GUI/View/RealSpaceWidgets/RealSpaceCanvas.h
rename to GUI/View/Realspace/RealSpaceCanvas.h
index 37e09b003e0..aa890b1c918 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceCanvas.h
+++ b/GUI/View/Realspace/RealSpaceCanvas.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceCanvas.h
+//! @file GUI/View/Realspace/RealSpaceCanvas.h
//! @brief Defines class RealSpaceCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACECANVAS_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACECANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACECANVAS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACECANVAS_H
#include <QItemSelectionModel>
#include <QModelIndex>
@@ -98,4 +98,4 @@ private:
void savePicture(const QPixmap& pixmap);
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACECANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACECANVAS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp b/GUI/View/Realspace/RealSpaceMesoCrystalUtils.cpp
similarity index 98%
rename from GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
rename to GUI/View/Realspace/RealSpaceMesoCrystalUtils.cpp
index 6e3e4c42385..a201dbb8d0d 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
+++ b/GUI/View/Realspace/RealSpaceMesoCrystalUtils.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.cpp
+//! @file GUI/View/Realspace/RealSpaceMesoCrystalUtils.cpp
//! @brief Defines GUI::RealSpace::BuilderUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,13 +12,13 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h"
+#include "GUI/View/Realspace/RealSpaceMesoCrystalUtils.h"
#include "Base/Const/Units.h"
#include "GUI/Model/Sample/MesoCrystalItem.h"
#include "GUI/Model/Sample/ParticleCompositionItem.h"
-#include "GUI/View/RealSpaceWidgets/Particle3DContainer.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h"
-#include "GUI/View/RealSpaceWidgets/TransformTo3D.h"
+#include "GUI/View/Realspace/Particle3DContainer.h"
+#include "GUI/View/Realspace/RealSpaceBuilderUtils.h"
+#include "GUI/View/Realspace/TransformTo3D.h"
#include "Sample/HardParticle/HardParticles.h"
#include "Sample/Particle/MesoCrystal.h"
#include "Sample/Particle/Particle.h"
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h b/GUI/View/Realspace/RealSpaceMesoCrystalUtils.h
similarity index 79%
rename from GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
rename to GUI/View/Realspace/RealSpaceMesoCrystalUtils.h
index d75c91f7681..c3f105ff8af 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
+++ b/GUI/View/Realspace/RealSpaceMesoCrystalUtils.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceMesoCrystalUtils.h
+//! @file GUI/View/Realspace/RealSpaceMesoCrystalUtils.h
//! @brief Defines GUI::RealSpace::BuilderUtils namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEMESOCRYSTALUTILS_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEMESOCRYSTALUTILS_H
#include "Sample/Scattering/Rotations.h"
#include <QVector3D>
@@ -38,4 +38,4 @@ private:
QVector3D m_origin;
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMESOCRYSTALUTILS_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEMESOCRYSTALUTILS_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceModel.h b/GUI/View/Realspace/RealSpaceModel.h
similarity index 72%
rename from GUI/View/RealSpaceWidgets/RealSpaceModel.h
rename to GUI/View/Realspace/RealSpaceModel.h
index 31b87fac904..945059095c5 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceModel.h
+++ b/GUI/View/Realspace/RealSpaceModel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceModel.h
+//! @file GUI/View/Realspace/RealSpaceModel.h
//! @brief Defines RealSpaceModel namespace
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMODEL_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMODEL_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEMODEL_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEMODEL_H
#include "GUI/ba3d/model/model.h"
class RealSpaceModel : public GUI::RealSpace::Model {
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEMODEL_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEMODEL_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.cpp b/GUI/View/Realspace/RealSpacePositionBuilder.cpp
similarity index 90%
rename from GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.cpp
rename to GUI/View/Realspace/RealSpacePositionBuilder.cpp
index 5d561489f81..888a64143b6 100644
--- a/GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.cpp
+++ b/GUI/View/Realspace/RealSpacePositionBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.cpp
+//! @file GUI/View/Realspace/RealSpacePositionBuilder.cpp
//! @brief Implements class RealSpacePositionBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h"
-#include "GUI/View/RealSpaceWidgets/IPositionBuilder.h"
+#include "GUI/View/Realspace/RealSpacePositionBuilder.h"
+#include "GUI/View/Realspace/IPositionBuilder.h"
RealSpacePositionBuilder::RealSpacePositionBuilder() : m_pos_builder{new DefaultPositionBuilder()}
{
diff --git a/GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h b/GUI/View/Realspace/RealSpacePositionBuilder.h
similarity index 83%
rename from GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h
rename to GUI/View/Realspace/RealSpacePositionBuilder.h
index 82ef9f49ca7..80d6ae91780 100644
--- a/GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h
+++ b/GUI/View/Realspace/RealSpacePositionBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpacePositionBuilder.h
+//! @file GUI/View/Realspace/RealSpacePositionBuilder.h
//! @brief Defines class RealSpacePositionBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEPOSITIONBUILDER_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEPOSITIONBUILDER_H
#include "Param/Node/INodeVisitor.h"
#include <memory>
@@ -41,4 +41,4 @@ private:
std::unique_ptr<IPositionBuilder> m_pos_builder;
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEPOSITIONBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEPOSITIONBUILDER_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceToolBar.cpp b/GUI/View/Realspace/RealSpaceToolBar.cpp
similarity index 97%
rename from GUI/View/RealSpaceWidgets/RealSpaceToolBar.cpp
rename to GUI/View/Realspace/RealSpaceToolBar.cpp
index 1d3f4e1ba78..bfc4ae0c956 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceToolBar.cpp
+++ b/GUI/View/Realspace/RealSpaceToolBar.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceToolBar.cpp
+//! @file GUI/View/Realspace/RealSpaceToolBar.cpp
//! @brief Implements class RealSpaceWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpaceToolBar.h"
+#include "GUI/View/Realspace/RealSpaceToolBar.h"
#include "GUI/Util/mainwindow_constants.h"
#include <QCheckBox>
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h b/GUI/View/Realspace/RealSpaceToolBar.h
similarity index 83%
rename from GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
rename to GUI/View/Realspace/RealSpaceToolBar.h
index 8018bc2e566..1d9c2bc296c 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
+++ b/GUI/View/Realspace/RealSpaceToolBar.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceToolBar.h
+//! @file GUI/View/Realspace/RealSpaceToolBar.h
//! @brief Defines class RealSpaceWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACETOOLBAR_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACETOOLBAR_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACETOOLBAR_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACETOOLBAR_H
#include "GUI/View/Common/StyledToolBar.h"
@@ -47,4 +47,4 @@ private:
QToolButton* m_savePictureButton;
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACETOOLBAR_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACETOOLBAR_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceView.cpp b/GUI/View/Realspace/RealSpaceView.cpp
similarity index 88%
rename from GUI/View/RealSpaceWidgets/RealSpaceView.cpp
rename to GUI/View/Realspace/RealSpaceView.cpp
index ffe57ba0eca..2a639dc63ee 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceView.cpp
+++ b/GUI/View/Realspace/RealSpaceView.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceView.cpp
+//! @file GUI/View/Realspace/RealSpaceView.cpp
//! @brief Implements class RealSpaceView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpaceView.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceModel.h"
+#include "GUI/View/Realspace/RealSpaceView.h"
+#include "GUI/View/Realspace/RealSpaceModel.h"
#include "GUI/ba3d/widget.h"
#include <QVBoxLayout>
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceView.h b/GUI/View/Realspace/RealSpaceView.h
similarity index 80%
rename from GUI/View/RealSpaceWidgets/RealSpaceView.h
rename to GUI/View/Realspace/RealSpaceView.h
index bb9cfa9df72..3df16af1cf0 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceView.h
+++ b/GUI/View/Realspace/RealSpaceView.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceView.h
+//! @file GUI/View/Realspace/RealSpaceView.h
//! @brief Defines class RealSpaceView
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEVIEW_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEVIEW_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEVIEW_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEVIEW_H
#include <QWidget>
@@ -44,4 +44,4 @@ private:
GUI::RealSpace::Widget3D* m_3dview;
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEVIEW_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEVIEW_H
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceWidget.cpp b/GUI/View/Realspace/RealSpaceWidget.cpp
similarity index 89%
rename from GUI/View/RealSpaceWidgets/RealSpaceWidget.cpp
rename to GUI/View/Realspace/RealSpaceWidget.cpp
index d31ab9fa175..37463b37d8e 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceWidget.cpp
+++ b/GUI/View/Realspace/RealSpaceWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceWidget.cpp
+//! @file GUI/View/Realspace/RealSpaceWidget.cpp
//! @brief Implements class RealSpaceWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/RealSpaceWidget.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceActions.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceCanvas.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceToolBar.h"
+#include "GUI/View/Realspace/RealSpaceWidget.h"
+#include "GUI/View/Realspace/RealSpaceActions.h"
+#include "GUI/View/Realspace/RealSpaceCanvas.h"
+#include "GUI/View/Realspace/RealSpaceToolBar.h"
#include <QLabel>
#include <QVBoxLayout>
diff --git a/GUI/View/RealSpaceWidgets/RealSpaceWidget.h b/GUI/View/Realspace/RealSpaceWidget.h
similarity index 83%
rename from GUI/View/RealSpaceWidgets/RealSpaceWidget.h
rename to GUI/View/Realspace/RealSpaceWidget.h
index 9982518c087..08260d8fb04 100644
--- a/GUI/View/RealSpaceWidgets/RealSpaceWidget.h
+++ b/GUI/View/Realspace/RealSpaceWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/RealSpaceWidget.h
+//! @file GUI/View/Realspace/RealSpaceWidget.h
//! @brief Defines class RealSpaceWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEWIDGET_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEWIDGET_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEWIDGET_H
#include <QWidget>
@@ -45,4 +45,4 @@ private:
QItemSelectionModel* m_selectionModel;
};
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_REALSPACEWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_REALSPACEWIDGET_H
diff --git a/GUI/View/RealSpaceWidgets/TransformTo3D.cpp b/GUI/View/Realspace/TransformTo3D.cpp
similarity index 98%
rename from GUI/View/RealSpaceWidgets/TransformTo3D.cpp
rename to GUI/View/Realspace/TransformTo3D.cpp
index 1a0de12bb61..f9cb83540a0 100644
--- a/GUI/View/RealSpaceWidgets/TransformTo3D.cpp
+++ b/GUI/View/Realspace/TransformTo3D.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/TransformTo3D.cpp
+//! @file GUI/View/Realspace/TransformTo3D.cpp
//! @brief Implements namespace GUI::View::TransformTo3D
//!
//! @homepage http://www.bornagainproject.org
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/View/RealSpaceWidgets/TransformTo3D.h"
+#include "GUI/View/Realspace/TransformTo3D.h"
#include "GUI/Model/Sample/FormFactorItems.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Model/Sample/ParticleItem.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceCanvas.h"
+#include "GUI/View/Realspace/RealSpaceCanvas.h"
#include "Sample/HardParticle/HardParticles.h"
#include <boost/polymorphic_cast.hpp>
diff --git a/GUI/View/RealSpaceWidgets/TransformTo3D.h b/GUI/View/Realspace/TransformTo3D.h
similarity index 85%
rename from GUI/View/RealSpaceWidgets/TransformTo3D.h
rename to GUI/View/Realspace/TransformTo3D.h
index 122fd57e7e0..34d26cb3f35 100644
--- a/GUI/View/RealSpaceWidgets/TransformTo3D.h
+++ b/GUI/View/Realspace/TransformTo3D.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/RealSpaceWidgets/TransformTo3D.h
+//! @file GUI/View/Realspace/TransformTo3D.h
//! @brief Defines namespace GUI::View::TransformTo3D
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_TRANSFORMTO3D_H
-#define BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_TRANSFORMTO3D_H
+#ifndef BORNAGAIN_GUI_VIEW_REALSPACE_TRANSFORMTO3D_H
+#define BORNAGAIN_GUI_VIEW_REALSPACE_TRANSFORMTO3D_H
#include "Base/Vector/Vectors3D.h"
#include "GUI/ba3d/model/layer.h"
@@ -41,4 +41,4 @@ createParticlefromIFormFactor(const IFormFactor* ff);
} // namespace GUI::View::TransformTo3D
-#endif // BORNAGAIN_GUI_VIEW_REALSPACEWIDGETS_TRANSFORMTO3D_H
+#endif // BORNAGAIN_GUI_VIEW_REALSPACE_TRANSFORMTO3D_H
diff --git a/GUI/View/SampleDesigner/RealSpacePanel.cpp b/GUI/View/SampleDesigner/RealSpacePanel.cpp
index 6828e9430ce..c4f624277de 100644
--- a/GUI/View/SampleDesigner/RealSpacePanel.cpp
+++ b/GUI/View/SampleDesigner/RealSpacePanel.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/RealSpacePanel.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceWidget.h"
+#include "GUI/View/Realspace/RealSpaceWidget.h"
#include <QVBoxLayout>
RealSpacePanel::RealSpacePanel(SampleModel* sampleModel, QItemSelectionModel* selectionModel,
diff --git a/GUI/View/SpecularDataWidgets/Plot1DCanvas.cpp b/GUI/View/SpecularData/Plot1DCanvas.cpp
similarity index 93%
rename from GUI/View/SpecularDataWidgets/Plot1DCanvas.cpp
rename to GUI/View/SpecularData/Plot1DCanvas.cpp
index 5b14174ce69..70e06d8d8c5 100644
--- a/GUI/View/SpecularDataWidgets/Plot1DCanvas.cpp
+++ b/GUI/View/SpecularData/Plot1DCanvas.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/Plot1DCanvas.cpp
+//! @file GUI/View/SpecularData/Plot1DCanvas.cpp
//! @brief Implements class Plot1DCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/SpecularDataWidgets/Plot1DCanvas.h"
+#include "GUI/View/SpecularData/Plot1DCanvas.h"
#include "GUI/View/Intensity/FontScalingEvent.h"
#include "GUI/View/Intensity/Plot1D.h"
#include "GUI/View/Intensity/PlotStatusLabel.h"
diff --git a/GUI/View/SpecularDataWidgets/Plot1DCanvas.h b/GUI/View/SpecularData/Plot1DCanvas.h
similarity index 83%
rename from GUI/View/SpecularDataWidgets/Plot1DCanvas.h
rename to GUI/View/SpecularData/Plot1DCanvas.h
index 92f1f0c937b..f4ddd0b7f11 100644
--- a/GUI/View/SpecularDataWidgets/Plot1DCanvas.h
+++ b/GUI/View/SpecularData/Plot1DCanvas.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/Plot1DCanvas.h
+//! @file GUI/View/SpecularData/Plot1DCanvas.h
//! @brief Defines class Plot1DCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
-#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATA_PLOT1DCANVAS_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATA_PLOT1DCANVAS_H
#include "GUI/View/Common/SessionItemWidget.h"
@@ -48,4 +48,4 @@ private:
PlotStatusLabel* m_statusLabel;
};
-#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_PLOT1DCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATA_PLOT1DCANVAS_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataCanvas.cpp b/GUI/View/SpecularData/SpecularDataCanvas.cpp
similarity index 95%
rename from GUI/View/SpecularDataWidgets/SpecularDataCanvas.cpp
rename to GUI/View/SpecularData/SpecularDataCanvas.cpp
index dfde5ef4b32..1f1407298c4 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataCanvas.cpp
+++ b/GUI/View/SpecularData/SpecularDataCanvas.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularDataCanvas.cpp
+//! @file GUI/View/SpecularData/SpecularDataCanvas.cpp
//! @brief Implements class SpecularDataCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/SpecularDataWidgets/SpecularDataCanvas.h"
+#include "GUI/View/SpecularData/SpecularDataCanvas.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/State/SessionData.h"
#include "GUI/View/Intensity/SavePlotAssistant.h"
-#include "GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h"
+#include "GUI/View/SpecularData/SpecularPlotCanvas.h"
#include <qcustomplot.h>
SpecularDataCanvas::SpecularDataCanvas(QWidget* parent)
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h b/GUI/View/SpecularData/SpecularDataCanvas.h
similarity index 86%
rename from GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
rename to GUI/View/SpecularData/SpecularDataCanvas.h
index 5ab7e5499fd..e1bd5427d66 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
+++ b/GUI/View/SpecularData/SpecularDataCanvas.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularDataCanvas.h
+//! @file GUI/View/SpecularData/SpecularDataCanvas.h
//! @brief Defines class SpecularDataCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
-#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATACANVAS_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATACANVAS_H
#include "GUI/View/Common/SessionItemWidget.h"
#include <QWidget>
@@ -57,4 +57,4 @@ private:
QAction* m_save_plot_action;
};
-#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATACANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATACANVAS_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.cpp b/GUI/View/SpecularData/SpecularDataImportWidget.cpp
similarity index 98%
rename from GUI/View/SpecularDataWidgets/SpecularDataImportWidget.cpp
rename to GUI/View/SpecularData/SpecularDataImportWidget.cpp
index 8b5c122cfe0..146a87a3a40 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.cpp
+++ b/GUI/View/SpecularData/SpecularDataImportWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularDataImportWidget.cpp
+//! @file GUI/View/SpecularData/SpecularDataImportWidget.cpp
//! @brief Implements class SpecularDataImportWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h"
+#include "GUI/View/SpecularData/SpecularDataImportWidget.h"
#include "GUI/Model/Data/DataItemUtils.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Data/SpecularDataItem.h"
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h b/GUI/View/SpecularData/SpecularDataImportWidget.h
similarity index 87%
rename from GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
rename to GUI/View/SpecularData/SpecularDataImportWidget.h
index 8d0f102ebd2..1b72873c7bd 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
+++ b/GUI/View/SpecularData/SpecularDataImportWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularDataImportWidget.h
+//! @file GUI/View/SpecularData/SpecularDataImportWidget.h
//! @brief Defines class SpecularDataImportWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
-#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATAIMPORTWIDGET_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATAIMPORTWIDGET_H
#include "GUI/Model/IO/AbstractDataLoader1D.h"
#include "GUI/View/Common/SessionItemWidget.h"
@@ -65,4 +65,4 @@ private:
AbstractDataLoader1D* m_loader; // only borrowed from realDataItem. Do not delete!
};
-#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAIMPORTWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATAIMPORTWIDGET_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.ui b/GUI/View/SpecularData/SpecularDataImportWidget.ui
similarity index 99%
rename from GUI/View/SpecularDataWidgets/SpecularDataImportWidget.ui
rename to GUI/View/SpecularData/SpecularDataImportWidget.ui
index 0e975b3d177..98ae03ac990 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataImportWidget.ui
+++ b/GUI/View/SpecularData/SpecularDataImportWidget.ui
@@ -294,7 +294,7 @@
<customwidget>
<class>SpecularDataCanvas</class>
<extends>QWidget</extends>
- <header location="global">GUI/View/SpecularDataWidgets/SpecularDataCanvas.h</header>
+ <header location="global">GUI/View/SpecularData/SpecularDataCanvas.h</header>
<container>1</container>
</customwidget>
<customwidget>
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataWidget.cpp b/GUI/View/SpecularData/SpecularDataWidget.cpp
similarity index 92%
rename from GUI/View/SpecularDataWidgets/SpecularDataWidget.cpp
rename to GUI/View/SpecularData/SpecularDataWidget.cpp
index 65f205ce24a..30ef29496f7 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataWidget.cpp
+++ b/GUI/View/SpecularData/SpecularDataWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularDataWidget.cpp
+//! @file GUI/View/SpecularData/SpecularDataWidget.cpp
//! @brief Implements class SpecularDataWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/SpecularDataWidgets/SpecularDataWidget.h"
+#include "GUI/View/SpecularData/SpecularDataWidget.h"
#include "GUI/Model/Data/DataItemUtils.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/View/Intensity/IntensityDataPropertyWidget.h"
-#include "GUI/View/SpecularDataWidgets/SpecularDataCanvas.h"
+#include "GUI/View/SpecularData/SpecularDataCanvas.h"
#include <QBoxLayout>
#include <QMenu>
diff --git a/GUI/View/SpecularDataWidgets/SpecularDataWidget.h b/GUI/View/SpecularData/SpecularDataWidget.h
similarity index 80%
rename from GUI/View/SpecularDataWidgets/SpecularDataWidget.h
rename to GUI/View/SpecularData/SpecularDataWidget.h
index d797068f1f2..76a15cf85b2 100644
--- a/GUI/View/SpecularDataWidgets/SpecularDataWidget.h
+++ b/GUI/View/SpecularData/SpecularDataWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularDataWidget.h
+//! @file GUI/View/SpecularData/SpecularDataWidget.h
//! @brief Defines class SpecularDataWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
-#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATAWIDGET_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATAWIDGET_H
#include "GUI/View/Common/SessionItemWidget.h"
@@ -41,4 +41,4 @@ private:
IntensityDataPropertyWidget* m_property_widget;
};
-#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARDATAWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARDATAWIDGET_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularPlot.cpp b/GUI/View/SpecularData/SpecularPlot.cpp
similarity index 98%
rename from GUI/View/SpecularDataWidgets/SpecularPlot.cpp
rename to GUI/View/SpecularData/SpecularPlot.cpp
index 72f02d28afa..32881fbf783 100644
--- a/GUI/View/SpecularDataWidgets/SpecularPlot.cpp
+++ b/GUI/View/SpecularData/SpecularPlot.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularPlot.cpp
+//! @file GUI/View/SpecularData/SpecularPlot.cpp
//! @brief Implements class SpecularPlot
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/SpecularDataWidgets/SpecularPlot.h"
+#include "GUI/View/SpecularData/SpecularPlot.h"
#include "GUI/Model/Data/AxesItems.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/View/Intensity/ColorMapUtils.h"
diff --git a/GUI/View/SpecularDataWidgets/SpecularPlot.h b/GUI/View/SpecularData/SpecularPlot.h
similarity index 93%
rename from GUI/View/SpecularDataWidgets/SpecularPlot.h
rename to GUI/View/SpecularData/SpecularPlot.h
index 18a02ad0be8..8923140ff7a 100644
--- a/GUI/View/SpecularDataWidgets/SpecularPlot.h
+++ b/GUI/View/SpecularData/SpecularPlot.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularPlot.h
+//! @file GUI/View/SpecularData/SpecularPlot.h
//! @brief Defines class SpecularPlot
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOT_H
-#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOT_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARPLOT_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARPLOT_H
#include "GUI/View/Intensity/ScientificPlot.h"
#include <memory>
@@ -108,4 +108,4 @@ private:
bool m_block_update;
};
-#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOT_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARPLOT_H
diff --git a/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.cpp b/GUI/View/SpecularData/SpecularPlotCanvas.cpp
similarity index 90%
rename from GUI/View/SpecularDataWidgets/SpecularPlotCanvas.cpp
rename to GUI/View/SpecularData/SpecularPlotCanvas.cpp
index 008db1e14cc..7649e298e7f 100644
--- a/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.cpp
+++ b/GUI/View/SpecularData/SpecularPlotCanvas.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularPlotCanvas.cpp
+//! @file GUI/View/SpecularData/SpecularPlotCanvas.cpp
//! @brief Declares class SpecularPlotCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,11 @@
//
// ************************************************************************************************
-#include "GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h"
+#include "GUI/View/SpecularData/SpecularPlotCanvas.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/View/Intensity/FontScalingEvent.h"
#include "GUI/View/Intensity/PlotStatusLabel.h"
-#include "GUI/View/SpecularDataWidgets/SpecularPlot.h"
+#include "GUI/View/SpecularData/SpecularPlot.h"
#include <QVBoxLayout>
SpecularPlotCanvas::SpecularPlotCanvas(QWidget* parent)
diff --git a/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h b/GUI/View/SpecularData/SpecularPlotCanvas.h
similarity index 82%
rename from GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
rename to GUI/View/SpecularData/SpecularPlotCanvas.h
index a05f94346b7..f147d968bd9 100644
--- a/GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
+++ b/GUI/View/SpecularData/SpecularPlotCanvas.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/SpecularDataWidgets/SpecularPlotCanvas.h
+//! @file GUI/View/SpecularData/SpecularPlotCanvas.h
//! @brief Defines class ColorMapCanvas
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
-#define BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
+#ifndef BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARPLOTCANVAS_H
+#define BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARPLOTCANVAS_H
#include "GUI/View/Common/SessionItemWidget.h"
@@ -47,4 +47,4 @@ private:
PlotStatusLabel* m_statusLabel;
};
-#endif // BORNAGAIN_GUI_VIEW_SPECULARDATAWIDGETS_SPECULARPLOTCANVAS_H
+#endif // BORNAGAIN_GUI_VIEW_SPECULARDATA_SPECULARPLOTCANVAS_H
diff --git a/GUI/View/Toplevel/TestView.cpp b/GUI/View/Toplevel/TestView.cpp
index 5dfa5ac9eae..0b6ebf5a746 100644
--- a/GUI/View/Toplevel/TestView.cpp
+++ b/GUI/View/Toplevel/TestView.cpp
@@ -19,10 +19,10 @@
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Fit/MinimizerItem.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/View/FitWidgets/MinimizerSettingsWidget.h"
+#include "GUI/View/Fit/MinimizerSettingsWidget.h"
#include "GUI/View/PropertyEditor/TestComponentView.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceWidget.h"
-#include "GUI/View/SpecularDataWidgets/Plot1DCanvas.h"
+#include "GUI/View/Realspace/RealSpaceWidget.h"
+#include "GUI/View/SpecularData/Plot1DCanvas.h"
#include <qAccordion/contentpane.h>
diff --git a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
index b062eedeff1..7ad394243cf 100644
--- a/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
+++ b/Tests/Unit/GUI/TestRealSpaceBuilderUtils.cpp
@@ -3,11 +3,11 @@
#include "GUI/Model/Sample/ParticleItem.h"
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Model/Sample/SampleModel.h"
-#include "GUI/View/RealSpaceWidgets/Particle3DContainer.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceBuilder.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceBuilderUtils.h"
-#include "GUI/View/RealSpaceWidgets/RealSpaceModel.h"
-#include "GUI/View/RealSpaceWidgets/TransformTo3D.h"
+#include "GUI/View/Realspace/Particle3DContainer.h"
+#include "GUI/View/Realspace/RealSpaceBuilder.h"
+#include "GUI/View/Realspace/RealSpaceBuilderUtils.h"
+#include "GUI/View/Realspace/RealSpaceModel.h"
+#include "GUI/View/Realspace/TransformTo3D.h"
#include "Sample/Particle/Particle.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QObject>
--
GitLab