X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_Object.sip;h=fd756c9020de0bb2514c2f06279fb791b2a54ded;hb=03f324d2f8bd78aa701c417c016a79017102a015;hp=5a0057fff5deecdd21073806910e6abcc9ce22d3;hpb=dd18f623821ffdf422b2ba4452024105953f7e8a;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_Object.sip b/src/HYDROPy/HYDROData_Object.sip
index 5a0057ff..fd756c90 100644
--- a/src/HYDROPy/HYDROData_Object.sip
+++ b/src/HYDROPy/HYDROData_Object.sip
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 // 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
@@ -24,7 +24,7 @@
 #include <HYDROData_Object.h>
 %End
 
-class HYDROData_Object : HYDROData_Entity /Abstract/
+class HYDROData_Object : public HYDROData_Entity /Abstract/
 {
 %TypeHeaderCode
 #include <HYDROData_Object.h>
@@ -38,6 +38,10 @@ class HYDROData_Object : HYDROData_Entity /Abstract/
       sipClass = sipClass_HYDROData_Obstacle;
       break;
 
+    case KIND_CONFLUENCE:
+      sipClass = sipClass_HYDROData_Confluence;
+      break;
+      
     case KIND_IMMERSIBLE_ZONE:
       sipClass = sipClass_HYDROData_ImmersibleZone;
       break;
@@ -58,6 +62,10 @@ class HYDROData_Object : HYDROData_Entity /Abstract/
       sipClass = sipClass_HYDROData_Profile;
       break;
 
+    case KIND_STREAM:
+      sipClass = sipClass_HYDROData_Stream;
+      break;
+
     case KIND_UNKNOWN:
       sipClass = sipClass_HYDROData_Entity;
       break;
@@ -110,6 +118,68 @@ public:
    */
   void RemoveAltitudeObject();
 
+  /**
+   * Sets filling color for zone.
+   */
+  virtual void SetFillingColor( const QColor& theColor );
+
+  /**
+   * Returns filling color of zone.
+   */
+  virtual QColor GetFillingColor() const;
+
+  /**
+   * Sets border color for zone.
+   */
+  virtual void SetBorderColor( const QColor& theColor );
+
+  /**
+   * Returns border color of zone.
+   */
+  virtual QColor GetBorderColor() const;
+
+
+  /**
+   * Returns sequence of object groups.
+   */
+  HYDROData_SequenceOfObjects GetGroups() const;
+
+  /**
+   * Returns group data model object by it id.
+   */
+  HYDROData_ShapesGroup GetGroup( const int theGroupId ) const [Handle_HYDROData_ShapesGroup ()];
+  %MethodCode
+
+    Handle(HYDROData_ShapesGroup) aRefGroup;
+    
+    Py_BEGIN_ALLOW_THREADS
+    aRefGroup = sipSelfWasArg ? sipCpp->HYDROData_Object::GetGroup( a0 ) : 
+                                sipCpp->GetGroup( a0 );
+    Py_END_ALLOW_THREADS
+    
+    sipRes = (HYDROData_ShapesGroup*)createPointer( aRefGroup );
+  
+  %End
+
+  /**
+   * Returns group id by data model object.
+   */
+  int GetGroupId( HYDROData_ShapesGroup theGroup ) const [int (const Handle_HYDROData_ShapesGroup&)];
+  %MethodCode
+
+    Handle(HYDROData_ShapesGroup) aRefGroup =
+      Handle(HYDROData_ShapesGroup)::DownCast( createHandle( a0 ) );
+    if ( !aRefGroup.IsNull() )
+    {
+      Py_BEGIN_ALLOW_THREADS
+      sipRes = sipSelfWasArg ? sipCpp->HYDROData_Object::GetGroupId( aRefGroup ) : 
+                               sipCpp->GetGroupId( aRefGroup );
+      Py_END_ALLOW_THREADS
+    }
+
+  %End
+
+
 protected:
 
   /**