From 33113dd9f7eea31eaf33e61eb56dab1015caca25 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 29 Sep 2023 16:22:37 +0200
Subject: [PATCH] split GUI/View/Fit into 4 directories
---
GUI/View/Fit/FitActivityPanel.cpp | 2 +-
GUI/View/Fit/FitSessionController.cpp | 8 ++++----
GUI/View/Fit/FitSessionWidget.cpp | 6 +++---
GUI/View/Fit/JobRealTimeWidget.cpp | 2 +-
GUI/View/{Fit => FitControl}/FitWorker.cpp | 6 +++---
GUI/View/{Fit => FitControl}/FitWorker.h | 8 ++++----
GUI/View/{Fit => FitControl}/FitWorkerLauncher.cpp | 6 +++---
GUI/View/{Fit => FitControl}/FitWorkerLauncher.h | 8 ++++----
.../{Fit => FitControl}/MinimizerSettingsWidget.cpp | 4 ++--
GUI/View/{Fit => FitControl}/MinimizerSettingsWidget.h | 8 ++++----
GUI/View/{Fit => FitControl}/RunFitControlWidget.cpp | 4 ++--
GUI/View/{Fit => FitControl}/RunFitControlWidget.h | 8 ++++----
GUI/View/{Fit => FitDisplay}/FitLog.cpp | 4 ++--
GUI/View/{Fit => FitDisplay}/FitLog.h | 8 ++++----
GUI/View/{Fit => FitDisplay}/FitProgressInfo.cpp | 4 ++--
GUI/View/{Fit => FitDisplay}/FitProgressInfo.h | 8 ++++----
GUI/View/{Fit => FitDisplay}/GUIFitObserver.cpp | 4 ++--
GUI/View/{Fit => FitDisplay}/GUIFitObserver.h | 10 +++++-----
GUI/View/{Fit => FitDisplay}/JobMessagePanel.cpp | 4 ++--
GUI/View/{Fit => FitDisplay}/JobMessagePanel.h | 10 +++++-----
GUI/View/{Fit => FitObjective}/FitObjectiveBuilder.cpp | 6 +++---
GUI/View/{Fit => FitObjective}/FitObjectiveBuilder.h | 8 ++++----
.../{Fit => FitObjective}/FitParameterDelegate.cpp | 4 ++--
GUI/View/{Fit => FitObjective}/FitParameterDelegate.h | 8 ++++----
GUI/View/{Fit => FitObjective}/FitParameterWidget.cpp | 8 ++++----
GUI/View/{Fit => FitObjective}/FitParameterWidget.h | 8 ++++----
.../{Fit => FitObjective}/ParameterTuningDelegate.cpp | 4 ++--
.../{Fit => FitObjective}/ParameterTuningDelegate.h | 8 ++++----
.../{Fit => FitObjective}/ParameterTuningWidget.cpp | 8 ++++----
GUI/View/{Fit => FitObjective}/ParameterTuningWidget.h | 8 ++++----
.../{Fit => FitObjective}/SliderSettingsWidget.cpp | 4 ++--
GUI/View/{Fit => FitObjective}/SliderSettingsWidget.h | 8 ++++----
GUI/View/Job/JobView.cpp | 2 +-
33 files changed, 103 insertions(+), 103 deletions(-)
rename GUI/View/{Fit => FitControl}/FitWorker.cpp (85%)
rename GUI/View/{Fit => FitControl}/FitWorker.h (83%)
rename GUI/View/{Fit => FitControl}/FitWorkerLauncher.cpp (94%)
rename GUI/View/{Fit => FitControl}/FitWorkerLauncher.h (85%)
rename GUI/View/{Fit => FitControl}/MinimizerSettingsWidget.cpp (99%)
rename GUI/View/{Fit => FitControl}/MinimizerSettingsWidget.h (85%)
rename GUI/View/{Fit => FitControl}/RunFitControlWidget.cpp (98%)
rename GUI/View/{Fit => FitControl}/RunFitControlWidget.h (87%)
rename GUI/View/{Fit => FitDisplay}/FitLog.cpp (91%)
rename GUI/View/{Fit => FitDisplay}/FitLog.h (86%)
rename GUI/View/{Fit => FitDisplay}/FitProgressInfo.cpp (86%)
rename GUI/View/{Fit => FitDisplay}/FitProgressInfo.h (85%)
rename GUI/View/{Fit => FitDisplay}/GUIFitObserver.cpp (96%)
rename GUI/View/{Fit => FitDisplay}/GUIFitObserver.h (84%)
rename GUI/View/{Fit => FitDisplay}/JobMessagePanel.cpp (96%)
rename GUI/View/{Fit => FitDisplay}/JobMessagePanel.h (79%)
rename GUI/View/{Fit => FitObjective}/FitObjectiveBuilder.cpp (96%)
rename GUI/View/{Fit => FitObjective}/FitObjectiveBuilder.h (86%)
rename GUI/View/{Fit => FitObjective}/FitParameterDelegate.cpp (97%)
rename GUI/View/{Fit => FitObjective}/FitParameterDelegate.h (88%)
rename GUI/View/{Fit => FitObjective}/FitParameterWidget.cpp (98%)
rename GUI/View/{Fit => FitObjective}/FitParameterWidget.h (90%)
rename GUI/View/{Fit => FitObjective}/ParameterTuningDelegate.cpp (98%)
rename GUI/View/{Fit => FitObjective}/ParameterTuningDelegate.h (91%)
rename GUI/View/{Fit => FitObjective}/ParameterTuningWidget.cpp (96%)
rename GUI/View/{Fit => FitObjective}/ParameterTuningWidget.h (89%)
rename GUI/View/{Fit => FitObjective}/SliderSettingsWidget.cpp (96%)
rename GUI/View/{Fit => FitObjective}/SliderSettingsWidget.h (82%)
diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
index 4755cc59a5d..131f1e85a53 100644
--- a/GUI/View/Fit/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -18,7 +18,7 @@
#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 "GUI/View/FitControl/RunFitControlWidget.h"
#include <QLabel>
#include <QSettings>
#include <QVBoxLayout>
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index 5e721e23919..bb3afaed51c 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -18,10 +18,10 @@
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.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"
+#include "GUI/View/FitDisplay/FitLog.h"
+#include "GUI/View/FitObjective/FitObjectiveBuilder.h"
+#include "GUI/View/FitControl/FitWorkerLauncher.h"
+#include "GUI/View/FitDisplay/GUIFitObserver.h"
namespace {
diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index 0e37c2b5b8a..42016497232 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -15,10 +15,10 @@
#include "GUI/View/Fit/FitSessionWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Support/Tool/mainwindow_constants.h"
-#include "GUI/View/Fit/FitParameterWidget.h"
+#include "GUI/View/FitObjective/FitParameterWidget.h"
#include "GUI/View/Fit/FitSessionController.h"
-#include "GUI/View/Fit/MinimizerSettingsWidget.h"
-#include "GUI/View/Fit/RunFitControlWidget.h"
+#include "GUI/View/FitControl/MinimizerSettingsWidget.h"
+#include "GUI/View/FitControl/RunFitControlWidget.h"
#include <QSettings>
#include <QTabWidget>
#include <QVBoxLayout>
diff --git a/GUI/View/Fit/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp
index fa9a9252fcf..b0d043c36e1 100644
--- a/GUI/View/Fit/JobRealTimeWidget.cpp
+++ b/GUI/View/Fit/JobRealTimeWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Fit/JobRealTimeWidget.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Support/Tool/mainwindow_constants.h"
-#include "GUI/View/Fit/ParameterTuningWidget.h"
+#include "GUI/View/FitObjective/ParameterTuningWidget.h"
#include <QSettings>
#include <QVBoxLayout>
diff --git a/GUI/View/Fit/FitWorker.cpp b/GUI/View/FitControl/FitWorker.cpp
similarity index 85%
rename from GUI/View/Fit/FitWorker.cpp
rename to GUI/View/FitControl/FitWorker.cpp
index 3d2788aafce..65a0708f91a 100644
--- a/GUI/View/Fit/FitWorker.cpp
+++ b/GUI/View/FitControl/FitWorker.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitWorker.cpp
+//! @file GUI/View/FitControl/FitWorker.cpp
//! @brief Implements class FitWorker
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/FitWorker.h"
-#include "GUI/View/Fit/FitObjectiveBuilder.h"
+#include "GUI/View/FitControl/FitWorker.h"
+#include "GUI/View/FitObjective/FitObjectiveBuilder.h"
void FitWorker::startFit()
{
diff --git a/GUI/View/Fit/FitWorker.h b/GUI/View/FitControl/FitWorker.h
similarity index 83%
rename from GUI/View/Fit/FitWorker.h
rename to GUI/View/FitControl/FitWorker.h
index d774bd75b3f..58486afb0f1 100644
--- a/GUI/View/Fit/FitWorker.h
+++ b/GUI/View/FitControl/FitWorker.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitWorker.h
+//! @file GUI/View/FitControl/FitWorker.h
//! @brief Implements class FitWorker
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKER_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKER_H
#include <QObject>
#include <memory>
@@ -44,4 +44,4 @@ private:
std::shared_ptr<FitObjectiveBuilder> m_fit_objective;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITWORKER_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKER_H
diff --git a/GUI/View/Fit/FitWorkerLauncher.cpp b/GUI/View/FitControl/FitWorkerLauncher.cpp
similarity index 94%
rename from GUI/View/Fit/FitWorkerLauncher.cpp
rename to GUI/View/FitControl/FitWorkerLauncher.cpp
index 82ca9121b3b..9da86d0c8c8 100644
--- a/GUI/View/Fit/FitWorkerLauncher.cpp
+++ b/GUI/View/FitControl/FitWorkerLauncher.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitWorkerLauncher.cpp
+//! @file GUI/View/FitControl/FitWorkerLauncher.cpp
//! @brief Implements class FitWorkerLauncher
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/FitWorkerLauncher.h"
-#include "GUI/View/Fit/FitWorker.h"
+#include "GUI/View/FitControl/FitWorkerLauncher.h"
+#include "GUI/View/FitControl/FitWorker.h"
#include <QThread>
FitWorkerLauncher::FitWorkerLauncher(QObject* parent)
diff --git a/GUI/View/Fit/FitWorkerLauncher.h b/GUI/View/FitControl/FitWorkerLauncher.h
similarity index 85%
rename from GUI/View/Fit/FitWorkerLauncher.h
rename to GUI/View/FitControl/FitWorkerLauncher.h
index 1a98237955c..66826e9d9bb 100644
--- a/GUI/View/Fit/FitWorkerLauncher.h
+++ b/GUI/View/FitControl/FitWorkerLauncher.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitWorkerLauncher.h
+//! @file GUI/View/FitControl/FitWorkerLauncher.h
//! @brief Implements class FitWorkerLauncher
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKERLAUNCHER_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKERLAUNCHER_H
#include <QDateTime>
#include <QObject>
@@ -56,4 +56,4 @@ private:
QDateTime m_fit_end;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITWORKERLAUNCHER_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_FITWORKERLAUNCHER_H
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/FitControl/MinimizerSettingsWidget.cpp
similarity index 99%
rename from GUI/View/Fit/MinimizerSettingsWidget.cpp
rename to GUI/View/FitControl/MinimizerSettingsWidget.cpp
index 176eae9878f..46ec7f8378e 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/FitControl/MinimizerSettingsWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/MinimizerSettingsWidget.cpp
+//! @file GUI/View/FitControl/MinimizerSettingsWidget.cpp
//! @brief Implements class MinimizerSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/MinimizerSettingsWidget.h"
+#include "GUI/View/FitControl/MinimizerSettingsWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.h b/GUI/View/FitControl/MinimizerSettingsWidget.h
similarity index 85%
rename from GUI/View/Fit/MinimizerSettingsWidget.h
rename to GUI/View/FitControl/MinimizerSettingsWidget.h
index 225d4afe874..cd8e896eb79 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.h
+++ b/GUI/View/FitControl/MinimizerSettingsWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/MinimizerSettingsWidget.h
+//! @file GUI/View/FitControl/MinimizerSettingsWidget.h
//! @brief Defines class MinimizerSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
#include "GUI/Model/Job/MinimizerItem.h"
#include <QWidget>
@@ -52,4 +52,4 @@ private:
QList<std::function<void()>> m_updaters;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_MINIMIZERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_MINIMIZERSETTINGSWIDGET_H
diff --git a/GUI/View/Fit/RunFitControlWidget.cpp b/GUI/View/FitControl/RunFitControlWidget.cpp
similarity index 98%
rename from GUI/View/Fit/RunFitControlWidget.cpp
rename to GUI/View/FitControl/RunFitControlWidget.cpp
index 22a09c722e5..d291c23a455 100644
--- a/GUI/View/Fit/RunFitControlWidget.cpp
+++ b/GUI/View/FitControl/RunFitControlWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/RunFitControlWidget.cpp
+//! @file GUI/View/FitControl/RunFitControlWidget.cpp
//! @brief Implements class RunFitControlWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/RunFitControlWidget.h"
+#include "GUI/View/FitControl/RunFitControlWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Fit/RunFitControlWidget.h b/GUI/View/FitControl/RunFitControlWidget.h
similarity index 87%
rename from GUI/View/Fit/RunFitControlWidget.h
rename to GUI/View/FitControl/RunFitControlWidget.h
index 5e8aa3d7d65..b87297921b7 100644
--- a/GUI/View/Fit/RunFitControlWidget.h
+++ b/GUI/View/FitControl/RunFitControlWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/RunFitControlWidget.h
+//! @file GUI/View/FitControl/RunFitControlWidget.h
//! @brief Defines class RunFitControlWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_RUNFITCONTROLWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITCONTROL_RUNFITCONTROLWIDGET_H
#include "GUI/View/Data/DataAccessWidget.h"
@@ -61,4 +61,4 @@ private:
CautionSign* m_cautionSign;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_RUNFITCONTROLWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITCONTROL_RUNFITCONTROLWIDGET_H
diff --git a/GUI/View/Fit/FitLog.cpp b/GUI/View/FitDisplay/FitLog.cpp
similarity index 91%
rename from GUI/View/Fit/FitLog.cpp
rename to GUI/View/FitDisplay/FitLog.cpp
index 149a8a7114c..cb991d38e3e 100644
--- a/GUI/View/Fit/FitLog.cpp
+++ b/GUI/View/FitDisplay/FitLog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitLog.cpp
+//! @file GUI/View/FitDisplay/FitLog.cpp
//! @brief Implements class FitLog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/FitLog.h"
+#include "GUI/View/FitDisplay/FitLog.h"
FitLog::FitLog(QObject* parent)
: QObject(parent)
diff --git a/GUI/View/Fit/FitLog.h b/GUI/View/FitDisplay/FitLog.h
similarity index 86%
rename from GUI/View/Fit/FitLog.h
rename to GUI/View/FitDisplay/FitLog.h
index b29b06832a4..c75e9dc9ec7 100644
--- a/GUI/View/Fit/FitLog.h
+++ b/GUI/View/FitDisplay/FitLog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitLog.h
+//! @file GUI/View/FitDisplay/FitLog.h
//! @brief Defines class FitLog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
+#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
+#define BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
#include <QObject>
@@ -46,4 +46,4 @@ private:
std::vector<Message> m_messages;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
+#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
diff --git a/GUI/View/Fit/FitProgressInfo.cpp b/GUI/View/FitDisplay/FitProgressInfo.cpp
similarity index 86%
rename from GUI/View/Fit/FitProgressInfo.cpp
rename to GUI/View/FitDisplay/FitProgressInfo.cpp
index 35d966336b3..058868b2386 100644
--- a/GUI/View/Fit/FitProgressInfo.cpp
+++ b/GUI/View/FitDisplay/FitProgressInfo.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitProgressInfo.cpp
+//! @file GUI/View/FitDisplay/FitProgressInfo.cpp
//! @brief Implements class FitProgressInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/FitProgressInfo.h"
+#include "GUI/View/FitDisplay/FitProgressInfo.h"
FitProgressInfo::FitProgressInfo()
: m_chi2(0.0)
diff --git a/GUI/View/Fit/FitProgressInfo.h b/GUI/View/FitDisplay/FitProgressInfo.h
similarity index 85%
rename from GUI/View/Fit/FitProgressInfo.h
rename to GUI/View/FitDisplay/FitProgressInfo.h
index af2d0ab1f82..7db150f42b6 100644
--- a/GUI/View/Fit/FitProgressInfo.h
+++ b/GUI/View/FitDisplay/FitProgressInfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitProgressInfo.h
+//! @file GUI/View/FitDisplay/FitProgressInfo.h
//! @brief Defines class FitProgressInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
+#define BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
#include <string>
#include <vector>
@@ -41,4 +41,4 @@ private:
std::vector<double> m_sim_values;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
+#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
diff --git a/GUI/View/Fit/GUIFitObserver.cpp b/GUI/View/FitDisplay/GUIFitObserver.cpp
similarity index 96%
rename from GUI/View/Fit/GUIFitObserver.cpp
rename to GUI/View/FitDisplay/GUIFitObserver.cpp
index dece057a202..89f5affb977 100644
--- a/GUI/View/Fit/GUIFitObserver.cpp
+++ b/GUI/View/FitDisplay/GUIFitObserver.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/GUIFitObserver.cpp
+//! @file GUI/View/FitDisplay/GUIFitObserver.cpp
//! @brief Implements class GUIFitObserver
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/GUIFitObserver.h"
+#include "GUI/View/FitDisplay/GUIFitObserver.h"
#include "Device/Data/Datafield.h"
#include "Fit/Minimizer/MinimizerResult.h"
#include "Sim/Fitting/FitObjective.h"
diff --git a/GUI/View/Fit/GUIFitObserver.h b/GUI/View/FitDisplay/GUIFitObserver.h
similarity index 84%
rename from GUI/View/Fit/GUIFitObserver.h
rename to GUI/View/FitDisplay/GUIFitObserver.h
index 3d86d7d12df..01dc2e6f5ea 100644
--- a/GUI/View/Fit/GUIFitObserver.h
+++ b/GUI/View/FitDisplay/GUIFitObserver.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/GUIFitObserver.h
+//! @file GUI/View/FitDisplay/GUIFitObserver.h
//! @brief Implements class GUIFitObserver
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
-#define BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_GUIFITOBSERVER_H
+#define BORNAGAIN_GUI_VIEW_FITDISPLAY_GUIFITOBSERVER_H
-#include "GUI/View/Fit/FitProgressInfo.h"
+#include "GUI/View/FitDisplay/FitProgressInfo.h"
#include <QObject>
#include <condition_variable>
#include <mutex>
@@ -57,4 +57,4 @@ private:
FitProgressInfo m_iteration_info;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_GUIFITOBSERVER_H
+#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_GUIFITOBSERVER_H
diff --git a/GUI/View/Fit/JobMessagePanel.cpp b/GUI/View/FitDisplay/JobMessagePanel.cpp
similarity index 96%
rename from GUI/View/Fit/JobMessagePanel.cpp
rename to GUI/View/FitDisplay/JobMessagePanel.cpp
index 5ded43daed2..4e5c2d71432 100644
--- a/GUI/View/Fit/JobMessagePanel.cpp
+++ b/GUI/View/FitDisplay/JobMessagePanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/JobMessagePanel.cpp
+//! @file GUI/View/FitDisplay/JobMessagePanel.cpp
//! @brief Implements class JobMessagePanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/JobMessagePanel.h"
+#include "GUI/View/FitDisplay/JobMessagePanel.h"
#include "GUI/Support/Tool/mainwindow_constants.h"
#include <QScrollBar>
#include <QSettings>
diff --git a/GUI/View/Fit/JobMessagePanel.h b/GUI/View/FitDisplay/JobMessagePanel.h
similarity index 79%
rename from GUI/View/Fit/JobMessagePanel.h
rename to GUI/View/FitDisplay/JobMessagePanel.h
index 36cc3c09f58..1e1565b7247 100644
--- a/GUI/View/Fit/JobMessagePanel.h
+++ b/GUI/View/FitDisplay/JobMessagePanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/JobMessagePanel.h
+//! @file GUI/View/FitDisplay/JobMessagePanel.h
//! @brief Defines class JobMessagePanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
-#define BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
+#define BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
-#include "GUI/View/Fit/FitLog.h"
+#include "GUI/View/FitDisplay/FitLog.h"
#include <QTextEdit>
//! Shows log messages from FitActivityPanel at the bottom part of JobView.
@@ -38,4 +38,4 @@ private:
FitLog* m_log;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_JOBMESSAGEPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/FitObjective/FitObjectiveBuilder.cpp
similarity index 96%
rename from GUI/View/Fit/FitObjectiveBuilder.cpp
rename to GUI/View/FitObjective/FitObjectiveBuilder.cpp
index cd468852dd3..0f34e8c0420 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/FitObjective/FitObjectiveBuilder.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitObjectiveBuilder.cpp
+//! @file GUI/View/FitObjective/FitObjectiveBuilder.cpp
//! @brief Implements class SimulationBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/FitObjectiveBuilder.h"
+#include "GUI/View/FitObjective/FitObjectiveBuilder.h"
#include "Base/Util/Assert.h"
#include "Device/Data/Datafield.h"
#include "Fit/Kernel/Minimizer.h"
@@ -24,7 +24,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/MinimizerItem.h"
#include "GUI/Model/ToCore/SimulationToCore.h"
-#include "GUI/View/Fit/GUIFitObserver.h"
+#include "GUI/View/FitDisplay/GUIFitObserver.h"
#include "Sim/Fitting/FitObjective.h"
#include "Sim/Fitting/ObjectiveMetric.h"
#include "Sim/Simulation/ISimulation.h"
diff --git a/GUI/View/Fit/FitObjectiveBuilder.h b/GUI/View/FitObjective/FitObjectiveBuilder.h
similarity index 86%
rename from GUI/View/Fit/FitObjectiveBuilder.h
rename to GUI/View/FitObjective/FitObjectiveBuilder.h
index c77d069a970..11cc50f1c28 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.h
+++ b/GUI/View/FitObjective/FitObjectiveBuilder.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitObjectiveBuilder.h
+//! @file GUI/View/FitObjective/FitObjectiveBuilder.h
//! @brief Defines class FitObjectiveBuilder
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITOBJECTIVEBUILDER_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITOBJECTIVEBUILDER_H
#include <memory>
@@ -57,4 +57,4 @@ private:
std::unique_ptr<FitObjective> m_fit_objective;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITOBJECTIVEBUILDER_H
diff --git a/GUI/View/Fit/FitParameterDelegate.cpp b/GUI/View/FitObjective/FitParameterDelegate.cpp
similarity index 97%
rename from GUI/View/Fit/FitParameterDelegate.cpp
rename to GUI/View/FitObjective/FitParameterDelegate.cpp
index b548eb039bb..4c79969f0db 100644
--- a/GUI/View/Fit/FitParameterDelegate.cpp
+++ b/GUI/View/FitObjective/FitParameterDelegate.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitParameterDelegate.cpp
+//! @file GUI/View/FitObjective/FitParameterDelegate.cpp
//! @brief Implements class FitParameterDelegate
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/FitParameterDelegate.h"
+#include "GUI/View/FitObjective/FitParameterDelegate.h"
#include "Base/Util/Assert.h"
#include "GUI/Support/Util/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/CustomEditors.h"
diff --git a/GUI/View/Fit/FitParameterDelegate.h b/GUI/View/FitObjective/FitParameterDelegate.h
similarity index 88%
rename from GUI/View/Fit/FitParameterDelegate.h
rename to GUI/View/FitObjective/FitParameterDelegate.h
index 49ba34890f5..5c04c38c2e1 100644
--- a/GUI/View/Fit/FitParameterDelegate.h
+++ b/GUI/View/FitObjective/FitParameterDelegate.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitParameterDelegate.h
+//! @file GUI/View/FitObjective/FitParameterDelegate.h
//! @brief Defines class FitParameterDelegate
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERDELEGATE_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERDELEGATE_H
#include <QStyledItemDelegate>
@@ -53,4 +53,4 @@ private:
const QModelIndex& index, const QString& text) const;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERDELEGATE_H
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/FitObjective/FitParameterWidget.cpp
similarity index 98%
rename from GUI/View/Fit/FitParameterWidget.cpp
rename to GUI/View/FitObjective/FitParameterWidget.cpp
index da1bbc9d4ed..72bb1891ab5 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/FitObjective/FitParameterWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitParameterWidget.cpp
+//! @file GUI/View/FitObjective/FitParameterWidget.cpp
//! @brief Implements class FitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,15 +12,15 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/FitParameterWidget.h"
+#include "GUI/View/FitObjective/FitParameterWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Model/FitParameterModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/CustomEventFilters.h"
-#include "GUI/View/Fit/FitParameterDelegate.h"
-#include "GUI/View/Fit/ParameterTuningWidget.h"
+#include "GUI/View/FitObjective/FitParameterDelegate.h"
+#include "GUI/View/FitObjective/ParameterTuningWidget.h"
#include "GUI/View/Info/OverlayLabelController.h"
#include <QAction>
#include <QHeaderView>
diff --git a/GUI/View/Fit/FitParameterWidget.h b/GUI/View/FitObjective/FitParameterWidget.h
similarity index 90%
rename from GUI/View/Fit/FitParameterWidget.h
rename to GUI/View/FitObjective/FitParameterWidget.h
index be872f1f34d..983d1417d54 100644
--- a/GUI/View/Fit/FitParameterWidget.h
+++ b/GUI/View/FitObjective/FitParameterWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/FitParameterWidget.h
+//! @file GUI/View/FitObjective/FitParameterWidget.h
//! @brief Defines class FitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERWIDGET_H
#include "GUI/View/Data/DataAccessWidget.h"
@@ -77,4 +77,4 @@ private:
OverlayLabelController* m_infoLabel;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_FITPARAMETERWIDGET_H
diff --git a/GUI/View/Fit/ParameterTuningDelegate.cpp b/GUI/View/FitObjective/ParameterTuningDelegate.cpp
similarity index 98%
rename from GUI/View/Fit/ParameterTuningDelegate.cpp
rename to GUI/View/FitObjective/ParameterTuningDelegate.cpp
index 011090741b7..cdbe97b7511 100644
--- a/GUI/View/Fit/ParameterTuningDelegate.cpp
+++ b/GUI/View/FitObjective/ParameterTuningDelegate.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/ParameterTuningDelegate.cpp
+//! @file GUI/View/FitObjective/ParameterTuningDelegate.cpp
//! @brief Implements class ParameterTuningDelegate
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/ParameterTuningDelegate.h"
+#include "GUI/View/FitObjective/ParameterTuningDelegate.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
diff --git a/GUI/View/Fit/ParameterTuningDelegate.h b/GUI/View/FitObjective/ParameterTuningDelegate.h
similarity index 91%
rename from GUI/View/Fit/ParameterTuningDelegate.h
rename to GUI/View/FitObjective/ParameterTuningDelegate.h
index 9a4b66a70fb..ae0b8903b41 100644
--- a/GUI/View/Fit/ParameterTuningDelegate.h
+++ b/GUI/View/FitObjective/ParameterTuningDelegate.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/ParameterTuningDelegate.h
+//! @file GUI/View/FitObjective/ParameterTuningDelegate.h
//! @brief Defines class ParameterTuningDelegate
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
-#define BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGDELEGATE_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGDELEGATE_H
#include "Fit/Param/RealLimits.h"
#include <QItemDelegate>
@@ -86,4 +86,4 @@ private:
bool m_isReadOnly;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGDELEGATE_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGDELEGATE_H
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/FitObjective/ParameterTuningWidget.cpp
similarity index 96%
rename from GUI/View/Fit/ParameterTuningWidget.cpp
rename to GUI/View/FitObjective/ParameterTuningWidget.cpp
index 14a41d3dc51..b0ad42044f7 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/FitObjective/ParameterTuningWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/ParameterTuningWidget.cpp
+//! @file GUI/View/FitObjective/ParameterTuningWidget.cpp
//! @brief Implements class ParameterTuningWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,14 +12,14 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/ParameterTuningWidget.h"
+#include "GUI/View/FitObjective/ParameterTuningWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Fit/ParameterTuningDelegate.h"
-#include "GUI/View/Fit/SliderSettingsWidget.h"
+#include "GUI/View/FitObjective/ParameterTuningDelegate.h"
+#include "GUI/View/FitObjective/SliderSettingsWidget.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Widget/StyledToolbar.h"
#include <QAction>
diff --git a/GUI/View/Fit/ParameterTuningWidget.h b/GUI/View/FitObjective/ParameterTuningWidget.h
similarity index 89%
rename from GUI/View/Fit/ParameterTuningWidget.h
rename to GUI/View/FitObjective/ParameterTuningWidget.h
index 4a3b70e2b2d..4254105e322 100644
--- a/GUI/View/Fit/ParameterTuningWidget.h
+++ b/GUI/View/FitObjective/ParameterTuningWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/ParameterTuningWidget.h
+//! @file GUI/View/FitObjective/ParameterTuningWidget.h
//! @brief Defines class ParameterTuningWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGWIDGET_H
#include "GUI/View/Data/DataAccessWidget.h"
@@ -72,4 +72,4 @@ private:
CautionSign* m_cautionSign;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_PARAMETERTUNINGWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_PARAMETERTUNINGWIDGET_H
diff --git a/GUI/View/Fit/SliderSettingsWidget.cpp b/GUI/View/FitObjective/SliderSettingsWidget.cpp
similarity index 96%
rename from GUI/View/Fit/SliderSettingsWidget.cpp
rename to GUI/View/FitObjective/SliderSettingsWidget.cpp
index a391abbce96..55fd2734925 100644
--- a/GUI/View/Fit/SliderSettingsWidget.cpp
+++ b/GUI/View/FitObjective/SliderSettingsWidget.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/SliderSettingsWidget.cpp
+//! @file GUI/View/FitObjective/SliderSettingsWidget.cpp
//! @brief Implements class SliderSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/Fit/SliderSettingsWidget.h"
+#include "GUI/View/FitObjective/SliderSettingsWidget.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include <QLabel>
diff --git a/GUI/View/Fit/SliderSettingsWidget.h b/GUI/View/FitObjective/SliderSettingsWidget.h
similarity index 82%
rename from GUI/View/Fit/SliderSettingsWidget.h
rename to GUI/View/FitObjective/SliderSettingsWidget.h
index 676b156d5be..521e160f238 100644
--- a/GUI/View/Fit/SliderSettingsWidget.h
+++ b/GUI/View/FitObjective/SliderSettingsWidget.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Fit/SliderSettingsWidget.h
+//! @file GUI/View/FitObjective/SliderSettingsWidget.h
//! @brief Defines class SliderSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
-#define BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
+#ifndef BORNAGAIN_GUI_VIEW_FITOBJECTIVE_SLIDERSETTINGSWIDGET_H
+#define BORNAGAIN_GUI_VIEW_FITOBJECTIVE_SLIDERSETTINGSWIDGET_H
#include "GUI/View/Data/DataAccessWidget.h"
#include <QCheckBox>
@@ -46,4 +46,4 @@ private:
QCheckBox* m_lockzCheckBox;
};
-#endif // BORNAGAIN_GUI_VIEW_FIT_SLIDERSETTINGSWIDGET_H
+#endif // BORNAGAIN_GUI_VIEW_FITOBJECTIVE_SLIDERSETTINGSWIDGET_H
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index 3ea354b18c2..82d640b82c7 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Job/JobView.h"
#include "GUI/Support/Data/ID.h"
#include "GUI/View/Fit/FitActivityPanel.h"
-#include "GUI/View/Fit/JobMessagePanel.h"
+#include "GUI/View/FitDisplay/JobMessagePanel.h"
#include "GUI/View/Fit/JobRealTimeWidget.h"
#include "GUI/View/Job/JobProgressAssistant.h"
#include "GUI/View/Job/JobResultsPresenter.h"
--
GitLab