Merge branch 'master' of https://github.com/tpaviot/pythonocc-utils

Author: skidzo

.travis.yml

@@ -4,24 +4,19 @@ language: cpp
 
 matrix:
   include:
-    - env: PYTHON="2.7" CONDA_PY=27
-      os: linux
-      dist: trusty
-    - env: PYTHON="2.7" CONDA_PY=27
-      os: osx
-      osx_image: xcode8.3
-    - env: PYTHON="3.5" CONDA_PY=35
-      os: linux
-      dist: trusty
-    - env: PYTHON="3.5" CONDA_PY=35
-      os: osx
-      osx_image: xcode8.3
     - env: PYTHON="3.6" CONDA_PY=36
       os: linux
-      dist: trusty
+      dist: bionic
     - env: PYTHON="3.6" CONDA_PY=36
       os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
+    - env: PYTHON="3.7" CONDA_PY=37
+      os: linux
+      dist: bionic
+    - env: PYTHON="3.7" CONDA_PY=37
+      os: osx
+      osx_image: xcode9.4
+
 
 install:
   - if [ ${PYTHON:0:1} == "2" ]; then
@@ -52,7 +47,7 @@ install:
       conda create -n pythonocc-utils-test;
       source activate pythonocc-utils-test;
     fi;
-  - conda install -c dlr-sc -c conda-forge -c oce -c pythonocc pythonocc-core=0.18.1
+  - conda install -c dlr-sc -c pythonocc pythonocc-core=7.4.0rc1
 
 script:
   # osx needs a dedicate environment

OCCUtils/Common.py

@@ -120,7 +120,7 @@ def to_tcol_(_list, collection_type):
     array = collection_type(1, len(_list)+1)
     for n, i in enumerate(_list):
         array.SetValue(n+1, i)
-    return array.GetHandle()
+    return array
 
 
 def _Tcol_dim_1(li, _type):
@@ -188,7 +188,7 @@ def fix(li, _type):
 
     fixed_points = fix(list_of_points, TColgp_HArray1OfPnt)
     try:
-        interp = GeomAPI_Interpolate(fixed_points.GetHandle(), False, tolerance)
+        interp = GeomAPI_Interpolate(fixed_points, False, tolerance)
         interp.Load(start_tangent, end_tangent, False)
         interp.Perform()
         if interp.IsDone():
@@ -224,8 +224,8 @@ def fix(li, _type):
     fixed_vectors = fix(list_of_vectors, TColgp_Array1OfVec)
 
     try:
-        interp = GeomAPI_Interpolate(fixed_points.GetHandle(), False, tolerance)
-        interp.Load(fixed_vectors, fixed_mask.GetHandle(), False)
+        interp = GeomAPI_Interpolate(fixed_points, False, tolerance)
+        interp.Load(fixed_vectors, fixed_mask, False)
         interp.Perform()
         if interp.IsDone():
             return interp.Curve()
@@ -252,7 +252,7 @@ def fix(li, _type):
 
     fixed_points = fix(list_of_points, TColgp_HArray1OfPnt)
     try:
-        interp = GeomAPI_Interpolate(fixed_points.GetHandle(), closed, tolerance)
+        interp = GeomAPI_Interpolate(fixed_points, closed, tolerance)
         interp.Perform()
         if interp.IsDone():
             return interp.Curve()
@@ -414,12 +414,12 @@ def normal_vector_from_plane(plane, vec_length=1.):
 
 
 def fix_tolerance(shape, tolerance=TOLERANCE):
-    from OCC.ShapeFix import ShapeFix_ShapeTolerance
+    from OCC.Core.ShapeFix import ShapeFix_ShapeTolerance
     ShapeFix_ShapeTolerance().SetTolerance(shape, tolerance)
 
 
 def fix_continuity(edge, continuity=1):
-    from OCC.ShapeUpgrade import ShapeUpgrade_ShapeDivideContinuity
+    from OCC.Core.ShapeUpgrade import ShapeUpgrade_ShapeDivideContinuity
     su = ShapeUpgrade_ShapeDivideContinuity(edge)
     su.SetBoundaryCriterion(eval('GeomAbs_C'+str(continuity)))
     su.Perform()
