Commit 5994639d authored by Lamar Moore's avatar Lamar Moore
Browse files

remove shape handline from GluGeometryHandler in ShapeInfo re #21248

parent 78c596ab
......@@ -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
......
......@@ -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") {
......
......@@ -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"
......
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