mypy pass: replace deprecated OCC wrapper functions

- migrate deprecated module-level wrappers to their static class
  methods (breptools_Read -> breptools.Read, gp_XOY -> gp.XOY,
  brepgprop_*, brepbndlib_Add, XCAFDoc_DocumentTool_*, ...)
- pass an Aspect_HatchStyle to SetCappingHatch instead of a bool
- add mypy configuration to pyproject.toml

Author: tpaviot

examples/core_classic_occ_bottle.py

@@ -40,12 +40,11 @@
 from OCC.Core.Geom2d import Geom2d_Ellipse, Geom2d_TrimmedCurve
 from OCC.Core.GeomAbs import GeomAbs_Plane
 from OCC.Core.gp import (
+    gp,
     gp_Ax2,
     gp_Ax2d,
     gp_Ax3,
     gp_Dir2d,
-    gp_DZ,
-    gp_OX,
     gp_Pln,
     gp_Pnt,
     gp_Pnt2d,
@@ -99,7 +98,7 @@ def geom_plane_from_face(aFace: TopoDS_Face) -> gp_Pln:
 aWire = BRepBuilderAPI_MakeWire(aEdge1.Edge(), aEdge2.Edge(), aEdge3.Edge())
 
 # Quick way to specify the X axis
-xAxis = gp_OX()
+xAxis = gp.OX()
 
 # Set up the mirror
 aTrsf = gp_Trsf()
@@ -139,7 +138,7 @@ def geom_plane_from_face(aFace: TopoDS_Face) -> gp_Pln:
 
 # Create the neck of the bottle
 neckLocation = gp_Pnt(0, 0, height)
-neckAxis = gp_DZ()
+neckAxis = gp.DZ()
 neckAx2 = gp_Ax2(neckLocation, neckAxis)
 
 myNeckRadius = thickness / 4.0
@@ -176,7 +175,7 @@ def geom_plane_from_face(aFace: TopoDS_Face) -> gp_Pln:
 myBody_step3 = mk_thick_solid.Shape()
 
 # Set up our surfaces for the threading on the neck
-neckAx2_Ax3 = gp_Ax3(neckLocation, gp_DZ())
+neckAx2_Ax3 = gp_Ax3(neckLocation, gp.DZ())
 aCyl1 = Geom_CylindricalSurface(neckAx2_Ax3, myNeckRadius * 0.99)
 aCyl2 = Geom_CylindricalSurface(neckAx2_Ax3, myNeckRadius * 1.05)
 

examples/core_display_callbacks.py

@@ -16,7 +16,7 @@
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
 from OCC.Core.Bnd import Bnd_Box
-from OCC.Core.BRepBndLib import brepbndlib_Add
+from OCC.Core.BRepBndLib import brepbndlib
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox, BRepPrimAPI_MakeTorus
 from OCC.Display.SimpleGui import init_display
 
@@ -31,7 +31,7 @@ def compute_bbox(shp, *kwargs):
     print(f"Compute bbox for {shp} ")
     for shape in shp:
         bbox = Bnd_Box()
-        brepbndlib_Add(shape, bbox)
+        brepbndlib.Add(shape, bbox)
         xmin, ymin, zmin, xmax, ymax, zmax = bbox.Get()
         dx = xmax - xmin
         dy = ymax - ymin

examples/core_display_clip_planes.py

@@ -19,8 +19,9 @@
 
 import sys
 
+from OCC.Core.Aspect import Aspect_HS_GRID_DIAGONAL
 from OCC.Core.BRep import BRep_Builder
-from OCC.Core.BRepTools import breptools_Read
+from OCC.Core.BRepTools import breptools
 from OCC.Core.gp import gp_Vec
 from OCC.Core.Graphic3d import Graphic3d_ClipPlane
 from OCC.Core.Quantity import Quantity_Color, Quantity_TOC_RGB
@@ -32,7 +33,7 @@
 
 cylinder_head = TopoDS_Shape()
 builder = BRep_Builder()
-breptools_Read(cylinder_head, "../assets/models/cylinder_head.brep", builder)
+breptools.Read(cylinder_head, "../assets/models/cylinder_head.brep", builder)
 
 ais_shp = display.DisplayShape(cylinder_head)[0]
 
@@ -41,7 +42,7 @@
 
 # set hatch on
 clip_plane_1.SetCapping(True)
-clip_plane_1.SetCappingHatch(True)
+clip_plane_1.SetCappingHatch(Aspect_HS_GRID_DIAGONAL)
 
 # off by default, user will have to enable it
 clip_plane_1.SetOn(False)

examples/core_display_signal_slots.py

@@ -1,6 +1,6 @@
 import sys
 
-from OCC.Core.BRepGProp import brepgprop_LinearProperties
+from OCC.Core.BRepGProp import brepgprop
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox, BRepPrimAPI_MakeSphere
 from OCC.Core.gp import gp_Trsf, gp_Vec
 from OCC.Core.GProp import GProp_GProps
@@ -47,7 +47,7 @@ def on_select(shapes):
     g1 = GProp_GProps()
 
     for shape in shapes:
-        brepgprop_LinearProperties(shape, g1)
+        brepgprop.LinearProperties(shape, g1)
         mass = g1.Mass()
         centre_of_mass = g1.CentreOfMass()
         com_x = centre_of_mass.X()

examples/core_export_gltf_single_shape.py

@@ -17,29 +17,26 @@
 
 from OCC.Core.BRepMesh import BRepMesh_IncrementalMesh
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeSphere
-from OCC.Core.BRepTools import breptools_Clean
+from OCC.Core.BRepTools import breptools
 from OCC.Core.Message import Message_ProgressRange
 
 # GLTF export
 from OCC.Core.RWGltf import RWGltf_CafWriter, RWGltf_WriterTrsfFormat
 from OCC.Core.TCollection import TCollection_AsciiString
 from OCC.Core.TColStd import TColStd_IndexedDataMapOfStringString
 from OCC.Core.TDocStd import TDocStd_Document
-from OCC.Core.XCAFDoc import (
-    XCAFDoc_DocumentTool_LayerTool,
-    XCAFDoc_DocumentTool_ShapeTool,
-)
+from OCC.Core.XCAFDoc import XCAFDoc_DocumentTool
 
 # create the shapeto export
 shp = BRepPrimAPI_MakeSphere(60.0).Shape()
 
 # create a document
 doc = TDocStd_Document("pythonocc-doc")
-shape_tool = XCAFDoc_DocumentTool_ShapeTool(doc.Main())
-layer_tool = XCAFDoc_DocumentTool_LayerTool(doc.Main())
+shape_tool = XCAFDoc_DocumentTool.ShapeTool(doc.Main())
+layer_tool = XCAFDoc_DocumentTool.LayerTool(doc.Main())
 
 # mesh shape
-breptools_Clean(shp)
+breptools.Clean(shp)
 # Triangulate
 msh_algo = BRepMesh_IncrementalMesh(shp, True)
 msh_algo.Perform()

examples/core_export_step_ap203.py

@@ -20,7 +20,7 @@
 
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox
 from OCC.Core.IFSelect import IFSelect_RetDone
-from OCC.Core.Interface import Interface_Static_SetCVal
+from OCC.Core.Interface import Interface_Static
 from OCC.Core.STEPControl import STEPControl_AsIs, STEPControl_Writer
 
 # creates a basic shape
@@ -31,7 +31,7 @@
 dd = step_writer.WS().TransferWriter().FinderProcess()
 print(dd)
 
-Interface_Static_SetCVal("write.step.schema", "AP203")
+Interface_Static.SetCVal("write.step.schema", "AP203")
 
 # transfer shapes and write file
 step_writer.Transfer(box_s, STEPControl_AsIs)

examples/core_export_step_header_section.py

@@ -20,7 +20,7 @@
 from OCC.Core.APIHeaderSection import APIHeaderSection_MakeHeader
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox
 from OCC.Core.IFSelect import IFSelect_RetDone
-from OCC.Core.Interface import Interface_HArray1OfHAsciiString, Interface_Static_SetCVal
+from OCC.Core.Interface import Interface_HArray1OfHAsciiString, Interface_Static
 from OCC.Core.STEPControl import STEPControl_AsIs, STEPControl_Writer
 from OCC.Core.TCollection import TCollection_HAsciiString
 
@@ -31,10 +31,10 @@
 step_writer = STEPControl_Writer()
 dd = step_writer.WS().TransferWriter().FinderProcess()
 
-Interface_Static_SetCVal("write.step.schema", "AP203")
+Interface_Static.SetCVal("write.step.schema", "AP203")
 
 # transfer shapes and write file
-Interface_Static_SetCVal("write.step.product.name", "Box")
+Interface_Static.SetCVal("write.step.product.name", "Box")
 step_writer.Transfer(box_s, STEPControl_AsIs)
 
 #

examples/core_geometry_bounding_box.py

@@ -18,7 +18,7 @@
 ##along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 
 from OCC.Core.Bnd import Bnd_Box
-from OCC.Core.BRepBndLib import brepbndlib_Add
+from OCC.Core.BRepBndLib import brepbndlib
 from OCC.Core.BRepMesh import BRepMesh_IncrementalMesh
 from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox, BRepPrimAPI_MakeCylinder
 
@@ -44,7 +44,7 @@ def get_boundingbox(shape, tol=1e-6, use_mesh=True):
         mesh.Perform()
         if not mesh.IsDone():
             raise AssertionError("Mesh not done.")
-    brepbndlib_Add(shape, bbox, use_mesh)
+    brepbndlib.Add(shape, bbox, use_mesh)
 
     xmin, ymin, zmin, xmax, ymax, zmax = bbox.Get()
     return xmin, ymin, zmin, xmax, ymax, zmax, xmax - xmin, ymax - ymin, zmax - zmin

examples/core_geometry_curves2d_from_curve.py

@@ -20,19 +20,19 @@
 from OCC.Core.Convert import Convert_TgtThetaOver2
 from OCC.Core.GC import GC_MakeEllipse2d
 from OCC.Core.Geom2d import Geom2d_TrimmedCurve
-from OCC.Core.Geom2dConvert import geom2dconvert_CurveToBSplineCurve
-from OCC.Core.gp import gp_OX2d
+from OCC.Core.Geom2dConvert import geom2dconvert
+from OCC.Core.gp import gp
 from OCC.Display.SimpleGui import init_display
 
 display, start_display, add_menu, add_function_to_menu = init_display()
 
 
 def curves2d_from_curves():
     major, minor = 12, 4
-    axis = gp_OX2d()
+    axis = gp.OX2d()
     ellipse = GC_MakeEllipse2d(axis, major, minor).Value()
     trimmed_curve = Geom2d_TrimmedCurve(ellipse, -1, 2, True)
-    bspline = geom2dconvert_CurveToBSplineCurve(trimmed_curve, Convert_TgtThetaOver2)
+    bspline = geom2dconvert.CurveToBSplineCurve(trimmed_curve, Convert_TgtThetaOver2)
     display.DisplayShape(bspline, update=True)
 
 

examples/core_geometry_make_pipe_shell.py

@@ -18,7 +18,7 @@
 from OCC.Core.BRepBuilderAPI import BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeWire
 from OCC.Core.BRepOffsetAPI import BRepOffsetAPI_MakePipeShell
 from OCC.Core.Geom import Geom_BezierCurve
-from OCC.Core.gp import gp_Circ, gp_Pnt, gp_ZOX
+from OCC.Core.gp import gp, gp_Circ, gp_Pnt
 from OCC.Core.Law import Law_Linear
 from OCC.Core.TColgp import TColgp_Array1OfPnt
 from OCC.Display.SimpleGui import init_display
@@ -42,7 +42,7 @@ def thicken_spline(event=None):
     display.DisplayShape(bz_curv_wire)
 
     # Creation of profile to sweep along the spine
-    circle = gp_Circ(gp_ZOX(), 1)
+    circle = gp_Circ(gp.ZOX(), 1)
     circle.SetLocation(array[0])
     circle_edge = BRepBuilderAPI_MakeEdge(circle).Edge()
     circle_wire = BRepBuilderAPI_MakeWire(circle_edge).Wire()