fix cylinder rendering issue #37

ScreamingUdder · Aug 8, 2018 · 53ab09d · 53ab09d
1 parent 2347318
commit 53ab09d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp b/Framework/Geometry/src/Rendering/GeometryTriangulator.cpp
@@ -136,7 +136,7 @@ void GeometryTriangulator::OCAnalyzeObject() {
   if (m_csgObj != nullptr) // If object exists
   {
     // Get the top rule tree in Obj
-    const Rule *top = m_csgObj->topRule();
+    const auto *top = m_csgObj->topRule();
     if (top == nullptr) {
       m_objSurface.reset(new TopoDS_Shape());
       return;

diff --git a/Framework/NexusGeometry/src/NexusShapeFactory.cpp b/Framework/NexusGeometry/src/NexusShapeFactory.cpp
@@ -4,15 +4,18 @@
 #include "MantidGeometry/Objects/MeshObject.h"
 #include "MantidGeometry/Objects/MeshObject2D.h"
 #include "MantidGeometry/Objects/Rules.h"
+#include "MantidGeometry/Rendering/GeometryHandler.h"
+#include "MantidGeometry/Rendering/ShapeInfo.h"
 #include "MantidGeometry/Surfaces/Cylinder.h"
 #include "MantidGeometry/Surfaces/Plane.h"
 #include "MantidGeometry/Surfaces/Surface.h"
+#include "MantidKernel/EigenConversionHelpers.h"
 #include "MantidKernel/Material.h"
 #include "MantidKernel/V3D.h"
-#include "MantidKernel/EigenConversionHelpers.h"
 #include "MantidKernel/make_unique.h"
 
 #include <boost/make_shared.hpp>
+#include <iterator>
 
 namespace Mantid {
 namespace NexusGeometry {
@@ -22,15 +25,17 @@ using namespace Eigen;
 namespace {
 
 /// Finalise shape
-std::unique_ptr<const Geometry::IObject>
-createShape(const std::map<int, boost::shared_ptr<Geometry::Surface>> &surfaces,
-            const std::string &algebra, std::vector<double> &boundingBox) {
+std::unique_ptr<const Geometry::IObject> createCylinderShape(
+    const std::map<int, boost::shared_ptr<Geometry::Surface>> &surfaces,
+    const std::string &algebra, std::vector<double> &boundingBox,
+    Geometry::detail::ShapeInfo &&shapeInfo) {
   auto shape = Mantid::Kernel::make_unique<Geometry::CSGObject>();
   shape->setObject(21, algebra);
   shape->populate(surfaces);
   // Boundingbox x,y,z:max; x,y,z:min
   shape->defineBoundingBox(boundingBox[0], boundingBox[2], boundingBox[4],
                            boundingBox[1], boundingBox[3], boundingBox[5]);
+  shape->getGeometryHandler()->setShapeInfo(std::move(shapeInfo));
   return Mantid::Kernel::make_unique<const Geometry::CSGObject>(*shape);
 }
 
@@ -84,14 +89,16 @@ createCylinder(const Eigen::Matrix<double, 3, 3> &pointsDef) {
   // Calculate cylinder parameters
   auto centre = (pointsDef.col(2) + pointsDef.col(0)) / 2;
   auto axisVector = pointsDef.col(2) - pointsDef.col(0);
+  auto height = axisVector.norm();
   auto axisUnitVector = axisVector.normalized();
   auto radiusVector = pointsDef.col(1) - pointsDef.col(0);
   double radius = radiusVector.norm();
   Kernel::V3D normVec =
       Kernel::V3D(axisUnitVector(0), axisUnitVector(1), axisUnitVector(2));
 
   auto cylinder = boost::make_shared<Geometry::Cylinder>();
-  cylinder->setCentre(Kernel::V3D(centre(0), centre(1), centre(2)));
+  auto vCenter = Kernel::V3D(centre(0), centre(1), centre(2));
+  cylinder->setCentre(vCenter);
   cylinder->setNorm(normVec);
   cylinder->setRadius(radius);
 
@@ -129,7 +136,10 @@ createCylinder(const Eigen::Matrix<double, 3, 3> &pointsDef) {
   }
 
   std::string algebra = "(-1 -2 3)";
-  return createShape(surfaceShapes, algebra, boundingBoxSimplified);
+  Geometry::detail::ShapeInfo shapeInfo;
+  shapeInfo.setCylinder(vCenter, normVec, radius, height);
+  return createCylinderShape(surfaceShapes, algebra, boundingBoxSimplified,
+                             std::move(shapeInfo));
 }
 
 std::unique_ptr<const Geometry::IObject>