Skip to content

Commit a6833bc

Browse files
dbbhdbbh
committed
updating deprecated imports
1 parent 860a037 commit a6833bc

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

‎OCCUtils/Construct.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
from OCC.Core.BRep import BRep_Tool
3131
from OCC.Core.BRepAdaptor import BRepAdaptor_HCurve
3232
from OCC.Core.BRepOffset import BRepOffset_Skin
33-
from OCC.Geom import Geom_TrimmedCurve
34-
from OCC.GeomConvert import GeomConvert_ApproxCurve
35-
from OCC.GeomLProp import GeomLProp_SLProps
33+
from OCC.Core.Geom import Geom_TrimmedCurve
34+
from OCC.Core.GeomConvert import GeomConvert_ApproxCurve
35+
from OCC.Core.GeomLProp import GeomLProp_SLProps
3636
from OCC.Core.BRepBuilderAPI import (BRepBuilderAPI_MakeFace,
3737
BRepBuilderAPI_Transform,
3838
BRepBuilderAPI_Sewing,
@@ -46,14 +46,14 @@
4646
BRepBuilderAPI_FindPlane)
4747
from OCC.Core.BRepPrimAPI import (BRepPrimAPI_MakeBox, BRepPrimAPI_MakePrism)
4848
from OCC.Core.BRepOffsetAPI import BRepOffsetAPI_MakeEvolved
49-
from OCC.GeomAbs import (GeomAbs_Arc, GeomAbs_C2, GeomAbs_C0, GeomAbs_Tangent,
49+
from OCC.Core.GeomAbs import (GeomAbs_Arc, GeomAbs_C2, GeomAbs_C0, GeomAbs_Tangent,
5050
GeomAbs_Intersection, GeomAbs_G1, GeomAbs_G2,
5151
GeomAbs_C1)
5252
from OCC.Core.TopAbs import TopAbs_REVERSED
5353
from OCC.Core.TopoDS import (TopoDS_Wire, TopoDS_Solid, TopoDS_Vertex, TopoDS_Shape,
5454
TopoDS_Builder, TopoDS_Compound)
55-
from OCC.TColgp import TColgp_SequenceOfVec, TColgp_HArray1OfPnt
56-
from OCC.gp import (gp_Vec, gp_Pnt, gp_Dir, gp_Trsf, gp_Ax1, gp_Quaternion,
55+
from OCC.Core.TColgp import TColgp_SequenceOfVec, TColgp_HArray1OfPnt
56+
from OCC.Core.gp import (gp_Vec, gp_Pnt, gp_Dir, gp_Trsf, gp_Ax1, gp_Quaternion,
5757
gp_Circ, gp_Pln)
5858

5959
from OCCUtils.Common import (TOLERANCE, assert_isdone, to_tcol_, to_adaptor_3d,

‎OCCUtils/Iteration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'''
1919
This module helps looping through topology
2020
'''
21-
from OCC.BRep import BRep_Tool
21+
from OCC.Core.BRep import BRep_Tool
2222

2323
from OCCUtils.Topology import WireExplorer, Topo
2424
from OCCUtils.edge import Edge

‎OCCUtils/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
brepgprop_SurfaceProperties)
4444
from OCC.Core.BRepCheck import (BRepCheck_Vertex, BRepCheck_Edge, BRepCheck_Wire,
4545
BRepCheck_Face, BRepCheck_Shell, BRepCheck_Analyzer)
46-
from OCC.GProp import GProp_GProps
46+
from OCC.Core.GProp import GProp_GProps
4747
from OCC.Display.SimpleGui import init_display
4848

4949
from OCCUtils.Common import get_boundingbox

‎OCCUtils/edge.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
##along with pythonOCC. If not, see <http://www.gnu.org/licenses/>
1717

1818
from OCC.Core.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_HCurve
19-
from OCC.GCPnts import GCPnts_UniformAbscissa
20-
from OCC.Geom import Geom_OffsetCurve, Geom_TrimmedCurve
19+
from OCC.Core.GCPnts import GCPnts_UniformAbscissa
20+
from OCC.Core.Geom import Geom_OffsetCurve, Geom_TrimmedCurve
2121
from OCC.Core.TopExp import topexp
2222
from OCC.Core.TopoDS import TopoDS_Edge, TopoDS_Vertex, TopoDS_Face
23-
from OCC.gp import gp_Vec, gp_Dir, gp_Pnt
24-
from OCC.GeomLProp import GeomLProp_CurveTool
23+
from OCC.Core.gp import gp_Vec, gp_Dir, gp_Pnt
24+
from OCC.Core.GeomLProp import GeomLProp_CurveTool
2525
from OCC.Core.BRepLProp import BRepLProp_CLProps
26-
from OCC.GeomLib import geomlib
27-
from OCC.GCPnts import GCPnts_AbscissaPoint
28-
from OCC.GeomAPI import GeomAPI_ProjectPointOnCurve
29-
from OCC.ShapeAnalysis import ShapeAnalysis_Edge
26+
from OCC.Core.GeomLib import geomlib
27+
from OCC.Core.GCPnts import GCPnts_AbscissaPoint
28+
from OCC.Core.GeomAPI import GeomAPI_ProjectPointOnCurve
29+
from OCC.Core.ShapeAnalysis import ShapeAnalysis_Edge
3030
from OCC.Core.BRep import BRep_Tool, BRep_Tool_Continuity
3131
from OCC.Core.BRepIntCurveSurface import BRepIntCurveSurface_Inter
3232

‎OCCUtils/face.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717

1818
from OCC.Core.BRep import BRep_Tool_Surface, BRep_Tool
1919
from OCC.Core.BRepTopAdaptor import BRepTopAdaptor_FClass2d
20-
from OCC.Geom import Geom_Curve
21-
from OCC.GeomAPI import GeomAPI_ProjectPointOnSurf
22-
from OCC.GeomLib import GeomLib_IsPlanarSurface
20+
from OCC.Core.Geom import Geom_Curve
21+
from OCC.Core.GeomAPI import GeomAPI_ProjectPointOnSurf
22+
from OCC.Core.GeomLib import GeomLib_IsPlanarSurface
2323
from OCC.Core.TopAbs import TopAbs_IN
2424
from OCC.Core.TopExp import topexp
2525
from OCC.Core.TopoDS import TopoDS_Vertex, TopoDS_Face, TopoDS_Edge
26-
from OCC.GeomLProp import GeomLProp_SLProps
26+
from OCC.Core.GeomLProp import GeomLProp_SLProps
2727
from OCC.Core.BRepTools import breptools_UVBounds
2828
from OCC.Core.BRepAdaptor import BRepAdaptor_Surface, BRepAdaptor_HSurface
29-
from OCC.ShapeAnalysis import ShapeAnalysis_Surface
30-
from OCC.GeomProjLib import geomprojlib
31-
from OCC.Adaptor3d import Adaptor3d_IsoCurve
32-
from OCC.gp import gp_Pnt2d, gp_Dir
29+
from OCC.Core.ShapeAnalysis import ShapeAnalysis_Surface
30+
from OCC.Core.GeomProjLib import geomprojlib
31+
from OCC.Core.Adaptor3d import Adaptor3d_IsoCurve
32+
from OCC.Core.gp import gp_Pnt2d, gp_Dir
3333

3434
from OCCUtils.base import BaseObject
3535
from OCCUtils.edge import Edge

‎OCCUtils/shell.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
##along with pythonOCC. If not, see <http://www.gnu.org/licenses/>
1717

1818
from OCC.Core.TopoDS import TopoDS_Shell
19-
from OCC.ShapeAnalysis import ShapeAnalysis_Shell
19+
from OCC.Core.ShapeAnalysis import ShapeAnalysis_Shell
2020

2121
from OCCUtils.Topology import Topo
2222
from OCCUtils.base import BaseObject, GlobalProperties

‎OCCUtils/types_lut.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
##along with pythonOCC. If not, see <http://www.gnu.org/licenses/>
1717

1818
from OCC.Core.BRepCheck import *
19-
from OCC.GeomAbs import *
19+
from OCC.Core.GeomAbs import *
2020
from OCC.Core.TopoDS import topods, TopoDS_Shape
2121
from OCC.Core.BRep import BRep_Tool_Surface
2222
from OCC.Core.TopAbs import *
23-
from OCC.Geom import Handle_Geom_CylindricalSurface, Handle_Geom_Plane
23+
from OCC.Core.Geom import Handle_Geom_CylindricalSurface, Handle_Geom_Plane
2424

2525

2626
class ShapeToTopology(object):

‎OCCUtils/vertex.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
##You should have received a copy of the GNU Lesser General Public License
1616
##along with pythonOCC. If not, see <http://www.gnu.org/licenses/>
1717

18-
from OCC.gp import gp_Pnt, gp_Vec, gp_Dir, gp_XYZ, gp_Pnt2d
18+
from OCC.Core.gp import gp_Pnt, gp_Vec, gp_Dir, gp_XYZ, gp_Pnt2d
1919
from OCC.Core.TopoDS import TopoDS_Vertex
20-
from OCC.ShapeBuild import ShapeBuild_ReShape
20+
from OCC.Core.ShapeBuild import ShapeBuild_ReShape
2121

2222
from OCCUtils.base import BaseObject
2323
from OCCUtils.Construct import make_vertex

‎examples/occutils_geomplate.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import sys
2929
import time
3030

31-
from OCC.gp import gp_Pnt
31+
from OCC.Core.gp import gp_Pnt
3232
from OCC.Core.BRepAdaptor import BRepAdaptor_HCurve
3333
from OCC.Core.BRep import BRep_Tool
34-
from OCC.ShapeAnalysis import ShapeAnalysis_Surface
35-
from OCC.GeomLProp import GeomLProp_SLProps
34+
from OCC.Core.ShapeAnalysis import ShapeAnalysis_Surface
35+
from OCC.Core.GeomLProp import GeomLProp_SLProps
3636
from OCC.Core.BRepFill import BRepFill_CurveConstraint
3737
from OCC.GeomPlate import (GeomPlate_MakeApprox,
3838
GeomPlate_BuildPlateSurface,

0 commit comments

Comments
 (0)