Skip to content

Commit d3a3891

Browse files
author
sth-v
committed
many
Signed-off-by: sth-v <aa@contextmachine.online>
1 parent 68da72e commit d3a3891

File tree

2 files changed

+41
-94
lines changed

2 files changed

+41
-94
lines changed

‎OCCUtils/Common.py‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,30 @@
1919

2020
import random
2121

22-
from OCC.Core.Bnd import Bnd_Box
22+
from OCC.Core import Graphic3d
23+
from OCC.Core.BRepAdaptor import (BRepAdaptor_CompCurve, BRepAdaptor_Curve)
2324
from OCC.Core.BRepBndLib import brepbndlib_Add
24-
from OCC.Core.TColgp import (
25-
TColgp_HArray1OfPnt,
26-
TColgp_Array1OfPnt,
27-
TColgp_Array1OfPnt2d,
28-
TColgp_Array1OfVec,
29-
)
30-
from OCC.Core.TColStd import TColStd_HArray1OfBoolean
31-
from OCC.Core.BRepAdaptor import (
32-
BRepAdaptor_Curve,
33-
BRepAdaptor_Curve,
34-
BRepAdaptor_CompCurve,
35-
BRepAdaptor_CompCurve,
36-
)
37-
from OCC.Core.GeomAPI import (
38-
GeomAPI_Interpolate,
39-
GeomAPI_PointsToBSpline,
40-
GeomAPI_ProjectPointOnCurve,
41-
)
42-
from OCC.Core.gp import gp_Pnt, gp_Vec, gp_Trsf
43-
from OCC.Core.BRepBuilderAPI import BRepBuilderAPI_Transform
44-
from OCC.Core.TopoDS import TopoDS_Edge, TopoDS_Shape, TopoDS_Wire, TopoDS_Vertex
45-
from OCC.Core.Quantity import Quantity_Color, Quantity_TOC_RGB
46-
from OCC.Core.GProp import GProp_GProps
47-
from OCC.Core.GeomAbs import GeomAbs_C1, GeomAbs_C2, GeomAbs_C3
4825
from OCC.Core.BRepGProp import (
4926
brepgprop_LinearProperties,
5027
brepgprop_SurfaceProperties,
5128
brepgprop_VolumeProperties,
52-
)
53-
from OCC.Core.GeomAdaptor import GeomAdaptor_Curve
29+
)
30+
from OCC.Core.Bnd import Bnd_Box
31+
from OCC.Core.GProp import GProp_GProps
5432
from OCC.Core.Geom import Geom_Curve
33+
from OCC.Core.GeomAPI import (
34+
GeomAPI_Interpolate,
35+
GeomAPI_PointsToBSpline,
36+
GeomAPI_ProjectPointOnCurve,
37+
)
38+
from OCC.Core.GeomAbs import GeomAbs_C2
39+
from OCC.Core.GeomAdaptor import GeomAdaptor_Curve
40+
from OCC.Core.Quantity import Quantity_Color, Quantity_TOC_RGB
41+
from OCC.Core.TColStd import TColStd_HArray1OfBoolean
42+
from OCC.Core.TColgp import (TColgp_Array1OfPnt, TColgp_Array1OfPnt2d, TColgp_Array1OfVec, TColgp_HArray1OfPnt)
43+
from OCC.Core.TopoDS import TopoDS_Edge, TopoDS_Shape, TopoDS_Vertex, TopoDS_Wire
44+
from OCC.Core.gp import gp_Pnt, gp_Vec
5545

56-
from OCC.Core import Graphic3d
5746

5847
# ===========================================================================
5948
# No PythonOCC dependencies...
@@ -466,7 +455,7 @@ def fix_continuity(edge, continuity=1):
466455
su = ShapeUpgrade_ShapeDivideContinuity(edge)
467456
su.SetBoundaryCriterion(eval("GeomAbs_C" + str(continuity)))
468457
su.Perform()
469-
te = st(su.Result())
458+
te = su(su.Result())
470459
return te
471460

472461

@@ -568,7 +557,7 @@ def minimum_distance(shp1, shp2):
568557

569558
def vertex2pnt(vertex):
570559
"""returns a gp_Pnt from a TopoDS_Vertex"""
571-
from OCC.Core.Core.BRep import BRep_Tool
560+
from OCC.Core.BRep import BRep_Tool
572561

573562
return BRep_Tool.Pnt(vertex)
574563

‎OCCUtils/Construct.py‎

