From 6fe262d9d8569f14c2de4933a1ac640f45e45ee4 Mon Sep 17 00:00:00 2001
From: Simon Heybrock <simon.heybrock@esss.se>
Date: Thu, 3 Nov 2016 09:54:28 +0100
Subject: [PATCH] Re #17918. Removed need to include ParameterFactory.
---
Framework/Algorithms/test/MonteCarloTesting.h | 1 +
Framework/DataHandling/test/SaveParameterFileTest.h | 1 +
Framework/DataObjects/src/MDBoxFlatTree.cpp | 1 +
.../Geometry/inc/MantidGeometry/Instrument/ParameterMap.h | 6 ++++--
Framework/Geometry/src/Instrument.cpp | 1 +
Framework/Geometry/src/Instrument/Detector.cpp | 1 +
Framework/Geometry/src/Instrument/DetectorGroup.cpp | 4 +---
Framework/Geometry/src/Instrument/ParameterMap.cpp | 8 ++++++++
Framework/Geometry/src/Rendering/GluGeometryHandler.cpp | 1 +
Framework/Geometry/test/ParameterMapTest.h | 1 +
Framework/Geometry/test/SampleEnvironmentFactoryTest.h | 1 +
.../SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp | 1 +
.../src/PoldiUtilities/PoldiResidualCorrelationCore.cpp | 1 +
Vates/VatesAPI/src/MetaDataExtractorUtils.cpp | 1 +
14 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Framework/Algorithms/test/MonteCarloTesting.h b/Framework/Algorithms/test/MonteCarloTesting.h
index 26dd5a02aed..e47f65dbd1b 100644
--- a/Framework/Algorithms/test/MonteCarloTesting.h
+++ b/Framework/Algorithms/test/MonteCarloTesting.h
@@ -8,6 +8,7 @@
#include "MantidKernel/Material.h"
#include "MantidKernel/PseudoRandomNumberGenerator.h"
#include "MantidKernel/WarningSuppressions.h"
+#include "MantidKernel/make_unique.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
#include <gmock/gmock.h>
diff --git a/Framework/DataHandling/test/SaveParameterFileTest.h b/Framework/DataHandling/test/SaveParameterFileTest.h
index bd4fd8da473..8f201b81403 100644
--- a/Framework/DataHandling/test/SaveParameterFileTest.h
+++ b/Framework/DataHandling/test/SaveParameterFileTest.h
@@ -15,6 +15,7 @@
#include "MantidGeometry/IDetector.h"
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/Component.h"
+#include "MantidGeometry/Instrument/ParameterFactory.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/StringTokenizer.h"
#include "MantidTestHelpers/ScopedFileHelper.h"
diff --git a/Framework/DataObjects/src/MDBoxFlatTree.cpp b/Framework/DataObjects/src/MDBoxFlatTree.cpp
index 8d39771ffdf..7a9232e17ff 100644
--- a/Framework/DataObjects/src/MDBoxFlatTree.cpp
+++ b/Framework/DataObjects/src/MDBoxFlatTree.cpp
@@ -4,6 +4,7 @@
#include "MantidAPI/FileBackedExperimentInfo.h"
#include "MantidAPI/WorkspaceHistory.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidKernel/Logger.h"
#include "MantidKernel/Strings.h"
#include <Poco/File.h>
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
index 9ffebaf72b0..83bc80a18e3 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/ParameterMap.h
@@ -6,7 +6,6 @@
#include "MantidGeometry/IDetector.h"
#include "MantidGeometry/IDTypes.h" //For specnum_t
#include "MantidGeometry/Instrument/Parameter.h"
-#include "MantidGeometry/Instrument/ParameterFactory.h"
#include "tbb/concurrent_unordered_map.h"
@@ -142,7 +141,7 @@ public:
void add(const std::string &type, const IComponent *comp,
const std::string &name, const T &value,
const std::string *const pDescription = nullptr) {
- auto param = ParameterFactory::create(type, name);
+ auto param = create(type, name);
auto typedParam = boost::dynamic_pointer_cast<ParameterType<T>>(param);
assert(typedParam); // If not true the factory has created the wrong type
typedParam->setValue(value);
@@ -341,6 +340,9 @@ public:
pmap_cit end() const { return m_map.end(); }
private:
+ boost::shared_ptr<Parameter> create(const std::string &className,
+ const std::string &name) const;
+
/// Assignment operator
ParameterMap &operator=(ParameterMap *rhs);
/// internal function to get position of the parameter in the parameter map
diff --git a/Framework/Geometry/src/Instrument.cpp b/Framework/Geometry/src/Instrument.cpp
index ed3f3554109..96afd7b431f 100644
--- a/Framework/Geometry/src/Instrument.cpp
+++ b/Framework/Geometry/src/Instrument.cpp
@@ -4,6 +4,7 @@
#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidKernel/Exception.h"
+#include "MantidKernel/Logger.h"
#include "MantidKernel/PhysicalConstants.h"
#include <boost/make_shared.hpp>
diff --git a/Framework/Geometry/src/Instrument/Detector.cpp b/Framework/Geometry/src/Instrument/Detector.cpp
index ce6d6b47791..bb0fd7612c8 100644
--- a/Framework/Geometry/src/Instrument/Detector.cpp
+++ b/Framework/Geometry/src/Instrument/Detector.cpp
@@ -1,5 +1,6 @@
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
+#include "MantidKernel/Logger.h"
namespace Mantid {
namespace Geometry {
diff --git a/Framework/Geometry/src/Instrument/DetectorGroup.cpp b/Framework/Geometry/src/Instrument/DetectorGroup.cpp
index abc36ded770..7cfc6b7dc58 100644
--- a/Framework/Geometry/src/Instrument/DetectorGroup.cpp
+++ b/Framework/Geometry/src/Instrument/DetectorGroup.cpp
@@ -1,9 +1,7 @@
-//----------------------------------------------------------------------
-// Includes
-//----------------------------------------------------------------------
#include "MantidGeometry/Instrument/DetectorGroup.h"
#include "MantidGeometry/Objects/BoundingBox.h"
#include "MantidKernel/Exception.h"
+#include "MantidKernel/Logger.h"
#include "MantidKernel/Material.h"
namespace Mantid {
diff --git a/Framework/Geometry/src/Instrument/ParameterMap.cpp b/Framework/Geometry/src/Instrument/ParameterMap.cpp
index d79e376fe4d..1aac5cc4f0f 100644
--- a/Framework/Geometry/src/Instrument/ParameterMap.cpp
+++ b/Framework/Geometry/src/Instrument/ParameterMap.cpp
@@ -4,6 +4,7 @@
#include "MantidKernel/Cache.h"
#include "MantidKernel/MultiThreaded.h"
#include "MantidGeometry/Instrument.h"
+#include "MantidGeometry/Instrument/ParameterFactory.h"
#include <cstring>
#include <boost/algorithm/string.hpp>
@@ -1101,5 +1102,12 @@ void ParameterMap::addParameterFilename(const std::string &filename) {
m_parameterFileNames.push_back(filename);
}
+ /// Wrapper for ParameterFactory::create to avoid include in header
+boost::shared_ptr<Parameter>
+ParameterMap::create(const std::string &className,
+ const std::string &name) const {
+ return ParameterFactory::create(className, name);
+}
+
} // Namespace Geometry
} // Namespace Mantid
diff --git a/Framework/Geometry/src/Rendering/GluGeometryHandler.cpp b/Framework/Geometry/src/Rendering/GluGeometryHandler.cpp
index 2014b93e034..3ecd3e61fc9 100644
--- a/Framework/Geometry/src/Rendering/GluGeometryHandler.cpp
+++ b/Framework/Geometry/src/Rendering/GluGeometryHandler.cpp
@@ -3,6 +3,7 @@
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Rendering/GeometryHandler.h"
#include "MantidGeometry/Rendering/GluGeometryRenderer.h"
+#include "MantidKernel/make_unique.h"
#include <boost/make_shared.hpp>
diff --git a/Framework/Geometry/test/ParameterMapTest.h b/Framework/Geometry/test/ParameterMapTest.h
index 96bc3e32a4c..4b3a053d158 100644
--- a/Framework/Geometry/test/ParameterMapTest.h
+++ b/Framework/Geometry/test/ParameterMapTest.h
@@ -2,6 +2,7 @@
#define PARAMETERMAPTEST_H_
#include "MantidGeometry/Instrument/Parameter.h"
+#include "MantidGeometry/Instrument/ParameterFactory.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
diff --git a/Framework/Geometry/test/SampleEnvironmentFactoryTest.h b/Framework/Geometry/test/SampleEnvironmentFactoryTest.h
index 06290556258..65a6b4f07ce 100644
--- a/Framework/Geometry/test/SampleEnvironmentFactoryTest.h
+++ b/Framework/Geometry/test/SampleEnvironmentFactoryTest.h
@@ -5,6 +5,7 @@
#include "MantidGeometry/Instrument/SampleEnvironmentFactory.h"
#include "MantidGeometry/Instrument/Container.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
+#include "MantidKernel/make_unique.h"
#include "MantidTestHelpers/ComponentCreationHelper.h"
diff --git a/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp b/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
index bd62179cc94..faebce7e8a9 100644
--- a/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/PoldiAutoCorrelationCore.cpp
@@ -6,6 +6,7 @@
#include "boost/bind.hpp"
#include "MantidAPI/Axis.h"
#include "MantidAPI/WorkspaceFactory.h"
+#include "MantidKernel/Logger.h"
#include "MantidKernel/MultiThreaded.h"
#include "MantidSINQ/PoldiUtilities/PoldiDGrid.h"
diff --git a/Framework/SINQ/src/PoldiUtilities/PoldiResidualCorrelationCore.cpp b/Framework/SINQ/src/PoldiUtilities/PoldiResidualCorrelationCore.cpp
index 08e4c82fdc7..5fa777bf251 100644
--- a/Framework/SINQ/src/PoldiUtilities/PoldiResidualCorrelationCore.cpp
+++ b/Framework/SINQ/src/PoldiUtilities/PoldiResidualCorrelationCore.cpp
@@ -1,4 +1,5 @@
#include "MantidSINQ/PoldiUtilities/PoldiResidualCorrelationCore.h"
+#include "MantidKernel/Logger.h"
#include <algorithm>
#include <numeric>
diff --git a/Vates/VatesAPI/src/MetaDataExtractorUtils.cpp b/Vates/VatesAPI/src/MetaDataExtractorUtils.cpp
index 5d520a30563..c542bd38311 100644
--- a/Vates/VatesAPI/src/MetaDataExtractorUtils.cpp
+++ b/Vates/VatesAPI/src/MetaDataExtractorUtils.cpp
@@ -7,6 +7,7 @@
#include "MantidAPI/IMDWorkspace.h"
#include "MantidGeometry/Instrument.h"
#include "MantidKernel/Logger.h"
+#include "MantidKernel/MultiThreaded.h"
#include "boost/pointer_cast.hpp"
#include <cfloat>
--
GitLab