ByoungSooPark/cadquery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug where telerance parameter of BoundingBox had of effect

Browse Source 
The tolerance parameter of the BoundingBox method of shape had no effect. Fixed this by passing the tolerance to the _fromTopoDS call. Changed the tolerance default value from 0.1 to None so that the global TOL is used by default.  This allows the user to set the global TOL value as outlined in #74.  The CenterofBoundbox method incorrectly passed a shape to the BoundingBox method, which is the position for the tolerance paramter. This has been fixed.  The _fromTopoDS method hard coded the global variable TOL in it's call to BRepMesh_IncrementalMesh. This has been updated to use the user supplied tolerance if one has been provided. Added test coverage for the tolerance parameter of the BoundingBox method.
This commit is contained in:
Michael Greminger
2019-07-29 10:20:55 -05:00
parent a17c217803
commit bcf7141197
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cadquery/occ_impl/geom.py
View File

@ -827,7 +827,7 @@ class BoundBox(object):
raise NotImplementedError raise NotImplementedError
# brepbndlib_AddOptimal(shape, bbox) #this is 'exact' but expensive - not yet wrapped by PythonOCC # brepbndlib_AddOptimal(shape, bbox) #this is 'exact' but expensive - not yet wrapped by PythonOCC
else: else:
mesh = BRepMesh_IncrementalMesh(shape, TOL, True) mesh = BRepMesh_IncrementalMesh(shape, tol, True)
mesh.Perform() mesh.Perform()
# this is adds +margin but is faster # this is adds +margin but is faster
brepbndlib_Add(shape, bbox, True) brepbndlib_Add(shape, bbox, True)

6
cadquery/occ_impl/shapes.py
View File

@ -315,8 +315,8 @@ class Shape(object):
def isValid(self): def isValid(self):
return BRepCheck_Analyzer(self.wrapped).IsValid() return BRepCheck_Analyzer(self.wrapped).IsValid()
def BoundingBox(self, tolerance=0.1): # need to implement that in GEOM def BoundingBox(self, tolerance=None): # need to implement that in GEOM
return BoundBox._fromTopoDS(self.wrapped) return BoundBox._fromTopoDS(self.wrapped, tol=tolerance)
def mirror(self, mirrorPlane="XY", basePointVector=(0, 0, 0)): def mirror(self, mirrorPlane="XY", basePointVector=(0, 0, 0)):
@ -353,7 +353,7 @@ class Shape(object):
return Shape.centerOfMass(self) return Shape.centerOfMass(self)
def CenterOfBoundBox(self, tolerance=0.1): def CenterOfBoundBox(self, tolerance=0.1):
return self.BoundingBox(self.wrapped).center return self.BoundingBox().center
@staticmethod @staticmethod
def CombinedCenter(objects): def CombinedCenter(objects):

9
tests/TestCadQuery.py
View File

@ -836,6 +836,15 @@ class TestCadQuery(BaseTest):
self.assertAlmostEqual(7.5, bb_center.y, 3) self.assertAlmostEqual(7.5, bb_center.y, 3)
self.assertAlmostEqual(50.0, bb_center.z, 3) self.assertAlmostEqual(50.0, bb_center.z, 3)
# The following will raise with the default tolerance of TOL 1e-2
bb = result.val().BoundingBox(tolerance=1e-3)
self.assertAlmostEqual(0.0, bb.xmin, 2)
self.assertAlmostEqual(28, bb.xmax, 2)
self.assertAlmostEqual(0.0, bb.ymin, 2)
self.assertAlmostEqual(15.0, bb.ymax, 2)
self.assertAlmostEqual(0.0, bb.zmin, 2)
self.assertAlmostEqual(100.0, bb.zmax, 2)
def testCutThroughAll(self): def testCutThroughAll(self):
""" """
Tests a model that uses more than one workplane Tests a model that uses more than one workplane