Merge branch 'BR_v14_rc' into BR_quadtree

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

diff --git a/src/HYDROPy/HYDROData_Entity.sip b/src/HYDROPy/HYDROData_Entity.sip
index 6208ab9fe1027a0c49360683ef53e4b8ce2007a0..9dc1676ed2653049d725949cfc06f4b36fcfdd28 100644 (file)
--- a/src/HYDROPy/HYDROData_Entity.sip
+++ b/src/HYDROPy/HYDROData_Entity.sip
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,6 +43,7 @@ const ObjectKind KIND_REGION;
 const ObjectKind KIND_SHAPES_GROUP;
 const ObjectKind KIND_SPLITTED_GROUP;
 const ObjectKind KIND_OBSTACLE_ALTITUDE;
+const ObjectKind KIND_STRICKLER_TABLE;
 
 class HYDROData_Entity
 {
@@ -142,6 +139,10 @@ class HYDROData_Entity
         sipClass = sipClass_HYDROData_ObstacleAltitude;
         break;
 
+      case KIND_STRICKLER_TABLE:
+        sipClass = sipClass_HYDROData_StricklerTable;
+        break;
+
       case KIND_UNKNOWN:
         sipClass = sipClass_HYDROData_Entity;
         break;
@@ -174,6 +175,11 @@ public:
    */
   virtual void Update();
 
+  /**
+   * Checks that object has 2D presentation. Base implementation returns false.
+   */
+  virtual bool IsHas2dPrs() const;
+
   /**
    * Returns data of object wrapped to QVariant.
    * Base implementation returns null value.
@@ -250,6 +256,23 @@ public:
    */
   virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
 
+
+  /**
+   * Returns the z-level for object presentation, -1 if no z-level.
+   */
+  virtual bool GetZLevel( int& theLevel ) const [Standard_Boolean ( Standard_Integer& )];
+
+  /**
+   * Set the z-level for object presentation.
+   */
+  virtual void SetZLevel( const int& theLevel ) [void ( const Standard_Integer& )];
+
+  /**
+   * Remove the z-level of object presentation.
+   */
+  virtual void RemoveZLevel();
+
+
 protected:
 
   /**