Merge branch 'BR_HYDRO_IMPS_2016' into pre/IMPS_2016

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

diff --git a/src/HYDROData/HYDROData_River.cxx b/src/HYDROData/HYDROData_River.cxx
index 77702049c49248dd4813c68a9dbab36ac28f6eb1..1f197c03cc81eff3d5af35978d1a2a4cac28fa17 100644 (file)
--- a/src/HYDROData/HYDROData_River.cxx
+++ b/src/HYDROData/HYDROData_River.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// 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
@@ -33,7 +29,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_River,HYDROData_NaturalObject)
 
 
 HYDROData_River::HYDROData_River()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject( Geom_3d )
 {
 }
 
@@ -41,7 +37,8 @@ HYDROData_River::~HYDROData_River()
 {
 }
 
-QStringList HYDROData_River::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_River::DumpToPython( const QString& thePyScriptPath,
+                                           MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
   QString aName = GetObjPyName();
@@ -49,7 +46,7 @@ QStringList HYDROData_River::DumpToPython( MapOfTreatedObjects& theTreatedObject
   // TODO
 
   aResList << QString( "" );
-  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "%1.Update()" ).arg( aName );
   aResList << QString( "" );
 
   return aResList;
@@ -66,18 +63,6 @@ bool HYDROData_River::IsHas2dPrs() const
   return true;
 }
 
-TopoDS_Shape HYDROData_River::GetTopShape() const
-{
-  // TODO
-  return getTopShape();
-}
-
-TopoDS_Shape HYDROData_River::GetShape3D() const
-{
-  // TODO
-  return getShape3D();
-}
-
 void HYDROData_River::UpdateLocalCS( double theDx, double theDy )
 {
   //TODO