From 86b3832bfbcda100fb7840ca487891f8e5d5f09f Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Thu, 26 May 2022 13:43:20 +0200 Subject: [PATCH] rename ToCore converters --- GUI/Model/Model/JobQueueData.cpp | 2 +- .../{ToDomain/ToDomain.cpp => ToCore/SampleToCore.cpp} | 4 ++-- GUI/Model/{ToDomain/ToDomain.h => ToCore/SampleToCore.h} | 8 ++++---- .../SimulationToCore.cpp} | 6 +++--- .../SimulationToCore.h} | 8 ++++---- GUI/View/Fit/FitObjectiveBuilder.cpp | 2 +- GUI/View/SampleDesigner/ScriptPanel.cpp | 2 +- GUI/View/Script/PythonScriptWidget.cpp | 2 +- Tests/Functional/GUI/Check.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) rename GUI/Model/{ToDomain/ToDomain.cpp => ToCore/SampleToCore.cpp} (98%) rename GUI/Model/{ToDomain/ToDomain.h => ToCore/SampleToCore.h} (81%) rename GUI/Model/{ToDomain/DomainSimulationBuilder.cpp => ToCore/SimulationToCore.cpp} (98%) rename GUI/Model/{ToDomain/DomainSimulationBuilder.h => ToCore/SimulationToCore.h} (82%) diff --git a/GUI/Model/Model/JobQueueData.cpp b/GUI/Model/Model/JobQueueData.cpp index deeb646534d..8c9868199dc 100644 --- a/GUI/Model/Model/JobQueueData.cpp +++ b/GUI/Model/Model/JobQueueData.cpp @@ -16,7 +16,7 @@ #include "Device/Histo/SimulationResult.h" #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Model/JobModel.h" -#include "GUI/Model/ToDomain/DomainSimulationBuilder.h" +#include "GUI/Model/ToCore/SimulationToCore.h" #include "GUI/Support/Data/JobWorker.h" #include "GUI/Util/Error.h" #include "GUI/Util/Path.h" diff --git a/GUI/Model/ToDomain/ToDomain.cpp b/GUI/Model/ToCore/SampleToCore.cpp similarity index 98% rename from GUI/Model/ToDomain/ToDomain.cpp rename to GUI/Model/ToCore/SampleToCore.cpp index 43a50f5524e..2267f2e9b58 100644 --- a/GUI/Model/ToDomain/ToDomain.cpp +++ b/GUI/Model/ToCore/SampleToCore.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/Model/ToDomain/ToDomain.cpp +//! @file GUI/Model/ToCore/SampleToCore.cpp //! @brief Implements class TransformToDomain //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "GUI/Model/ToDomain/ToDomain.h" +#include "GUI/Model/ToCore/SampleToCore.h" #include "GUI/Model/Descriptor/DoubleDescriptor.h" #include "GUI/Model/Descriptor/UIntDescriptor.h" #include "GUI/Model/Sample/InterferenceItems.h" diff --git a/GUI/Model/ToDomain/ToDomain.h b/GUI/Model/ToCore/SampleToCore.h similarity index 81% rename from GUI/Model/ToDomain/ToDomain.h rename to GUI/Model/ToCore/SampleToCore.h index a05c23a306d..dfa6760b02c 100644 --- a/GUI/Model/ToDomain/ToDomain.h +++ b/GUI/Model/ToCore/SampleToCore.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/Model/ToDomain/ToDomain.h +//! @file GUI/Model/ToCore/SampleToCore.h //! @brief Defines namespace GUI::Transform::ToDomain //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_MODEL_TODOMAIN_TODOMAIN_H -#define BORNAGAIN_GUI_MODEL_TODOMAIN_TODOMAIN_H +#ifndef BORNAGAIN_GUI_MODEL_TOCORE_SAMPLETOCORE_H +#define BORNAGAIN_GUI_MODEL_TOCORE_SAMPLETOCORE_H #include <memory> #include <variant> @@ -30,4 +30,4 @@ std::unique_ptr<MultiLayer> itemToSample(const MultiLayerItem& item); } // namespace GUI::Transform::ToDomain -#endif // BORNAGAIN_GUI_MODEL_TODOMAIN_TODOMAIN_H +#endif // BORNAGAIN_GUI_MODEL_TOCORE_SAMPLETOCORE_H diff --git a/GUI/Model/ToDomain/DomainSimulationBuilder.cpp b/GUI/Model/ToCore/SimulationToCore.cpp similarity index 98% rename from GUI/Model/ToDomain/DomainSimulationBuilder.cpp rename to GUI/Model/ToCore/SimulationToCore.cpp index 7f620f84f2d..4589751c7b7 100644 --- a/GUI/Model/ToDomain/DomainSimulationBuilder.cpp +++ b/GUI/Model/ToCore/SimulationToCore.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/Model/ToDomain/DomainSimulationBuilder.cpp +//! @file GUI/Model/ToCore/SimulationToCore.cpp //! @brief Implements class DomainSimulationBuilder //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "GUI/Model/ToDomain/DomainSimulationBuilder.h" +#include "GUI/Model/ToCore/SimulationToCore.h" #include "Base/Const/Units.h" #include "Base/Util/Assert.h" #include "Device/Beam/Beam.h" @@ -25,7 +25,7 @@ #include "GUI/Model/Device/Instrument.h" #include "GUI/Model/Device/InstrumentItems.h" #include "GUI/Model/Sample/MultiLayerItem.h" -#include "GUI/Model/ToDomain/ToDomain.h" +#include "GUI/Model/ToCore/SampleToCore.h" #include "GUI/Support/Data/SimulationOptionsItem.h" #include "GUI/Util/Error.h" #include "Param/Distrib/RangedDistributions.h" diff --git a/GUI/Model/ToDomain/DomainSimulationBuilder.h b/GUI/Model/ToCore/SimulationToCore.h similarity index 82% rename from GUI/Model/ToDomain/DomainSimulationBuilder.h rename to GUI/Model/ToCore/SimulationToCore.h index a1014e4ece5..0f3ba4b91d4 100644 --- a/GUI/Model/ToDomain/DomainSimulationBuilder.h +++ b/GUI/Model/ToCore/SimulationToCore.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/Model/ToDomain/DomainSimulationBuilder.h +//! @file GUI/Model/ToCore/SimulationToCore.h //! @brief Defines namespace GUI::Transform::ToDomain //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_MODEL_TODOMAIN_DOMAINSIMULATIONBUILDER_H -#define BORNAGAIN_GUI_MODEL_TODOMAIN_DOMAINSIMULATIONBUILDER_H +#ifndef BORNAGAIN_GUI_MODEL_TOCORE_SIMULATIONTOCORE_H +#define BORNAGAIN_GUI_MODEL_TOCORE_SIMULATIONTOCORE_H #include <memory> @@ -34,4 +34,4 @@ std::unique_ptr<ISimulation> itemsToSimulation(const MultiLayerItem* sampleItem, } // namespace GUI::Transform::ToDomain -#endif // BORNAGAIN_GUI_MODEL_TODOMAIN_DOMAINSIMULATIONBUILDER_H +#endif // BORNAGAIN_GUI_MODEL_TOCORE_SIMULATIONTOCORE_H diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp index d4f2c26df88..1d4f20d740b 100644 --- a/GUI/View/Fit/FitObjectiveBuilder.cpp +++ b/GUI/View/Fit/FitObjectiveBuilder.cpp @@ -21,7 +21,7 @@ #include "GUI/Model/Job/FitSuiteItem.h" #include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Job/MinimizerItem.h" -#include "GUI/Model/ToDomain/DomainSimulationBuilder.h" +#include "GUI/Model/ToCore/SimulationToCore.h" #include "GUI/Util/Error.h" #include "GUI/View/Fit/GUIFitObserver.h" #include "Sim/Fitting/FitObjective.h" diff --git a/GUI/View/SampleDesigner/ScriptPanel.cpp b/GUI/View/SampleDesigner/ScriptPanel.cpp index 52a2b10acfc..1cfa725badd 100644 --- a/GUI/View/SampleDesigner/ScriptPanel.cpp +++ b/GUI/View/SampleDesigner/ScriptPanel.cpp @@ -14,7 +14,7 @@ #include "GUI/View/SampleDesigner/ScriptPanel.h" #include "GUI/Model/Sample/MultiLayerItem.h" -#include "GUI/Model/ToDomain/ToDomain.h" +#include "GUI/Model/ToCore/SampleToCore.h" #include "GUI/View/Info/CautionSign.h" #include "GUI/View/Info/PythonSyntaxHighlighter.h" #include "GUI/View/Tool/DesignerHelper.h" diff --git a/GUI/View/Script/PythonScriptWidget.cpp b/GUI/View/Script/PythonScriptWidget.cpp index 868fd1565d7..cb89cfab9c3 100644 --- a/GUI/View/Script/PythonScriptWidget.cpp +++ b/GUI/View/Script/PythonScriptWidget.cpp @@ -14,7 +14,7 @@ #include "GUI/View/Script/PythonScriptWidget.h" #include "GUI/Application/ApplicationSettings.h" -#include "GUI/Model/ToDomain/DomainSimulationBuilder.h" +#include "GUI/Model/ToCore/SimulationToCore.h" #include "GUI/View/Common/StyledToolbar.h" #include "GUI/View/Info/CautionSign.h" #include "GUI/View/Info/PythonSyntaxHighlighter.h" diff --git a/Tests/Functional/GUI/Check.cpp b/Tests/Functional/GUI/Check.cpp index 08690e8e530..76aaee45de6 100644 --- a/Tests/Functional/GUI/Check.cpp +++ b/Tests/Functional/GUI/Check.cpp @@ -22,7 +22,7 @@ #include "GUI/Model/FromDomain/GUIObjectBuilder.h" #include "GUI/Model/FromDomain/GUISampleBuilder.h" #include "GUI/Model/Sample/MultiLayerItem.h" -#include "GUI/Model/ToDomain/DomainSimulationBuilder.h" +#include "GUI/Model/ToCore/SimulationToCore.h" #include "GUI/Support/Data/SimulationOptionsItem.h" #include "Sim/Simulation/ISimulation.h" #include <iostream> -- GitLab