Merge branch 'BR_PY3'

[modules/hydro.git] / src / HYDROPy / HYDROData_Entity.sip

diff --git a/src/HYDROPy/HYDROData_Entity.sip b/src/HYDROPy/HYDROData_Entity.sip
index 1986b5c182075987449fd7eb99b033a2b5471b08..0833eb5eddc067ebf305864b393183df5a1fa086 100644 (file)
--- a/src/HYDROPy/HYDROData_Entity.sip
+++ b/src/HYDROPy/HYDROData_Entity.sip
@@ -45,6 +45,7 @@ const ObjectKind KIND_SPLIT_GROUP;
 const ObjectKind KIND_OBSTACLE_ALTITUDE;
 const ObjectKind KIND_STRICKLER_TABLE;
 const ObjectKind KIND_LAND_COVER_MAP;
+const ObjectKind KIND_BC_POLYGON;
 
 class HYDROData_Entity
 {
@@ -127,7 +128,7 @@ class HYDROData_Entity
       case KIND_SHAPES_GROUP:
         sipClass = sipClass_HYDROData_ShapesGroup;
         break;
-        
+
       case KIND_SPLIT_GROUP:
         sipClass = sipClass_HYDROData_SplitShapesGroup;
         break;
@@ -148,6 +149,10 @@ class HYDROData_Entity
         sipClass = sipClass_HYDROData_LandCoverMap;
         break;
 
+      case KIND_BC_POLYGON:
+        sipClass = sipClass_HYDROData_BCPolygon;
+        break;
+
       case KIND_UNKNOWN:
         sipClass = sipClass_HYDROData_Entity;
         break;
@@ -206,7 +211,7 @@ public:
    */
   virtual bool CanBeUpdated() const;
 
-  
+
   /**
    * Checks is object exists in the data structure.
    * \returns true is object is not exists in the data model
@@ -222,15 +227,15 @@ public:
    * Returns father object. For object created under root document label
    * this method always return NULL object.
    */
-  HYDROData_Entity GetFatherObject() const [Handle_HYDROData_Entity ()];
+  HYDROData_Entity GetFatherObject() const [opencascade::handle<HYDROData_Entity> ()];
   %MethodCode
     Handle(HYDROData_Entity) aFather;
-    
+
     Py_BEGIN_ALLOW_THREADS
-    aFather = sipSelfWasArg ? sipCpp->HYDROData_Entity::GetFatherObject() : 
+    aFather = sipSelfWasArg ? sipCpp->HYDROData_Entity::GetFatherObject() :
                               sipCpp->GetFatherObject();
     Py_END_ALLOW_THREADS
-    
+
     sipRes = createPointer( aFather );
   %End
 
@@ -244,7 +249,7 @@ public:
   /**
    * Returns the z-level for object presentation, -1 if no z-level.
    */
-  virtual bool GetZLevel( int& theLevel ) const;
+  virtual bool GetZLevel( int& theLevel ) const [bool ( Standard_Integer& )];
 
   /**
    * Set the z-level for object presentation.
@@ -256,11 +261,12 @@ public:
    */
   virtual void RemoveZLevel();
 
+   void SetColor( const QColor& theColor, const int theTag = 0 );
 
 protected:
 
   /**
-   * Creates new object in the internal data structure. Use higher level objects 
+   * Creates new object in the internal data structure. Use higher level objects
    * to create objects with real content.
    */
   HYDROData_Entity( Geometry );
@@ -269,5 +275,5 @@ protected:
    * Destructs properties of the object and object itself, removes it from the document.
    */
   virtual ~HYDROData_Entity();
-  
+
 };