X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=986c9b0161abbf40531000924a7a3c5121894597;hb=4d4d74dd554819c30f1c8ded5520cc6c25aba56b;hp=5cb82351aa3abe54cef4759c09368d1671546f9c;hpb=b686c538598e95920143dfa71d3bc27a6e0fa1b1;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 5cb82351..986c9b01 100644
--- 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 );
-    aResList << QString( "%1 = %2.GetGroup( %3 );" )
+    aResList << QString( "%1 = %2.GetGroup( %3 )" )
               .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();
@@ -168,7 +168,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( const QString&       thePyS
 
   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 )
   {
@@ -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 );
 
-  DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
+  //DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
 
   aResList << QString( "" );
   return aResList;
@@ -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;
 }