@@ -433,7 +433,7 @@ def resample_curve_with_uniform_deflection(curve, deflection=0.5, degreeMin=3, d
     @param curve: TopoDS_Wire, TopoDS_Edge, curve
     @param n_samples:
     '''
-    from OCC.GCPnts import GCPnts_UniformDeflection
+    from OCC.Core.GCPnts import GCPnts_UniformDeflection
     crv = to_adaptor_3d(curve)
     defl = GCPnts_UniformDeflection(crv, deflection)
     with assert_isdone(defl, 'failed to compute UniformDeflection'):
@@ -497,7 +497,7 @@ def minimum_distance(shp1, shp2):
              minimum distance points on shp1
              minimum distance points on shp2
     '''
-    from OCC.BRepExtrema import BRepExtrema_DistShapeShape
+    from OCC.Core.BRepExtrema import BRepExtrema_DistShapeShape
     bdss = BRepExtrema_DistShapeShape(shp1, shp2)
     bdss.Perform()
     with assert_isdone(bdss, 'failed computing minimum distances'):
@@ -512,7 +512,7 @@ def minimum_distance(shp1, shp2):
 def vertex2pnt(vertex):
     '''returns a gp_Pnt from a TopoDS_Vertex
     '''
-    from OCC.Core.BRep import BRep_Tool
+    from OCC.Core.Core.BRep import BRep_Tool
     return BRep_Tool.Pnt(vertex)
 
 
@@ -543,7 +543,7 @@ def to_adaptor_3d(curveType):
     elif isinstance(curveType, TopoDS_Edge):
         return BRepAdaptor_Curve(curveType)
     elif issubclass(curveType.__class__, Geom_Curve):
-        return GeomAdaptor_Curve(curveType.GetHandle())
+        return GeomAdaptor_Curve(curveType)
     elif hasattr(curveType, 'GetObject'):
         _crv = curveType.GetObject()
         if issubclass(_crv.__class__, Geom_Curve):
@@ -554,7 +554,7 @@ def to_adaptor_3d(curveType):
 
 def project_point_on_curve(crv, pnt):
     if isinstance(crv, TopoDS_Shape):
-        # get the curve handle...
+        # get the curve
         crv = adapt_edge_to_curve(crv).Curve().Curve()
     else:
         raise NotImplementedError('expected a TopoDS_Edge...')
@@ -568,7 +568,7 @@ def project_point_on_plane(plane, point):
     @param plane: Geom_Plane
     @param point: gp_Pnt
     '''
-    from OCC.ProjLib import projlib_Project
+    from OCC.Core.ProjLib import projlib_Project
     pl = plane.Pln()
     aa, bb = projlib_Project(pl, point).Coord()
     point = plane.Value(aa, bb)
@@ -583,8 +583,8 @@ def wire_to_curve(wire, tolerance=TOLERANCE, order=GeomAbs_C2, max_segment=200,
     '''
     adap = BRepAdaptor_CompCurve(wire)
     hadap = BRepAdaptor_HCompCurve(adap)
-    from OCC.Approx import Approx_Curve3d
-    approx = Approx_Curve3d(hadap.GetHandle(), tolerance, order, max_segment, max_order)
+    from OCC.Core.Approx import Approx_Curve3d
+    approx = Approx_Curve3d(hadap, tolerance, order, max_segment, max_order)
     with assert_isdone(approx, 'not able to compute approximation from wire'):
         return approx.Curve().GetObject()
 

OCCUtils/Construct.py

@@ -214,7 +214,6 @@ def make_solid(*args):
     sld = BRepBuilderAPI_MakeSolid(*args)
     with assert_isdone(sld, 'failed to produce solid'):
         result = sld.Solid()
-        sld.Delete()
         return result
 
 
@@ -224,7 +223,6 @@ def make_shell(*args):
     st = ShapeToTopology()
     with assert_isdone(shell, 'failed to produce shell'):
         result = shell.Shell()
-        shell.Delete()
         return st(result)
 
 
@@ -233,7 +231,6 @@ def make_face(*args):
     face = BRepBuilderAPI_MakeFace(*args)
     with assert_isdone(face, 'failed to produce face'):
         result = face.Face()
-        face.Delete()
         return result
 
 
@@ -242,7 +239,6 @@ def make_edge2d(*args):
     edge = BRepBuilderAPI_MakeEdge2d(*args)
     with assert_isdone(edge, 'failed to produce edge'):
         result = edge.Edge()
-        edge.Delete()
     return result
 
 
@@ -251,7 +247,6 @@ def make_edge(*args):
     edge = BRepBuilderAPI_MakeEdge(*args)
     with assert_isdone(edge, 'failed to produce edge'):
         result = edge.Edge()
-        edge.Delete()
         return result
 
 
@@ -260,10 +255,8 @@ def make_vertex(*args):
     vert = BRepBuilderAPI_MakeVertex(*args)
     with assert_isdone(vert, 'failed to produce vertex'):
         result = vert.Vertex()
-        vert.Delete()
         return result
 
-
 @wraps(BRepBuilderAPI_MakeWire)
 def make_wire(*args):
     # if we get an iterable, than add all edges to wire builder
@@ -580,14 +573,14 @@ def make_constrained_surface_from_edges(edges): #, w
     for edg in edges:
         c = BRepAdaptor_HCurve()
         c.ChangeCurve().Initialize(edg)
-        constraint = BRepFill_CurveConstraint(c.GetHandle(), 0)
+        constraint = BRepFill_CurveConstraint(c, 0)
         bpSrf.Add(constraint)
     bpSrf.Perform()
     maxSeg, maxDeg, critOrder = 9, 8, 0
     tol = 1e-4
     srf = bpSrf.Surface()
     plate = GeomPlate_MakeApprox(srf, tol, maxSeg, maxDeg, tol, critOrder)
-    uMin, uMax, vMin, vMax = srf.Bounds() #srf.GetObject().Bounds()
+    uMin, uMax, vMin, vMax = srf.Bounds()
     face = make_face(plate.Surface(), uMin, uMax, vMin, vMax)
     #face = make_face(srf, w, False) #plate.Surface(), uMin, uMax, vMin, vMax)
     return face
@@ -606,7 +599,6 @@ def add_wire_to_face(face, wire, reverse=False):
         wire.Reverse()
     face.Add(wire)
     result = face.Face()
-    face.Delete()
     return result
 
 
@@ -676,15 +668,14 @@ def trim_wire(wire, shapeLimit1, shapeLimit2, periodic=False):
     adap = to_adaptor_3d(wire)
     bspl = adap.BSpline()
     if periodic:
-        spl = bspl # .GetObject()
-        if spl.IsClosed():
-            spl.SetPeriodic()
+        if bspl.IsClosed():
+            bspl.SetPeriodic()
         else:
             warnings.warn('the wire to be trimmed is not closed, hence cannot be made periodic')
     p1 = project_point_on_curve(bspl, shapeLimit1)[0]
     p2 = project_point_on_curve(bspl, shapeLimit2)[0]
     a, b = sorted([p1, p2])
-    tr = Geom_TrimmedCurve(bspl, a, b).GetHandle()
+    tr = Geom_TrimmedCurve(bspl, a, b)
     return make_edge(tr)
 
 #===========================================================================
@@ -696,7 +687,7 @@ def fix_shape(shp, tolerance=1e-3):
     from OCC.Core.ShapeFix import ShapeFix_Shape
     fix = ShapeFix_Shape(shp)
     fix.SetFixFreeShellMode(True)
-    sf = fix.FixShellTool() #.GetObject()
+    sf = fix.FixShellTool()
     sf.SetFixOrientationMode(True)
     fix.LimitTolerance(tolerance)
     fix.Perform()
@@ -823,16 +814,16 @@ def face_normal(face):
 
 
 def face_from_plane(_geom_plane, lowerLimit=-1000, upperLimit=1000):
-    from OCC.Core.Geom import Geom_RectangularTrimmedSurface
-    _trim_plane = make_face(Geom_RectangularTrimmedSurface(_geom_plane.GetHandle(), lowerLimit, upperLimit, lowerLimit, upperLimit).GetHandle())
+    from OCC.Geom import Geom_RectangularTrimmedSurface
+    _trim_plane = make_face(Geom_RectangularTrimmedSurface(_geom_plane, lowerLimit, upperLimit, lowerLimit, upperLimit))
     return _trim_plane
 
 
 def find_plane_from_shape(shape, tolerance=-1):
     try:
         fpl = BRepBuilderAPI_FindPlane(shape, tolerance)
         if fpl.Found():
-            return fpl.Plane() #.GetObject()
+            return fpl.Plane()
         else:
             return None
     except:
@@ -854,7 +845,7 @@ def fit_plane_through_face_vertices(_face):
     [NORMALS.Append(i) for i in normals]
     POINTS = to_tcol_(points, TColgp_HArray1OfPnt)
 
-    pl = GeomPlate_BuildAveragePlane(NORMALS, POINTS).Plane() #.GetObject()
+    pl = GeomPlate_BuildAveragePlane(NORMALS, POINTS).Plane()
     vec = gp_Vec(pl.Location(), _face.GlobalProperties.centre())
     pt = (pl.Location().as_vec() + vec).as_pnt()
     pl.SetLocation(pt)
@@ -867,13 +858,13 @@ def project_edge_onto_plane(edg, plane):
     :param plane:   Geom_Plane
     :return:        TopoDS_Edge projected on the plane
     """
-    from OCC.Core.GeomProjLib import geomprojlib_ProjectOnPlane
-    proj = geomprojlib_ProjectOnPlane(edg.adaptor.Curve().Curve(), plane.GetHandle(), plane.Axis().Direction(), 1)
+    from OCC.GeomProjLib import geomprojlib_ProjectOnPlane
+    proj = geomprojlib_ProjectOnPlane(edg.adaptor.Curve().Curve(), plane, plane.Axis().Direction(), 1)
     return make_edge(proj)
 
 
-def curve_to_bspline(crv_handle, tolerance=TOLERANCE, continuity=GeomAbs_C1, sections=300, degree=12):
-    approx_curve = GeomConvert_ApproxCurve(crv_handle, tolerance, continuity, sections, degree)
+def curve_to_bspline(crv, tolerance=TOLERANCE, continuity=GeomAbs_C1, sections=300, degree=12):
+    approx_curve = GeomConvert_ApproxCurve(crv, tolerance, continuity, sections, degree)
     with assert_isdone(approx_curve, 'could not compute bspline from curve'):
         return approx_curve.Curve()
 

OCCUtils/Iteration.py

@@ -18,7 +18,7 @@
 '''
 This module helps looping through topology
 '''
-from OCC.BRep import BRep_Tool
+from OCC.Core.BRep import BRep_Tool
 
 from OCCUtils.Topology import WireExplorer, Topo
 from OCCUtils.edge import Edge

OCCUtils/Topology.py

@@ -310,7 +310,7 @@ def _map_shapes_and_ancestors(self, topoTypeA, topoTypeB, topologicalEntity):
         _map = TopTools_IndexedDataMapOfShapeListOfShape()
         topexp_MapShapesAndAncestors(self.myShape, topoTypeA, topoTypeB, _map)
         results = _map.FindFromKey(topologicalEntity)
-        if results.IsEmpty():
+        if results.Size() == 0:
             yield None
 
         topology_iterator = TopTools_ListIteratorOfListOfShape(results)
@@ -348,7 +348,7 @@ def _number_shapes_ancestors(self, topoTypeA, topoTypeB, topologicalEntity):
         _map = TopTools_IndexedDataMapOfShapeListOfShape()
         topexp_MapShapesAndAncestors(self.myShape, topoTypeA, topoTypeB, _map)
         results = _map.FindFromKey(topologicalEntity)
-        if results.IsEmpty():
+        if results.Size() == 0:
             return None
         topology_iterator = TopTools_ListIteratorOfListOfShape(results)
         while topology_iterator.More():