Lines changed: 22 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -22,76 +22,34 @@
2222
"""
2323

2424
from __future__ import with_statement
25-
from functools import wraps
26-
import warnings
27-
import operator
25+
2826
import math
27+
import operator
28+
import warnings
29+
from functools import wraps
2930

3031
from OCC.Core.BRep import BRep_Tool
3132
from OCC.Core.BRepAdaptor import BRepAdaptor_Curve
33+
from OCC.Core.BRepBuilderAPI import (BRepBuilderAPI_FindPlane, BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeEdge2d,
34+
BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakePolygon, BRepBuilderAPI_MakeShell,
35+
BRepBuilderAPI_MakeSolid, BRepBuilderAPI_MakeVertex, BRepBuilderAPI_MakeWire,
36+
BRepBuilderAPI_Sewing, BRepBuilderAPI_Transform)
3237
from OCC.Core.BRepOffset import BRepOffset_Skin
38+
from OCC.Core.BRepOffsetAPI import BRepOffsetAPI_MakeEvolved
39+
from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox, BRepPrimAPI_MakePrism
3340
from OCC.Core.Geom import Geom_TrimmedCurve
41+
from OCC.Core.GeomAbs import (GeomAbs_Arc, GeomAbs_C0, GeomAbs_C1, GeomAbs_C2, GeomAbs_Intersection, GeomAbs_Tangent)
3442
from OCC.Core.GeomConvert import GeomConvert_ApproxCurve
3543
from OCC.Core.GeomLProp import GeomLProp_SLProps
36-
from OCC.Core.BRepBuilderAPI import (
37-
BRepBuilderAPI_MakeFace,
38-
BRepBuilderAPI_Transform,
39-
BRepBuilderAPI_Sewing,
40-
BRepBuilderAPI_MakePolygon,
41-
BRepBuilderAPI_MakeWire,
42-
BRepBuilderAPI_MakeSolid,
43-
BRepBuilderAPI_MakeShell,
44-
BRepBuilderAPI_MakeEdge2d,
45-
BRepBuilderAPI_MakeEdge,
46-
BRepBuilderAPI_MakeVertex,
47-
BRepBuilderAPI_FindPlane,
48-
)
49-
from OCC.Core.BRepPrimAPI import BRepPrimAPI_MakeBox, BRepPrimAPI_MakePrism
50-
from OCC.Core.BRepOffsetAPI import BRepOffsetAPI_MakeEvolved
51-
from OCC.Core.GeomAbs import (
52-
GeomAbs_Arc,
53-
GeomAbs_C2,
54-
GeomAbs_C0,
55-
GeomAbs_Tangent,
56-
GeomAbs_Intersection,
57-
GeomAbs_G1,
58-
GeomAbs_G2,
59-
GeomAbs_C1,
60-
)
44+
from OCC.Core.TColgp import TColgp_HArray1OfPnt, TColgp_SequenceOfVec
6145
from OCC.Core.TopAbs import TopAbs_REVERSED
62-
from OCC.Core.TopoDS import (
63-
TopoDS_Wire,
64-
TopoDS_Solid,
65-
TopoDS_Vertex,
66-
TopoDS_Shape,
67-
TopoDS_Builder,
68-
TopoDS_Compound,
69-
)
70-
from OCC.Core.TColgp import TColgp_SequenceOfVec, TColgp_HArray1OfPnt
71-
from OCC.Core.gp import (
72-
gp_Vec,
73-
gp_Pnt,
74-
gp_Dir,
75-
gp_Trsf,
76-
gp_Ax1,
77-
gp_Quaternion,
78-
gp_Circ,
79-
gp_Pln,
80-
)
81-
82-
from OCCUtils.Common import (
83-
TOLERANCE,
84-
assert_isdone,
85-
to_tcol_,
86-
to_adaptor_3d,
87-
vertex2pnt,
88-
smooth_pnts,
89-
points_to_bspline,
90-
project_point_on_curve,
91-
)
92-
from OCCUtils.types_lut import ShapeToTopology
93-
from OCCUtils.Topology import Topo
46+
from OCC.Core.TopoDS import (TopoDS_Builder, TopoDS_Compound, TopoDS_Shape, TopoDS_Vertex, TopoDS_Wire)
47+
from OCC.Core.gp import (gp_Ax1, gp_Circ, gp_Dir, gp_Pln, gp_Pnt, gp_Quaternion, gp_Trsf, gp_Vec)
9448

49+
from ..OCCUtils.Common import (TOLERANCE, assert_isdone, points_to_bspline, project_point_on_curve, smooth_pnts,
50+
to_adaptor_3d, to_tcol_, vertex2pnt)
51+
from ..OCCUtils.Topology import Topo
52+
from ..OCCUtils.types_lut import ShapeToTopology
9553

9654
EPSILON = TOLERANCE = 1e-6
9755
ST = ShapeToTopology()
@@ -587,7 +545,7 @@ def make_n_sections(edges):
587545

588546

589547
def make_coons(edges):
590-
from OCC.GeomFill import GeomFill_BSplineCurves, GeomFill_StretchStyle
548+
from OCC.Core.GeomFill import GeomFill_BSplineCurves, GeomFill_StretchStyle
591549

592550
if len(edges) == 4:
593551
spl1, spl2, spl3, spl4 = edges
@@ -852,7 +810,7 @@ def face_normal(face):
852810

853811

854812
def face_from_plane(_geom_plane, lowerLimit=-1000, upperLimit=1000):
855-
from OCC.Geom import Geom_RectangularTrimmedSurface
813+
from OCC.Core.Geom import Geom_RectangularTrimmedSurface
856814

857815
_trim_plane = make_face(
858816
Geom_RectangularTrimmedSurface(
@@ -878,7 +836,7 @@ def fit_plane_through_face_vertices(_face):
878836
:param _face: OCC.KBE.face.Face instance
879837
:return: Geom_Plane
880838
"""
881-
from OCC.GeomPlate import GeomPlate_BuildAveragePlane
839+
from OCC.Core.GeomPlate import GeomPlate_BuildAveragePlane
882840

883841
uvs_from_vertices = [
884842
_face.project_vertex(vertex2pnt(i)) for i in Topo(_face).vertices()
@@ -903,7 +861,7 @@ def project_edge_onto_plane(edg, plane):
903861
:param plane: Geom_Plane
904862
:return: TopoDS_Edge projected on the plane
905863
"""
906-
from OCC.GeomProjLib import geomprojlib_ProjectOnPlane
864+
from OCC.Core.GeomProjLib import geomprojlib_ProjectOnPlane
907865

908866
proj = geomprojlib_ProjectOnPlane(
909867
edg.adaptor.Curve().Curve(), plane, plane.Axis().Direction(), 1

0 commit comments

Comments
 (0)