Checking a Shape from the ResultConstruction in python scripts

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 731a449c7c72998a5c9ec4c1d502a9b6f075fa0f..c92f95df6666fad8ecee05f56a0769cbdec468f6 100644 (file)
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -61,7 +61,8 @@ SET(SWIG_SCRIPTS
 )
 
 SET(SWIG_LINK_LIBRARIES
-  ModelAPI 
+  ModelAPI
+  GeomAPI 
   ${PYTHON_LIBRARIES}
 )
 

diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i
index 456a52775ebc92d6ef9d4c83149264716d959351..31936c53eb04a5bc954fe9e9757a70443017b695 100644 (file)
--- a/src/ModelAPI/ModelAPI.i
+++ b/src/ModelAPI/ModelAPI.i
@@ -1,6 +1,8 @@
 /* ModelAPI.i */
 %module ModelAPI
 %{
+  #include "GeomAPI_Interface.h"
+  #include "GeomAPI_Shape.h"
   #include "ModelAPI.h"
   #include "ModelAPI_Document.h"
   #include "ModelAPI_PluginManager.h"
@@ -36,6 +38,9 @@
 
 // boost pointers
 %include <boost_shared_ptr.i>
+// For ModelAPI_ResultConstruction.shape()
+%shared_ptr(GeomAPI_Interface)
+%shared_ptr(GeomAPI_Shape)
 %shared_ptr(ModelAPI_Document)
 %shared_ptr(ModelAPI_PluginManager)
 %shared_ptr(ModelAPI_Object)
@@ -51,6 +56,8 @@
 %shared_ptr(ModelAPI_ResultConstruction)
 
 // all supported interfaces
+%include "GeomAPI_Interface.h"
+%include "GeomAPI_Shape.h"
 %include "ModelAPI_Document.h"
 %include "ModelAPI_PluginManager.h"
 %include "ModelAPI_Object.h"

diff --git a/src/SketchPlugin/Test/TestSketchBasics.py b/src/SketchPlugin/Test/TestSketchBasics.py
index 22df6ce62f7ae48ce41b387e97ca586422353a4b..b4889ea989330ef0460576ecba30b5bb027071ff 100644 (file)
--- a/src/SketchPlugin/Test/TestSketchBasics.py
+++ b/src/SketchPlugin/Test/TestSketchBasics.py
@@ -121,9 +121,8 @@ aDocument.finishOperation()
 # Check results
 #===============================================================================
 aResult = aSketchLine.firstResult()
-assert (aResult is not None)
 aResultConstruction = modelAPI_ResultConstruction(aResult)
-aShape = aResult.shape()
+aShape = aResultConstruction.shape()
 assert (aShape is not None)
 assert (not aShape.isNull())
  #==============================================================================