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

Merge remote-tracking branch 'upstream/master' into feature_isinside

Browse Source
This commit is contained in:
Michael Greminger
2019-06-24 10:14:22 -05:00
parent 86c521a82e ef0808f410
commit 4fd04f37a1
13 changed files with 225 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
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):
"""
@ -1227,9 +1227,9 @@ class TestCadQuery(BaseTest):
self.assertEqual(7, c.faces().size())
# now cut it in half sideways
c.faces(">Y").workplane(-0.5).split(keepTop=True)
self.saveModel(c)
self.assertEqual(8, c.faces().size())
result = c.faces(">Y").workplane(-0.5).split(keepTop=True)
self.saveModel(result)
self.assertEqual(8, result.faces().size())
def testSplitKeepingBoth(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())
@ -1836,13 +1835,13 @@ class TestCadQuery(BaseTest):
box = Workplane("XY" ).box(4, 4, 0.5)
obj1 = box.faces('>Z').workplane()\
.text('CQ 2.0',0.5,-.05,cut=True,halign='left',valign='bottom')
.text('CQ 2.0',0.5,-.05,cut=True,halign='left',valign='bottom', font='Sans')
#combined object should have smaller volume
self.assertGreater(box.val().Volume(),obj1.val().Volume())
obj2 = box.faces('>Z').workplane()\
.text('CQ 2.0',0.5,.05,cut=False,combine=True)
.text('CQ 2.0',0.5,.05,cut=False,combine=True, font='Sans')
#combined object should have bigger volume
self.assertLess(box.val().Volume(),obj2.val().Volume())
@ -1851,7 +1850,7 @@ class TestCadQuery(BaseTest):
self.assertEqual(len(obj2.faces('>Z').vals()),5)
obj3 = box.faces('>Z').workplane()\
.text('CQ 2.0',0.5,.05,cut=False,combine=False,halign='right',valign='top')
.text('CQ 2.0',0.5,.05,cut=False,combine=False,halign='right',valign='top', font='Sans')
#verify that the number of solids is correct
self.assertEqual(len(obj3.solids().vals()),5)