Commit 400df480 authored by Karl Palmen's avatar Karl Palmen
Browse files

Rename Geometry::Object class to Geometry::CSGObject re #12827



The files are yet to be renamed

Signed-off-by: default avatarKarl Palmen <karl.palmen@stfc.ac.uk>
parent a2d24486
......@@ -17,7 +17,7 @@ GeometryHandler::GeometryHandler(IObjComponent *comp) : Obj() {
* @param[in] obj
* This geometry handler will be Object's geometry handler
*/
GeometryHandler::GeometryHandler(boost::shared_ptr<Object> obj)
GeometryHandler::GeometryHandler(boost::shared_ptr<CSGObject> obj)
: Obj(obj.get()) {
ObjComp = nullptr;
boolTriangulated = false;
......@@ -28,7 +28,7 @@ GeometryHandler::GeometryHandler(boost::shared_ptr<Object> obj)
* @param[in] obj
* This geometry handler will be Object's geometry handler
*/
GeometryHandler::GeometryHandler(Object *obj) : Obj(obj) {
GeometryHandler::GeometryHandler(CSGObject *obj) : Obj(obj) {
ObjComp = nullptr;
boolTriangulated = false;
boolIsInitialized = false;
......
......@@ -16,12 +16,12 @@ GluGeometryHandler::GluGeometryHandler(IObjComponent *comp)
Renderer(Kernel::make_unique<GluGeometryRenderer>()), radius(0.0),
height(0.0), type(GeometryType::NOSHAPE) {}
GluGeometryHandler::GluGeometryHandler(boost::shared_ptr<Object> obj)
GluGeometryHandler::GluGeometryHandler(boost::shared_ptr<CSGObject> obj)
: GeometryHandler(std::move(obj)),
Renderer(Kernel::make_unique<GluGeometryRenderer>()), radius(0.0),
height(0.0), type(GeometryType::NOSHAPE) {}
GluGeometryHandler::GluGeometryHandler(Object *obj)
GluGeometryHandler::GluGeometryHandler(CSGObject *obj)
: GeometryHandler(obj),
Renderer(Kernel::make_unique<GluGeometryRenderer>()), radius(0.0),
height(0.0), type(GeometryType::NOSHAPE) {}
......@@ -43,11 +43,11 @@ GeometryHandler *GluGeometryHandler::createInstance(IObjComponent *comp) {
}
GeometryHandler *
GluGeometryHandler::createInstance(boost::shared_ptr<Object> obj) {
GluGeometryHandler::createInstance(boost::shared_ptr<CSGObject> obj) {
return new GluGeometryHandler(obj);
}
GeometryHandler *GluGeometryHandler::createInstance(Object *obj) {
GeometryHandler *GluGeometryHandler::createInstance(CSGObject *obj) {
return new GluGeometryHandler(obj);
}
......
......@@ -77,7 +77,7 @@ Kernel::Logger g_log("OCGeometryGenerator");
* Constructor
* @param obj :: input object
*/
OCGeometryGenerator::OCGeometryGenerator(const Object *obj) : Obj(obj) {
OCGeometryGenerator::OCGeometryGenerator(const CSGObject *obj) : Obj(obj) {
ObjSurface = nullptr;
}
......
......@@ -15,13 +15,13 @@ OCGeometryHandler::OCGeometryHandler(IObjComponent *comp)
Renderer = new OCGeometryRenderer();
}
OCGeometryHandler::OCGeometryHandler(boost::shared_ptr<Object> obj)
OCGeometryHandler::OCGeometryHandler(boost::shared_ptr<CSGObject> obj)
: GeometryHandler(obj) {
Triangulator = new OCGeometryGenerator(obj.get());
Renderer = new OCGeometryRenderer();
}
OCGeometryHandler::OCGeometryHandler(Object *obj) : GeometryHandler(obj) {
OCGeometryHandler::OCGeometryHandler(CSGObject *obj) : GeometryHandler(obj) {
Triangulator = new OCGeometryGenerator(obj);
Renderer = new OCGeometryRenderer();
}
......@@ -46,11 +46,11 @@ GeometryHandler *OCGeometryHandler::createInstance(IObjComponent *comp) {
}
GeometryHandler *
OCGeometryHandler::createInstance(boost::shared_ptr<Object> obj) {
OCGeometryHandler::createInstance(boost::shared_ptr<CSGObject> obj) {
return new OCGeometryHandler(obj);
}
GeometryHandler *OCGeometryHandler::createInstance(Object *obj) {
GeometryHandler *OCGeometryHandler::createInstance(CSGObject *obj) {
return new OCGeometryHandler(obj);
}
......
......@@ -25,7 +25,7 @@ StructuredGeometryHandler::StructuredGeometryHandler(StructuredDetector *comp)
}
StructuredGeometryHandler::StructuredGeometryHandler()
: GeometryHandler(static_cast<Object *>(nullptr)), m_Det(nullptr) {}
: GeometryHandler(static_cast<CSGObject *>(nullptr)), m_Det(nullptr) {}
///< Create an instance of concrete geometry handler for ObjComponent
StructuredGeometryHandler *
......@@ -35,12 +35,12 @@ StructuredGeometryHandler::createInstance(IObjComponent *) {
///< Create an instance of concrete geometry handler for Object
StructuredGeometryHandler *
StructuredGeometryHandler::createInstance(boost::shared_ptr<Object>) {
StructuredGeometryHandler::createInstance(boost::shared_ptr<CSGObject>) {
return new StructuredGeometryHandler();
}
///< Create an instance of concrete geometry handler for Object
GeometryHandler *StructuredGeometryHandler::createInstance(Object *) {
GeometryHandler *StructuredGeometryHandler::createInstance(CSGObject *) {
return new StructuredGeometryHandler();
}
......
......@@ -57,7 +57,7 @@ void vtkGeometryCacheReader::Init() {
/**
* Set the geometry for the object
*/
void vtkGeometryCacheReader::readCacheForObject(Object *obj) {
void vtkGeometryCacheReader::readCacheForObject(CSGObject *obj) {
// Get the element corresponding to the name of the object
std::stringstream objName;
objName << obj->getName();
......
......@@ -76,7 +76,7 @@ void vtkGeometryCacheWriter::createVTKFileHeader() {
* Adds the geometry of the Object to the document
* @param obj :: The object to add
*/
void vtkGeometryCacheWriter::addObject(Object *obj) {
void vtkGeometryCacheWriter::addObject(CSGObject *obj) {
// First check whether Object can be written to the file
boost::shared_ptr<GeometryHandler> handle = obj->getGeometryHandler();
if (!(handle->canTriangulate()))
......
......@@ -503,7 +503,7 @@ public:
CompAssembly *bank3 = new CompAssembly("bank 111", detectors);
// add some rectangular detectors
boost::shared_ptr<Object> cuboidShape =
boost::shared_ptr<CSGObject> cuboidShape =
ComponentCreationHelper::createCuboid(0.5);
for (size_t i = 0; i < 15; i++) {
......
......@@ -44,7 +44,7 @@ makeComponentIDMap(const boost::shared_ptr<
return idMap;
}
boost::shared_ptr<Object> createCappedCylinder() {
boost::shared_ptr<CSGObject> createCappedCylinder() {
std::string C31 = "cx 0.5"; // cylinder x-axis radius 0.5
std::string C32 = "px 1.2";
std::string C33 = "px -3.2";
......@@ -66,7 +66,7 @@ boost::shared_ptr<Object> createCappedCylinder() {
// using surface ids: 31 (cylinder) 32 (plane (top) ) and 33 (plane (base))
std::string ObjCapCylinder = "-31 -32 33";
auto retVal = boost::make_shared<Object>();
auto retVal = boost::make_shared<CSGObject>();
retVal->setObject(21, ObjCapCylinder);
retVal->populate(CylSurMap);
......@@ -158,9 +158,9 @@ public:
std::vector<Mantid::Geometry::ComponentID>{&comp1, &comp2});
auto shapes = boost::make_shared<
std::vector<boost::shared_ptr<const Geometry::Object>>>();
shapes->push_back(boost::make_shared<const Geometry::Object>());
shapes->push_back(boost::make_shared<const Geometry::Object>());
std::vector<boost::shared_ptr<const Geometry::CSGObject>>>();
shapes->push_back(boost::make_shared<const Geometry::CSGObject>());
shapes->push_back(boost::make_shared<const Geometry::CSGObject>());
ComponentInfo info(std::move(internalInfo), componentIds,
makeComponentIDMap(componentIds), shapes);
......@@ -177,7 +177,7 @@ public:
std::vector<Mantid::Geometry::ComponentID>{&comp1});
auto shapes = boost::make_shared<
std::vector<boost::shared_ptr<const Geometry::Object>>>();
std::vector<boost::shared_ptr<const Geometry::CSGObject>>>();
shapes->push_back(createCappedCylinder());
ComponentInfo a(std::move(internalInfo), componentIds,
......@@ -203,7 +203,7 @@ public:
std::vector<Mantid::Geometry::ComponentID>{&comp1});
auto shapes = boost::make_shared<
std::vector<boost::shared_ptr<const Geometry::Object>>>();
std::vector<boost::shared_ptr<const Geometry::CSGObject>>>();
shapes->push_back(createCappedCylinder());
ComponentInfo compInfo(std::move(internalInfo), componentIds,
......@@ -211,7 +211,7 @@ public:
TS_ASSERT(compInfo.hasShape(0));
// Nullify the shape of the component
shapes->at(0) = boost::shared_ptr<const Geometry::Object>(nullptr);
shapes->at(0) = boost::shared_ptr<const Geometry::CSGObject>(nullptr);
TS_ASSERT(!compInfo.hasShape(0));
TS_ASSERT_THROWS(compInfo.solidAngle(0, V3D{1, 1, 1}),
Mantid::Kernel::Exception::NullPointerException &);
......@@ -231,7 +231,7 @@ public:
std::vector<Mantid::Geometry::ComponentID>{&comp1});
auto shapes = boost::make_shared<
std::vector<boost::shared_ptr<const Geometry::Object>>>();
std::vector<boost::shared_ptr<const Geometry::CSGObject>>>();
shapes->push_back(ComponentCreationHelper::createSphere(radius));
ComponentInfo info(std::move(internalInfo), componentIds,
......@@ -247,7 +247,7 @@ public:
observer = V3D{0, 0, 0};
TS_ASSERT_DELTA(info.solidAngle(0, observer), 4 * M_PI, satol);
// Nullify the shape and retest solid angle
shapes->at(0) = boost::shared_ptr<const Geometry::Object>(nullptr);
shapes->at(0) = boost::shared_ptr<const Geometry::CSGObject>(nullptr);
TS_ASSERT_THROWS(info.solidAngle(0, observer),
Mantid::Kernel::Exception::NullPointerException &);
}
......@@ -266,7 +266,7 @@ public:
std::vector<Mantid::Geometry::ComponentID>{&comp1});
auto shapes = boost::make_shared<
std::vector<boost::shared_ptr<const Geometry::Object>>>();
std::vector<boost::shared_ptr<const Geometry::CSGObject>>>();
shapes->push_back(createCappedCylinder());
ComponentInfo info(std::move(internalInfo), componentIds,
......@@ -289,7 +289,7 @@ public:
std::vector<Mantid::Geometry::ComponentID>{&comp1});
auto shapes = boost::make_shared<
std::vector<boost::shared_ptr<const Geometry::Object>>>();
std::vector<boost::shared_ptr<const Geometry::CSGObject>>>();
shapes->push_back(ComponentCreationHelper::createSphere(radius));
ComponentInfo componentInfo(std::move(internalInfo), componentIds,
......@@ -304,7 +304,7 @@ public:
(Kernel::V3D{position[0] + radius, position[1] + radius,
position[2] + radius})).norm() < 1e-9);
// Nullify shape and retest BoundingBox
shapes->at(0) = boost::shared_ptr<const Geometry::Object>(nullptr);
shapes->at(0) = boost::shared_ptr<const Geometry::CSGObject>(nullptr);
boundingBox = componentInfo.boundingBox(0);
TS_ASSERT(boundingBox.isNull());
}
......
......@@ -100,7 +100,7 @@ private:
"<height val =\"0.05\" />"
"</cylinder></type>");
}
double getSphereRadius(const Mantid::Geometry::Object &shape) {
double getSphereRadius(const Mantid::Geometry::CSGObject &shape) {
using Mantid::Geometry::SurfPoint;
using Mantid::Geometry::Sphere;
auto topRule = shape.topRule();
......
......@@ -342,7 +342,7 @@ public:
obj_str << "<radius val=\"0.1\" />";
obj_str << "<height val=\"0.2\" />";
obj_str << "</cylinder>";
boost::shared_ptr<Object> s =
boost::shared_ptr<CSGObject> s =
Mantid::Geometry::ShapeFactory().createShape(obj_str.str());
ObjCompAssembly bank("BankName");
......@@ -357,7 +357,7 @@ public:
bank.add(det2);
bank.add(det3);
boost::shared_ptr<Object> shape = bank.createOutline();
boost::shared_ptr<CSGObject> shape = bank.createOutline();
TS_ASSERT(shape);
int otype;
......@@ -379,7 +379,7 @@ public:
obj_str << "<radius val=\"0.1\" />";
obj_str << "<height val=\"0.2\" />";
obj_str << "</segmented-cylinder>";
boost::shared_ptr<Object> s =
boost::shared_ptr<CSGObject> s =
Mantid::Geometry::ShapeFactory().createShape(obj_str.str());
ObjCompAssembly bank("BankName");
......@@ -394,7 +394,7 @@ public:
bank.add(det2);
bank.add(det3);
TS_ASSERT_THROWS(boost::shared_ptr<Object> shape = bank.createOutline(),
TS_ASSERT_THROWS(boost::shared_ptr<CSGObject> shape = bank.createOutline(),
std::runtime_error);
}
};
......
......@@ -40,12 +40,12 @@ public:
void testShape() {
// Create an empty shape and put it in an ObjComponent
Object_const_sptr shape(new Object);
Object_const_sptr shape(new CSGObject);
ObjComponent objComp("obj", shape);
// Get it back - it's the same one
TS_ASSERT_EQUALS(objComp.shape(), shape);
// Put a different shape object in there and check we get back that one
Object_const_sptr shape2(new Object);
Object_const_sptr shape2(new CSGObject);
objComp.setShape(shape2);
TS_ASSERT_DIFFERS(objComp.shape(), shape);
TS_ASSERT_EQUALS(objComp.shape(), shape2);
......@@ -442,7 +442,7 @@ public:
}
private:
boost::shared_ptr<Object> createCappedCylinder() {
boost::shared_ptr<CSGObject> createCappedCylinder() {
std::string C31 = "cx 0.5"; // cylinder x-axis radius 0.5
std::string C32 = "px 1.2";
std::string C33 = "px -3.2";
......@@ -464,14 +464,14 @@ private:
// using surface ids: 31 (cylinder) 32 (plane (top) ) and 33 (plane (base))
std::string ObjCapCylinder = "-31 -32 33";
auto retVal = boost::make_shared<Object>();
auto retVal = boost::make_shared<CSGObject>();
retVal->setObject(21, ObjCapCylinder);
retVal->populate(CylSurMap);
return retVal;
}
boost::shared_ptr<Object> createCappedCylinder2() {
boost::shared_ptr<CSGObject> createCappedCylinder2() {
std::string C31 = "cx 0.5"; // cylinder x-axis radius 0.5
std::string C32 = "px -1.0";
std::string C33 = "px -3.0";
......@@ -493,14 +493,14 @@ private:
// using surface ids: 31 (cylinder) 32 (plane (top) ) and 33 (plane (base))
std::string ObjCapCylinder = "-31 -32 33";
boost::shared_ptr<Object> retVal = boost::make_shared<Object>();
boost::shared_ptr<CSGObject> retVal = boost::make_shared<CSGObject>();
retVal->setObject(21, ObjCapCylinder);
retVal->populate(CylSurMap);
return retVal;
}
boost::shared_ptr<Object> createCuboid(std::vector<std::string> &planes) {
boost::shared_ptr<CSGObject> createCuboid(std::vector<std::string> &planes) {
std::string C1 = planes[0];
std::string C2 = planes[1];
std::string C3 = planes[2];
......@@ -534,7 +534,7 @@ private:
// using surface ids: 1-6
std::string ObjCube = "1 -2 3 -4 5 -6";
boost::shared_ptr<Object> retVal = boost::make_shared<Object>();
boost::shared_ptr<CSGObject> retVal = boost::make_shared<CSGObject>();
retVal->setObject(68, ObjCube);
retVal->populate(CubeSurMap);
......
......@@ -61,7 +61,7 @@ class ObjectTest : public CxxTest::TestSuite {
public:
void testDefaultObjectHasEmptyMaterial() {
Object obj;
CSGObject obj;
TSM_ASSERT_DELTA("Expected a zero number density", 0.0,
obj.material().numberDensity(), 1e-12);
......@@ -69,7 +69,7 @@ public:
void testObjectSetMaterialReplacesExisting() {
using Mantid::Kernel::Material;
Object obj;
CSGObject obj;
TSM_ASSERT_DELTA("Expected a zero number density", 0.0,
obj.material().numberDensity(), 1e-12);
......@@ -90,7 +90,7 @@ public:
TS_ASSERT(boost::dynamic_pointer_cast<GluGeometryHandler>(
original->getGeometryHandler()));
Object copy(*original);
CSGObject copy(*original);
// The copy should be a primitive object with a GluGeometryHandler
objType = -1;
copy.GetObjectGeom(objType, pts, radius, height);
......@@ -116,7 +116,7 @@ public:
TS_ASSERT(boost::dynamic_pointer_cast<GluGeometryHandler>(
original->getGeometryHandler()));
Object lhs; // initialize
CSGObject lhs; // initialize
lhs = *original; // assign
// The copy should be a primitive object with a GluGeometryHandler
objType = -1;
......@@ -330,7 +330,7 @@ public:
// A sphere
std::string ObjSphere = "-41";
Object_sptr geom_obj = Object_sptr(new Object);
Object_sptr geom_obj = Object_sptr(new CSGObject);
geom_obj->setObject(41, ObjSphere);
geom_obj->populate(SphSurMap);
......@@ -431,12 +431,12 @@ public:
std::string ObjB = "80001 -80002 60003 -60004 60005 -60006";
createSurfaces(ObjA);
Object object1 = Object();
CSGObject object1 = CSGObject();
object1.setObject(3, ObjA);
object1.populate(SMap);
createSurfaces(ObjB);
Object object2 = Object();
CSGObject object2 = CSGObject();
object2.setObject(4, ObjB);
object2.populate(SMap);
......@@ -462,12 +462,12 @@ public:
std::string ObjB = "60002 -80002 60003 -60004 60005 -60006";
createSurfaces(ObjA);
Object object1 = Object();
CSGObject object1 = CSGObject();
object1.setObject(3, ObjA);
object1.populate(SMap);
createSurfaces(ObjB);
Object object2 = Object();
CSGObject object2 = CSGObject();
object2.setObject(4, ObjB);
object2.populate(SMap);
......@@ -494,12 +494,12 @@ public:
std::string ObjB = "-71";
createSurfaces(ObjA);
Object object1 = Object();
CSGObject object1 = CSGObject();
object1.setObject(3, ObjA);
object1.populate(SMap);
createSurfaces(ObjB);
Object object2 = Object();
CSGObject object2 = CSGObject();
object2.setObject(4, ObjB);
object2.populate(SMap);
......@@ -527,12 +527,12 @@ public:
std::string ObjB = "(-72 : -73)";
createSurfaces(ObjA);
Object object1 = Object();
CSGObject object1 = CSGObject();
object1.setObject(3, ObjA);
object1.populate(SMap);
createSurfaces(ObjB);
Object object2 = Object();
CSGObject object2 = CSGObject();
object2.setObject(4, ObjB);
object2.populate(SMap);
......@@ -560,12 +560,12 @@ public:
std::string ObjB = "(-72 : -73)";
createSurfaces(ObjA);
Object object1 = Object();
CSGObject object1 = CSGObject();
object1.setObject(3, ObjA);
object1.populate(SMap);
createSurfaces(ObjB);
Object object2 = Object();
CSGObject object2 = CSGObject();
object2.setObject(4, ObjB);
object2.populate(SMap);
......@@ -952,7 +952,7 @@ public:
}
void testVolumeThrowsWhenBoundingBoxIsInvalid() {
Object shape("This text gives an invalid Object.");
CSGObject shape("This text gives an invalid Object.");
TS_ASSERT_THROWS(shape.volume(), std::runtime_error);
}
......@@ -1168,7 +1168,7 @@ private:
// using surface ids: 31 (cylinder) 32 (plane (top) ) and 33 (plane (base))
std::string ObjCapCylinder = "-31 -32 33";
Object_sptr retVal = Object_sptr(new Object);
Object_sptr retVal = Object_sptr(new CSGObject);
retVal->setObject(21, ObjCapCylinder);
retVal->populate(CylSurMap);
......@@ -1203,7 +1203,7 @@ private:
// using surface ids: 31 (cylinder) 32 (plane (top) ) and 33 (plane (base))
std::string ObjCapCylinder = "-31 -32 33";
Object_sptr retVal = Object_sptr(new Object);
Object_sptr retVal = Object_sptr(new CSGObject);
retVal->setObject(21, ObjCapCylinder);
retVal->populate(CylSurMap);
......@@ -1303,7 +1303,7 @@ private:
// using surface ids: 1-6
std::string ObjCube = "1 -2 3 -4 5 -6";
Object_sptr retVal = Object_sptr(new Object);
Object_sptr retVal = Object_sptr(new CSGObject);
retVal->setObject(68, ObjCube);
retVal->populate(CubeSurMap);
......@@ -1344,7 +1344,7 @@ private:
// using surface ids: 1-6
std::string ObjCube = "1 -2 3 -4 5 -6";
Object_sptr retVal = Object_sptr(new Object);
Object_sptr retVal = Object_sptr(new CSGObject);
retVal->setObject(68, ObjCube);
retVal->populate(CubeSurMap);
......@@ -1424,7 +1424,7 @@ private:
std::string ObjHex = "-1 2 3 -4 -5 6";
Object_sptr retVal = Object_sptr(new Object);
Object_sptr retVal = Object_sptr(new CSGObject);
// Explicitly setting the GluGeometryHanler hexahedron allows
// for the correct bounding box calculation.
......
......@@ -117,7 +117,7 @@ public:
obj_str << "<radius val=\"0.1\" />";
obj_str << "<height val=\"0.2\" />";
obj_str << "</cylinder>";
boost::shared_ptr<Object> s =
boost::shared_ptr<CSGObject> s =
Mantid::Geometry::ShapeFactory().createShape(obj_str.str());
ObjCompAssembly bank("BankName");
......@@ -132,7 +132,7 @@ public:
bank.add(det2);
bank.add(det3);
boost::shared_ptr<Object> shape = bank.createOutline();
boost::shared_ptr<CSGObject> shape = bank.createOutline();
TS_ASSERT(shape);
int otype;
......
......@@ -296,7 +296,7 @@ public:
}
private:
boost::shared_ptr<Object> createCappedCylinder() {
boost::shared_ptr<CSGObject> createCappedCylinder() {
std::string C31 = "cx 0.5"; // cylinder x-axis radius 0.5
std::string C32 = "px 1.2";
std::string C33 = "px -3.2";
......@@ -318,14 +318,14 @@ private:
// using surface ids: 31 (cylinder) 32 (plane (top) ) and 33 (plane (base))
std::string ObjCapCylinder = "-31 -32 33";
auto retVal = boost::make_shared<Object>();
auto retVal = boost::make_shared<CSGObject>();
retVal->setObject(21, ObjCapCylinder);
retVal->populate(CylSurMap);
return retVal;
}
boost::shared_ptr<Object> createCuboid(std::vector<std::string> &planes) {
boost::shared_ptr<CSGObject> createCuboid(std::vector<std::string> &planes) {
std::string C1 = planes[0];
std::string C2 = planes[1];
std::string C3 = planes[2];
......@@ -359,7 +359,7 @@ private:
// using surface ids: 1-6
std::string ObjCube = "1 -2 3 -4 5 -6";
boost::shared_ptr<Object> retVal = boost::make_shared<Object>();
boost::shared_ptr<CSGObject> retVal = boost::make_shared<CSGObject>();
retVal->setObject(68, ObjCube);
retVal->populate(CubeSurMap);
......
......@@ -86,7 +86,7 @@ public:
}
void testFullConstructor() {
boost::shared_ptr<Geometry::Object> cuboidShape =
boost::shared_ptr<Geometry::CSGObject> cuboidShape =
ComponentCreationHelper::createCuboid(0.5);
RectangularDetector *det = new RectangularDetector("MyRectangle");
......@@ -202,7 +202,7 @@ public:
* resizes it.
*/
void testResizingParameter() {
boost::shared_ptr<Geometry::Object> cuboidShape =
boost::shared_ptr<Geometry::CSGObject> cuboidShape =
ComponentCreationHelper::createCuboid(0.5);
RectangularDetector *det = new RectangularDetector("MyRectangle");
......
......@@ -29,12 +29,12 @@ public:
TS_ASSERT_EQUALS(A.leaf(1), (Rule *)nullptr);
TS_ASSERT_EQUALS(A.display(), "#0");
TS_ASSERT_EQUALS(A.getObjN(), 0);
TS_ASSERT_EQUALS(A.getObj(), (Object *)nullptr);
TS_ASSERT_EQUALS(A.getObj(), (CSGObject *)nullptr);