merge trunk on BR_quadtree 20140820

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

diff --git a/src/HYDROData/HYDROData_Confluence.h b/src/HYDROData/HYDROData_Confluence.h
index b8ef031725de82936a9fb8a73c24ec2ada1308e8..f8f68af7dadded3f52034c4d7b3ed6ee65a5b40e 100644 (file)
--- a/src/HYDROData/HYDROData_Confluence.h
+++ b/src/HYDROData/HYDROData_Confluence.h
@@ -27,7 +27,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 +44,8 @@ public:
    */
   HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
 
+  HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
+
 protected:
 
   friend class HYDROData_Iterator;