Skip to content

Commit db9a28a

Browse files
tpaviottpaviot
authored
Merge pull request #984 from tpaviot/review/occt751-support
occt7.5.1 support
2 parents 8475f38 + 6adf581 commit db9a28a

File tree

15 files changed

+8309
-94
lines changed

15 files changed

+8309
-94
lines changed

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ project(PYTHONOCC)
2222
# set pythonOCC version
2323
set(PYTHONOCC_VERSION_MAJOR 7)
2424
set(PYTHONOCC_VERSION_MINOR 5)
25-
set(PYTHONOCC_VERSION_PATCH 0)
25+
set(PYTHONOCC_VERSION_PATCH 1)
2626

2727
# Empty for official releases, set to -dev, -rc1, etc for development releases
28-
set(PYTHONOCC_VERSION_DEVEL -rc1)
28+
set(PYTHONOCC_VERSION_DEVEL -dev)
2929

3030
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
3131

@@ -140,7 +140,7 @@ if(DEFINED OCE_INCLUDE_PATH)
140140
# if OCE_INCLUDE_PATH is not passed at command line,
141141
# find OCE automatically
142142
else(OCE_INCLUDE_PATH)
143-
find_package(OpenCASCADE 7.5.0 REQUIRED)
143+
find_package(OpenCASCADE 7.5.1 EXACT REQUIRED)
144144
if(OpenCASCADE_FOUND)
145145
message(STATUS "OpenCASCADE version found: " ${OpenCASCADE_MAJOR_VERSION} "." ${OpenCASCADE_MINOR_VERSION} "." ${OpenCASCADE_MAINTENANCE_VERSION})
146146
message(STATUS "OpenCASCADE include directory: " ${OpenCASCADE_INCLUDE_DIR})

