minor changes

Isabel · Isabel · commit a97956d5bc34 · 2020-01-04T20:32:06.000+01:00
diff --git a/OCCUtils/Construct.py b/OCCUtils/Construct.py
@@ -693,7 +693,7 @@ def trim_wire(wire, shapeLimit1, shapeLimit2, periodic=False):
 
 
 def fix_shape(shp, tolerance=1e-3):
-    from OCC.ShapeFix import ShapeFix_Shape
+    from OCC.Core.ShapeFix import ShapeFix_Shape
     fix = ShapeFix_Shape(shp)
     fix.SetFixFreeShellMode(True)
     sf = fix.FixShellTool() #.GetObject()
@@ -704,14 +704,14 @@ def fix_shape(shp, tolerance=1e-3):
 
 
 def fix_face(shp, tolerance=1e-3):
-    from OCC.ShapeFix import ShapeFix_Face
+    from OCC.Core.ShapeFix import ShapeFix_Face
     fix = ShapeFix_Face(shp)
     fix.SetMaxTolerance(tolerance)
     fix.Perform()
     return fix.Face()
 
 def fix_small_faces(shp, prec, tolerance=1e-3):
-    from OCC.ShapeFix import ShapeFix_FixSmallFace
+    from OCC.Core.ShapeFix import ShapeFix_FixSmallFace
     fix = ShapeFix_FixSmallFace()
     fix.Init(shp)
     fix.SetPrecision(prec)
@@ -720,12 +720,12 @@ def fix_small_faces(shp, prec, tolerance=1e-3):
     return fix.FixShape()
 
 def fix_solid(shp, tolerance=1e-3):
-    from OCC.ShapeFix import ShapeFix_Solid
+    from OCC.Core.ShapeFix import ShapeFix_Solid
     fix = ShapeFix_Solid(shp)
     fix.SetCreateOpenSolidMode(True)
     fix.SetMaxTolerance(tolerance)
     fix.Perform()
-    print(dir(fix))
+    # print(dir(fix))
     return fix.Solid()
 
 #===========================================================================
diff --git a/OCCUtils/shell.py b/OCCUtils/shell.py
@@ -16,7 +16,7 @@
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>
 
 from OCC.Core.TopoDS import TopoDS_Shell
-from OCC.ShapeAnalysis import ShapeAnalysis_Shell
+from OCC.Core.ShapeAnalysis import ShapeAnalysis_Shell
 
 from OCCUtils.Topology import Topo
 from OCCUtils.base import BaseObject, GlobalProperties
diff --git a/OCCUtils/types_lut.py b/OCCUtils/types_lut.py
@@ -20,7 +20,8 @@
 from OCC.Core.TopoDS import topods, TopoDS_Shape
 from OCC.Core.BRep import BRep_Tool_Surface
 from OCC.Core.TopAbs import *
-from OCC.Core.Geom import Handle_Geom_CylindricalSurface, Handle_Geom_Plane
+# from OCC.Geom import Handle_Geom_CylindricalSurface, Handle_Geom_Plane
+#Handle_Geom_CylindricalSurface, Handle_Geom_Plane
 
 
 class ShapeToTopology(object):
