From: isn <isn@opencascade.com>
Date: Fri, 27 Nov 2015 12:35:07 +0000 (+0300)
Subject: Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into... 
X-Git-Tag: v1.5^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=81ec820167fa9115167af7f7cfc41530a38bd6a5;hp=579593d206d5841e3141173e95cf48742bb462d9;p=modules%2Fhydro.git

Merge branch 'BR_LAND_COVER_MAP' of ssh://git.salome-platform.org/modules/hydro into BR_LAND_COVER_MAP
---

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;
 }