From cc85eacdad39d98cbee64488cf29fb453b511681 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 26 Jul 2021 18:11:58 +0200
Subject: [PATCH] local namespace to top
---
GUI/Models/GUIObjectBuilder.cpp | 86 +++++++++++++++------------------
1 file changed, 39 insertions(+), 47 deletions(-)
diff --git a/GUI/Models/GUIObjectBuilder.cpp b/GUI/Models/GUIObjectBuilder.cpp
index 1a4dbbaa845..d309663a18b 100644
--- a/GUI/Models/GUIObjectBuilder.cpp
+++ b/GUI/Models/GUIObjectBuilder.cpp
@@ -24,19 +24,55 @@
#include "GUI/Models/TransformFromDomain.h"
namespace {
+
GISASInstrumentItem* createGISASInstrumentItem(InstrumentModel* model,
const GISASSimulation& simulation,
- const QString& name);
+ const QString& name)
+{
+ auto result = model->insertItem<GISASInstrumentItem>();
+ result->setItemName(name);
+ GUI::Transform::FromDomain::setGISASBeamItem(result->beamItem(), simulation);
+ GUI::Transform::FromDomain::setDetector(result, simulation);
+ GUI::Transform::FromDomain::setBackground(result, simulation);
+
+ return result;
+}
OffSpecularInstrumentItem* createOffSpecularInstrumentItem(InstrumentModel* model,
const OffSpecularSimulation& simulation,
- const QString& name);
+ const QString& name)
+{
+ auto result = model->insertItem<OffSpecularInstrumentItem>();
+ result->setItemName(name);
+ GUI::Transform::FromDomain::setOffSpecularBeamItem(result->beamItem(), simulation);
+ GUI::Transform::FromDomain::setDetector(result, simulation);
+ GUI::Transform::FromDomain::setBackground(result, simulation);
+
+ BasicAxisItem* axisItem = result->alphaAxis();
+ ASSERT(axisItem);
+ GUI::Transform::FromDomain::setAxisItem(axisItem, *simulation.beamAxis(), 1. / Units::deg);
+
+ return result;
+}
SpecularInstrumentItem* createSpecularInstrumentItem(InstrumentModel* model,
const SpecularSimulation& simulation,
- const QString& name);
+ const QString& name)
+{
+ auto result = model->insertItem<SpecularInstrumentItem>();
+ result->setItemName(name);
+ GUI::Transform::FromDomain::setSpecularBeamItem(result->beamItem(), simulation);
+ GUI::Transform::FromDomain::setBackground(result, simulation);
+
+ return result;
+}
+
} // namespace
+// ************************************************************************************************
+// class implementation
+// ************************************************************************************************
+
SessionItem* GUI::Model::ObjectBuilder::populateSampleModel(SampleModel* sampleModel,
MaterialModel* materialModel,
const MultiLayer& sample,
@@ -83,47 +119,3 @@ SessionItem* GUI::Model::ObjectBuilder::populateDocumentModel(DocumentModel* p_d
return item;
}
-
-namespace {
-GISASInstrumentItem* createGISASInstrumentItem(InstrumentModel* model,
- const GISASSimulation& simulation,
- const QString& name)
-{
- auto result = model->insertItem<GISASInstrumentItem>();
- result->setItemName(name);
- GUI::Transform::FromDomain::setGISASBeamItem(result->beamItem(), simulation);
- GUI::Transform::FromDomain::setDetector(result, simulation);
- GUI::Transform::FromDomain::setBackground(result, simulation);
-
- return result;
-}
-
-OffSpecularInstrumentItem* createOffSpecularInstrumentItem(InstrumentModel* model,
- const OffSpecularSimulation& simulation,
- const QString& name)
-{
- auto result = model->insertItem<OffSpecularInstrumentItem>();
- result->setItemName(name);
- GUI::Transform::FromDomain::setOffSpecularBeamItem(result->beamItem(), simulation);
- GUI::Transform::FromDomain::setDetector(result, simulation);
- GUI::Transform::FromDomain::setBackground(result, simulation);
-
- BasicAxisItem* axisItem = result->alphaAxis();
- ASSERT(axisItem);
- GUI::Transform::FromDomain::setAxisItem(axisItem, *simulation.beamAxis(), 1. / Units::deg);
-
- return result;
-}
-
-SpecularInstrumentItem* createSpecularInstrumentItem(InstrumentModel* model,
- const SpecularSimulation& simulation,
- const QString& name)
-{
- auto result = model->insertItem<SpecularInstrumentItem>();
- result->setItemName(name);
- GUI::Transform::FromDomain::setSpecularBeamItem(result->beamItem(), simulation);
- GUI::Transform::FromDomain::setBackground(result, simulation);
-
- return result;
-}
-} // namespace
--
GitLab