Merge pull request tpaviot#29 from tnakaicode/master

tpaviot · web-flow · commit babb37e91a59 · 2022-09-17T06:22:01.000+02:00
update for pythonocc-core=7.6.2
diff --git a/.gitignore b/.gitignore
@@ -55,3 +55,6 @@ docs/_build/
 
 # PyBuilder
 target/
+
+# VScode
+.vscode/launch.json
diff --git a/OCCUtils/Common.py b/OCCUtils/Common.py
@@ -26,8 +26,8 @@
                              TColgp_Array1OfPnt2d,
                              TColgp_Array1OfVec)
 from OCC.Core.TColStd import TColStd_HArray1OfBoolean
-from OCC.Core.BRepAdaptor import (BRepAdaptor_Curve, BRepAdaptor_HCurve,
-                                  BRepAdaptor_CompCurve, BRepAdaptor_HCompCurve)
+from OCC.Core.BRepAdaptor import (BRepAdaptor_Curve, BRepAdaptor_Curve,
+                                  BRepAdaptor_CompCurve, BRepAdaptor_CompCurve)
 from OCC.Core.GeomAPI import (GeomAPI_Interpolate, GeomAPI_PointsToBSpline,
                               GeomAPI_ProjectPointOnCurve)
 from OCC.Core.gp import gp_Pnt, gp_Vec, gp_Trsf
@@ -525,7 +525,7 @@ def adapt_edge_to_curve(edg):
 
 
 def adapt_edge_to_hcurve(edg):
-    c = BRepAdaptor_HCurve()
+    c = BRepAdaptor_Curve()
     c.ChangeCurve().Initialize(edg)
     return c
 
@@ -579,7 +579,7 @@ def wire_to_curve(wire, tolerance=TOLERANCE, order=GeomAbs_C2, max_segment=200,
     @param wire:
     '''
     adap = BRepAdaptor_CompCurve(wire)
-    hadap = BRepAdaptor_HCompCurve(adap)
+    hadap = BRepAdaptor_CompCurve(adap)
     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'):
@@ -595,6 +595,6 @@ def adapt_edge_to_curve(edg):
 
 
 def adapt_edge_to_hcurve(edg):
-    c = BRepAdaptor_HCurve()
+    c = BRepAdaptor_Curve()
     c.ChangeCurve().Initialize(edg)
     return c
diff --git a/OCCUtils/Construct.py b/OCCUtils/Construct.py
@@ -28,7 +28,7 @@
 import math
 
 from OCC.Core.BRep import BRep_Tool
-from OCC.Core.BRepAdaptor import BRepAdaptor_HCurve
+from OCC.Core.BRepAdaptor import BRepAdaptor_Curve
 from OCC.Core.BRepOffset import BRepOffset_Skin
 from OCC.Core.Geom import Geom_TrimmedCurve
 from OCC.Core.GeomConvert import GeomConvert_ApproxCurve
@@ -546,7 +546,7 @@ def make_constrained_surface_from_edges(edges):
     from OCC.Core.BRepFill import BRepFill_CurveConstraint
     bpSrf = GeomPlate_BuildPlateSurface(3, 15, 2)
     for edg in edges:
-        c = BRepAdaptor_HCurve()
+        c = BRepAdaptor_Curve()
         c.ChangeCurve().Initialize(edg)
         constraint = BRepFill_CurveConstraint(c, 0)
         bpSrf.Add(constraint)
diff --git a/OCCUtils/edge.py b/OCCUtils/edge.py
@@ -15,7 +15,7 @@
 ##You should have received a copy of the GNU Lesser General Public License
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>
 
-from OCC.Core.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_HCurve
+from OCC.Core.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_Curve
 from OCC.Core.GCPnts import GCPnts_UniformAbscissa
 from OCC.Core.Geom import Geom_OffsetCurve, Geom_TrimmedCurve
 from OCC.Core.TopExp import topexp
diff --git a/examples/occutils_geomplate.py b/examples/occutils_geomplate.py
@@ -29,16 +29,16 @@
 import time
 
 from OCC.Core.gp import gp_Pnt
-from OCC.Core.BRepAdaptor import BRepAdaptor_HCurve
+from OCC.Core.BRepAdaptor import BRepAdaptor_Curve
 from OCC.Core.BRep import BRep_Tool
 from OCC.Core.ShapeAnalysis import ShapeAnalysis_Surface
 from OCC.Core.GeomLProp import GeomLProp_SLProps
 from OCC.Core.BRepFill import BRepFill_CurveConstraint
-from OCC.GeomPlate import (GeomPlate_MakeApprox,
+from OCC.Core.GeomPlate import (GeomPlate_MakeApprox,
                            GeomPlate_BuildPlateSurface,
                            GeomPlate_PointConstraint)
-from OCC.IGESControl import IGESControl_Reader
-from OCC.IFSelect import (IFSelect_RetDone,
+from OCC.Core.IGESControl import IGESControl_Reader
+from OCC.Core.IFSelect import (IFSelect_RetDone,
                           IFSelect_ItemsByEntity)
 from OCC.Display.SimpleGui import init_display
 from OCC.Core.TopoDS import TopoDS_Compound
@@ -154,7 +154,7 @@ def build_plate(polygon, points):
     # add curve constraints
     for poly in polygon:
         for edg in WireExplorer(poly).ordered_edges():
-            c = BRepAdaptor_HCurve()
+            c = BRepAdaptor_Curve()
             c.ChangeCurve().Initialize(edg)
             constraint = BRepFill_CurveConstraint(c.GetHandle(), 0)
             bpSrf.Add(constraint.GetHandle())
@@ -270,7 +270,7 @@ def build_geom_plate(edges):
 
     # add curve constraints
     for edg in edges:
-        c = BRepAdaptor_HCurve()
+        c = BRepAdaptor_Curve()
         print('edge:', edg)
         c.ChangeCurve().Initialize(edg)
         constraint = BRepFill_CurveConstraint(c.GetHandle(), 0)
