Final SWIG update before occt-790

Author: tpaviot

src/SWIG_files/wrapper/BRepTools.i

@@ -973,36 +973,37 @@ Parameter theProgress the range of progress indicator to fill in.
 		static Standard_Boolean Write(const TopoDS_Shape & theShape, Standard_CString theFile, const Standard_Boolean theWithTriangles, const Standard_Boolean theWithNormals, const TopTools_FormatVersion theVersion, const Message_ProgressRange & theProgress = Message_ProgressRange());
 
 
-                    %feature("autodoc", "Serializes TopoDS_Shape to string. If full_precision is False, the default precision of std::stringstream is used which regularly causes rounding.") WriteToString;
-                    %extend{
-                        static std::string WriteToString(const TopoDS_Shape & shape, bool full_precision = true) {
-                        std::stringstream s;
-                        if(full_precision) {
-                            s.precision(17);
-                            s.setf(std::ios::scientific);
-                        }
-                        BRepTools::Write(shape, s);
-                        return s.str();}
-                    };
-                    %feature("autodoc", "Deserializes TopoDS_Shape from string. Create and return a new TopoDS_Shape each time the method is called.") ReadFromString;
-                    %extend{
-                        static TopoDS_Shape ReadFromString(const std::string & src) {
-                            std::istringstream s(std::move(src));
-                            TopoDS_Shape shape;
-                            BRep_Builder b;
-                            BRepTools::Read(shape, s, b);
-                            return shape;
-                        }
-                    };
-                    %feature("autodoc", "Deserializes TopoDS_Shape from string. Take a TopoDS_Shape instance by reference to prevent memory increase.") ReadFromString;
-                    %extend{
-                        static void ReadFromString(const std::string & src, TopoDS_Shape& shape) {
-						    std::istringstream s(std::move(src));
-						    BRep_Builder b;
-						    BRepTools::Read(shape, s, b);
-						}
-                    };     
-            };
+%feature("autodoc", "Serializes TopoDS_Shape to string. If full_precision is False, the default precision of std::stringstream is used which regularly causes rounding.") WriteToString;
+%extend{
+    static std::string WriteToString(const TopoDS_Shape & shape, bool full_precision = true) {
+    std::stringstream s;
+    if(full_precision) {
+        s.precision(17);
+        s.setf(std::ios::scientific);
+    }
+    BRepTools::Write(shape, s);
+    return s.str();}
+};
+%feature("autodoc", "Deserializes TopoDS_Shape from string. Create and return a new TopoDS_Shape each time the method is called.") ReadFromString;
+%extend{
+    static TopoDS_Shape ReadFromString(const std::string & src) {
+        std::istringstream s(std::move(src));
+        TopoDS_Shape shape;
+        BRep_Builder b;
+        BRepTools::Read(shape, s, b);
+        return shape;
+    }
+};
+%feature("autodoc", "Deserializes TopoDS_Shape from string. Take a TopoDS_Shape instance by reference to prevent memory increase.") ReadFromString;
+%extend{
+    static void ReadFromString(const std::string & src, TopoDS_Shape& shape) {
+        std::istringstream s(std::move(src));
+        BRep_Builder b;
+        BRepTools::Read(shape, s, b);
+    }
+};
+
+};
 
 
 %extend BRepTools {
@@ -2602,27 +2603,37 @@ Writes the triangulation on the stream <OS> in a format that can be read back by
 		void WriteTriangulation(std::ostream &OutValue, const Standard_Boolean Compact = Standard_True, const Message_ProgressRange & theProgress = Message_ProgressRange());
 
 
-                    %feature("autodoc", "Serializes TopoDS_Shape to string. If full_precision is False, the default precision of std::stringstream is used which regularly causes rounding.") WriteToString;
-                    %extend{
-                        static std::string WriteToString(const TopoDS_Shape & shape, bool full_precision = true) {
-                        std::stringstream s;
-                        if(full_precision) {
-                            s.precision(17);
-                            s.setf(std::ios::scientific);
-                        }
-                        BRepTools::Write(shape, s);
-                        return s.str();}
-                    };
-                    %feature("autodoc", "Deserializes TopoDS_Shape from string") ReadFromString;
-                    %extend{
-                        static TopoDS_Shape ReadFromString(const std::string & src) {
-                        std::stringstream s(src);
-                        TopoDS_Shape shape;
-                        BRep_Builder b;
-                        BRepTools::Read(shape, s, b);
-                        return shape;}
-                    };
-            };
+%feature("autodoc", "Serializes TopoDS_Shape to string. If full_precision is False, the default precision of std::stringstream is used which regularly causes rounding.") WriteToString;
+%extend{
+    static std::string WriteToString(const TopoDS_Shape & shape, bool full_precision = true) {
+    std::stringstream s;
+    if(full_precision) {
+        s.precision(17);
+        s.setf(std::ios::scientific);
+    }
+    BRepTools::Write(shape, s);
+    return s.str();}
+};
+%feature("autodoc", "Deserializes TopoDS_Shape from string. Create and return a new TopoDS_Shape each time the method is called.") ReadFromString;
+%extend{
+    static TopoDS_Shape ReadFromString(const std::string & src) {
+        std::istringstream s(std::move(src));
+        TopoDS_Shape shape;
+        BRep_Builder b;
+        BRepTools::Read(shape, s, b);
+        return shape;
+    }
+};
+%feature("autodoc", "Deserializes TopoDS_Shape from string. Take a TopoDS_Shape instance by reference to prevent memory increase.") ReadFromString;
+%extend{
+    static void ReadFromString(const std::string & src, TopoDS_Shape& shape) {
+        std::istringstream s(std::move(src));
+        BRep_Builder b;
+        BRepTools::Read(shape, s, b);
+    }
+};
+
+};
 
 
 %extend BRepTools_ShapeSet {

src/SWIG_files/wrapper/BRepTools.pyi

@@ -126,10 +126,13 @@ class breptools:
     @overload
     @staticmethod
     def Write(theShape: TopoDS_Shape, theFile: str, theWithTriangles: bool, theWithNormals: bool, theVersion: TopTools_FormatVersion, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> bool: ...
+
     @staticmethod
     def WriteToString(sh: TopoDS_Shape) -> str: ...
     @staticmethod
     def ReadFromString(s: str) -> TopoDS_Shape: ...
+    @staticmethod
+    def ReadFromString(s: str, topods_shape: TopoDS_Shape) -> None: ...
 
 class BRepTools_History(Standard_Transient):
     @overload
@@ -247,10 +250,13 @@ class BRepTools_ShapeSet(TopTools_ShapeSet):
     def WritePolygon3D(self, Compact: Optional[bool] = True, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> str: ...
     def WritePolygonOnTriangulation(self, Compact: Optional[bool] = True, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> str: ...
     def WriteTriangulation(self, Compact: Optional[bool] = True, theProgress: Optional[Message_ProgressRange] = Message_ProgressRange()) -> str: ...
+
     @staticmethod
     def WriteToString(sh: TopoDS_Shape) -> str: ...
     @staticmethod
     def ReadFromString(s: str) -> TopoDS_Shape: ...
+    @staticmethod
+    def ReadFromString(s: str, topods_shape: TopoDS_Shape) -> None: ...
 
 class BRepTools_Substitution:
     def __init__(self) -> None: ...

src/SWIG_files/wrapper/BVH.i

@@ -124,7 +124,6 @@ typedef typename BVH ::VectorType<T , 2>::Type BVH_VecNt;
 		/****** BVH_AxisSelector<T,2>::MainAxis ******/
 		/****** md5 signature: 3eeb73485373349ee6e5770c410c7405 ******/
 		%feature("compactdefaultargs") MainAxis;
-		%rename BVH::MainAxis bvh_MainAxis;
 		%feature("autodoc", "
 Parameters
 ----------

src/SWIG_files/wrapper/ChFi3d.i

@@ -147,18 +147,17 @@ Parameters
 S1: BRepAdaptor_Surface
 S2: BRepAdaptor_Surface
 E: TopoDS_Edge
-Or1: TopAbs_Orientation
-Or2: TopAbs_Orientation
 
 Return
 -------
-int
+Or1: TopAbs_Orientation
+Or2: TopAbs_Orientation
 
 Description
 -----------
 Returns Reversed in Or1 and(or) Or2 if the concave edge defined by the interior of faces F1 and F2, in the neighbourhood of their boundary E is of the edge opposite to the normal of their surface support. The orientation of faces is not taken into consideration in the calculation. The function returns 0 if the calculation fails (tangence), if not, it returns the number of choice of the fillet or chamfer corresponding to the orientations calculated and to the tangent to the guide line read in E.
 ") ConcaveSide;
-		static Standard_Integer ConcaveSide(const BRepAdaptor_Surface & S1, const BRepAdaptor_Surface & S2, const TopoDS_Edge & E, TopAbs_Orientation & Or1, TopAbs_Orientation & Or2);
+		static Standard_Integer ConcaveSide(const BRepAdaptor_Surface & S1, const BRepAdaptor_Surface & S2, const TopoDS_Edge & E, TopAbs_Orientation &OutValue, TopAbs_Orientation &OutValue);
 
 		/****** ChFi3d::DefineConnectType ******/
 		/****** md5 signature: cff62fae1d6d67c4fc161f59e5544eaa ******/
@@ -209,41 +208,39 @@ Returns true if theEdge between theFace1 and theFace2 is tangent.
 		%feature("autodoc", "
 Parameters
 ----------
-Or1: TopAbs_Orientation
-Or2: TopAbs_Orientation
 OrSave1: TopAbs_Orientation
 OrSave2: TopAbs_Orientation
 ChoixSauv: int
 
 Return
 -------
-int
+Or1: TopAbs_Orientation
+Or2: TopAbs_Orientation
 
 Description
 -----------
 Same as ConcaveSide, but the orientations are logically deduced from the result of the call of ConcaveSide on the first pair of faces of the fillet or chamnfer.
 ") NextSide;
-		static Standard_Integer NextSide(TopAbs_Orientation & Or1, TopAbs_Orientation & Or2, const TopAbs_Orientation OrSave1, const TopAbs_Orientation OrSave2, const Standard_Integer ChoixSauv);
+		static Standard_Integer NextSide(TopAbs_Orientation &OutValue, TopAbs_Orientation &OutValue, const TopAbs_Orientation OrSave1, const TopAbs_Orientation OrSave2, const Standard_Integer ChoixSauv);
 
 		/****** ChFi3d::NextSide ******/
 		/****** md5 signature: cdb55087e2f58002d8dd06337ade33f1 ******/
 		%feature("compactdefaultargs") NextSide;
 		%feature("autodoc", "
 Parameters
 ----------
-Or: TopAbs_Orientation
 OrSave: TopAbs_Orientation
 OrFace: TopAbs_Orientation
 
 Return
 -------
-None
+Or: TopAbs_Orientation
 
 Description
 -----------
 Same as the other NextSide, but the calculation is done on an edge only.
 ") NextSide;
-		static void NextSide(TopAbs_Orientation & Or, const TopAbs_Orientation OrSave, const TopAbs_Orientation OrFace);
+		static void NextSide(TopAbs_Orientation &OutValue, const TopAbs_Orientation OrSave, const TopAbs_Orientation OrFace);
 
 		/****** ChFi3d::SameSide ******/
 		/****** md5 signature: cb26ae9b069d0a97c5fa9e8f947264b7 ******/

src/SWIG_files/wrapper/ChFi3d.pyi

@@ -28,17 +28,17 @@ ChFi3d_Polynomial = ChFi3d_FilletShape.ChFi3d_Polynomial
 
 class chfi3d:
     @staticmethod
-    def ConcaveSide(S1: BRepAdaptor_Surface, S2: BRepAdaptor_Surface, E: TopoDS_Edge, Or1: TopAbs_Orientation, Or2: TopAbs_Orientation) -> int: ...
+    def ConcaveSide(S1: BRepAdaptor_Surface, S2: BRepAdaptor_Surface, E: TopoDS_Edge) -> Tuple[int, TopAbs_Orientation, TopAbs_Orientation]: ...
     @staticmethod
     def DefineConnectType(E: TopoDS_Edge, F1: TopoDS_Face, F2: TopoDS_Face, SinTol: float, CorrectPoint: bool) -> ChFiDS_TypeOfConcavity: ...
     @staticmethod
     def IsTangentFaces(theEdge: TopoDS_Edge, theFace1: TopoDS_Face, theFace2: TopoDS_Face, Order: Optional[GeomAbs_Shape] = GeomAbs_G1) -> bool: ...
     @overload
     @staticmethod
-    def NextSide(Or1: TopAbs_Orientation, Or2: TopAbs_Orientation, OrSave1: TopAbs_Orientation, OrSave2: TopAbs_Orientation, ChoixSauv: int) -> int: ...
+    def NextSide(OrSave1: TopAbs_Orientation, OrSave2: TopAbs_Orientation, ChoixSauv: int) -> Tuple[int, TopAbs_Orientation, TopAbs_Orientation]: ...
     @overload
     @staticmethod
-    def NextSide(Or: TopAbs_Orientation, OrSave: TopAbs_Orientation, OrFace: TopAbs_Orientation) -> None: ...
+    def NextSide(OrSave: TopAbs_Orientation, OrFace: TopAbs_Orientation) -> TopAbs_Orientation: ...
     @staticmethod
     def SameSide(Or: TopAbs_Orientation, OrSave1: TopAbs_Orientation, OrSave2: TopAbs_Orientation, OrFace1: TopAbs_Orientation, OrFace2: TopAbs_Orientation) -> bool: ...
 

src/SWIG_files/wrapper/Graphic3d.i

@@ -1665,12 +1665,14 @@ Graphic3d_VTA_TOPFIRSTLINE = Graphic3d_VerticalTextAlignment.Graphic3d_VTA_TOPFI
 %wrap_handle(Graphic3d_AspectLine3d)
 %wrap_handle(Graphic3d_AspectMarker3d)
 %wrap_handle(Graphic3d_AspectText3d)
+%wrap_handle(Graphic3d_AttribBuffer)
 %wrap_handle(Graphic3d_CView)
 %wrap_handle(Graphic3d_MediaTextureSet)
 %wrap_handle(Graphic3d_TextureEnv)
 %wrap_handle(Graphic3d_TextureMap)
 %wrap_handle(Graphic3d_TransformPersScaledAbove)
 %wrap_handle(Graphic3d_CubeMap)
+%wrap_handle(Graphic3d_MutableIndexBuffer)
 %wrap_handle(Graphic3d_Texture1D)
 %wrap_handle(Graphic3d_Texture2D)
 %wrap_handle(Graphic3d_Texture3D)
@@ -22207,6 +22209,8 @@ Invalidate specified sub-range of data (as byte offsets).
 };
 
 
+%make_alias(Graphic3d_AttribBuffer)
+
 %extend Graphic3d_AttribBuffer {
 	%pythoncode {
 	__repr__ = _dumps_object
@@ -25237,6 +25241,8 @@ Invalidate specified sub-range of data (as byte offsets).
 };
 
 
+%make_alias(Graphic3d_MutableIndexBuffer)
+
 %extend Graphic3d_MutableIndexBuffer {
 	%pythoncode {
 	__repr__ = _dumps_object

src/SWIG_files/wrapper/STEPControl.i

@@ -782,6 +782,25 @@ Loads a file and returns the read status Zero for a Model which compies with the
 ") ReadFile;
 		virtual IFSelect_ReturnStatus ReadFile(Standard_CString filename);
 
+		/****** STEPControl_Reader::ReadFile ******/
+		/****** md5 signature: 653d10ed20f94341a4bff4dc0daf4326 ******/
+		%feature("compactdefaultargs") ReadFile;
+		%feature("autodoc", "
+Parameters
+----------
+filename: str
+theParams: DESTEP_Parameters
+
+Return
+-------
+IFSelect_ReturnStatus
+
+Description
+-----------
+Loads a file and returns the read status Zero for a Model which compies with the Controller.
+") ReadFile;
+		IFSelect_ReturnStatus ReadFile(Standard_CString filename, const DESTEP_Parameters & theParams);
+
 		/****** STEPControl_Reader::ReadStream ******/
 		/****** md5 signature: 468612e1b7574162a37279817cf6848c ******/
 		%feature("compactdefaultargs") ReadStream;
@@ -799,7 +818,7 @@ Description
 -----------
 Loads a file from stream and returns the read status.
 ") ReadStream;
-		IFSelect_ReturnStatus ReadStream(Standard_CString theName, std::istream & theIStream);
+		virtual IFSelect_ReturnStatus ReadStream(Standard_CString theName, std::istream & theIStream);
 
 		/****** STEPControl_Reader::SetSystemLengthUnit ******/
 		/****** md5 signature: 510dfa5f705479dabe69cd18ff63f186 ******/

src/SWIG_files/wrapper/STEPControl.pyi

@@ -81,7 +81,6 @@ class STEPControl_Reader(XSControl_Reader):
     def NbRootsForTransfer(self) -> int: ...
     @overload
     def ReadFile(self, filename: str) -> IFSelect_ReturnStatus: ...
-    @overload
     def ReadStream(self, theName: str, theIStream: str) -> IFSelect_ReturnStatus: ...
     def SetSystemLengthUnit(self, theLengthUnit: float) -> None: ...
     def StepModel(self) -> StepData_StepModel: ...