From d9d2d820b2773df3a5c21c1355ea32958e959c0e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 3 Mar 2023 14:57:24 +0100
Subject: [PATCH 1/2] rename -> [Multi]InstrumentNotifyer (#444)
---
GUI/Model/Device/InstrumentLibrary.h | 2 +-
.../Device/InstrumentNotifier.cpp} | 6 +++---
.../Device/InstrumentNotifier.h} | 8 ++++----
...entsEditController.cpp => MultiInstrumentNotifier.cpp} | 4 ++--
...trumentsEditController.h => MultiInstrumentNotifier.h} | 8 ++++----
GUI/Model/Project/ProjectDocument.h | 2 +-
GUI/View/Import/RealDataPropertiesWidget.cpp | 2 +-
GUI/View/Instrument/DepthprobeInstrumentEditor.cpp | 2 +-
GUI/View/Instrument/DepthprobeInstrumentEditor.h | 2 +-
GUI/View/Instrument/InstrumentListModel.cpp | 2 +-
GUI/View/Instrument/SpecularBeamEditor.cpp | 2 +-
GUI/View/Instrument/SpecularInstrumentEditor.cpp | 2 +-
GUI/View/Instrument/SpecularInstrumentEditor.h | 2 +-
13 files changed, 22 insertions(+), 22 deletions(-)
rename GUI/{View/Instrument/InstrumentEditController.cpp => Model/Device/InstrumentNotifier.cpp} (90%)
rename GUI/{View/Instrument/InstrumentEditController.h => Model/Device/InstrumentNotifier.h} (88%)
rename GUI/Model/Device/{InstrumentsEditController.cpp => MultiInstrumentNotifier.cpp} (94%)
rename GUI/Model/Device/{InstrumentsEditController.h => MultiInstrumentNotifier.h} (93%)
diff --git a/GUI/Model/Device/InstrumentLibrary.h b/GUI/Model/Device/InstrumentLibrary.h
index c1c1f3f8a73..55f2b30abcc 100644
--- a/GUI/Model/Device/InstrumentLibrary.h
+++ b/GUI/Model/Device/InstrumentLibrary.h
@@ -16,7 +16,7 @@
#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTLIBRARY_H
#include "GUI/Model/Device/InstrumentModel.h"
-#include "GUI/Model/Device/InstrumentsEditController.h"
+#include "GUI/Model/Device/MultiInstrumentNotifier.h"
class InstrumentLibrary {
public:
diff --git a/GUI/View/Instrument/InstrumentEditController.cpp b/GUI/Model/Device/InstrumentNotifier.cpp
similarity index 90%
rename from GUI/View/Instrument/InstrumentEditController.cpp
rename to GUI/Model/Device/InstrumentNotifier.cpp
index dd1a27a6abd..a1367db7c63 100644
--- a/GUI/View/Instrument/InstrumentEditController.cpp
+++ b/GUI/Model/Device/InstrumentNotifier.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Instrument/InstrumentEditController.cpp
+//! @file GUI/Model/Device/InstrumentNotifier.cpp
//! @brief Implements class InstrumentEditController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
-#include "GUI/View/Instrument/InstrumentEditController.h"
+#include "GUI/Model/Device/InstrumentNotifier.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/InstrumentsEditController.h"
+#include "GUI/Model/Device/MultiInstrumentNotifier.h"
#include "GUI/Model/Device/PointwiseAxisItem.h"
InstrumentEditController::InstrumentEditController(InstrumentsEditController* ec,
diff --git a/GUI/View/Instrument/InstrumentEditController.h b/GUI/Model/Device/InstrumentNotifier.h
similarity index 88%
rename from GUI/View/Instrument/InstrumentEditController.h
rename to GUI/Model/Device/InstrumentNotifier.h
index 393dbd7a31e..b912a4a203a 100644
--- a/GUI/View/Instrument/InstrumentEditController.h
+++ b/GUI/Model/Device/InstrumentNotifier.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/Instrument/InstrumentEditController.h
+//! @file GUI/Model/Device/InstrumentNotifier.h
//! @brief Defines class InstrumentEditController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_INSTRUMENTEDITCONTROLLER_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_INSTRUMENTEDITCONTROLLER_H
+#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTNOTIFIER_H
+#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTNOTIFIER_H
#include <QObject>
@@ -58,4 +58,4 @@ private:
InstrumentsEditController* m_ec;
};
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_INSTRUMENTEDITCONTROLLER_H
+#endif // BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTNOTIFIER_H
diff --git a/GUI/Model/Device/InstrumentsEditController.cpp b/GUI/Model/Device/MultiInstrumentNotifier.cpp
similarity index 94%
rename from GUI/Model/Device/InstrumentsEditController.cpp
rename to GUI/Model/Device/MultiInstrumentNotifier.cpp
index 8cdee227a3b..71872b0f651 100644
--- a/GUI/Model/Device/InstrumentsEditController.cpp
+++ b/GUI/Model/Device/MultiInstrumentNotifier.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/InstrumentsEditController.cpp
+//! @file GUI/Model/Device/MultiInstrumentNotifier.cpp
//! @brief Implements class InstrumentsEditController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/Model/Device/InstrumentsEditController.h"
+#include "GUI/Model/Device/MultiInstrumentNotifier.h"
#include "GUI/Model/Device/InstrumentItems.h"
InstrumentsEditController::InstrumentsEditController(InstrumentModel* instruments)
diff --git a/GUI/Model/Device/InstrumentsEditController.h b/GUI/Model/Device/MultiInstrumentNotifier.h
similarity index 93%
rename from GUI/Model/Device/InstrumentsEditController.h
rename to GUI/Model/Device/MultiInstrumentNotifier.h
index 0c2a79b6697..923e716230b 100644
--- a/GUI/Model/Device/InstrumentsEditController.h
+++ b/GUI/Model/Device/MultiInstrumentNotifier.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/Model/Device/InstrumentsEditController.h
+//! @file GUI/Model/Device/MultiInstrumentNotifier.h
//! @brief Defines class InstrumentsEditController
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTSEDITCONTROLLER_H
-#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTSEDITCONTROLLER_H
+#ifndef BORNAGAIN_GUI_MODEL_DEVICE_MULTIINSTRUMENTNOTIFIER_H
+#define BORNAGAIN_GUI_MODEL_DEVICE_MULTIINSTRUMENTNOTIFIER_H
#include "GUI/Model/Device/InstrumentModel.h"
#include <QObject>
@@ -94,4 +94,4 @@ T* InstrumentsEditController::addInstrumentItem()
return t;
}
-#endif // BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENTSEDITCONTROLLER_H
+#endif // BORNAGAIN_GUI_MODEL_DEVICE_MULTIINSTRUMENTNOTIFIER_H
diff --git a/GUI/Model/Project/ProjectDocument.h b/GUI/Model/Project/ProjectDocument.h
index 56ef429663e..23c80be227b 100644
--- a/GUI/Model/Project/ProjectDocument.h
+++ b/GUI/Model/Project/ProjectDocument.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
#define BORNAGAIN_GUI_MODEL_PROJECT_PROJECTDOCUMENT_H
-#include "GUI/Model/Device/InstrumentsEditController.h"
+#include "GUI/Model/Device/MultiInstrumentNotifier.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/RealModel.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
diff --git a/GUI/View/Import/RealDataPropertiesWidget.cpp b/GUI/View/Import/RealDataPropertiesWidget.cpp
index 34045be38b7..2bf2b391b13 100644
--- a/GUI/View/Import/RealDataPropertiesWidget.cpp
+++ b/GUI/View/Import/RealDataPropertiesWidget.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Import/RealDataPropertiesWidget.h"
#include "GUI/Model/Data/RealItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/InstrumentsEditController.h"
+#include "GUI/Model/Device/MultiInstrumentNotifier.h"
#include "GUI/Model/Project/LinkInstrumentManager.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Tool/Globals.h"
diff --git a/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp b/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
index 97869b69019..c26b13ff1a8 100644
--- a/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
+++ b/GUI/View/Instrument/DepthprobeInstrumentEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Instrument/DepthprobeInstrumentEditor.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/InstrumentsEditController.h"
+#include "GUI/Model/Device/MultiInstrumentNotifier.h"
#include "GUI/View/Device/AxisPropertyForm.h"
#include "GUI/View/Instrument/SpecularBeamEditor.h"
#include <QVBoxLayout>
diff --git a/GUI/View/Instrument/DepthprobeInstrumentEditor.h b/GUI/View/Instrument/DepthprobeInstrumentEditor.h
index 0d3855e9a3b..865b7c00846 100644
--- a/GUI/View/Instrument/DepthprobeInstrumentEditor.h
+++ b/GUI/View/Instrument/DepthprobeInstrumentEditor.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_DEPTHPROBEINSTRUMENTEDITOR_H
#define BORNAGAIN_GUI_VIEW_INSTRUMENT_DEPTHPROBEINSTRUMENTEDITOR_H
-#include "GUI/View/Instrument/InstrumentEditController.h"
+#include "GUI/Model/Device/InstrumentNotifier.h"
#include <QWidget>
class InstrumentsEditController;
diff --git a/GUI/View/Instrument/InstrumentListModel.cpp b/GUI/View/Instrument/InstrumentListModel.cpp
index 43325a955b6..23759260746 100644
--- a/GUI/View/Instrument/InstrumentListModel.cpp
+++ b/GUI/View/Instrument/InstrumentListModel.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Instrument/InstrumentListModel.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/InstrumentsEditController.h"
+#include "GUI/Model/Device/MultiInstrumentNotifier.h"
namespace {
diff --git a/GUI/View/Instrument/SpecularBeamEditor.cpp b/GUI/View/Instrument/SpecularBeamEditor.cpp
index ac0214e8180..8d459bed2b0 100644
--- a/GUI/View/Instrument/SpecularBeamEditor.cpp
+++ b/GUI/View/Instrument/SpecularBeamEditor.cpp
@@ -19,7 +19,7 @@
#include "GUI/View/Device/FootprintForm.h"
#include "GUI/View/Instrument/AlphaScanEditor.h"
#include "GUI/View/Instrument/DistributionEditor.h"
-#include "GUI/View/Instrument/InstrumentEditController.h"
+#include "GUI/Model/Device/InstrumentNotifier.h"
#include "GUI/View/Numeric/FixupDoubleValidator.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include <QDoubleValidator>
diff --git a/GUI/View/Instrument/SpecularInstrumentEditor.cpp b/GUI/View/Instrument/SpecularInstrumentEditor.cpp
index ec9c970346d..7f4234a3cac 100644
--- a/GUI/View/Instrument/SpecularInstrumentEditor.cpp
+++ b/GUI/View/Instrument/SpecularInstrumentEditor.cpp
@@ -14,7 +14,7 @@
#include "GUI/View/Instrument/SpecularInstrumentEditor.h"
#include "GUI/Model/Device/InstrumentItems.h"
-#include "GUI/Model/Device/InstrumentsEditController.h"
+#include "GUI/Model/Device/MultiInstrumentNotifier.h"
#include "GUI/View/Device/BackgroundForm.h"
#include "GUI/View/Instrument/PolarizationAnalysisEditor.h"
#include "GUI/View/Instrument/SpecularBeamEditor.h"
diff --git a/GUI/View/Instrument/SpecularInstrumentEditor.h b/GUI/View/Instrument/SpecularInstrumentEditor.h
index 2f508871f0f..bf3d9355877 100644
--- a/GUI/View/Instrument/SpecularInstrumentEditor.h
+++ b/GUI/View/Instrument/SpecularInstrumentEditor.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_SPECULARINSTRUMENTEDITOR_H
#define BORNAGAIN_GUI_VIEW_INSTRUMENT_SPECULARINSTRUMENTEDITOR_H
-#include "GUI/View/Instrument/InstrumentEditController.h"
+#include "GUI/Model/Device/InstrumentNotifier.h"
#include <QWidget>
class InstrumentsEditController;
--
GitLab
From 1a6d53597a8eab277d18da056208a981aec98509 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 3 Mar 2023 15:05:10 +0100
Subject: [PATCH 2/2] clang-format
---
GUI/View/Instrument/SpecularBeamEditor.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/GUI/View/Instrument/SpecularBeamEditor.cpp b/GUI/View/Instrument/SpecularBeamEditor.cpp
index 8d459bed2b0..c1a027189dc 100644
--- a/GUI/View/Instrument/SpecularBeamEditor.cpp
+++ b/GUI/View/Instrument/SpecularBeamEditor.cpp
@@ -16,10 +16,10 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Device/BeamItems.h"
#include "GUI/Model/Device/BeamWavelengthItem.h"
+#include "GUI/Model/Device/InstrumentNotifier.h"
#include "GUI/View/Device/FootprintForm.h"
#include "GUI/View/Instrument/AlphaScanEditor.h"
#include "GUI/View/Instrument/DistributionEditor.h"
-#include "GUI/Model/Device/InstrumentNotifier.h"
#include "GUI/View/Numeric/FixupDoubleValidator.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include <QDoubleValidator>
--
GitLab