‎INSTALL.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ can compile/use it :
2222
* the python programming language (<http://www.python.org>). Python 3.x is required. Python 2
2323
is officially dropped since the release 7.5.0.
2424

25-
* OpenCascade 7.5.0 (<https://dev.opencascade.org>),
25+
* OpenCascade 7.5.1 (<https://dev.opencascade.org>), direct source download at https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=94c00556ea33f3895196b30c45b1fa901ad4c377;sf=tgz
2626

2727
* SWIG 3.0.11 or higher (<http://www.swig.org>),
2828

‎ci/conda/meta.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ requirements:
2525

2626
host:
2727
- python {{ python }}
28-
- occt ==7.5.0
28+
- occt ==7.5.1
2929

3030
run:
31-
- occt ==7.5.0
31+
- occt ==7.5.1
3232
- python
3333
- six
3434

‎src/PkgBase/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PYTHONOCC_VERSION_MAJOR = 7
22
PYTHONOCC_VERSION_MINOR = 5
3-
PYTHONOCC_VERSION_PATCH = 0
3+
PYTHONOCC_VERSION_PATCH = 1
44

55
# Empty for official releases, set to -dev, -rc1, etc for development releases
6-
PYTHONOCC_VERSION_DEVEL = '-rc1'
6+
PYTHONOCC_VERSION_DEVEL = '-dev'
77

88
VERSION = "%s.%s.%s%s" % (PYTHONOCC_VERSION_MAJOR, PYTHONOCC_VERSION_MINOR,
99
PYTHONOCC_VERSION_PATCH, PYTHONOCC_VERSION_DEVEL)

‎src/SWIG_files/wrapper/AIS.i‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -644,43 +644,20 @@ AIS_DS_None = AIS_DisplayStatus.AIS_DS_None
644644
/* end templates declaration */
645645

646646
/* typedefs */
647-
typedef PrsDim_AngleDimension AIS_AngleDimension;
648647
typedef Media_Timer AIS_AnimationTimer;
649-
typedef PrsDim_Chamf2dDimension AIS_Chamf2dDimension;
650-
typedef PrsDim_Chamf3dDimension AIS_Chamf3dDimension;
651-
typedef PrsDim_ConcentricRelation AIS_ConcentricRelation;
652648
typedef NCollection_DataMap<opencascade::handle<AIS_InteractiveObject>, opencascade::handle<AIS_GlobalStatus>, TColStd_MapTransientHasher>::Iterator AIS_DataMapIteratorOfDataMapOfIOStatus;
653649
typedef NCollection_DataMap<Standard_Integer, AIS_ListOfInteractive, TColStd_MapIntegerHasher>::Iterator AIS_DataMapIteratorOfDataMapofIntegerListOfinteractive;
654650
typedef NCollection_DataMap<opencascade::handle<AIS_InteractiveObject>, opencascade::handle<AIS_GlobalStatus>, TColStd_MapTransientHasher> AIS_DataMapOfIOStatus;
655651
typedef NCollection_DataMap<TopoDS_Shape, opencascade::handle<AIS_ColoredDrawer>, TopTools_ShapeMapHasher> AIS_DataMapOfShapeDrawer;
656652
typedef NCollection_DataMap<Standard_Integer, AIS_ListOfInteractive, TColStd_MapIntegerHasher> AIS_DataMapofIntegerListOfinteractive;
657-
typedef PrsDim_DiameterDimension AIS_DiameterDimension;
658-
typedef PrsDim_Dimension AIS_Dimension;
659-
typedef PrsDim_DimensionOwner AIS_DimensionOwner;
660-
typedef PrsDim_EllipseRadiusDimension AIS_EllipseRadiusDimension;
661-
typedef PrsDim_EqualDistanceRelation AIS_EqualDistanceRelation;
662-
typedef PrsDim_EqualRadiusRelation AIS_EqualRadiusRelation;
663-
typedef PrsDim_FixRelation AIS_FixRelation;
664-
typedef PrsDim_IdenticRelation AIS_IdenticRelation;
665653
typedef NCollection_IndexedDataMap<opencascade::handle<SelectMgr_EntityOwner>, opencascade::handle<Prs3d_Presentation>, TColStd_MapTransientHasher> AIS_IndexedDataMapOfOwnerPrs;
666-
typedef PrsDim_LengthDimension AIS_LengthDimension;
667654
typedef NCollection_List<opencascade::handle<AIS_InteractiveObject>>::Iterator AIS_ListIteratorOfListOfInteractive;
668655
typedef NCollection_List<opencascade::handle<AIS_InteractiveObject>> AIS_ListOfInteractive;
669656
typedef NCollection_Map<opencascade::handle<AIS_InteractiveObject>, TColStd_MapTransientHasher>::Iterator AIS_MapIteratorOfMapOfInteractive;
670657
typedef NCollection_Map<opencascade::handle<AIS_InteractiveObject>, TColStd_MapTransientHasher> AIS_MapOfInteractive;
671-
typedef PrsDim_MaxRadiusDimension AIS_MaxRadiusDimension;
672-
typedef PrsDim_MidPointRelation AIS_MidPointRelation;
673-
typedef PrsDim_MinRadiusDimension AIS_MinRadiusDimension;
674658
typedef NCollection_DataMap<unsigned int, AIS_MouseGesture> AIS_MouseGestureMap;
675659
typedef NCollection_List<opencascade::handle<SelectMgr_EntityOwner>> AIS_NListOfEntityOwner;
676-
typedef PrsDim_OffsetDimension AIS_OffsetDimension;
677-
typedef PrsDim_ParallelRelation AIS_ParallelRelation;
678-
typedef PrsDim_PerpendicularRelation AIS_PerpendicularRelation;
679-
typedef PrsDim_RadiusDimension AIS_RadiusDimension;
680-
typedef PrsDim_Relation AIS_Relation;
681660
typedef NCollection_Sequence<opencascade::handle<AIS_InteractiveObject>> AIS_SequenceOfInteractive;
682-
typedef PrsDim_SymmetricRelation AIS_SymmetricRelation;
683-
typedef PrsDim_TangentRelation AIS_TangentRelation;
684661
/* end typedefs declaration */
685662

686663
/************

‎src/SWIG_files/wrapper/AIS.pyi‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,36 +25,13 @@ from OCC.Core.Select3D import *
2525
from OCC.Core.Poly import *
2626
from OCC.Core.Image import *
2727

28-
AIS_AngleDimension = NewType('AIS_AngleDimension', PrsDim_AngleDimension)
2928
AIS_AnimationTimer = NewType('AIS_AnimationTimer', Media_Timer)
30-
AIS_Chamf2dDimension = NewType('AIS_Chamf2dDimension', PrsDim_Chamf2dDimension)
31-
AIS_Chamf3dDimension = NewType('AIS_Chamf3dDimension', PrsDim_Chamf3dDimension)
32-
AIS_ConcentricRelation = NewType('AIS_ConcentricRelation', PrsDim_ConcentricRelation)
33-
AIS_DiameterDimension = NewType('AIS_DiameterDimension', PrsDim_DiameterDimension)
34-
AIS_Dimension = NewType('AIS_Dimension', PrsDim_Dimension)
35-
AIS_DimensionOwner = NewType('AIS_DimensionOwner', PrsDim_DimensionOwner)
36-
AIS_EllipseRadiusDimension = NewType('AIS_EllipseRadiusDimension', PrsDim_EllipseRadiusDimension)
37-
AIS_EqualDistanceRelation = NewType('AIS_EqualDistanceRelation', PrsDim_EqualDistanceRelation)
38-
AIS_EqualRadiusRelation = NewType('AIS_EqualRadiusRelation', PrsDim_EqualRadiusRelation)
39-
AIS_FixRelation = NewType('AIS_FixRelation', PrsDim_FixRelation)
40-
AIS_IdenticRelation = NewType('AIS_IdenticRelation', PrsDim_IdenticRelation)
4129
#the following typedef cannot be wrapped as is
4230
AIS_IndexedDataMapOfOwnerPrs = NewType('AIS_IndexedDataMapOfOwnerPrs', Any)
43-
AIS_LengthDimension = NewType('AIS_LengthDimension', PrsDim_LengthDimension)
4431
#the following typedef cannot be wrapped as is
4532
AIS_MapIteratorOfMapOfInteractive = NewType('AIS_MapIteratorOfMapOfInteractive', Any)
4633
#the following typedef cannot be wrapped as is
4734
AIS_MapOfInteractive = NewType('AIS_MapOfInteractive', Any)
48-
AIS_MaxRadiusDimension = NewType('AIS_MaxRadiusDimension', PrsDim_MaxRadiusDimension)
49-
AIS_MidPointRelation = NewType('AIS_MidPointRelation', PrsDim_MidPointRelation)
50-
AIS_MinRadiusDimension = NewType('AIS_MinRadiusDimension', PrsDim_MinRadiusDimension)
51-
AIS_OffsetDimension = NewType('AIS_OffsetDimension', PrsDim_OffsetDimension)
52-
AIS_ParallelRelation = NewType('AIS_ParallelRelation', PrsDim_ParallelRelation)
53-
AIS_PerpendicularRelation = NewType('AIS_PerpendicularRelation', PrsDim_PerpendicularRelation)
54-
AIS_RadiusDimension = NewType('AIS_RadiusDimension', PrsDim_RadiusDimension)
55-
AIS_Relation = NewType('AIS_Relation', PrsDim_Relation)
56-
AIS_SymmetricRelation = NewType('AIS_SymmetricRelation', PrsDim_SymmetricRelation)
57-
AIS_TangentRelation = NewType('AIS_TangentRelation', PrsDim_TangentRelation)
5835

5936
class AIS_ListOfInteractive:
6037
def __init__(self) -> None: ...

‎src/SWIG_files/wrapper/BRepAlgo.i‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,36 @@ None
10881088
") Perform;
10891089
void Perform();
10901090

1091+
/****************** SetImageVV ******************/
1092+
/**** md5 signature: e4e1ed7e9cd079a003f1ab409e87973e ****/
1093+
%feature("compactdefaultargs") SetImageVV;
1094+
%feature("autodoc", "Sets the image vertex - vertex.
1095+
1096+
Parameters
1097+
----------
1098+
theImageVV: BRepAlgo_Image
1099+
1100+
Returns
1101+
-------
1102+
None
1103+
") SetImageVV;
1104+
void SetImageVV(const BRepAlgo_Image & theImageVV);
1105+
1106+
/****************** UpdateVEmap ******************/
1107+
/**** md5 signature: 491681c63af221fbd7247e01d389bbc0 ****/
1108+
%feature("compactdefaultargs") UpdateVEmap;
1109+
%feature("autodoc", "Update ve map according to image vertex - vertex.
1110+
1111+
Parameters
1112+
----------
1113+
theVEmap: TopTools_IndexedDataMapOfShapeListOfShape
1114+
1115+
Returns
1116+
-------
1117+
None
1118+
") UpdateVEmap;
1119+
void UpdateVEmap(TopTools_IndexedDataMapOfShapeListOfShape & theVEmap);
1120+
10911121
/****************** VerticesForSubstitute ******************/
10921122
/**** md5 signature: b26ff2366762048c84c096651ba2d80c ****/
10931123
%feature("compactdefaultargs") VerticesForSubstitute;

‎src/SWIG_files/wrapper/BRepAlgo.pyi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ class BRepAlgo_Loop:
107107
def NewFaces(self) -> TopTools_ListOfShape: ...
108108
def NewWires(self) -> TopTools_ListOfShape: ...
109109
def Perform(self) -> None: ...
110+
def SetImageVV(self, theImageVV: BRepAlgo_Image) -> None: ...
111+
def UpdateVEmap(self, theVEmap: TopTools_IndexedDataMapOfShapeListOfShape) -> None: ...
110112
def VerticesForSubstitute(self, VerVerMap: TopTools_DataMapOfShapeShape) -> None: ...
111113
def WiresToFaces(self) -> None: ...
112114

‎src/SWIG_files/wrapper/BRepOffset.i‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ BRepOffset_ListOfInterval
646646
class BRepOffset_Inter2d {
647647
public:
648648
/****************** Compute ******************/
649-
/**** md5 signature: 979a13b397be41e90b8e3ab967e4f53f ****/
649+
/**** md5 signature: bde03ec66a797cb4685832503e894f02 ****/
650650
%feature("compactdefaultargs") Compute;
651651
%feature("autodoc", "Computes the intersections between the edges stored is asdes as descendants of <f> . intersections is computed between two edges if one of them is bound in newedges. when all faces of the shape are treated the intersection vertices have to be fused using the fusevertices method. thedmvv contains the vertices that should be fused.
652652
@@ -656,16 +656,17 @@ AsDes: BRepAlgo_AsDes
656656
F: TopoDS_Face
657657
NewEdges: TopTools_IndexedMapOfShape
658658
Tol: float
659+
theEdgeIntEdges: TopTools_DataMapOfShapeListOfShape
659660
theDMVV: TopTools_IndexedDataMapOfShapeListOfShape
660661
661662
Returns
662663
-------
663664
None
664665
") Compute;
665-
static void Compute(const opencascade::handle<BRepAlgo_AsDes> & AsDes, const TopoDS_Face & F, const TopTools_IndexedMapOfShape & NewEdges, const Standard_Real Tol, TopTools_IndexedDataMapOfShapeListOfShape & theDMVV);
666+
static void Compute(const opencascade::handle<BRepAlgo_AsDes> & AsDes, const TopoDS_Face & F, const TopTools_IndexedMapOfShape & NewEdges, const Standard_Real Tol, const TopTools_DataMapOfShapeListOfShape & theEdgeIntEdges, TopTools_IndexedDataMapOfShapeListOfShape & theDMVV);
666667

667668
/****************** ConnexIntByInt ******************/
668-
/**** md5 signature: 1a671b5662dcca5e08cbb12b0f392946 ****/
669+
/**** md5 signature: 9542f85ef2c6d8783402b4d5f6bb0b58 ****/
669670
%feature("compactdefaultargs") ConnexIntByInt;
670671
%feature("autodoc", "Computes the intersection between the offset edges of the <fi>. all intersection vertices will be stored in asdes2d. when all faces of the shape are treated the intersection vertices have to be fused using the fusevertices method. thedmvv contains the vertices that should be fused.
671672
@@ -675,18 +676,21 @@ FI: TopoDS_Face
675676
OFI: BRepOffset_Offset
676677
MES: TopTools_DataMapOfShapeShape
677678
Build: TopTools_DataMapOfShapeShape
679+
theAsDes: BRepAlgo_AsDes
678680
AsDes2d: BRepAlgo_AsDes
679681
Offset: float
680682
Tol: float
681683
Analyse: BRepOffset_Analyse
682684
FacesWithVerts: TopTools_IndexedMapOfShape
685+
theImageVV: BRepAlgo_Image
686+
theEdgeIntEdges: TopTools_DataMapOfShapeListOfShape
683687
theDMVV: TopTools_IndexedDataMapOfShapeListOfShape
684688
685689
Returns
686690
-------
687691
bool
688692
") ConnexIntByInt;
689-
static Standard_Boolean ConnexIntByInt(const TopoDS_Face & FI, BRepOffset_Offset & OFI, TopTools_DataMapOfShapeShape & MES, const TopTools_DataMapOfShapeShape & Build, const opencascade::handle<BRepAlgo_AsDes> & AsDes2d, const Standard_Real Offset, const Standard_Real Tol, const BRepOffset_Analyse & Analyse, TopTools_IndexedMapOfShape & FacesWithVerts, TopTools_IndexedDataMapOfShapeListOfShape & theDMVV);
693+
static Standard_Boolean ConnexIntByInt(const TopoDS_Face & FI, BRepOffset_Offset & OFI, TopTools_DataMapOfShapeShape & MES, const TopTools_DataMapOfShapeShape & Build, const opencascade::handle<BRepAlgo_AsDes> & theAsDes, const opencascade::handle<BRepAlgo_AsDes> & AsDes2d, const Standard_Real Offset, const Standard_Real Tol, const BRepOffset_Analyse & Analyse, TopTools_IndexedMapOfShape & FacesWithVerts, BRepAlgo_Image & theImageVV, TopTools_DataMapOfShapeListOfShape & theEdgeIntEdges, TopTools_IndexedDataMapOfShapeListOfShape & theDMVV);
690694

691695
/****************** ConnexIntByIntInVert ******************/
692696
/**** md5 signature: ea838c391bea9387e57a224561f2be12 ****/
@@ -729,20 +733,21 @@ bool
729733
static Standard_Boolean ExtentEdge(const TopoDS_Edge & E, TopoDS_Edge & NE, const Standard_Real theOffset);
730734

731735
/****************** FuseVertices ******************/
732-
/**** md5 signature: 039f375f0808091df05360168c765f3c ****/
736+
/**** md5 signature: 13e662b268b3ad2a3fc5abb84641c05a ****/
733737
%feature("compactdefaultargs") FuseVertices;
734738
%feature("autodoc", "Fuses the chains of vertices in the thedmvv and updates asdes by replacing the old vertices with the new ones.
735739
736740
Parameters
737741
----------
738742
theDMVV: TopTools_IndexedDataMapOfShapeListOfShape
739743
theAsDes: BRepAlgo_AsDes
744+
theImageVV: BRepAlgo_Image
740745
741746
Returns
742747
-------
743748
bool
744749
") FuseVertices;
745-
static Standard_Boolean FuseVertices(const TopTools_IndexedDataMapOfShapeListOfShape & theDMVV, const opencascade::handle<BRepAlgo_AsDes> & theAsDes);
750+
static Standard_Boolean FuseVertices(const TopTools_IndexedDataMapOfShapeListOfShape & theDMVV, const opencascade::handle<BRepAlgo_AsDes> & theAsDes, BRepAlgo_Image & theImageVV);
746751

747752
};
748753

@@ -1116,7 +1121,7 @@ None
11161121
BRepOffset_MakeLoops();
11171122

11181123
/****************** Build ******************/
1119-
/**** md5 signature: 6659e42a50d0c1c2250f0e1e0ec1b1eb ****/
1124+
/**** md5 signature: fa75ced0f1b13af9db45939bc0b3ea40 ****/
11201125
%feature("compactdefaultargs") Build;
11211126
%feature("autodoc", "No available documentation.
11221127
@@ -1125,12 +1130,13 @@ Parameters
11251130
LF: TopTools_ListOfShape
11261131
AsDes: BRepAlgo_AsDes
11271132
Image: BRepAlgo_Image
1133+
theImageVV: BRepAlgo_Image
11281134
11291135
Returns
11301136
-------
11311137
None
11321138
") Build;
1133-
void Build(const TopTools_ListOfShape & LF, const opencascade::handle<BRepAlgo_AsDes> & AsDes, BRepAlgo_Image & Image);
1139+
void Build(const TopTools_ListOfShape & LF, const opencascade::handle<BRepAlgo_AsDes> & AsDes, BRepAlgo_Image & Image, BRepAlgo_Image & theImageVV);
11341140

11351141
/****************** BuildFaces ******************/
11361142
/**** md5 signature: c3db0e3d2792b138a1249d8591b7cf76 ****/
@@ -2420,7 +2426,7 @@ None
24202426
static void Inter2d(const TopoDS_Face & F, const TopoDS_Edge & E1, const TopoDS_Edge & E2, TopTools_ListOfShape & LV, const Standard_Real Tol);
24212427

24222428
/****************** Inter3D ******************/
2423-
/**** md5 signature: 411d6729c1367e207c90ad10f6b9f34e ****/
2429+
/**** md5 signature: 14c7b38326d9f6a6878482c940a4d0b3 ****/
24242430
%feature("compactdefaultargs") Inter3D;
24252431
%feature("autodoc", "Computes the section betwwen <f1> and <f2> the edges solution are stored in <lint1> with the orientation on <f1>, the sames edges are stored in <lint2> with the orientation on <f2>.
24262432
@@ -2432,14 +2438,14 @@ LInt1: TopTools_ListOfShape
24322438
LInt2: TopTools_ListOfShape
24332439
Side: TopAbs_State
24342440
RefEdge: TopoDS_Edge
2435-
IsRefEdgeDefined: bool,optional
2436-
default value is Standard_False
2441+
RefFace1: TopoDS_Face
2442+
RefFace2: TopoDS_Face
24372443
24382444
Returns
24392445
-------
24402446
None
24412447
") Inter3D;
2442-
static void Inter3D(const TopoDS_Face & F1, const TopoDS_Face & F2, TopTools_ListOfShape & LInt1, TopTools_ListOfShape & LInt2, const TopAbs_State Side, const TopoDS_Edge & RefEdge, const Standard_Boolean IsRefEdgeDefined = Standard_False);
2448+
static void Inter3D(const TopoDS_Face & F1, const TopoDS_Face & F2, TopTools_ListOfShape & LInt1, TopTools_ListOfShape & LInt2, const TopAbs_State Side, const TopoDS_Edge & RefEdge, const TopoDS_Face & RefFace1, const TopoDS_Face & RefFace2);
24432449

24442450
/****************** InterOrExtent ******************/
24452451
/**** md5 signature: b59609d22996a8309b9d7db1980b24a8 ****/

‎src/SWIG_files/wrapper/BRepOffset.pyi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ class BRepOffset_Analyse:
123123

124124
class BRepOffset_Inter2d:
125125
@staticmethod
126-
def Compute(AsDes: BRepAlgo_AsDes, F: TopoDS_Face, NewEdges: TopTools_IndexedMapOfShape, Tol: float, theDMVV: TopTools_IndexedDataMapOfShapeListOfShape) -> None: ...
126+
def Compute(AsDes: BRepAlgo_AsDes, F: TopoDS_Face, NewEdges: TopTools_IndexedMapOfShape, Tol: float, theEdgeIntEdges: TopTools_DataMapOfShapeListOfShape, theDMVV: TopTools_IndexedDataMapOfShapeListOfShape) -> None: ...
127127
@staticmethod
128-
def ConnexIntByInt(FI: TopoDS_Face, OFI: BRepOffset_Offset, MES: TopTools_DataMapOfShapeShape, Build: TopTools_DataMapOfShapeShape, AsDes2d: BRepAlgo_AsDes, Offset: float, Tol: float, Analyse: BRepOffset_Analyse, FacesWithVerts: TopTools_IndexedMapOfShape, theDMVV: TopTools_IndexedDataMapOfShapeListOfShape) -> bool: ...
128+
def ConnexIntByInt(FI: TopoDS_Face, OFI: BRepOffset_Offset, MES: TopTools_DataMapOfShapeShape, Build: TopTools_DataMapOfShapeShape, theAsDes: BRepAlgo_AsDes, AsDes2d: BRepAlgo_AsDes, Offset: float, Tol: float, Analyse: BRepOffset_Analyse, FacesWithVerts: TopTools_IndexedMapOfShape, theImageVV: BRepAlgo_Image, theEdgeIntEdges: TopTools_DataMapOfShapeListOfShape, theDMVV: TopTools_IndexedDataMapOfShapeListOfShape) -> bool: ...
129129
@staticmethod
130130
def ConnexIntByIntInVert(FI: TopoDS_Face, OFI: BRepOffset_Offset, MES: TopTools_DataMapOfShapeShape, Build: TopTools_DataMapOfShapeShape, AsDes: BRepAlgo_AsDes, AsDes2d: BRepAlgo_AsDes, Tol: float, Analyse: BRepOffset_Analyse, theDMVV: TopTools_IndexedDataMapOfShapeListOfShape) -> None: ...
131131
@staticmethod
132132
def ExtentEdge(E: TopoDS_Edge, NE: TopoDS_Edge, theOffset: float) -> bool: ...
133133
@staticmethod
134-
def FuseVertices(theDMVV: TopTools_IndexedDataMapOfShapeListOfShape, theAsDes: BRepAlgo_AsDes) -> bool: ...
134+
def FuseVertices(theDMVV: TopTools_IndexedDataMapOfShapeListOfShape, theAsDes: BRepAlgo_AsDes, theImageVV: BRepAlgo_Image) -> bool: ...
135135

136136
class BRepOffset_Inter3d:
137137
def __init__(self, AsDes: BRepAlgo_AsDes, Side: TopAbs_State, Tol: float) -> None: ...
@@ -168,7 +168,7 @@ class BRepOffset_Interval:
168168

169169
class BRepOffset_MakeLoops:
170170
def __init__(self) -> None: ...
171-
def Build(self, LF: TopTools_ListOfShape, AsDes: BRepAlgo_AsDes, Image: BRepAlgo_Image) -> None: ...
171+
def Build(self, LF: TopTools_ListOfShape, AsDes: BRepAlgo_AsDes, Image: BRepAlgo_Image, theImageVV: BRepAlgo_Image) -> None: ...
172172
def BuildFaces(self, LF: TopTools_ListOfShape, AsDes: BRepAlgo_AsDes, Image: BRepAlgo_Image) -> None: ...
173173
def BuildOnContext(self, LContext: TopTools_ListOfShape, Analyse: BRepOffset_Analyse, AsDes: BRepAlgo_AsDes, Image: BRepAlgo_Image, InSide: bool) -> None: ...
174174

@@ -285,7 +285,7 @@ class BRepOffset_Tool:
285285
@staticmethod
286286
def Inter2d(F: TopoDS_Face, E1: TopoDS_Edge, E2: TopoDS_Edge, LV: TopTools_ListOfShape, Tol: float) -> None: ...
287287
@staticmethod
288-
def Inter3D(F1: TopoDS_Face, F2: TopoDS_Face, LInt1: TopTools_ListOfShape, LInt2: TopTools_ListOfShape, Side: TopAbs_State, RefEdge: TopoDS_Edge, IsRefEdgeDefined: Optional[bool] = False) -> None: ...
288+
def Inter3D(F1: TopoDS_Face, F2: TopoDS_Face, LInt1: TopTools_ListOfShape, LInt2: TopTools_ListOfShape, Side: TopAbs_State, RefEdge: TopoDS_Edge, RefFace1: TopoDS_Face, RefFace2: TopoDS_Face) -> None: ...
289289
@staticmethod
290290
def InterOrExtent(F1: TopoDS_Face, F2: TopoDS_Face, LInt1: TopTools_ListOfShape, LInt2: TopTools_ListOfShape, Side: TopAbs_State) -> None: ...
291291
@staticmethod

0 commit comments

Comments
 (0)