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

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

diff --git a/src/HYDROData/HYDROData_Confluence.cxx b/src/HYDROData/HYDROData_Confluence.cxx
index 64aeacf8e335c20e504d2e959344624e77cb6baa..12f19b5a60a72396a9123feafc89662c29d55333 100644 (file)
--- 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,8 +24,6 @@
 
 #include <QStringList>
 
-#define PYTHON_CONFLUENCE_ID "KIND_CONFLUENCE"
-
 IMPLEMENT_STANDARD_HANDLE(HYDROData_Confluence,HYDROData_NaturalObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Confluence,HYDROData_NaturalObject)
 
@@ -24,22 +39,14 @@ HYDROData_Confluence::~HYDROData_Confluence()
 
 QStringList HYDROData_Confluence::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
-  QStringList aResList;
-
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  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;
 }
@@ -56,5 +63,10 @@ TopoDS_Shape HYDROData_Confluence::GetShape3D() const
   return getShape3D();
 }
 
+void HYDROData_Confluence::UpdateLocalCS( double theDx, double theDy )
+{
+  //TODO
+}
+