From 9dc4ea8df5ae478b8e2325ab96d5f93975d00c5c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Fri, 5 Nov 2021 11:56:08 +0100
Subject: [PATCH] Fit no longer depends on Varia
---
GUI/Mapper/ComponentProxyStrategy.cpp | 2 +-
GUI/Models/Data/DataProperties.cpp | 2 +-
GUI/Models/Fit/FitParameterItems.cpp | 2 +-
GUI/Models/Fit/FitParameterProxyModel.cpp | 2 +-
GUI/Models/{Varia => Fit}/ModelPath.cpp | 4 ++--
GUI/Models/{Varia => Fit}/ModelPath.h | 8 ++++----
GUI/Models/Job/FitParameterHelper.cpp | 2 +-
GUI/Models/Job/ParameterTreeUtils.cpp | 2 +-
GUI/Models/Parameter/ParameterTreeItems.cpp | 2 +-
GUI/Models/Project/OutputDataIOService.cpp | 2 +-
GUI/Models/Sample/ParticleCoreShellItem.cpp | 2 +-
GUI/Models/Types/DoubleDescriptor.cpp | 2 +-
GUI/Views/FitWidgets/ParameterTuningDelegate.cpp | 2 +-
GUI/Views/SampleDesigner/MaterialInplaceForm.cpp | 2 +-
14 files changed, 18 insertions(+), 18 deletions(-)
rename GUI/Models/{Varia => Fit}/ModelPath.cpp (97%)
rename GUI/Models/{Varia => Fit}/ModelPath.h (86%)
diff --git a/GUI/Mapper/ComponentProxyStrategy.cpp b/GUI/Mapper/ComponentProxyStrategy.cpp
index 7c23151a4c3..b315dcd2dc0 100644
--- a/GUI/Mapper/ComponentProxyStrategy.cpp
+++ b/GUI/Mapper/ComponentProxyStrategy.cpp
@@ -15,9 +15,9 @@
#include "GUI/Mapper/ComponentProxyStrategy.h"
#include "GUI/Mapper/ComponentProxyModel.h"
#include "GUI/Mapper/ComponentUtils.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/ModelPath.h"
void ComponentProxyStrategy::onDataChanged(SessionModel* source, ComponentProxyModel* proxy)
{
diff --git a/GUI/Models/Data/DataProperties.cpp b/GUI/Models/Data/DataProperties.cpp
index 92cb074be84..cb0195951e5 100644
--- a/GUI/Models/Data/DataProperties.cpp
+++ b/GUI/Models/Data/DataProperties.cpp
@@ -14,9 +14,9 @@
#include "GUI/Models/Data/DataProperties.h"
#include "GUI/Models/Data/DataItem.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/Error.h"
#include <QColor>
diff --git a/GUI/Models/Fit/FitParameterItems.cpp b/GUI/Models/Fit/FitParameterItems.cpp
index abef840af40..e0231a943cc 100644
--- a/GUI/Models/Fit/FitParameterItems.cpp
+++ b/GUI/Models/Fit/FitParameterItems.cpp
@@ -15,10 +15,10 @@
#include "GUI/Models/Fit/FitParameterItems.h"
#include "Base/Utils/Assert.h"
#include "Fit/Param/Parameters.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Group/ComboProperty.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/Error.h"
#include <cmath>
diff --git a/GUI/Models/Fit/FitParameterProxyModel.cpp b/GUI/Models/Fit/FitParameterProxyModel.cpp
index 8655501a937..549b1ec6e4d 100644
--- a/GUI/Models/Fit/FitParameterProxyModel.cpp
+++ b/GUI/Models/Fit/FitParameterProxyModel.cpp
@@ -14,10 +14,10 @@
#include "GUI/Models/Fit/FitParameterProxyModel.h"
#include "GUI/Models/Fit/FitParameterItems.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Session/SessionItemUtils.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/Error.h"
#include <QColor>
#include <QMimeData>
diff --git a/GUI/Models/Varia/ModelPath.cpp b/GUI/Models/Fit/ModelPath.cpp
similarity index 97%
rename from GUI/Models/Varia/ModelPath.cpp
rename to GUI/Models/Fit/ModelPath.cpp
index 6f2f6a54556..9b2fccf3d4d 100644
--- a/GUI/Models/Varia/ModelPath.cpp
+++ b/GUI/Models/Fit/ModelPath.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ModelPath.cpp
+//! @file GUI/Models/Fit/ModelPath.cpp
//! @brief Implements class ModelPath
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Models/Varia/ModelPath.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Job/JobItem.h"
diff --git a/GUI/Models/Varia/ModelPath.h b/GUI/Models/Fit/ModelPath.h
similarity index 86%
rename from GUI/Models/Varia/ModelPath.h
rename to GUI/Models/Fit/ModelPath.h
index 6737e03fe66..65905b454ac 100644
--- a/GUI/Models/Varia/ModelPath.h
+++ b/GUI/Models/Fit/ModelPath.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Models/Varia/ModelPath.h
+//! @file GUI/Models/Fit/ModelPath.h
//! @brief Defines namespace GUI::Model::Path
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODELS_VARIA_MODELPATH_H
-#define BORNAGAIN_GUI_MODELS_VARIA_MODELPATH_H
+#ifndef BORNAGAIN_GUI_MODELS_FIT_MODELPATH_H
+#define BORNAGAIN_GUI_MODELS_FIT_MODELPATH_H
#include <memory>
#include <vector>
@@ -39,4 +39,4 @@ const SessionItem* ancestor(const SessionItem* item, const QString& requiredMode
} // namespace GUI::Model::Path
-#endif // BORNAGAIN_GUI_MODELS_VARIA_MODELPATH_H
+#endif // BORNAGAIN_GUI_MODELS_FIT_MODELPATH_H
diff --git a/GUI/Models/Job/FitParameterHelper.cpp b/GUI/Models/Job/FitParameterHelper.cpp
index 646a3be865b..8067b32cdc6 100644
--- a/GUI/Models/Job/FitParameterHelper.cpp
+++ b/GUI/Models/Job/FitParameterHelper.cpp
@@ -14,10 +14,10 @@
#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Models/Fit/FitParameterItems.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Job/JobModel.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
-#include "GUI/Models/Varia/ModelPath.h"
//! Creates fit parameter from given ParameterItem, sets starting value to the value
//! of ParameterItem, copies link.
diff --git a/GUI/Models/Job/ParameterTreeUtils.cpp b/GUI/Models/Job/ParameterTreeUtils.cpp
index e6d0e933f49..75fb26d8c2f 100644
--- a/GUI/Models/Job/ParameterTreeUtils.cpp
+++ b/GUI/Models/Job/ParameterTreeUtils.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Models/Job/ParameterTreeUtils.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Group/GroupItem.h"
#include "GUI/Models/Instrument/InstrumentItems.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Material/MaterialItemContainer.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Sample/MultiLayerItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Models/Varia/PropertyItem.h"
#include "GUI/utils/Error.h"
#include <QStack>
diff --git a/GUI/Models/Parameter/ParameterTreeItems.cpp b/GUI/Models/Parameter/ParameterTreeItems.cpp
index fa479fc4716..bd6f1d9d566 100644
--- a/GUI/Models/Parameter/ParameterTreeItems.cpp
+++ b/GUI/Models/Parameter/ParameterTreeItems.cpp
@@ -13,10 +13,10 @@
// ************************************************************************************************
#include "GUI/Models/Parameter/ParameterTreeItems.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Job/FitParameterHelper.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/ModelPath.h"
// ----------------------------------------------------------------------------
diff --git a/GUI/Models/Project/OutputDataIOService.cpp b/GUI/Models/Project/OutputDataIOService.cpp
index 08b01592401..449c048c502 100644
--- a/GUI/Models/Project/OutputDataIOService.cpp
+++ b/GUI/Models/Project/OutputDataIOService.cpp
@@ -14,9 +14,9 @@
#include "GUI/Models/Project/OutputDataIOService.h"
#include "GUI/Models/Data/ApplicationModels.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Job/JobItem.h"
#include "GUI/Models/Project/ProjectUtils.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/MessageService.h"
#include "GUI/utils/SaveLoadInterface.h"
#include <QFile>
diff --git a/GUI/Models/Sample/ParticleCoreShellItem.cpp b/GUI/Models/Sample/ParticleCoreShellItem.cpp
index ee17bef8a98..af9188367a8 100644
--- a/GUI/Models/Sample/ParticleCoreShellItem.cpp
+++ b/GUI/Models/Sample/ParticleCoreShellItem.cpp
@@ -14,12 +14,12 @@
#include "GUI/Models/Sample/ParticleCoreShellItem.h"
#include "GUI/Models/Domain/TransformToDomain.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Sample/ParticleItem.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/VectorItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/utils/Error.h"
#include "Sample/Particle/Particle.h"
#include "Sample/Particle/ParticleCoreShell.h"
diff --git a/GUI/Models/Types/DoubleDescriptor.cpp b/GUI/Models/Types/DoubleDescriptor.cpp
index 086534b77c9..65804690f9e 100644
--- a/GUI/Models/Types/DoubleDescriptor.cpp
+++ b/GUI/Models/Types/DoubleDescriptor.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Models/Types/DoubleDescriptor.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Session/SessionItem.h"
-#include "GUI/Models/Varia/ModelPath.h"
DoubleDescriptor::DoubleDescriptor(const QString& label, SessionItem* item,
const variant<QString, Unit>& unit)
diff --git a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
index 63f78fa2bab..bcc9f29fe59 100644
--- a/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
+++ b/GUI/Views/FitWidgets/ParameterTuningDelegate.cpp
@@ -13,11 +13,11 @@
// ************************************************************************************************
#include "GUI/Views/FitWidgets/ParameterTuningDelegate.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Parameter/ParameterTreeItems.h"
#include "GUI/Models/Parameter/ParameterTuningModel.h"
#include "GUI/Models/Session/SessionItemUtils.h"
#include "GUI/Models/Session/SessionModel.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Widgets/Common/ScientificSpinBox.h"
#include <QAbstractItemModel>
#include <QApplication>
diff --git a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
index e8e85424376..3d21dc60fd5 100644
--- a/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
+++ b/GUI/Views/SampleDesigner/MaterialInplaceForm.cpp
@@ -13,13 +13,13 @@
// ************************************************************************************************
#include "GUI/Views/SampleDesigner/MaterialInplaceForm.h"
+#include "GUI/Models/Fit/ModelPath.h"
#include "GUI/Models/Material/MaterialItemUtils.h"
#include "GUI/Models/Material/MaterialModel.h"
#include "GUI/Models/Material/MaterialModelStore.h"
#include "GUI/Models/Types/DoubleDescriptor.h"
#include "GUI/Models/Types/VectorDescriptor.h"
#include "GUI/Models/Varia/ItemWithMaterial.h"
-#include "GUI/Models/Varia/ModelPath.h"
#include "GUI/Session/SessionData.h"
#include "GUI/Views/Edit/DoubleLineEdit.h"
#include "GUI/Views/Edit/DoubleSpinBox.h"
--
GitLab