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

Remove the combine arg for bool ops and get rid of side-effects

Browse Source
This commit is contained in:
adam-urbanczyk
2019-06-08 17:21:23 +02:00
parent 646e07c33a
commit e4c84c99e0
2 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/TestCadQuery.py
View File

@ -771,9 +771,9 @@ class TestCadQuery(BaseTest):
currentS = s.rect(2.0, 2.0).extrude(0.5)
toCut = s.rect(1.0, 1.0).extrude(0.5)
currentS.cut(toCut.val())
resS = currentS.cut(toCut.val())
self.assertEqual(10, currentS.faces().size())
self.assertEqual(10, resS.faces().size())
def testIntersect(self):
"""
@ -783,15 +783,15 @@ class TestCadQuery(BaseTest):
currentS = s.rect(2.0, 2.0).extrude(0.5)
toIntersect = s.rect(1.0, 1.0).extrude(1)
currentS.intersect(toIntersect.val())
resS = currentS.intersect(toIntersect.val())
self.assertEqual(6, currentS.faces().size())
self.assertAlmostEqual(currentS.val().Volume(),0.5)
self.assertEqual(6, resS.faces().size())
self.assertAlmostEqual(resS.val().Volume(),0.5)
currentS.intersect(toIntersect)
resS = currentS.intersect(toIntersect)
self.assertEqual(6, currentS.faces().size())
self.assertAlmostEqual(currentS.val().Volume(),0.5)
self.assertEqual(6, resS.faces().size())
self.assertAlmostEqual(resS.val().Volume(),0.5)
def testBoundingBox(self):
"""
@ -1414,10 +1414,9 @@ class TestCadQuery(BaseTest):
currentS = s.rect(2.0, 2.0).extrude(0.5)
toUnion = s.rect(1.0, 1.0).extrude(1.0)
currentS.union(toUnion.val(), combine=False)
# TODO: When unioning and combining is figured out, uncomment the following assert
# self.assertEqual(10,currentS.faces().size())
resS = currentS.union(toUnion)
self.assertEqual(11,resS.faces().size())
def testCombine(self):
s = Workplane(Plane.XY())