From 38e4d11c6605d1ae8e7eb3803974d7d60196b999 Mon Sep 17 00:00:00 2001 From: sbh Date: Tue, 18 Nov 2014 15:26:34 +0300 Subject: [PATCH 1/1] Extension of SWIG interfaces --- src/GeomAPI/GeomAPI.i | 54 +++++++++++++++++++++++++++++++---- src/GeomAlgoAPI/GeomAlgoAPI.i | 18 +++++++++--- src/ModelAPI/ModelAPI.i | 15 ++++++++++ 3 files changed, 77 insertions(+), 10 deletions(-) diff --git a/src/GeomAPI/GeomAPI.i b/src/GeomAPI/GeomAPI.i index 474ea1caa..99ff18f02 100644 --- a/src/GeomAPI/GeomAPI.i +++ b/src/GeomAPI/GeomAPI.i @@ -3,10 +3,24 @@ %{ #include "GeomAPI.h" #include "GeomAPI_Interface.h" - #include "GeomAPI_Pnt.h" + #include "GeomAPI_Shape.h" + #include "GeomAPI_AISObject.h" + #include "GeomAPI_Circ2d.h" + #include "GeomAPI_Circ.h" + #include "GeomAPI_Curve.h" + #include "GeomAPI_DataMapOfShapeShape.h" + #include "GeomAPI_Dir2d.h" #include "GeomAPI_Dir.h" + #include "GeomAPI_Edge.h" + #include "GeomAPI_IPresentable.h" + #include "GeomAPI_Lin2d.h" + #include "GeomAPI_Lin.h" + #include "GeomAPI_PlanarEdges.h" #include "GeomAPI_Pln.h" - #include "GeomAPI_Shape.h" + #include "GeomAPI_Pnt2d.h" + #include "GeomAPI_Pnt.h" + #include "GeomAPI_XY.h" + #include "GeomAPI_XYZ.h" %} // to avoid error on this @@ -18,15 +32,43 @@ %include "std_shared_ptr.i" // shared pointers -%shared_ptr(GeomAPI_Interface) -%shared_ptr(GeomAPI_Pnt) +%shared_ptr(GeomAPI_AISObject) +%shared_ptr(GeomAPI_Circ2d) +%shared_ptr(GeomAPI_Circ) +%shared_ptr(GeomAPI_Curve) +%shared_ptr(GeomAPI_DataMapOfShapeShape) +%shared_ptr(GeomAPI_Dir2d) %shared_ptr(GeomAPI_Dir) +%shared_ptr(GeomAPI_Edge) +%shared_ptr(GeomAPI_Interface) +%shared_ptr(GeomAPI_IPresentable) +%shared_ptr(GeomAPI_Lin2d) +%shared_ptr(GeomAPI_Lin) +%shared_ptr(GeomAPI_PlanarEdges) %shared_ptr(GeomAPI_Pln) +%shared_ptr(GeomAPI_Pnt2d) +%shared_ptr(GeomAPI_Pnt) %shared_ptr(GeomAPI_Shape) +%shared_ptr(GeomAPI_XY) +%shared_ptr(GeomAPI_XYZ) // all supported interfaces %include "GeomAPI_Interface.h" -%include "GeomAPI_Pnt.h" +%include "GeomAPI_Shape.h" +%include "GeomAPI_AISObject.h" +%include "GeomAPI_Circ2d.h" +%include "GeomAPI_Circ.h" +%include "GeomAPI_Curve.h" +%include "GeomAPI_DataMapOfShapeShape.h" +%include "GeomAPI_Dir2d.h" %include "GeomAPI_Dir.h" +%include "GeomAPI_Edge.h" +%include "GeomAPI_IPresentable.h" +%include "GeomAPI_Lin2d.h" +%include "GeomAPI_Lin.h" +%include "GeomAPI_PlanarEdges.h" %include "GeomAPI_Pln.h" -%include "GeomAPI_Shape.h" +%include "GeomAPI_Pnt2d.h" +%include "GeomAPI_Pnt.h" +%include "GeomAPI_XY.h" +%include "GeomAPI_XYZ.h" diff --git a/src/GeomAlgoAPI/GeomAlgoAPI.i b/src/GeomAlgoAPI/GeomAlgoAPI.i index b93be2a7e..4a1b94eda 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI.i +++ b/src/GeomAlgoAPI/GeomAlgoAPI.i @@ -2,8 +2,13 @@ %module GeomAlgoAPI %{ #include "GeomAlgoAPI.h" - #include "GeomAlgoAPI_FaceBuilder.h" + #include "GeomAlgoAPI_Boolean.h" + #include "GeomAlgoAPI_CompoundBuilder.h" + #include "GeomAlgoAPI_DFLoader.h" #include "GeomAlgoAPI_EdgeBuilder.h" + #include "GeomAlgoAPI_Extrusion.h" + #include "GeomAlgoAPI_FaceBuilder.h" + #include "GeomAlgoAPI_MakeShape.h" #include "GeomAlgoAPI_PointBuilder.h" #include "GeomAlgoAPI_SketchBuilder.h" %} @@ -17,10 +22,15 @@ %include "std_list.i" %include "std_shared_ptr.i" -%template(ShapeList) std::list >; - // all supported interfaces -%include "GeomAlgoAPI_FaceBuilder.h" +%include "GeomAlgoAPI_Boolean.h" +%include "GeomAlgoAPI_CompoundBuilder.h" +%include "GeomAlgoAPI_DFLoader.h" %include "GeomAlgoAPI_EdgeBuilder.h" +%include "GeomAlgoAPI_Extrusion.h" +%include "GeomAlgoAPI_FaceBuilder.h" +%include "GeomAlgoAPI_MakeShape.h" %include "GeomAlgoAPI_PointBuilder.h" %include "GeomAlgoAPI_SketchBuilder.h" + +%template(ShapeList) std::list >; \ No newline at end of file diff --git a/src/ModelAPI/ModelAPI.i b/src/ModelAPI/ModelAPI.i index c1ade993d..3017bac28 100644 --- a/src/ModelAPI/ModelAPI.i +++ b/src/ModelAPI/ModelAPI.i @@ -19,13 +19,18 @@ #include "ModelAPI_AttributeRefAttr.h" #include "ModelAPI_AttributeSelection.h" #include "ModelAPI_AttributeSelectionList.h" + #include "ModelAPI_AttributeValidator.h" #include "ModelAPI_Validator.h" + #include "ModelAPI_FeatureValidator.h" #include "ModelAPI_AttributeRefList.h" #include "ModelAPI_AttributeBoolean.h" #include "ModelAPI_Result.h" #include "ModelAPI_ResultConstruction.h" #include "ModelAPI_ResultBody.h" #include "ModelAPI_ResultPart.h" + #include "ModelAPI_ResultParameters.h" + #include "ModelAPI_ResultGroup.h" + #include "ModelAPI_Tools.h" template std::shared_ptr shared_ptr_cast(std::shared_ptr theObject) @@ -66,10 +71,15 @@ %shared_ptr(ModelAPI_AttributeBoolean) %shared_ptr(ModelAPI_AttributeSelection) %shared_ptr(ModelAPI_AttributeSelectionList) +%shared_ptr(ModelAPI_Validator) +%shared_ptr(ModelAPI_AttributeValidator) +%shared_ptr(ModelAPI_FeatureValidator) %shared_ptr(ModelAPI_Result) %shared_ptr(ModelAPI_ResultConstruction) %shared_ptr(ModelAPI_ResultBody) %shared_ptr(ModelAPI_ResultPart) +%shared_ptr(ModelAPI_ResultGroup) +%shared_ptr(ModelAPI_ResultParameters) // all supported interfaces %include "GeomAPI_Interface.h" @@ -92,10 +102,15 @@ %include "ModelAPI_AttributeSelectionList.h" %include "ModelAPI_AttributeRefList.h" %include "ModelAPI_Validator.h" +%include "ModelAPI_AttributeValidator.h" +%include "ModelAPI_FeatureValidator.h" %include "ModelAPI_Result.h" %include "ModelAPI_ResultConstruction.h" %include "ModelAPI_ResultBody.h" %include "ModelAPI_ResultPart.h" +%include "ModelAPI_ResultGroup.h" +%include "ModelAPI_ResultParameters.h" +%include "ModelAPI_Tools.h" %template(ObjectList) std::list >; %template(ResultList) std::list >; -- 2.30.2