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

diff --git a/src/HYDROGUI/HYDROGUI_Zone.h b/src/HYDROGUI/HYDROGUI_Zone.h
index 1ecc1545..ee25b802 100644
--- a/src/HYDROGUI/HYDROGUI_Zone.h
+++ b/src/HYDROGUI/HYDROGUI_Zone.h
@@ -53,20 +53,39 @@ public:
   /**
    * 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; }
 
   /**
    * Returns true if it is a zone which needs merge of bathymetries.
    */
-  bool    isMergingNeed() const override;
+  bool        isMergingNeed() const;
 
+  /**
+   * Returns the list of bathymetries names.
+   */
   QStringList getBathymetries() const;
 
+  /**
+   * Returns the merging type for conflict bathymetries.
+   */
+  HYDROData_Zone::MergeBathymetriesType getMergeType() const;
+
+  /**
+   * Set the merging type for conflict bathymetries. 
+   * If the type is Merge_Object then use the second parameter to set the merge bathymetry.
+   */
+  void        setMergeType( int theMergeType, QString theBathymetryName = QString() );
+
 private:
   QString getRefObjectNames() const;
   QString getBathimetryName() const;