Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Confluence.cxx
diff --git
a/src/HYDROData/HYDROData_Confluence.cxx
b/src/HYDROData/HYDROData_Confluence.cxx
index 21ec0269a80ad2d1c1cbb89279dac1eff1b9394e..d40c9a17770a3126c7560b9dcf9fbc39a5e0875c 100644
(file)
--- a/
src/HYDROData/HYDROData_Confluence.cxx
+++ b/
src/HYDROData/HYDROData_Confluence.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
// 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_Confluence,HYDROData_NaturalObject)
HYDROData_Confluence::HYDROData_Confluence()
HYDROData_Confluence::HYDROData_Confluence()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject(
Geom_3d
)
{
}
{
}
@@
-41,7
+37,8
@@
HYDROData_Confluence::~HYDROData_Confluence()
{
}
{
}
-QStringList HYDROData_Confluence::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Confluence::DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
QString aName = GetObjPyName();
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
QString aName = GetObjPyName();
@@
-49,24
+46,12
@@
QStringList HYDROData_Confluence::DumpToPython( MapOfTreatedObjects& theTreatedO
// TODO
aResList << QString( "" );
// TODO
aResList << QString( "" );
- aResList << QString( "%1.Update()
;
" ).arg( aName );
+ aResList << QString( "%1.Update()" ).arg( aName );
aResList << QString( "" );
return aResList;
}
aResList << QString( "" );
return aResList;
}
-TopoDS_Shape HYDROData_Confluence::GetTopShape() const
-{
- // TODO
- return getTopShape();
-}
-
-TopoDS_Shape HYDROData_Confluence::GetShape3D() const
-{
- // TODO
- return getShape3D();
-}
-
void HYDROData_Confluence::UpdateLocalCS( double theDx, double theDy )
{
//TODO
void HYDROData_Confluence::UpdateLocalCS( double theDx, double theDy )
{
//TODO