From a02c04b9d092485d58fa206a33f7bea84e983279 Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 27 Nov 2015 15:01:50 +0300 Subject: [PATCH] refs #673: patch for export to telemac --- src/HYDROData/HYDROData_CalculationCase.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx index 5cb82351..e6e62169 100644 --- a/src/HYDROData/HYDROData_CalculationCase.cxx +++ b/src/HYDROData/HYDROData_CalculationCase.cxx @@ -975,13 +975,6 @@ QString HYDROData_CalculationCase::Export( int theStudyId ) const QString aGeomObjEntry, anErrorMsg; bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg ); - if( isOK && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() ) - { - QString aTelemacFileName = GetName() + ".telemac"; - isOK = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable() ); - } - - return isOK ? aGeomObjEntry : QString(); #endif } @@ -1043,6 +1036,11 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine, 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; } -- 2.39.2