Patch for Geom_BSplineSurface::Weights (#84)

Author: trelau

README.md

@@ -2,9 +2,11 @@
 
 [![Documentation Status](https://readthedocs.org/projects/pyocct/badge/?version=latest)](http://pyocct.readthedocs.io/en/latest/?badge=latest)
 [![Join the chat at https://gitter.im/pyOCCT/Lobby](https://badges.gitter.im/pyOCCT/Lobby.svg)](https://gitter.im/pyOCCT/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 ![Workflow](https://github.com/trelau/pyOCCT/workflows/Workflow/badge.svg)
-[![Anaconda-Server Badge](https://anaconda.org/trelau/pyocct/badges/installer/conda.svg)](https://conda.anaconda.org/trelau/pyocct)
+
+[![Anaconda-Server Badge](https://anaconda.org/trelau/pyocct/badges/version.svg)](https://anaconda.org/trelau/pyocct)
+[![Anaconda-Server Badge](https://anaconda.org/trelau/pyocct/badges/latest_release_date.svg)](https://anaconda.org/trelau/pyocct)
+[![Anaconda-Server Badge](https://anaconda.org/trelau/pyocct/badges/installer/conda.svg)](https://anaconda.org/trelau/pyocct)
 [![Anaconda-Server Badge](https://anaconda.org/trelau/pyocct/badges/platforms.svg)](https://anaconda.org/trelau/pyocct)
 [![Anaconda-Server Badge](https://anaconda.org/trelau/pyocct/badges/downloads.svg)](https://anaconda.org/trelau/pyocct)
 

binder/config.txt

@@ -906,6 +906,12 @@
 +skip OpenGl_TextureFormatSelector<GLuint>
 +skip OpenGl_TextureFormatSelector<GLushort>
 
+# Return value policies -------------------------------------------------------
++return_policy OpenGl_GraphicDriver::ChangeOptions-->reference
++return_policy OpenGl_GraphicDriver::Options-->reference
+
++return_policy V3d_View::ChangeRenderingParams-->reference
+
 # Manual text -----------------------------------------------------------------
 +before_type BOPTools_BoxSet<NumType, Dimension, DataType>-->bind_BVH_BoxSet<NumType, Dimension, DataType>(mod, "BOPTools_BoxSet_Base", py::module_local());
 +before_type BOPTools_BoxSelector<Dimension>-->bind_BVH_Traverse<Standard_Real, Dimension, BVH_BoxSet<Standard_Real, Dimension, Standard_Integer>, Standard_Boolean>(mod, "BOPTools_BoxSelector_Base", py::module_local());
@@ -974,7 +980,7 @@
 # Add exception translator
 +after_type Standard_Failure-->py::register_exception_translator([](std::exception_ptr p) {try {if (p) std::rethrow_exception(p);} catch (const Standard_Failure &e) { PyErr_SetString(PyExc_RuntimeError, e.GetMessageString());}});
 
-# Patches -----------------------------------------------------------------
+# Patches ---------------------------------------------------------------------
 
 # Patch parameter for AIS_ManipulatorObjectSequence::Append
 +patch AIS: (AIS_ManipulatorObjectSequence::*)(const int &)-->(AIS_ManipulatorObjectSequence::*)(const typename AIS_ManipulatorObjectSequence::value_type &)
@@ -985,6 +991,7 @@
 +patch bind_BVH_BaseBox: BVH_BaseBox<T, N>-->BVH_BaseBox<T, N, TheDerivedBox>
 +patch bind_BVH_Traverse: (const int &)-->(const opencascade::handle<BVH_Tree <NumType, Dimension>>&)
 
++patch Geom: (const TColStd_Array2OfReal * (Geom_BSplineSurface::*)() const) &Geom_BSplineSurface::Weights-->[](Geom_BSplineSurface& self) -> py::object {return self.Weights() ? py::cast(*self.Weights()) : py::none(); }
 
 +patch IVtkTools: (IVtkOCC_Shape::Handle (-->(opencascade::handle<IVtkOCC_Shape> (
 
@@ -1005,11 +1012,5 @@
 +patch Font: (TopoDS_Shape (Font_BRepTextBuilder::*)(Font_BRepFont &, const NCollection_String &, const gp_Ax3 &, const Graphic3d_HorizontalTextAlignment, const Graphic3d_VerticalTextAlignment)) &Font_BRepTextBuilder::Perform-->[](Font_BRepTextBuilder &self, Font_BRepFont_ & a0, const NCollection_String & a1, const gp_Ax3 & a2, const Graphic3d_HorizontalTextAlignment a3, const Graphic3d_VerticalTextAlignment a4) -> TopoDS_Shape { return self.Perform(a0, a1, a2, a3, a4); }
 +patch Font: Font_BRepFont &-->Font_BRepFont_ &
 
-# Return value policies
-+return_policy OpenGl_GraphicDriver::ChangeOptions-->reference
-+return_policy OpenGl_GraphicDriver::Options-->reference
-
-+return_policy V3d_View::ChangeRenderingParams-->reference
-
-# Inject trapoline
+# Inject trampoline
 +patch AIS: py::class_<AIS_InteractiveObject, opencascade-->py::class_<AIS_InteractiveObject, AIS_PyInteractiveObject, opencascade

test/test_Geom.py

@@ -20,7 +20,9 @@
 import math
 import unittest
 
-from OCCT.Geom import Geom_SphericalSurface
+from OCCT.Geom import Geom_SphericalSurface, Geom_RectangularTrimmedSurface
+from OCCT.GeomConvert import GeomConvert
+from OCCT.TColStd import TColStd_Array2OfReal
 from OCCT.gp import gp_Pnt, gp_Ax3, gp_Dir, gp_Sphere
 
 
@@ -76,5 +78,41 @@ def test_V2(self):
         self.assertAlmostEqual(self._surf.V2(), 0.5 * math.pi)
 
 
+class Test_Geom_BSplineSurface(unittest.TestCase):
+    """
+    Test for Geom_BSplineSurface class.
+    """
+
+    def test_Weights(self):
+        """
+        Test Geom_BSplineSurface::Weights()
+        """
+
+        s1 = Geom_SphericalSurface(gp_Ax3(), 1.)
+        s2 = Geom_RectangularTrimmedSurface(s1, 0., 1., 0., 1.)
+        s3 = GeomConvert.SurfaceToBSplineSurface_(s2)
+
+        weights = TColStd_Array2OfReal(1, s3.NbUPoles(), 1, s3.NbVPoles())
+        s3.Weights(weights)
+
+        self.assertEqual(weights.Size(), 9)
+        self.assertAlmostEqual(weights.Value(1, 1), 1.0)
+        self.assertAlmostEqual(weights.Value(3, 3), 1.0)
+
+    def test_Weights_const(self):
+        """
+        Test Geom_BSplineSurface::Weights() const
+        """
+        s1 = Geom_SphericalSurface(gp_Ax3(), 1.)
+        s2 = Geom_RectangularTrimmedSurface(s1, 0., 1., 0., 1.)
+        s3 = GeomConvert.SurfaceToBSplineSurface_(s2)
+
+        weights = s3.Weights()
+
+        self.assertEqual(weights.Size(), 9)
+        self.assertAlmostEqual(weights.Value(1, 1), 1.0)
+        self.assertAlmostEqual(weights.Value(3, 3), 1.0)
+
+
 if __name__ == '__main__':
     unittest.main()