Made the STEP import function more robust so that it could return a CQ.Workplane object.

cadquery/freecad_impl/geom.py

@@ -18,9 +18,6 @@
 """
 
 import math,sys
-#import FreeCAD
-#from .verutil import fc_import
-#FreeCAD = fc_import("FreeCAD")
 import FreeCAD
 #Turns out we don't need the Part module here.
 

cadquery/freecad_impl/importers.py

@@ -20,10 +20,8 @@
     a string containing the model content.
 """
 import cadquery
-from .shapes import Shape
+from .shapes import Shape, Compound
-#from .verutil import fc_import
+
-# FreeCAD = fc_import("FreeCAD")
-# Part = fc_import("FreeCAD.Part")
 import FreeCAD
 import Part
 
@@ -34,6 +32,7 @@ class UNITS:
     MM = "mm"
     IN = "in"
 
+
 def importShape(importType, fileName):
     """
     Imports a file based on the type (STEP, STL, etc)
@@ -45,7 +44,8 @@ def importShape(importType,fileName):
     if importType == ImportTypes.STEP:
         return importStep(fileName)
 
-#Loads a STEP file into a CQ object
+
+#Loads a STEP file into a CQ.Workplane object
 def importStep(fileName):
     """
         Accepts a file name and loads the STEP file into a cadquery shape
@@ -56,9 +56,11 @@ def importStep(fileName):
     try:
         rshape = Part.read(fileName)
 
-		r = Shape.cast(rshape)
+        #Make sure that we extract all the solids
-		#print "loadStep: " + str(r)
+        solids = []
-		#print "Faces=%d" % cadquery.CQ(r).solids().size()
+        for solid in rshape.Solids:
-		return cadquery.CQ(r)
+            solids.append(Shape.cast(solid))
+
+        return cadquery.Workplane("XY").newObject(solids)
     except:
         raise ValueError("STEP File Could not be loaded")

cadquery/freecad_impl/shapes.py

@@ -49,10 +49,6 @@
 """
 from cadquery import Vector, BoundBox
 import FreeCAD
-
-#from .verutil import fc_import
-
-#FreeCADPart = fc_import("FreeCAD.Part")
 import Part as FreeCADPart