Finish updates to OCCT 8.0.0 API

src/SWIG_files/headers/NCollection_module.hxx

@@ -28,7 +28,9 @@ along with pythonOCC.  If not, see <http://www.gnu.org/licenses/>.
 #include<NCollection_BaseAllocator.hxx>
 #include<NCollection_BaseList.hxx>
 #include<NCollection_BaseMap.hxx>
-#include<NCollection_BasePointerVector.hxx>
+// occt-800: NCollection_BasePointerVector.hxx was removed; the class is
+// %ignore'd in NCollection.i, so drop the include to keep wrappers compiling.
+//#include<NCollection_BasePointerVector.hxx>
 #include<NCollection_BaseSequence.hxx>
 #include<NCollection_Buffer.hxx>
 #include<NCollection_CellFilter.hxx>

src/SWIG_files/wrapper/AppDef.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *
@@ -521,9 +521,9 @@ class AppDef_LinearCriteria(AppDef_SmoothCriterion):
 
 # harray1 classes
 
-class AppDef_HArray1OfMultiPointConstraint(NCollection_Array1<AppDef_MultiPointConstraint>, Standard_Transient):
+class AppDef_HArray1OfMultiPointConstraint(AppDef_Array1OfMultiPointConstraint, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<AppDef_MultiPointConstraint>: ...
+    def Array1(self) -> AppDef_Array1OfMultiPointConstraint: ...
 
 # harray2 classes
 # hsequence classes

src/SWIG_files/wrapper/AppParCurves.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *
@@ -259,24 +259,24 @@ class AppParCurves_MultiBSpCurve(AppParCurves_MultiCurve):
 
 # harray1 classes
 
-class AppParCurves_HArray1OfConstraintCouple(NCollection_Array1<AppParCurves_ConstraintCouple>, Standard_Transient):
+class AppParCurves_HArray1OfConstraintCouple(AppParCurves_Array1OfConstraintCouple, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<AppParCurves_ConstraintCouple>: ...
+    def Array1(self) -> AppParCurves_Array1OfConstraintCouple: ...
 
 
-class AppParCurves_HArray1OfMultiBSpCurve(NCollection_Array1<AppParCurves_MultiBSpCurve>, Standard_Transient):
+class AppParCurves_HArray1OfMultiBSpCurve(AppParCurves_Array1OfMultiBSpCurve, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<AppParCurves_MultiBSpCurve>: ...
+    def Array1(self) -> AppParCurves_Array1OfMultiBSpCurve: ...
 
 
-class AppParCurves_HArray1OfMultiCurve(NCollection_Array1<AppParCurves_MultiCurve>, Standard_Transient):
+class AppParCurves_HArray1OfMultiCurve(AppParCurves_Array1OfMultiCurve, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<AppParCurves_MultiCurve>: ...
+    def Array1(self) -> AppParCurves_Array1OfMultiCurve: ...
 
 
-class AppParCurves_HArray1OfMultiPoint(NCollection_Array1<AppParCurves_MultiPoint>, Standard_Transient):
+class AppParCurves_HArray1OfMultiPoint(AppParCurves_Array1OfMultiPoint, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<AppParCurves_MultiPoint>: ...
+    def Array1(self) -> AppParCurves_Array1OfMultiPoint: ...
 
 # harray2 classes
 # hsequence classes

src/SWIG_files/wrapper/Approx.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *
@@ -294,14 +294,14 @@ class Approx_SweepFunction(Standard_Transient):
 
 # harray1 classes
 
-class Approx_HArray1OfAdHSurface(NCollection_Array1<opencascade::handle<Adaptor3d_Surface>>, Standard_Transient):
+class Approx_HArray1OfAdHSurface(Approx_Array1OfAdHSurface, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<opencascade::handle<Adaptor3d_Surface>>: ...
+    def Array1(self) -> Approx_Array1OfAdHSurface: ...
 
 
-class Approx_HArray1OfGTrsf2d(NCollection_Array1<gp_GTrsf2d>, Standard_Transient):
+class Approx_HArray1OfGTrsf2d(Approx_Array1OfGTrsf2d, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<gp_GTrsf2d>: ...
+    def Array1(self) -> Approx_Array1OfGTrsf2d: ...
 
 # harray2 classes
 # hsequence classes

src/SWIG_files/wrapper/Aspect.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BOPAlgo.pyi

@@ -157,7 +157,7 @@ class BOPAlgo_SectionAttribute:
 
 class BOPAlgo_Tools:
     @staticmethod
-    def ClassifyFaces(theFaces: TopTools_ListOfShape, theSolids: TopTools_ListOfShape, theRunParallel: bool, theContext: IntTools_Context, theInParts: TopTools_IndexedDataMapOfShapeListOfShape, theShapeBoxMap: Optional[TopTools_DataMapOfShapeBox] = NCollection_DataMap<TopoDS_Shape,Bnd_Box,TopTools_ShapeMapHasher>(), theSolidsIF: Optional[TopTools_DataMapOfShapeListOfShape] = NCollection_DataMap<TopoDS_Shape,NCollection_List<TopoDS_Shape>,TopTools_ShapeMapHasher>(), theRange: Optional[Message_ProgressRange] = Message_ProgressRange()) -> None: ...
+    def ClassifyFaces(theFaces: TopTools_ListOfShape, theSolids: TopTools_ListOfShape, theRunParallel: bool, theContext: IntTools_Context, theInParts: TopTools_IndexedDataMapOfShapeListOfShape, theShapeBoxMap: Optional[TopTools_DataMapOfShapeBox] = TopTools_DataMapOfShapeBox(), theSolidsIF: Optional[TopTools_DataMapOfShapeListOfShape] = TopTools_DataMapOfShapeListOfShape(), theRange: Optional[Message_ProgressRange] = Message_ProgressRange()) -> None: ...
     @staticmethod
     def ComputeToleranceOfCB(theCB: BOPDS_CommonBlock, theDS: BOPDS_PDS, theContext: IntTools_Context) -> False: ...
     @staticmethod

src/SWIG_files/wrapper/BOPDS.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BOPTools.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BRepAdaptor.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *
@@ -120,9 +120,9 @@ class BRepAdaptor_Surface(GeomAdaptor_TransformedSurface):
 
 # harray1 classes
 
-class BRepAdaptor_HArray1OfCurve(NCollection_Array1<BRepAdaptor_Curve>, Standard_Transient):
+class BRepAdaptor_HArray1OfCurve(BRepAdaptor_Array1OfCurve, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<BRepAdaptor_Curve>: ...
+    def Array1(self) -> BRepAdaptor_Array1OfCurve: ...
 
 # harray2 classes
 # hsequence classes

src/SWIG_files/wrapper/BRepAlgoAPI.i

@@ -320,6 +320,22 @@ Returns a shape built by the shape construction algorithm. Does not check if the
 /********************************
 * class BRepAlgoAPI_BuilderAlgo *
 ********************************/
+// occt-800: BRepAlgoAPI_BuilderAlgo gained deleted copy/move members, so the
+// generator dropped it into the excluded-classes list. That severed the
+// inheritance chain (BooleanOperation/Splitter -> BuilderAlgo -> Algo), hiding
+// the inherited Shape() from every boolean operation. Re-wrap it (empty body
+// is enough) so Shape() is exposed again.
+%nodefaultctor BRepAlgoAPI_BuilderAlgo;
+class BRepAlgoAPI_BuilderAlgo : public BRepAlgoAPI_Algo {
+	public:
+};
+
+%extend BRepAlgoAPI_BuilderAlgo {
+	%pythoncode {
+	__repr__ = _dumps_object
+	}
+};
+
 /********************************
 * class BRepAlgoAPI_Defeaturing *
 ********************************/
@@ -1475,10 +1491,6 @@ initialize the tool <Sf> - tool Obsolete.
 
 /* python proxy for excluded classes */
 %pythoncode {
-@classnotwrapped
-class BRepAlgoAPI_BuilderAlgo:
-	pass
-
 }
 /* end python proxy for excluded classes */
 /* harray1 classes */

src/SWIG_files/wrapper/BRepAlgoAPI.pyi

@@ -138,7 +138,7 @@ class BRepAlgoAPI_Section(BRepAlgoAPI_BooleanOperation):
     def Init2(self, Sf: Geom_Surface) -> None: ...
 
 #classnotwrapped
-class BRepAlgoAPI_BuilderAlgo: ...
+class BRepAlgoAPI_BuilderAlgo(BRepAlgoAPI_Algo): ...
 
 # harray1 classes
 # harray2 classes

src/SWIG_files/wrapper/BRepBuilderAPI.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BRepCheck.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BRepFill.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BVH.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BinLDrivers.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BinMDF.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/BinObjMgt.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/Bnd.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *
@@ -337,19 +337,19 @@ class Bnd_Tools:
 
 # harray1 classes
 
-class Bnd_HArray1OfBox(NCollection_Array1<Bnd_Box>, Standard_Transient):
+class Bnd_HArray1OfBox(Bnd_Array1OfBox, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<Bnd_Box>: ...
+    def Array1(self) -> Bnd_Array1OfBox: ...
 
 
-class Bnd_HArray1OfBox2d(NCollection_Array1<Bnd_Box2d>, Standard_Transient):
+class Bnd_HArray1OfBox2d(Bnd_Array1OfBox2d, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<Bnd_Box2d>: ...
+    def Array1(self) -> Bnd_Array1OfBox2d: ...
 
 
-class Bnd_HArray1OfSphere(NCollection_Array1<Bnd_Sphere>, Standard_Transient):
+class Bnd_HArray1OfSphere(Bnd_Array1OfSphere, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<Bnd_Sphere>: ...
+    def Array1(self) -> Bnd_Array1OfSphere: ...
 
 # harray2 classes
 # hsequence classes

src/SWIG_files/wrapper/CDM.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/ChFiDS.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *
@@ -597,19 +597,19 @@ class ChFiDS_FilSpine(ChFiDS_Spine):
 
 # harray1 classes
 
-class ChFiDS_SecHArray1(NCollection_Array1<ChFiDS_CircSection>, Standard_Transient):
+class ChFiDS_SecHArray1(ChFiDS_SecArray1, Standard_Transient):
     def __init__(self, theLower: int, theUpper: int) -> None: ...
-    def Array1(self) -> NCollection_Array1<ChFiDS_CircSection>: ...
+    def Array1(self) -> ChFiDS_SecArray1: ...
 
 # harray2 classes
 # hsequence classes
 
-class ChFiDS_HData(NCollection_Sequence<opencascade::handle<ChFiDS_SurfData>>, Standard_Transient):
+class ChFiDS_HData(ChFiDS_SequenceOfSurfData, Standard_Transient):
     @overload
     def __init__(self) -> None: ...
     @overload
-    def __init__(self, other: NCollection_Sequence<opencascade::handle<ChFiDS_SurfData>>) -> None: ...
-    def Sequence(self) -> NCollection_Sequence<opencascade::handle<ChFiDS_SurfData>>: ...
-    def Append(self, theSequence: NCollection_Sequence<opencascade::handle<ChFiDS_SurfData>>) -> None: ...
+    def __init__(self, other: ChFiDS_SequenceOfSurfData) -> None: ...
+    def Sequence(self) -> ChFiDS_SequenceOfSurfData: ...
+    def Append(self, theSequence: ChFiDS_SequenceOfSurfData) -> None: ...
 
 

src/SWIG_files/wrapper/Contap.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *
@@ -456,12 +456,12 @@ class Contap_TheSegmentOfTheSearch:
 # harray2 classes
 # hsequence classes
 
-class Contap_TheHSequenceOfPoint(NCollection_Sequence<Contap_Point>, Standard_Transient):
+class Contap_TheHSequenceOfPoint(Contap_TheSequenceOfPoint, Standard_Transient):
     @overload
     def __init__(self) -> None: ...
     @overload
-    def __init__(self, other: NCollection_Sequence<Contap_Point>) -> None: ...
-    def Sequence(self) -> NCollection_Sequence<Contap_Point>: ...
-    def Append(self, theSequence: NCollection_Sequence<Contap_Point>) -> None: ...
+    def __init__(self, other: Contap_TheSequenceOfPoint) -> None: ...
+    def Sequence(self) -> Contap_TheSequenceOfPoint: ...
+    def Append(self, theSequence: Contap_TheSequenceOfPoint) -> None: ...
 
 

src/SWIG_files/wrapper/DE.pyi

@@ -112,9 +112,9 @@ class DE_Wrapper(Standard_Transient):
     @overload
     def Read(self, thePath: str, theShape: TopoDS_Shape, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
     @overload
-    def Save(self, theResourcePath: str, theIsRecursive: Optional[bool] = true, theFormats: Optional[TColStd_ListOfAsciiString] = NCollection_List<TCollection_AsciiString>(), theVendors: Optional[TColStd_ListOfAsciiString] = NCollection_List<TCollection_AsciiString>()) -> bool: ...
+    def Save(self, theResourcePath: str, theIsRecursive: Optional[bool] = true, theFormats: Optional[TColStd_ListOfAsciiString] = TColStd_ListOfAsciiString(), theVendors: Optional[TColStd_ListOfAsciiString] = TColStd_ListOfAsciiString()) -> bool: ...
     @overload
-    def Save(self, theIsRecursive: Optional[bool] = true, theFormats: Optional[TColStd_ListOfAsciiString] = NCollection_List<TCollection_AsciiString>(), theVendors: Optional[TColStd_ListOfAsciiString] = NCollection_List<TCollection_AsciiString>()) -> str: ...
+    def Save(self, theIsRecursive: Optional[bool] = true, theFormats: Optional[TColStd_ListOfAsciiString] = TColStd_ListOfAsciiString(), theVendors: Optional[TColStd_ListOfAsciiString] = TColStd_ListOfAsciiString()) -> str: ...
     @staticmethod
     def SetGlobalWrapper(theWrapper: DE_Wrapper) -> None: ...
     def SetKeepUpdates(self, theToKeepUpdates: bool) -> None: ...

src/SWIG_files/wrapper/Draft.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *

src/SWIG_files/wrapper/Expr.pyi

@@ -1,5 +1,5 @@
 from enum import IntEnum
-from typing import overload, NewType, Optional, Tuple
+from typing import Any, overload, NewType, Optional, Tuple
 
 from OCC.Core.Standard import *
 from OCC.Core.NCollection import *