X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Zone.h;h=29d8a2b931c7421678d9ac5684cbc84db5a8ab36;hb=f34b90e9e4e02ba65419134d5d37a2e42aecfabf;hp=1ecc1545dbf60b86185d15f867ba07d13aee2026;hpb=6d6c4ec18ead5730c1d14090e33dc9667c5a5841;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Zone.h b/src/HYDROGUI/HYDROGUI_Zone.h
index 1ecc1545..29d8a2b9 100644
--- a/src/HYDROGUI/HYDROGUI_Zone.h
+++ b/src/HYDROGUI/HYDROGUI_Zone.h
@@ -45,30 +45,54 @@ public:
    * \param theParent parent data object
    * \param theData reference to the corresponding object from data structure
    * \param theParentEntry entry of the parent data object (for reference objects)
+   * \param theIsInOperation if true then the tree is used for a browser within an operation, it is false by default
    */
-  HYDROGUI_Zone( SUIT_DataObject* theParent,
-                       Handle(HYDROData_Zone) theData,
-                       const QString& theParentEntry );
+  HYDROGUI_Zone( SUIT_DataObject*       theParent,
+                 Handle(HYDROData_Zone) theData,
+                 const QString&         theParentEntry,
+                 const bool             theIsInOperation = false );
     
   /**
    * Returns the text for the specified column.
    */
-  QString text( const int = NameId ) const override;
+  QString     text( const int = NameId ) const;
 
   /**
    * Returns the color for the specified column.
    */
-  QColor  color( const ColorRole, const int = NameId ) const override;
+  QColor      color( const ColorRole theColorRole, const int theColumnId = NameId ) const;
+
+  /**
+   * Return true because zones are draggable.
+   */
+  bool        isDraggable() const { return true; }
+
+  bool        renameAllowed( const int = NameId ) const;
+  //bool        setName( const QString& );
 
   /**
    * Returns true if it is a zone which needs merge of bathymetries.
    */
-  bool    isMergingNeed() const override;
+  bool        isMergingNeed() const;
+
+  /**
+   * Returns the list of altidude object names.
+   */
+  QStringList getAltitudes() const;
+
+  /**
+   * Returns the merging type for conflict altidudes.
+   */
+  HYDROData_Zone::MergeAltitudesType getMergeType() const;
 
-  QStringList getBathymetries() const;
+  /**
+   * Set the merging type for conflict altidudes. 
+   * If the type is Merge_Object then use the second parameter to set the merge bathymetry.
+   */
+  void        setMergeType( int theMergeType, QString theAltitudeName = QString() );
 
 private:
   QString getRefObjectNames() const;
-  QString getBathimetryName() const;
+  QString getAltitudeName() const;
 };
 #endif