Correct return of shape type: swig treats it as int, so, omni can not take it as...

diff --git a/src/PY/SHAPERSTUDY_Object.py b/src/PY/SHAPERSTUDY_Object.py
index 3ad6599a868c9be2fc9fd005271cebe827ab0dc5..534315502fd76ededfbf6486a2e151fe39c30d9b 100644 (file)
--- a/src/PY/SHAPERSTUDY_Object.py
+++ b/src/PY/SHAPERSTUDY_Object.py
@@ -41,7 +41,10 @@ class SHAPERSTUDY_Object(SHAPERSTUDY_ORB__POA.SHAPER_Object):
         """
         if self.data is None:
             return GEOM.SHAPE
-        return self.data.type();
+        types = {0:GEOM.COMPOUND, 1:GEOM.COMPSOLID, 2:GEOM.SOLID,
+                 3:GEOM.SHELL, 4:GEOM.FACE, 5:GEOM.WIRE,
+                 6:GEOM.EDGE, 7:GEOM.VERTEX, 8:GEOM.SHAPE, 9:GEOM.FLAT}
+        return types[self.data.type()];
 
     def IsMainShape( self ):
         """

diff --git a/src/StudyData/StudyData_Object.cpp b/src/StudyData/StudyData_Object.cpp
index a2ef5f7790ab86c9f13d14fb75531df34e65fbce..0ff581b5275e22796fb005195fa45359b3d1bd31 100644 (file)
--- a/src/StudyData/StudyData_Object.cpp
+++ b/src/StudyData/StudyData_Object.cpp
@@ -36,11 +36,11 @@ StudyData_Object::StudyData_Object(const std::string theFile)
 }
 
 
-GEOM::shape_type StudyData_Object::type() const
+int StudyData_Object::type() const
 {
   if (myShape.IsNull())
-    return GEOM::SHAPE;
-  return (GEOM::shape_type) myShape.ShapeType();
+    return 8; // GEOM.SHAPE
+  return (int) myShape.ShapeType();
 }
 
 

diff --git a/src/StudyData/StudyData_Object.h b/src/StudyData/StudyData_Object.h
index 99322f37c022a68919c23139d2a30e2b6355e4df..789d974b196e1a2e9d688ddde2cd78d3f1569628 100644 (file)
--- a/src/StudyData/StudyData_Object.h
+++ b/src/StudyData/StudyData_Object.h
@@ -34,7 +34,7 @@ class StudyData_EXPORT StudyData_Object
 public:
   StudyData_Object(const std::string theFile);
 
-  GEOM::shape_type type() const;
+  int type() const;
 
   SALOMEDS::TMPFile* shapeStream() const;