X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Entity.h;h=8e4937291bcf518b08e967f2bba8e24f7cf72ca9;hb=23a6f7b3e29e74735d71d7e1448465a9920f91dd;hp=506044e487a07e4e00d03b90f016cafd653f22fb;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h
index 506044e4..8e493729 100644
--- a/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -67,7 +63,9 @@ const ObjectKind KIND_SHAPES_GROUP      = 22;
 const ObjectKind KIND_SPLITTED_GROUP    = 23;
 const ObjectKind KIND_STREAM_ALTITUDE   = 24;
 const ObjectKind KIND_OBSTACLE_ALTITUDE = 25;
-const ObjectKind KIND_LAST              = KIND_OBSTACLE_ALTITUDE;
+const ObjectKind KIND_STRICKLER_TABLE   = 26;
+const ObjectKind KIND_LAND_COVER        = 27;
+const ObjectKind KIND_LAST              = KIND_LAND_COVER;
 
 DEFINE_STANDARD_HANDLE(HYDROData_Entity, MMgt_TShared)
 
@@ -197,7 +195,7 @@ public:
    * Objects must be the same type.
    * \param theDestination initialized object (from any document) - target of copying
    */
-  HYDRODATA_EXPORT void CopyTo( const Handle(HYDROData_Entity)& theDestination ) const;
+  HYDRODATA_EXPORT virtual void CopyTo( const Handle(HYDROData_Entity)& theDestination ) const;
 
   /**
    * Returns the label of this object.
@@ -241,6 +239,20 @@ public:
   */
   void findPythonReferenceObject( MapOfTreatedObjects&            theTreatedObjects,
                                   QStringList&                    theScript ) const;
+
+  /**
+   * Internal method that used to store the color attribute
+   * \param theTag tag of a label that keeps the attribute (for 0 this is myLab)
+   * \param theColor color to save
+   */
+  HYDRODATA_EXPORT void SetColor( const QColor& theColor, const int theTag = 0 );
+
+  /**
+   * Internal method that used to retreive the color attribute
+   * \param theTag tag of a label that keeps the attribute (for 0 this is myLab)
+   * \param theDefColor default color to return if attribute has not been set before
+   */
+  HYDRODATA_EXPORT QColor GetColor( const QColor& theDefColor, const int theTag = 0 ) const;
  
 protected:
 
@@ -369,21 +381,7 @@ protected:
    * \param theTag tag of a label that keeps the attribute (for 0 this is myLab)
    */
   void ClearReferenceObjects( const int theTag = 0 );
-
-  /**
-   * Internal method that used to store the color attribute
-   * \param theTag tag of a label that keeps the attribute (for 0 this is myLab)
-   * \param theColor color to save
-   */
-  void SetColor( const QColor& theColor, const int theTag = 0 );
-
-  /**
-   * Internal method that used to retreive the color attribute
-   * \param theTag tag of a label that keeps the attribute (for 0 this is myLab)
-   * \param theDefColor default color to return if attribute has not been set before
-   */
-  QColor GetColor( const QColor& theDefColor, const int theTag = 0 ) const;
-   
+  
 protected:
 
   /**