diff --git a/cadquery/CQ.py b/cadquery/CQ.py index d2a5d8e..d723ee4 100644 --- a/cadquery/CQ.py +++ b/cadquery/CQ.py @@ -679,7 +679,7 @@ class CQ(object): startPt = obj.Center() endPt = startPt + endVec obj.rotate(startPt,endPt,angleDegrees) - + return self.each(_rot, False) def translate(self,vec): diff --git a/cadquery/freecad_impl/importers.py b/cadquery/freecad_impl/importers.py index 9a4243e..c8786d3 100644 --- a/cadquery/freecad_impl/importers.py +++ b/cadquery/freecad_impl/importers.py @@ -20,7 +20,7 @@ a string containing the model content. """ import cadquery -from .shapes import Shape, Compound +from .shapes import Shape import FreeCAD import Part diff --git a/tests/TestImporters.py b/tests/TestImporters.py index 6cb8390..edee5d5 100644 --- a/tests/TestImporters.py +++ b/tests/TestImporters.py @@ -16,39 +16,39 @@ if sys.platform.startswith("win"): else: OUTDIR = "/tmp" + class TestImporters(BaseTest): + def importBox(self, importType, fileName): + """ + Exports a simple box to a STEP file and then imports it again + :param importType: The type of file we're importing (STEP, STL, etc) + :param fileName: The path and name of the file to write to + """ + #We're importing a STEP file + if importType == importers.ImportTypes.STEP: + #We first need to build a simple shape to export + shape = Workplane("XY").box(1, 2, 3).val() - def importBox(self, importType,fileName): - """ - Exports a simple box to a STEP file and then imports it again - :param importType: The type of file we're importing (STEP, STL, etc) - :param fileName: The path and name of the file to write to - """ - #We're importing a STEP file - if importType == importers.ImportTypes.STEP: - #We first need to build a simple shape to export - shape = Workplane("XY").box(1,2,3).val() + #Export the shape to a temporary file + shape.exportStep(fileName) - #Export the shape to a temporary file - shape.exportStep(fileName) + # Reimport the shape from the new STEP file + importedShape = importers.importShape(importType,fileName) - # Reimport the shape from the new STEP file - importedShape = importers.importShape(importType,fileName) + #Check to make sure we got a solid back + self.assertTrue(importedShape.val().ShapeType() == "Solid") - #Check to make sure we got a solid back - self.assertTrue(importedShape.val().ShapeType() == "Solid") + #Check the number of faces and vertices per face to make sure we have a box shape + self.assertTrue(importedShape.faces("+X").size() == 1 and importedShape.faces("+X").vertices().size() == 4) + self.assertTrue(importedShape.faces("+Y").size() == 1 and importedShape.faces("+Y").vertices().size() == 4) + self.assertTrue(importedShape.faces("+Z").size() == 1 and importedShape.faces("+Z").vertices().size() == 4) - #Check the number of faces and vertices per face to make sure we have a box shape - self.assertTrue(importedShape.faces("+X").size() == 1 and importedShape.faces("+X").vertices().size() == 4) - self.assertTrue(importedShape.faces("+Y").size() == 1 and importedShape.faces("+Y").vertices().size() == 4) - self.assertTrue(importedShape.faces("+Z").size() == 1 and importedShape.faces("+Z").vertices().size() == 4) - - def testSTEP(self): - """ - Tests STEP file import - """ - self.importBox(importers.ImportTypes.STEP, OUTDIR + "/tempSTEP.step") + def testSTEP(self): + """ + Tests STEP file import + """ + self.importBox(importers.ImportTypes.STEP, OUTDIR + "/tempSTEP.step") if __name__ == '__main__': - import unittest - unittest.main() + import unittest + unittest.main()