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' of https://git.salome-platform.org/git/modules/hydro
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_CalculationCase.cxx
diff --git
a/src/HYDROData/HYDROData_CalculationCase.cxx
b/src/HYDROData/HYDROData_CalculationCase.cxx
index 3919019f0adcfac78e69d3c05c67502bdba55647..986c9b0161abbf40531000924a7a3c5121894597 100644
(file)
--- a/
src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/
src/HYDROData/HYDROData_CalculationCase.cxx
@@
-154,10
+154,10
@@
QStringList HYDROData_CalculationCase::DumpToPython( const QString& thePyS
continue;
int aGroupId = aFatherGeom->GetGroupId( aGeomGroup );
continue;
int aGroupId = aFatherGeom->GetGroupId( aGeomGroup );
- aResList << QString( "%1 = %2.GetGroup( %3 )
;
" )
+ aResList << QString( "%1 = %2.GetGroup( %3 )" )
.arg( aGroupName ).arg( aFatherGeom->GetObjPyName() ).arg( aGroupId );
.arg( aGroupName ).arg( aFatherGeom->GetObjPyName() ).arg( aGroupId );
- aResList << QString( "%1.AddGeometryGroup( %2 )
;
" ).arg( aCalculName ).arg( aGroupName );
+ aResList << QString( "%1.AddGeometryGroup( %2 )" ).arg( aCalculName ).arg( aGroupName );
}
Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
}
Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
@@
-168,7
+168,7
@@
QStringList HYDROData_CalculationCase::DumpToPython( const QString& thePyS
aResList << QString( "" );
aResList << "# Start the algorithm of the partition and assignment";
aResList << QString( "" );
aResList << "# Start the algorithm of the partition and assignment";
- aResList << QString( "%1.Update()
;
" ).arg( aCalculName );
+ aResList << QString( "%1.Update()" ).arg( aCalculName );
if( aMode==MANUAL )
{
if( aMode==MANUAL )
{
@@
-194,7
+194,7
@@
QStringList HYDROData_CalculationCase::DumpToPython( const QString& thePyS
aResList << QString( "print \"Geom shape:\", %1" ).arg( aGeomShapeName );
aResList << QString( "print \"Geom shape name:\", %1.GetName()" ).arg( aGeomShapeName );
aResList << QString( "print \"Geom shape:\", %1" ).arg( aGeomShapeName );
aResList << QString( "print \"Geom shape name:\", %1.GetName()" ).arg( aGeomShapeName );
- DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
+
//
DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
aResList << QString( "" );
return aResList;
aResList << QString( "" );
return aResList;
@@
-1036,6
+1036,11
@@
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
}
aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
}
+ if( aRes && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() )
+ {
+ QString aTelemacFileName = GetName() + ".telemac";
+ aRes = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable() );
+ }
return aRes;
}
return aRes;
}