Merge pull request #55 from tpaviot/review/occt762

Review/occt762

Author: tpaviot

.travis.yml

@@ -1,16 +1,14 @@
-[![Travis Badge](https://travis-ci.org/tpaviot/pythonocc-demos.svg?branch=master)](https://travis-ci.org/tpaviot/pythonocc-demos)
-[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/2h130pglpchxjd5i/branch/master?svg=true)](https://ci.appveyor.com/project/tpaviot/pythonocc-demos)
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/tpaviot/pythonocc-demos.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/tpaviot/pythonocc-demos/context:python)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/6a7ad7d29ff44acea40ef5f130249557)](https://www.codacy.com/app/tpaviot/pythonocc-demos?utm_source=github.com&utm_medium=referral&utm_content=tpaviot/pythonocc-demos&utm_campaign=Badge_Grade)
 
 Some pythonocc related code snippets, examples, jupter notebooks etc.
 
 Requirements :
 
-* pythonocc-core 7.5.1
+* pythonocc-core 7.6.2
 
 ````
-conda install -c conda-forge pythonocc-core=7.5.1
+conda install -c conda-forge pythonocc-core=7.6.2
 ````
 
 * jupyter if you want to test the jupyter notebooks, as well as pythreejs.

README.md

@@ -170,9 +170,12 @@ def geom_plane_from_face(aFace: TopoDS_Face) -> gp_Pln:
 facesToRemove = TopTools_ListOfShape()
 facesToRemove.Append(aFace)
 
-myBody_step3 = BRepOffsetAPI_MakeThickSolid(
+mk_thick_solid = BRepOffsetAPI_MakeThickSolid()
+mk_thick_solid.MakeThickSolidByJoin(
     myBody_step2.Shape(), facesToRemove, -thickness / 50.0, 0.001
 )
+mk_thick_solid.Build()
+myBody_step3 = mk_thick_solid.Shape()
 
 # Set up our surfaces for the threading on the neck
 neckAx2_Ax3 = gp_Ax3(neckLocation, gp_DZ())
@@ -222,7 +225,7 @@ def geom_plane_from_face(aFace: TopoDS_Face) -> gp_Pln:
 bottle = TopoDS_Compound()
 aBuilder = BRep_Builder()
 aBuilder.MakeCompound(bottle)
-aBuilder.Add(bottle, myBody_step3.Shape())
+aBuilder.Add(bottle, myBody_step3)
 aBuilder.Add(bottle, myThreading)
 print("bottle finished")
 

appveyor.yml

@@ -17,7 +17,12 @@
 
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox
 from OCC.Core.AIS import AIS_ColorScale
-from OCC.Core.Graphic3d import Graphic3d_ZLayerId_TopOSD, Graphic3d_TMF_2d
+from OCC.Core.Aspect import Aspect_TOTP_LEFT_LOWER
+from OCC.Core.Graphic3d import (
+    Graphic3d_ZLayerId_TopOSD,
+    Graphic3d_TMF_2d,
+    Graphic3d_TransformPers,
+)
 from OCC.Core.gp import gp_XY, gp_Pnt
 
 from OCC.Display.SimpleGui import init_display
@@ -43,7 +48,9 @@
 colorscale.SetNumberOfIntervals(10)
 
 colorscale.SetZLayer(Graphic3d_ZLayerId_TopOSD)
-colorscale.SetTransformPersistence(Graphic3d_TMF_2d, gp_Pnt(-1, -1, 0))
+colorscale.SetTransformPersistence(
+    Graphic3d_TransformPers(Graphic3d_TMF_2d, Aspect_TOTP_LEFT_LOWER)
+)
 colorscale.SetToUpdate()
 
 display.Context.Display(colorscale, True)

assets/models/torus_default_resolution.stl

@@ -30,6 +30,9 @@
 
 # initialize the STEP exporter
 step_writer = STEPControl_Writer()
+dd = step_writer.WS().TransferWriter().FinderProcess()
+print(dd)
+
 Interface_Static_SetCVal("write.step.schema", "AP203")
 
 # transfer shapes and write file

examples/core_classic_occ_bottle.py

@@ -21,14 +21,15 @@
 import time
 
 from OCC.Core.BRep import BRep_Tool
-from OCC.Core.BRepAdaptor import BRepAdaptor_HCurve
+from OCC.Core.BRepAdaptor import BRepAdaptor_Curve
 from OCC.Core.BRepBuilderAPI import BRepBuilderAPI_MakePolygon
 from OCC.Core.BRepFill import BRepFill_CurveConstraint
 from OCC.Display.SimpleGui import init_display
 from OCC.Core.GeomAbs import GeomAbs_C0
 from OCC.Core.GeomLProp import GeomLProp_SLProps
 from OCC.Core.GeomPlate import (
     GeomPlate_BuildPlateSurface,
+    GeomPlate_CurveConstraint,
     GeomPlate_PointConstraint,
     GeomPlate_MakeApprox,
 )
@@ -134,9 +135,8 @@ def build_plate(polygon, points):
     # add curve constraints
     for poly in polygon:
         for edg in WireExplorer(poly).ordered_edges():
-            c = BRepAdaptor_HCurve()
-            c.ChangeCurve().Initialize(edg)
-            constraint = BRepFill_CurveConstraint(c, 0)
+            c = BRepAdaptor_Curve(edg)
+            constraint = GeomPlate_CurveConstraint(c, 0)
             bpSrf.Add(constraint)
 
     # add point constraint
@@ -253,10 +253,8 @@ def build_geom_plate(edges):
 
     # add curve constraints
     for edg in edges:
-        c = BRepAdaptor_HCurve()
-        print("edge:", edg)
-        c.ChangeCurve().Initialize(edg)
-        constraint = BRepFill_CurveConstraint(c, 0)
+        c = BRepAdaptor_Curve(edg)
+        constraint = GeomPlate_CurveConstraint(c, 0)
         bpSrf.Add(constraint)
 
     # add point constraint

examples/core_display_colorscale.py

@@ -23,7 +23,7 @@
 
 from OCC.Core.BRep import BRep_Builder
 from OCC.Core.BRepTools import breptools
-from OCC.Core.BRepAdaptor import BRepAdaptor_CompCurve, BRepAdaptor_HCompCurve
+from OCC.Core.BRepAdaptor import BRepAdaptor_CompCurve
 from OCC.Core.ShapeAnalysis import ShapeAnalysis_Curve
 from OCC.Core.TopoDS import TopoDS_Shape, topods
 from OCC.Core.gp import gp_Pnt
@@ -42,11 +42,10 @@
 
 # discretize the wire and interpolate using a C2
 wireAdaptor = BRepAdaptor_CompCurve(wire)
-curve = BRepAdaptor_HCompCurve(wireAdaptor)
 tol = 1e-7
 max_segments = 200
 max_degrees = 12
-approx = Approx_Curve3d(curve, tol, GeomAbs_C2, max_segments, max_degrees)
+approx = Approx_Curve3d(wireAdaptor, tol, GeomAbs_C2, max_segments, max_degrees)
 if approx.IsDone() and approx.HasResult():
     an_approximated_curve = approx.Curve()
 

examples/core_export_step_ap203.py

@@ -20,7 +20,7 @@
 from OCC.Display.SimpleGui import init_display
 from OCC.Extend.DataExchange import read_iges_file
 
-shapes = read_iges_file("../assets/models/surf114.igs")
+shapes = read_iges_file("../../pythonocc-core/test/test_io/example_45_faces.iges")
 
 display, start_display, add_menu, add_function_to_menu = init_display()
 display.DisplayShape(shapes, update=True)