diff --git a/LatticeDehomogenization/src/lattice/BuildLattice.cpp b/LatticeDehomogenization/src/lattice/BuildLattice.cpp index 442900070b26b053b2a6aa05061b20f0c1d1b4c4..b1da6677787b72a1e147c5680b8dc9459c63eba6 100644 --- a/LatticeDehomogenization/src/lattice/BuildLattice.cpp +++ b/LatticeDehomogenization/src/lattice/BuildLattice.cpp @@ -47,7 +47,6 @@ bool BuildLattice::mergeCells() fuser.SetTools(_unitCells); fuser.SetRunParallel(true); - fuser.SetFuzzyValue(1e-4); fuser.Build(); if (fuser.HasErrors()) @@ -57,13 +56,13 @@ bool BuildLattice::mergeCells() return false; } - fuser.SimplifyResult(); + /*fuser.SimplifyResult(); if (fuser.HasErrors()) { fuser.DumpErrors(std::cout); _errors.emplace_back(ErrorCodes::FailedToMergeCells); return false; - } + }*/ _lattice = fuser.Shape(); return true; } diff --git a/LatticeDehomogenization/src/lattice/BuildLattice.h b/LatticeDehomogenization/src/lattice/BuildLattice.h index cb582797b628f13d0ea0aa5ff3c313bbe5d219d2..38c85a10e29eb03e2de8e9d21910d36f0391518c 100644 --- a/LatticeDehomogenization/src/lattice/BuildLattice.h +++ b/LatticeDehomogenization/src/lattice/BuildLattice.h @@ -28,7 +28,7 @@ protected: TopoDS_ListOfShape _unitCells; TopoDS_Shape _tmpUnitCell; TopoDS_Shape _lattice; - TopoDS_Solid _boundingBox; + TopoDS_Shape _boundingBox; protected: bool buildCell(double w, double d, double h, double r); @@ -64,6 +64,8 @@ public: bool buildLattice(); TopoDS_Shape getLattice() { return _lattice; } + void setBoundingBox(const TopoDS_Shape& shape) { _boundingBox = shape; } + bool hasErrors() { return _errors.size() > 0; } void dumpErrors() {