X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Zone.h;h=a4293f4c8152ea94ebecf71cdd998d1b41420d77;hb=HEAD;hp=4dca40d27ad013e3688e77c4101a0e7cc9323145;hpb=bfe9d3ccf8d5347b917d4c9e5e89413cebe51cc6;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Zone.h b/src/HYDROGUI/HYDROGUI_Zone.h
index 4dca40d2..a4293f4c 100644
--- a/src/HYDROGUI/HYDROGUI_Zone.h
+++ b/src/HYDROGUI/HYDROGUI_Zone.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // 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
@@ -45,25 +41,30 @@ 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 theColorRole, const int theColumnId = NameId ) const override;
+  QColor      color( const ColorRole theColorRole, const int theColumnId = NameId ) const;
 
   /**
    * Return true because zones are draggable.
    */
-  bool        isDraggable() const override { return true; }
+  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.
@@ -71,23 +72,23 @@ public:
   bool        isMergingNeed() const;
 
   /**
-   * Returns the list of bathymetries names.
+   * Returns the list of source object names.
    */
-  QStringList getBathymetries() const;
+  QStringList getObjects() const;
 
   /**
-   * Returns the merging type for conflict bathymetries.
+   * Returns the merging type for conflict altidudes.
    */
-  HYDROData_Zone::MergeBathymetriesType getMergeType() const;
+  HYDROData_Zone::MergeType 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.
+   * Set the merging type for conflict altidudes/types. 
+   * If the type is Merge_Object then use the second parameter to set the merge bathymetry/land cover.
    */
-  void        setMergeType( int theMergeType, QString theBathymetryName = QString() );
+  void        setMergeType( int theMergeType, QString theMergeObjectName = QString() );
 
 private:
   QString getRefObjectNames() const;
-  QString getBathimetryName() const;
+  QString getObjectName() const;
 };
 #endif