Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
5994639d
Commit
5994639d
authored
Nov 29, 2017
by
Lamar Moore
Browse files
remove shape handline from GluGeometryHandler in ShapeInfo re #21248
parent
78c596ab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Framework/Geometry/inc/MantidGeometry/Objects/CSGObject.h
View file @
5994639d
...
...
@@ -259,6 +259,7 @@ private:
/// Geometry Handle for rendering
boost
::
shared_ptr
<
GeometryHandler
>
m_handler
;
friend
class
GeometryHandler
;
friend
class
GeometryRenderer
;
/// Is geometry caching enabled?
bool
bGeometryCaching
;
/// a pointer to a class for reading from the geometry cache
...
...
Framework/Geometry/src/Objects/ShapeFactory.cpp
View file @
5994639d
...
...
@@ -7,6 +7,7 @@
#include
"MantidGeometry/Objects/ShapeFactory.h"
#include
"MantidGeometry/Rendering/GeometryHandler.h"
#include
"MantidGeometry/Rendering/ShapeInfo.h"
#include
"MantidGeometry/Rendering/ShapeInfo.h"
#include
"MantidGeometry/Surfaces/Cone.h"
#include
"MantidGeometry/Surfaces/Cylinder.h"
#include
"MantidGeometry/Surfaces/Plane.h"
...
...
@@ -1416,6 +1417,7 @@ ShapeFactory::createHexahedralShape(double xlb, double xlf, double xrf,
shapeInfo
.
setHexahedron
(
hex
.
lbb
,
hex
.
lfb
,
hex
.
rfb
,
hex
.
rbb
,
hex
.
lbt
,
hex
.
lft
,
hex
.
rft
,
hex
.
rbt
);
handler
->
setShapeInfo
(
std
::
move
(
shapeInfo
));
shape
->
defineBoundingBox
(
std
::
max
(
xrb
,
xrf
),
yrf
,
ZDEPTH
,
std
::
min
(
xlf
,
xlb
),
...
...
@@ -1430,6 +1432,7 @@ void ShapeFactory::createGeometryHandler(Poco::XML::Element *pElem,
auto
geomHandler
=
boost
::
make_shared
<
GeometryHandler
>
(
Obj
);
detail
::
ShapeInfo
shapeInfo
;
detail
::
ShapeInfo
shapeInfo
;
Obj
->
setGeometryHandler
(
geomHandler
);
if
(
pElem
->
tagName
()
==
"cuboid"
)
{
...
...
Framework/Geometry/test/CSGObjectTest.h
View file @
5994639d
...
...
@@ -12,6 +12,7 @@
#include
"MantidGeometry/Objects/Track.h"
#include
"MantidGeometry/Rendering/GeometryHandler.h"
#include
"MantidGeometry/Rendering/ShapeInfo.h"
#include
"MantidGeometry/Rendering/ShapeInfo.h"
#include
"MantidGeometry/Objects/ShapeFactory.h"
#include
"MantidKernel/make_unique.h"
#include
"MantidKernel/Material.h"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment