ByoungSooPark/cadquery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new OCC submodule structure

Browse Source
This commit is contained in:
adam-urbanczyk
2018-12-08 22:50:42 +01:00
parent 183e04ea8c
commit 42f7b69149
6 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cadquery/occ_impl/exporters.py
View File

@ -1,5 +1,5 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from OCC.Visualization import Tesselator from OCC.Core.Visualization import Tesselator
import cadquery import cadquery
@ -14,14 +14,14 @@ else:
from .shapes import Shape, Compound, TOLERANCE from .shapes import Shape, Compound, TOLERANCE
from .geom import BoundBox from .geom import BoundBox
from OCC.gp import gp_Ax2, gp_Pnt, gp_Dir from OCC.Core.gp import gp_Ax2, gp_Pnt, gp_Dir
from OCC.BRep import BRep_Tool from OCC.Core.BRep import BRep_Tool
from OCC.BRepMesh import BRepMesh_IncrementalMesh from OCC.Core.BRepMesh import BRepMesh_IncrementalMesh
from OCC.BRepLib import breplib from OCC.Core.BRepLib import breplib
from OCC.TopLoc import TopLoc_Location from OCC.Core.TopLoc import TopLoc_Location
from OCC.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape from OCC.Core.HLRBRep import HLRBRep_Algo, HLRBRep_HLRToShape
from OCC.HLRAlgo import HLRAlgo_Projector from OCC.Core.HLRAlgo import HLRAlgo_Projector
from OCC.GCPnts import GCPnts_QuasiUniformDeflection from OCC.Core.GCPnts import GCPnts_QuasiUniformDeflection
try: try:
import xml.etree.cElementTree as ET import xml.etree.cElementTree as ET

14
cadquery/occ_impl/geom.py
View File

@ -1,10 +1,10 @@
import math import math
import cadquery import cadquery
from OCC.gp import gp_Vec, gp_Ax1, gp_Ax3, gp_Pnt, gp_Dir, gp_Trsf, gp, gp_XYZ from OCC.Core.gp import gp_Vec, gp_Ax1, gp_Ax3, gp_Pnt, gp_Dir, gp_Trsf, gp, gp_XYZ
from OCC.Bnd import Bnd_Box from OCC.Core.Bnd import Bnd_Box
from OCC.BRepBndLib import brepbndlib_Add # brepbndlib_AddOptimal from OCC.Core.BRepBndLib import brepbndlib_Add # brepbndlib_AddOptimal
from OCC.BRepMesh import BRepMesh_IncrementalMesh from OCC.Core.BRepMesh import BRepMesh_IncrementalMesh
TOL = 1e-2 TOL = 1e-2
@ -43,7 +43,7 @@ class Vector(object):
elif len(args) == 0: elif len(args) == 0:
fV = gp_Vec(0, 0, 0) fV = gp_Vec(0, 0, 0)
else: else:
raise ValueError("Expected three floats, OCC Geom_, or 3-tuple") raise ValueError("Expected three floats, OCC.Core.Geom_, or 3-tuple")
self._wrapped = fV self._wrapped = fV
@ -168,7 +168,7 @@ class Vector(object):
def transform(self, T): def transform(self, T):
# to gp_Pnt to obey cq transformation convention (in OCC vectors do not translate) # to gp_Pnt to obey cq transformation convention (in OCC.Core.vectors do not translate)
pnt = self.toPnt() pnt = self.toPnt()
pnt_t = pnt.Transformed(T.wrapped) pnt_t = pnt.Transformed(T.wrapped)
@ -652,7 +652,7 @@ class Plane(object):
class BoundBox(object): class BoundBox(object):
"""A BoundingBox for an object or set of objects. Wraps the OCC one""" """A BoundingBox for an object or set of objects. Wraps the OCC.Core.one"""
def __init__(self, bb): def __init__(self, bb):
self.wrapped = bb self.wrapped = bb

6
cadquery/occ_impl/importers.py
View File

@ -7,8 +7,8 @@ import os
import urllib as urlreader import urllib as urlreader
import tempfile import tempfile
from OCC.STEPControl import STEPControl_Reader from OCC.Core.STEPControl import STEPControl_Reader
import OCC.IFSelect import OCC.Core.IFSelect
class ImportTypes: class ImportTypes:
@ -41,7 +41,7 @@ def importStep(fileName):
# Now read and return the shape # Now read and return the shape
reader = STEPControl_Reader() reader = STEPControl_Reader()
readStatus = reader.ReadFile(fileName) readStatus = reader.ReadFile(fileName)
if readStatus != OCC.IFSelect.IFSelect_RetDone: if readStatus != OCC.Core.IFSelect.IFSelect_RetDone:
raise ValueError("STEP File could not be loaded") raise ValueError("STEP File could not be loaded")
reader.TransferRoot() reader.TransferRoot()

4
cadquery/occ_impl/jupyter_tools.py
View File

@ -1,5 +1,5 @@
from OCC.Display.WebGl.x3dom_renderer import X3DExporter from OCC.Core.Display.WebGl.x3dom_renderer import X3DExporter
from OCC.gp import gp_Quaternion, gp_Vec from OCC.Core.gp import gp_Quaternion, gp_Vec
from uuid import uuid1 from uuid import uuid1
from math import tan from math import tan

80
cadquery/occ_impl/shapes.py
View File

@ -1,15 +1,15 @@
from cadquery import Vector, BoundBox from cadquery import Vector, BoundBox
import OCC.TopAbs as ta # Tolopolgy type enum import OCC.Core.TopAbs as ta # Tolopolgy type enum
import OCC.GeomAbs as ga # Geometry type enum import OCC.Core.GeomAbs as ga # Geometry type enum
from OCC.gp import (gp_Vec, gp_Pnt, gp_Ax1, gp_Ax2, gp_Ax3, gp_Dir, gp_Circ, from OCC.Core.gp import (gp_Vec, gp_Pnt, gp_Ax1, gp_Ax2, gp_Ax3, gp_Dir, gp_Circ,
gp_Trsf, gp_Pln, gp_GTrsf, gp_Pnt2d, gp_Dir2d) gp_Trsf, gp_Pln, gp_GTrsf, gp_Pnt2d, gp_Dir2d)
# collection of pints (used for spline construction) # collection of pints (used for spline construction)
from OCC.TColgp import TColgp_Array1OfPnt from OCC.Core.TColgp import TColgp_Array1OfPnt
from OCC.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_Surface from OCC.Core.BRepAdaptor import BRepAdaptor_Curve, BRepAdaptor_Surface
from OCC.BRepBuilderAPI import (BRepBuilderAPI_MakeVertex, from OCC.Core.BRepBuilderAPI import (BRepBuilderAPI_MakeVertex,
BRepBuilderAPI_MakeEdge, BRepBuilderAPI_MakeEdge,
BRepBuilderAPI_MakeFace, BRepBuilderAPI_MakeFace,
BRepBuilderAPI_MakePolygon, BRepBuilderAPI_MakePolygon,
@ -18,14 +18,14 @@ from OCC.BRepBuilderAPI import (BRepBuilderAPI_MakeVertex,
BRepBuilderAPI_GTransform, BRepBuilderAPI_GTransform,
BRepBuilderAPI_Transform) BRepBuilderAPI_Transform)
# properties used to store mass calculation result # properties used to store mass calculation result
from OCC.GProp import GProp_GProps from OCC.Core.GProp import GProp_GProps
from OCC.BRepGProp import BRepGProp_Face, \ from OCC.Core.BRepGProp import BRepGProp_Face, \
brepgprop_LinearProperties, \ brepgprop_LinearProperties, \
brepgprop_SurfaceProperties, \ brepgprop_SurfaceProperties, \
brepgprop_VolumeProperties # used for mass calculation brepgprop_VolumeProperties # used for mass calculation
from OCC.BRepLProp import BRepLProp_CLProps # local curve properties from OCC.Core.BRepLProp import BRepLProp_CLProps # local curve properties
from OCC.BRepPrimAPI import (BRepPrimAPI_MakeBox, # TODO list functions/used for making primitives from OCC.Core.BRepPrimAPI import (BRepPrimAPI_MakeBox, # TODO list functions/used for making primitives
BRepPrimAPI_MakeCone, BRepPrimAPI_MakeCone,
BRepPrimAPI_MakeCylinder, BRepPrimAPI_MakeCylinder,
BRepPrimAPI_MakeTorus, BRepPrimAPI_MakeTorus,
@ -34,13 +34,13 @@ from OCC.BRepPrimAPI import (BRepPrimAPI_MakeBox, # TODO list functions/used fo
BRepPrimAPI_MakeRevol, BRepPrimAPI_MakeRevol,
BRepPrimAPI_MakeSphere) BRepPrimAPI_MakeSphere)
from OCC.TopExp import TopExp_Explorer # Toplogy explorer from OCC.Core.TopExp import TopExp_Explorer # Toplogy explorer
from OCC.BRepTools import (BRepTools_WireExplorer, # might be needed for iterating thorugh wires from OCC.Core.BRepTools import (BRepTools_WireExplorer, # might be needed for iterating thorugh wires
breptools_UVBounds) breptools_UVBounds)
# used for getting underlying geoetry -- is this equvalent to brep adaptor? # used for getting underlying geoetry -- is this equvalent to brep adaptor?
from OCC.BRep import BRep_Tool from OCC.Core.BRep import BRep_Tool
from OCC.TopoDS import (topods_Vertex, # downcasting functions from OCC.Core.TopoDS import (topods_Vertex, # downcasting functions
topods_Edge, topods_Edge,
topods_Wire, topods_Wire,
topods_Face, topods_Face,
@ -48,65 +48,65 @@ from OCC.TopoDS import (topods_Vertex, # downcasting functions
topods_Compound, topods_Compound,
topods_Solid) topods_Solid)
from OCC.TopoDS import (TopoDS_Shell, from OCC.Core.TopoDS import (TopoDS_Shell,
TopoDS_Compound, TopoDS_Compound,
TopoDS_Builder) TopoDS_Builder)
from OCC.GC import GC_MakeArcOfCircle # geometry construction from OCC.Core.GC import GC_MakeArcOfCircle # geometry construction
from OCC.GCE2d import GCE2d_MakeSegment from OCC.Core.GCE2d import GCE2d_MakeSegment
from OCC.GeomAPI import (GeomAPI_PointsToBSpline, from OCC.Core.GeomAPI import (GeomAPI_PointsToBSpline,
GeomAPI_ProjectPointOnSurf) GeomAPI_ProjectPointOnSurf)
from OCC.BRepFill import brepfill_Shell, brepfill_Face from OCC.Core.BRepFill import brepfill_Shell, brepfill_Face
from OCC.BRepAlgoAPI import (BRepAlgoAPI_Common, from OCC.Core.BRepAlgoAPI import (BRepAlgoAPI_Common,
BRepAlgoAPI_Fuse, BRepAlgoAPI_Fuse,
BRepAlgoAPI_Cut) BRepAlgoAPI_Cut)
from OCC.GeomLProp import GeomLProp_SLProps from OCC.Core.GeomLProp import GeomLProp_SLProps
from OCC.Geom import Geom_ConicalSurface, Geom_CylindricalSurface from OCC.Core.Geom import Geom_ConicalSurface, Geom_CylindricalSurface
from OCC.Geom2d import Geom2d_Line from OCC.Core.Geom2d import Geom2d_Line
from OCC.BRepLib import breplib_BuildCurves3d from OCC.Core.BRepLib import breplib_BuildCurves3d
from OCC.BRepOffsetAPI import (BRepOffsetAPI_ThruSections, from OCC.Core.BRepOffsetAPI import (BRepOffsetAPI_ThruSections,
BRepOffsetAPI_MakePipe, BRepOffsetAPI_MakePipe,
BRepOffsetAPI_MakePipeShell, BRepOffsetAPI_MakePipeShell,
BRepOffsetAPI_MakeThickSolid) BRepOffsetAPI_MakeThickSolid)
from OCC.BRepFilletAPI import (BRepFilletAPI_MakeChamfer, from OCC.Core.BRepFilletAPI import (BRepFilletAPI_MakeChamfer,
BRepFilletAPI_MakeFillet) BRepFilletAPI_MakeFillet)
from OCC.TopTools import (TopTools_IndexedDataMapOfShapeListOfShape, from OCC.Core.TopTools import (TopTools_IndexedDataMapOfShapeListOfShape,
TopTools_ListOfShape) TopTools_ListOfShape)
from OCC.TopExp import topexp_MapShapesAndAncestors from OCC.Core.TopExp import topexp_MapShapesAndAncestors
from OCC.TopTools import TopTools_HSequenceOfShape, Handle_TopTools_HSequenceOfShape from OCC.Core.TopTools import TopTools_HSequenceOfShape, Handle_TopTools_HSequenceOfShape
from OCC.ShapeAnalysis import ShapeAnalysis_FreeBounds from OCC.Core.ShapeAnalysis import ShapeAnalysis_FreeBounds
from OCC.ShapeFix import ShapeFix_Wire, ShapeFix_Face from OCC.Core.ShapeFix import ShapeFix_Wire, ShapeFix_Face
from OCC.STEPControl import STEPControl_Writer, STEPControl_AsIs from OCC.Core.STEPControl import STEPControl_Writer, STEPControl_AsIs
from OCC.BRepMesh import BRepMesh_IncrementalMesh from OCC.Core.BRepMesh import BRepMesh_IncrementalMesh
from OCC.StlAPI import StlAPI_Writer from OCC.Core.StlAPI import StlAPI_Writer
from OCC.TopTools import TopTools_DataMapOfShapeListOfShape, TopTools_ListIteratorOfListOfShape from OCC.Core.TopTools import TopTools_DataMapOfShapeListOfShape, TopTools_ListIteratorOfListOfShape
from OCC.ShapeUpgrade import ShapeUpgrade_UnifySameDomain from OCC.Core.ShapeUpgrade import ShapeUpgrade_UnifySameDomain
from OCC.BRepTools import breptools_Write from OCC.Core.BRepTools import breptools_Write
from OCC.Visualization import Tesselator from OCC.Core.Visualization import Tesselator
from math import pi, sqrt from math import pi, sqrt
TOLERANCE = 1e-6 TOLERANCE = 1e-6
DEG2RAD = 2 * pi / 360. DEG2RAD = 2 * pi / 360.
HASH_CODE_MAX = int(1e+6) # required by OCC HashCode HASH_CODE_MAX = int(1e+6) # required by OCC.Core.HashCode
shape_LUT = \ shape_LUT = \
{ta.TopAbs_VERTEX: 'Vertex', {ta.TopAbs_VERTEX: 'Vertex',
@ -1403,7 +1403,7 @@ class Compound(Shape, Mixin3D):
return cls(comp) return cls(comp)
# TODO this is likely not needed if sing PythonOCC correclty but we will see # TODO this is likely not needed if sing PythonOCC.Core.correclty but we will see
def sortWiresByBuildOrder(wireList, plane, result=[]): def sortWiresByBuildOrder(wireList, plane, result=[]):

2
tests/TestCadQuery.py
View File

@ -83,7 +83,7 @@ class TestCadQuery(BaseTest):
r = r.toOCC() r = r.toOCC()
import OCC import OCC.Core as OCC
self.assertEqual(type(r), OCC.TopoDS.TopoDS_Compound) self.assertEqual(type(r), OCC.TopoDS.TopoDS_Compound)
def testToSVG(self): def testToSVG(self):