Commit ed96f03b authored by Karl Palmen's avatar Karl Palmen
Browse files

Rename files of CSGObject re #12827



Signed-off-by: default avatarKarl Palmen <karl.palmen@stfc.ac.uk>
parent e794e226
......@@ -6,7 +6,7 @@
#include "MantidDataHandling/SetSample.h"
#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidGeometry/Instrument/SampleEnvironment.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/Rules.h"
#include "MantidGeometry/Surfaces/Sphere.h"
#include "MantidKernel/ArrayProperty.h"
......
......@@ -102,8 +102,8 @@ set ( SRC_FILES
src/Math/Triple.cpp
src/Math/mathSupport.cpp
src/Objects/BoundingBox.cpp
src/Objects/CSGObject.cpp
src/Objects/InstrumentRayTracer.cpp
src/Objects/Object.cpp
src/Objects/RuleItems.cpp
src/Objects/Rules.cpp
src/Objects/ShapeFactory.cpp
......@@ -267,8 +267,8 @@ set ( INC_FILES
inc/MantidGeometry/Math/Triple.h
inc/MantidGeometry/Math/mathSupport.h
inc/MantidGeometry/Objects/BoundingBox.h
inc/MantidGeometry/Objects/CSGObject.h
inc/MantidGeometry/Objects/InstrumentRayTracer.h
inc/MantidGeometry/Objects/Object.h
inc/MantidGeometry/Objects/Rules.h
inc/MantidGeometry/Objects/ShapeFactory.h
inc/MantidGeometry/Objects/Track.h
......@@ -321,6 +321,7 @@ set ( TEST_FILES
ConventionalCellTest.h
ConvexPolygonIteratorTest.h
ConvexPolygonTest.h
CSGObjectTest.h
CrystalStructureTest.h
CyclicGroupTest.h
CylinderTest.h
......@@ -363,7 +364,6 @@ set ( TEST_FILES
NullImplicitFunctionTest.h
ObjCompAssemblyTest.h
ObjComponentTest.h
ObjectTest.h
OrientedLatticeTest.h
ParCompAssemblyTest.h
ParComponentFactoryTest.h
......
......@@ -2,7 +2,7 @@
#define MANTID_GEOMETRY_CONTAINER_H_
#include "MantidGeometry/DllConfig.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include <unordered_map>
namespace Mantid {
......
......@@ -6,7 +6,7 @@
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Instrument/Component.h"
#include "MantidGeometry/Instrument/CompAssembly.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/IObjComponent.h"
namespace Mantid {
......
......@@ -6,7 +6,7 @@
#include "MantidGeometry/Instrument/CompAssembly.h"
#include "MantidGeometry/Instrument/Component.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include <string>
#include <vector>
......
......@@ -31,13 +31,14 @@ class vtkGeometryCacheReader;
class vtkGeometryCacheWriter;
/**
\class Object
\brief Global object for object
\class CSGObject
\brief Constructive Solid Geometry object
\version 1.0
\date July 2007
\author S. Ansell
An object is a collection of Rules and surface objects
A Constructive Solid Geometry (CSG) object, implemented
as a collection of Rules and surface objects
Copyright &copy; 2007-2010 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
National Laboratory & European Spallation Source
......
......@@ -6,7 +6,7 @@
//----------------------------------------------------------------------
#include "MantidGeometry/DllConfig.h"
#include "MantidGeometry/IComponent.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidKernel/Tolerance.h"
#include <list>
......
......@@ -8,9 +8,9 @@
#include "MantidKernel/Logger.h"
#include "MantidGeometry/IObjComponent.h"
#include "MantidGeometry/Rendering/GeometryHandler.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Instrument/RectangularDetector.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
namespace Mantid {
namespace Geometry {
......
......@@ -7,8 +7,8 @@
#include "MantidGeometry/DllConfig.h"
#include "MantidGeometry/IObjComponent.h"
#include "MantidGeometry/Instrument/StructuredDetector.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Rendering/GeometryHandler.h"
#include "MantidKernel/Logger.h"
......
......@@ -2,7 +2,7 @@
#include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidGeometry/IComponent.h"
#include "MantidGeometry/Instrument/ReferenceFrame.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidGeometry/Instrument/Detector.h"
......
#include "MantidGeometry/Instrument/ComponentInfo.h"
#include "MantidGeometry/Objects/BoundingBox.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/IComponent.h"
#include "MantidBeamline/ComponentInfo.h"
#include "MantidKernel/EigenConversionHelpers.h"
......
......@@ -8,7 +8,7 @@
#include "MantidGeometry/Instrument.h"
#include "MantidGeometry/Instrument/ParameterMap.h"
#include "MantidGeometry/Instrument/ParComponentFactory.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidKernel/EigenConversionHelpers.h"
#include "MantidKernel/make_unique.h"
#include "MantidBeamline/ComponentInfo.h"
......
......@@ -2,7 +2,7 @@
#include "MantidGeometry/Instrument/ComponentVisitor.h"
#include "MantidGeometry/Instrument/ObjComponent.h"
#include "MantidGeometry/Instrument/ParComponentFactory.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Logger.h"
......
#include "MantidGeometry/Instrument/ObjComponent.h"
#include "MantidGeometry/Instrument/ComponentVisitor.h"
#include "MantidGeometry/Instrument/ComponentInfo.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/BoundingBox.h"
#include "MantidGeometry/Objects/Track.h"
#include "MantidKernel/Exception.h"
......
......@@ -4,7 +4,7 @@
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidKernel/Matrix.h"
#include "MantidGeometry/Objects/BoundingBox.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidGeometry/Objects/Track.h"
#include "MantidGeometry/Rendering/BitmapGeometryHandler.h"
......
......@@ -3,7 +3,7 @@
//------------------------------------------------------------------------------
#include "MantidGeometry/Instrument/SampleEnvironment.h"
#include "MantidGeometry/IObjComponent.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/Track.h"
#include "MantidKernel/PseudoRandomNumberGenerator.h"
......
......@@ -3,7 +3,7 @@
#include "MantidGeometry/Instrument/ComponentInfo.h"
#include "MantidGeometry/Instrument/Detector.h"
#include "MantidGeometry/Objects/BoundingBox.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidGeometry/Rendering/GluGeometryHandler.h"
#include "MantidGeometry/Rendering/StructuredGeometryHandler.h"
......
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/Rules.h"
#include "MantidGeometry/Objects/Track.h"
......
......@@ -20,7 +20,7 @@
#include "MantidGeometry/Surfaces/BaseVisit.h"
#include "MantidGeometry/Surfaces/Surface.h"
#include "MantidGeometry/Objects/Rules.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#ifdef ENABLE_OPENCASCADE
// Opencascade defines _USE_MATH_DEFINES without checking whether it is already
......
......@@ -3,7 +3,7 @@
//----------------------------------------------------------------------
#include "MantidGeometry/Instrument/Container.h"
#include "MantidGeometry/Objects/Object.h"
#include "MantidGeometry/Objects/CSGObject.h"
#include "MantidGeometry/Objects/ShapeFactory.h"
#include "MantidGeometry/Rendering/GluGeometryHandler.h"
#include "MantidGeometry/Surfaces/Cone.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment