suzanne.soy/cadquery-freecad-module
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up a few of the assert statements and fixed the findall line in exporters.py based on a FutureWarning.

Browse Source
This commit is contained in:
Jeremy Wright 2014-08-19 08:10:46 -04:00
parent 0e5980400a
commit 55b70c882c
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cadquery/freecad_impl/exporters.py
View File

@ -239,7 +239,7 @@ def getPaths(freeCadSVG):
#yuk, freecad returns svg fragments. stupid stupid #yuk, freecad returns svg fragments. stupid stupid
fullDoc = "<root>%s</root>" % freeCadSVG fullDoc = "<root>%s</root>" % freeCadSVG
e = ET.ElementTree(ET.fromstring(fullDoc)) e = ET.ElementTree(ET.fromstring(fullDoc))
segments = e.findall("//g") segments = e.findall(".//g")
for s in segments: for s in segments:
paths = s.findall("path") paths = s.findall("path")

13
tests/TestImporters.py
View File

@ -38,15 +38,10 @@ class TestImporters(BaseTest):
#Check to make sure we got a solid back #Check to make sure we got a solid back
self.assertTrue(importedShape.val().ShapeType() == "Solid") self.assertTrue(importedShape.val().ShapeType() == "Solid")
#Check the number of vertices per face to make sure we have a box shape #Check the number of faces and vertices per face to make sure we have a box shape
self.assertTrue(importedShape.faces("+X").vertices().size() == 4) self.assertTrue(importedShape.faces("+X").size() == 1 and importedShape.faces("+X").vertices().size() == 4)
self.assertTrue(importedShape.faces("+Y").vertices().size() == 4) self.assertTrue(importedShape.faces("+Y").size() == 1 and importedShape.faces("+Y").vertices().size() == 4)
self.assertTrue(importedShape.faces("+Z").vertices().size() == 4) self.assertTrue(importedShape.faces("+Z").size() == 1 and importedShape.faces("+Z").vertices().size() == 4)
#Check the faces per selection on an axis to make sure we have a box shape
self.assertTrue(importedShape.faces("+X").size() == 1)
self.assertTrue(importedShape.faces("+Y").size() == 1)
self.assertTrue(importedShape.faces("+Z").size() == 1)
def testSTEP(self): def testSTEP(self):
""" """