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 7f617c404c64064d19cb71788b376552d8e3b876..d40c9a17770a3126c7560b9dcf9fbc39a5e0875c 100644
(file)
--- a/
src/HYDROData/HYDROData_Confluence.cxx
+++ b/
src/HYDROData/HYDROData_Confluence.cxx
@@
-29,7
+29,7
@@
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Confluence,HYDROData_NaturalObject)
HYDROData_Confluence::HYDROData_Confluence()
HYDROData_Confluence::HYDROData_Confluence()
-: HYDROData_NaturalObject()
+: HYDROData_NaturalObject(
Geom_3d
)
{
}
{
}
@@
-37,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();
@@
-45,7
+46,7
@@
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;