X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Object.h;h=302f5580e813fe8b45b2712cc2a79fc383f47da0;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=e20e47893a0088434f1fb2ce685d1fde88ed7fa0;hpb=a079934858ab030e4c64d72d4e4e944a4a609fd6;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Object.h b/src/HYDROData/HYDROData_Object.h
index e20e4789..302f5580 100644
--- a/src/HYDROData/HYDROData_Object.h
+++ b/src/HYDROData/HYDROData_Object.h
@@ -8,7 +8,7 @@
 DEFINE_STANDARD_HANDLE(HYDROData_Object, HYDROData_Entity)
 
 class TopoDS_Shape;
-class Handle(HYDROData_Bathymetry);
+class Handle(HYDROData_IAltitudeObject);
 class Handle(HYDROData_DummyObject3D);
 class Handle(HYDROData_ShapesGroup);
 
@@ -27,16 +27,23 @@ protected:
     DataTag_First = HYDROData_Entity::DataTag_First + 100, ///< first tag, to reserve
     DataTag_TopShape,
     DataTag_Shape3D,
-    DataTag_Bathymetry,   ///< reference bathymetry
-    DataTag_FillingColor, ///< filling color of geometrical object
-    DataTag_BorderColor,  ///< border color of geometrical object
-    DataTag_Object3D,     ///< child 3D object
-    DataTag_EdgesGroup,   ///< child group objects
+    DataTag_AltitudeObject,      ///< reference altitude object
+    DataTag_FillingColor,        ///< filling color of geometrical object
+    DataTag_BorderColor,         ///< border color of geometrical object
+    DataTag_Object3D,            ///< child 3D object
+    DataTag_EdgesGroup,          ///< child group objects
+    DataTag_ChildAltitudeObject, ///< child altitude object
   };
 
 public:
   DEFINE_STANDARD_RTTI(HYDROData_Object);
 
+  /**
+   * Updates the name of this object.
+   * Reimplemented to update the names child groups.
+   */
+  HYDRODATA_EXPORT virtual void SetName( const QString& theName );
+
   /**
    * Update the geometry object.
    * Call this method whenever you made changes for object data.
@@ -81,26 +88,38 @@ public:
    */
   HYDRODATA_EXPORT virtual Handle(HYDROData_DummyObject3D) GetObject3D() const;
 
+
   /**
    * Returns sequence of object groups.
    */
   HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetGroups() const;
 
+  /**
+   * Returns group data model object by it id.
+   */
+  HYDRODATA_EXPORT virtual Handle(HYDROData_ShapesGroup) GetGroup( const int theGroupId ) const;
 
   /**
-   * Set reference bathymetry object for geometry object.
+   * Returns group id by data model object.
    */
-  HYDRODATA_EXPORT virtual bool SetBathymetry( const Handle(HYDROData_Bathymetry)& theBathymetry );
+  HYDRODATA_EXPORT virtual int GetGroupId( const Handle(HYDROData_ShapesGroup)& theGroup ) const;
+
 
   /**
-   * Returns reference bathymetry object of geometry object.
+   * Set reference altitude object for geometry object.
    */
-  HYDRODATA_EXPORT virtual Handle(HYDROData_Bathymetry) GetBathymetry() const;
+  HYDRODATA_EXPORT virtual bool SetAltitudeObject( const Handle(HYDROData_IAltitudeObject)& theAltitude );
 
   /**
-   * Clear the reference bathymetry object for geometry object.
+   * Returns reference altitude object of geometry object.
    */
-  HYDRODATA_EXPORT virtual void RemoveBathymetry();
+  HYDRODATA_EXPORT virtual Handle(HYDROData_IAltitudeObject) GetAltitudeObject() const;
+
+  /**
+   * Clear the reference altitude object for geometry object.
+   */
+  HYDRODATA_EXPORT virtual void RemoveAltitudeObject();
+
 
    /**
    * Sets filling color for object.
@@ -122,16 +141,6 @@ public:
    */
   HYDRODATA_EXPORT virtual QColor GetBorderColor() const;
 
-  /**
-   * Returns default filling color for new object.
-   */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
-
-  /**
-   * Returns default border color for new object.
-   */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
-
 protected:
 
   /**
@@ -159,6 +168,13 @@ protected:
 
 protected:
 
+  /**
+   * Dump the initial object creation to a Python script.
+   * Reimplemented to dump the object colors.
+   */
+  HYDRODATA_EXPORT virtual QStringList dumpObjectCreation( MapOfTreatedObjects& theTreatedObjects ) const;
+
+
   /**
    * Checks and if necessary create child 3D object.
    * Reimplement this function in your subclass if you 
@@ -168,15 +184,29 @@ protected:
 
 
   /**
-   * Create new one child group object.
+   * Returns the type of child altitude object.
+   * Base implementation returns KIND_UNKNOWN, it means that child altitude 
+   * object will not be created inside of checkAndSetAltitudeObject() function.
+   * Reimplement this function in your subclass an return correct altitude
+   * object type if you want to create child altitude object.
    */
-  HYDRODATA_EXPORT virtual Handle(HYDROData_ShapesGroup) createGroupObject();
+  HYDRODATA_EXPORT virtual ObjectKind getAltitudeObjectType() const;
 
   /**
-   * Create all necessary child group objects.
-   * Base implementation does nothing.
+   * Checks and if necessary create child altitude object.
    */
-  HYDRODATA_EXPORT virtual void createGroupObjects();
+  HYDRODATA_EXPORT virtual void checkAndSetAltitudeObject();
+
+  /**
+   * Return the child altitude object.
+   */
+  HYDRODATA_EXPORT virtual Handle(HYDROData_IAltitudeObject) getChildAltitudeObject() const;
+
+
+  /**
+   * Create new one child group object.
+   */
+  HYDRODATA_EXPORT virtual Handle(HYDROData_ShapesGroup) createGroupObject();
 
   /**
    * Remove all child group objects.