Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc

[modules/hydro.git] / src / HYDROData / HYDROData_Confluence.h

diff --git a/src/HYDROData/HYDROData_Confluence.h b/src/HYDROData/HYDROData_Confluence.h
index b8ef031725de82936a9fb8a73c24ec2ada1308e8..e5c5dfffb0eb3640651d278d5ad83b11fd6b4a07 100644 (file)
--- a/src/HYDROData/HYDROData_Confluence.h
+++ b/src/HYDROData/HYDROData_Confluence.h
@@ -1,3 +1,20 @@
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef HYDROData_Confluence_HeaderFile
 #define HYDROData_Confluence_HeaderFile
@@ -27,7 +44,7 @@ public:
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
    */
-  HYDRODATA_EXPORT virtual const ObjectKind GetKind() const {return KIND_RIVER;}
+  HYDRODATA_EXPORT virtual const ObjectKind GetKind() const {return KIND_CONFLUENCE;}
 
   /**
    * Dump object to Python script representation.
@@ -44,6 +61,8 @@ public:
    */
   HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
 
+  HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
+
 protected:
 
   friend class HYDROData_Iterator;