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 9c4bf4fd013772f42f924ddb09c2b24ac2e65fb3..0833eb5eddc067ebf305864b393183df5a1fa086 100644 (file)
--- a/src/HYDROPy/HYDROData_Entity.sip
+++ b/src/HYDROPy/HYDROData_Entity.sip
@@ -41,8 +41,11 @@ const ObjectKind KIND_CALCULATION;
 const ObjectKind KIND_ZONE;
 const ObjectKind KIND_REGION;
 const ObjectKind KIND_SHAPES_GROUP;
-const ObjectKind KIND_SPLITTED_GROUP;
+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
 {
@@ -125,9 +128,9 @@ class HYDROData_Entity
       case KIND_SHAPES_GROUP:
         sipClass = sipClass_HYDROData_ShapesGroup;
         break;
-        
-      case KIND_SPLITTED_GROUP:
-        sipClass = sipClass_HYDROData_SplittedShapesGroup;
+
+      case KIND_SPLIT_GROUP:
+        sipClass = sipClass_HYDROData_SplitShapesGroup;
         break;
 
       case KIND_STREAM_ALTITUDE:
@@ -138,6 +141,18 @@ class HYDROData_Entity
         sipClass = sipClass_HYDROData_ObstacleAltitude;
         break;
 
+      case KIND_STRICKLER_TABLE:
+        sipClass = sipClass_HYDROData_StricklerTable;
+        break;
+
+      case KIND_LAND_COVER_MAP:
+        sipClass = sipClass_HYDROData_LandCoverMap;
+        break;
+
+      case KIND_BC_POLYGON:
+        sipClass = sipClass_HYDROData_BCPolygon;
+        break;
+
       case KIND_UNKNOWN:
         sipClass = sipClass_HYDROData_Entity;
         break;
@@ -149,6 +164,16 @@ class HYDROData_Entity
 %End
 
 public:
+  enum Geometry
+  {
+    Geom_No = 1,
+    Geom_2d = 2,
+    Geom_Z  = 4,
+    Geom_Groups = 8,
+
+    Geom_3d = 6,
+    Geom_2d_and_groups = 10,
+  };
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -181,25 +206,12 @@ public:
    */
   virtual QVariant GetDataVariant();
 
-
-  /**
-   * Sets the "MustBeUpdated" flag: if object is depended on updated features.
-   * \param theFlag is true for objects that must be updated, false for up-to-date
-   */
-  virtual void SetToUpdate( bool theFlag );
-
-  /**
-   * Returns the "MustBeUpdated" flag: is object data must be updated or not
-   * \returns false if object is up to date
-   */
-  virtual bool IsMustBeUpdated() const;
-
   /**
    * Returns flag indicating that object is updateble or not.
    */
   virtual bool CanBeUpdated() const;
 
-  
+
   /**
    * Checks is object exists in the data structure.
    * \returns true is object is not exists in the data model
@@ -211,37 +223,19 @@ public:
    */
   virtual void Remove();
 
-
-  /**
-   * Copies all properties of this to the destinated object.
-   * Objects must be the same type.
-   * \param theDestination initialized object (from any document) - target of copying
-   */
-  void CopyTo( HYDROData_Entity theDestination ) const [void ( const Handle_HYDROData_Entity& )];
-  %MethodCode
-    Handle(HYDROData_Entity) aCopyTo = createHandle( a0 );
-    if ( !aCopyTo.IsNull() )
-    {
-      Py_BEGIN_ALLOW_THREADS
-      sipSelfWasArg ? sipCpp->HYDROData_Entity::CopyTo( aCopyTo ):
-                      sipCpp->CopyTo( aCopyTo );
-      Py_END_ALLOW_THREADS
-    }
-  %End
-
   /**
    * 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
 
@@ -255,30 +249,31 @@ public:
   /**
    * Returns the z-level for object presentation, -1 if no z-level.
    */
-  virtual bool GetZLevel( int& theLevel ) const [Standard_Boolean ( Standard_Integer& )];
+  virtual bool GetZLevel( int& theLevel ) const [bool ( Standard_Integer& )];
 
   /**
    * Set the z-level for object presentation.
    */
-  virtual void SetZLevel( const int& theLevel ) [void ( const Standard_Integer& )];
+  virtual void SetZLevel( int theLevel );
 
   /**
    * Remove the z-level of object presentation.
    */
   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();
+  HYDROData_Entity( Geometry );
 
   /**
    * Destructs properties of the object and object itself, removes it from the document.
    */
   virtual ~HYDROData_Entity();
-  
+
 };