X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Confluence.cxx;h=d40c9a17770a3126c7560b9dcf9fbc39a5e0875c;hb=f9d37ee66fa46871478d806faa54de237225d3c6;hp=7d898574240a556d7f414c7eba8f52f336323d9e;hpb=7b9454f8053b968f127bf7981eb05b6749e261f4;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Confluence.cxx b/src/HYDROData/HYDROData_Confluence.cxx
index 7d898574..d40c9a17 100644
--- a/src/HYDROData/HYDROData_Confluence.cxx
+++ b/src/HYDROData/HYDROData_Confluence.cxx
@@ -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
+//
 
 #include "HYDROData_Confluence.h"
 
@@ -7,14 +24,12 @@
 
 #include <QStringList>
 
-#define PYTHON_CONFLUENCE_ID "KIND_CONFLUENCE"
-
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Confluence,HYDROData_NaturalObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Confluence,HYDROData_NaturalObject)
 
 
 HYDROData_Confluence::HYDROData_Confluence()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject( Geom_3d )
 {
 }
 
@@ -22,38 +37,24 @@ HYDROData_Confluence::~HYDROData_Confluence()
 {
 }
 
-QStringList HYDROData_Confluence::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Confluence::DumpToPython( const QString& thePyScriptPath,
+                                                MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( this );
-  if ( aDocument.IsNull() )
-    return aResList;
+  QStringList aResList = dumpObjectCreation( theTreatedObjects );
+  QString aName = GetObjPyName();
 
-  QString aDocName = aDocument->GetDocPyName();
-  QString aConfluenceName = GetName();
+  // TODO
 
-  aResList << QString( "%1 = %2.CreateObject( %3 );" )
-              .arg( aConfluenceName ).arg( aDocName ).arg( PYTHON_CONFLUENCE_ID );
-  aResList << QString( "%1.SetName( \"%2\" );" )
-              .arg( aConfluenceName ).arg( aConfluenceName );
   aResList << QString( "" );
-
-  // TODO
+  aResList << QString( "%1.Update()" ).arg( aName );
+  aResList << QString( "" );
 
   return aResList;
 }
 
-TopoDS_Shape HYDROData_Confluence::GetTopShape() const
+void HYDROData_Confluence::UpdateLocalCS( double theDx, double theDy )
 {
-  // TODO
-  return getTopShape();
-}
-
-TopoDS_Shape HYDROData_Confluence::GetShape3D() const
-{
-  // TODO
-  return getShape3D();
+  //TODO
 }