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

diff --git a/src/HYDROPy/HYDROData_Object.sip b/src/HYDROPy/HYDROData_Object.sip
index 59a7a4a1..5a0057ff 100644
--- a/src/HYDROPy/HYDROData_Object.sip
+++ b/src/HYDROPy/HYDROData_Object.sip
@@ -20,109 +20,95 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-
 %ExportedHeaderCode
 #include <HYDROData_Object.h>
 %End
 
-typedef int ObjectKind;
-
-class HYDROData_Object
+class HYDROData_Object : HYDROData_Entity /Abstract/
 {
 %TypeHeaderCode
 #include <HYDROData_Object.h>
 %End
 
 %ConvertToSubClassCode
-    // HYDROData_Object sub-classes provide a unique kind ID.
-    switch ( sipCpp->GetKind() )
-    {
-      case KIND_BATHYMETRY:
-        sipClass = sipClass_HYDROData_Bathymetry;
-        break;
-
-      case KIND_UNKNOWN:
-        sipClass = sipClass_HYDROData_Object;
-        break;
-
-      default:
-        // We don't recognise the type.
-        sipClass = NULL;
-    }
-%End
-
-public:
-  /**
-   * Visual state data.
-   */
-  struct VisualState
+   // HYDROData_Object sub-classes provide a unique kind ID.
+  switch ( sipCpp->GetKind() )
   {
-    bool Visibility;
-    double Transparency;
-    double ZValue;
-
-    VisualState();
-  };
-  
-  typedef QMap        < int, HYDROData_Object::VisualState > ViewId2VisualStateMap;
-  typedef QMapIterator< int, HYDROData_Object::VisualState > ViewId2VisualStateMapIterator;
+    case KIND_OBSTACLE:
+      sipClass = sipClass_HYDROData_Obstacle;
+      break;
+
+    case KIND_IMMERSIBLE_ZONE:
+      sipClass = sipClass_HYDROData_ImmersibleZone;
+      break;
+
+    case KIND_DIGUE:
+      sipClass = sipClass_HYDROData_Digue;
+      break;
+
+    case KIND_CHANNEL:
+      sipClass = sipClass_HYDROData_Channel;
+      break;
+      
+    case KIND_POLYLINE:
+      sipClass = sipClass_HYDROData_Polyline3D;
+      break;
+
+    case KIND_PROFILE:
+      sipClass = sipClass_HYDROData_Profile;
+      break;
+
+    case KIND_UNKNOWN:
+      sipClass = sipClass_HYDROData_Entity;
+      break;
+
+    default:
+      // We don't recognise the type.
+      sipClass = NULL;
+  }
+%End
 
 public:
 
   /**
-   * Returns the kind of this object. Must be redefined in all objects of known type.
-   */
-  const ObjectKind GetKind() const;
-
-  /**
-   * Returns the name of this object.
+   * Set reference altitude object for geometry object.
    */
-  QString GetName() const;
+  bool SetAltitudeObject( HYDROData_IAltitudeObject theAltitude ) [void (const Handle_HYDROData_IAltitudeObject&)];
+  %MethodCode
 
-  /**
-   * Updates the name of this object.
-   */
-  void SetName(const QString& theName);
-
-  /**
-   * Returns the object visibility state for the view with specified id.
-   * \param theViewId view id
-   * \returns visibility state
-   */
-  bool IsVisible( const int theViewId ) const;
-
-  /**
-   * Sets the object visibility state for the view with specified id.
-   * \param theViewId view id
-   * \param theVal visibility state
-   */
-  void SetVisible( const int theViewId,
-                   const bool theVal );
-
-  /**
-   * Checks is object exists in the data structure.
-   * \returns true is object is not exists in the data model
-   */
-  bool IsRemoved() const;
+    Handle(HYDROData_IAltitudeObject) aRefAltitude =
+      Handle(HYDROData_IAltitudeObject)::DownCast( createHandle( a0 ) );
+    if ( !aRefAltitude.IsNull() )
+    {
+      Py_BEGIN_ALLOW_THREADS
+      sipRes = sipSelfWasArg ? sipCpp->HYDROData_Object::SetAltitudeObject( aRefAltitude ) : 
+                               sipCpp->SetAltitudeObject( aRefAltitude );
+      Py_END_ALLOW_THREADS
+    }
 
-  /**
-   * Removes object from the data structure.
-   */
-  void Remove();
+  %End
 
   /**
-   * Returns unique integer identifier of the object (may be used for ordering of objects)
+   * Returns reference altitude object of geometry object.
    */
-  int ID() const;
+  HYDROData_IAltitudeObject GetAltitudeObject() const [Handle_HYDROData_IAltitudeObject ()];
+  %MethodCode
+
+    Handle(HYDROData_IAltitudeObject) aRefAltitude;
+    
+    Py_BEGIN_ALLOW_THREADS
+    aRefAltitude = sipSelfWasArg ? sipCpp->HYDROData_Object::GetAltitudeObject() : 
+                                   sipCpp->GetAltitudeObject();
+    Py_END_ALLOW_THREADS
+    
+    sipRes = (HYDROData_IAltitudeObject*)createPointer( aRefAltitude );
+  
+  %End
 
   /**
-   * 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
+   * Clear the reference altitude object for geometry object.
    */
-  /*
-  void CopyTo( HYDROData_Object theDestination ) const;
-  */
+  void RemoveAltitudeObject();
 
 protected: