X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Confluence.h;h=13fdee491334dc4a82ef3c0aa59756f07fcac021;hb=e7e76450be3fadf6ad263f78e10ceb8cd1f70deb;hp=224b19e6b34e4ca5bc5267db56c90c22c140e093;hpb=689300b77850ff61c260063115544e462783620c;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Confluence.h b/src/HYDROData/HYDROData_Confluence.h
index 224b19e6..13fdee49 100644
--- a/src/HYDROData/HYDROData_Confluence.h
+++ b/src/HYDROData/HYDROData_Confluence.h
@@ -1,11 +1,26 @@
+// 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
 
 #include "HYDROData_NaturalObject.h"
 
-DEFINE_STANDARD_HANDLE(HYDROData_Confluence, HYDROData_NaturalObject)
-
 /**\class HYDROData_Confluence
  * \brief 
  *
@@ -22,7 +37,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_Confluence);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_Confluence, HYDROData_NaturalObject);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -32,17 +47,10 @@ public:
   /**
    * Dump object to Python script representation.
    */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
-
-  /**
-   * Returns the top shape of the object.
-   */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
-  /**
-   * Returns the 3d shape of the object.
-   */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
+  HYDRODATA_EXPORT virtual void UpdateLocalCS( double theDx, double theDy );
 
 protected: