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 34b413fa97e92e229ec27e6076e0ec6646ad57a5..986c9b0161abbf40531000924a7a3c5121894597 100644 (file)
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -26,7 +26,7 @@
 #include "HYDROData_PolylineXY.h"
 #include "HYDROData_StricklerTable.h"
 #include "HYDROData_LandCoverMap.h"
-#include "HYDROData_SplittedShapesGroup.h"
+#include "HYDROData_SplitShapesGroup.h"
 #include "HYDROData_Region.h"
 #include "HYDROData_Tool.h"
 #include "HYDROData_GeomTool.h"
@@ -97,14 +97,14 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
     // Update names of regions and its zones
     UpdateRegionsNames( GetRegions(), anOldCaseName, theName );
 
-    HYDROData_SequenceOfObjects aGroups = GetSplittedGroups();
+    HYDROData_SequenceOfObjects aGroups = GetSplitGroups();
 
     HYDROData_SequenceOfObjects::Iterator anIter;
     anIter.Init( aGroups );
     for ( ; anIter.More(); anIter.Next() )
     {
-      Handle(HYDROData_SplittedShapesGroup) aGroup =
-        Handle(HYDROData_SplittedShapesGroup)::DownCast( anIter.Value() );
+      Handle(HYDROData_SplitShapesGroup) aGroup =
+        Handle(HYDROData_SplitShapesGroup)::DownCast( anIter.Value() );
       if ( aGroup.IsNull() )
         continue;
 
@@ -115,7 +115,8 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
   HYDROData_Entity::SetName( theName );
 }
 
-QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_CalculationCase::DumpToPython( const QString&       thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
   aResList.prepend( "# Calculation case" );
@@ -132,7 +133,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
   {
     Handle(HYDROData_Object) aRefGeomObj =
       Handle(HYDROData_Object)::DownCast( anIter.Value() );
-    setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
+    setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
   }
   aResList << QString( "" );
 
@@ -153,27 +154,27 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
       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();
-  setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
 
   if( aMode==AUTOMATIC )
     DumpRulesToPython( aCalculName, aResList );
 
   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 )
   {
     // Now we restore the
     // - regions and zones order
-    DumpRegionsToPython( aResList, theTreatedObjects, GetRegions() );   
+    DumpRegionsToPython( aResList, thePyScriptPath, theTreatedObjects, GetRegions() );   
   }
 
   // Export calculation case
@@ -193,7 +194,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
   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;
@@ -262,7 +263,7 @@ void HYDROData_CalculationCase::Update()
 
   // At first we remove previously created objects
   RemoveRegions();
-  RemoveSplittedGroups();
+  RemoveSplitGroups();
 
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   if ( aDocument.IsNull() )
@@ -408,7 +409,7 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
 void HYDROData_CalculationCase::CreateEdgeGroupsDef( const Handle(HYDROData_Document)& theDoc,
                                                      const HYDROData_SplitToZonesTool::SplitDataList& theEdges )
 {
-  QMap<QString,Handle(HYDROData_SplittedShapesGroup)> aSplittedEdgesGroupsMap;
+  QMap<QString,Handle(HYDROData_SplitShapesGroup)> aSplitEdgesGroupsMap;
 
   HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theEdges );
   while( anIter.hasNext() )
@@ -425,20 +426,20 @@ void HYDROData_CalculationCase::CreateEdgeGroupsDef( const Handle(HYDROData_Docu
     QString aStr = aSplitData.ObjectNames.join(" "); 
          cout << " CCase: Names = "<<aStr.toStdString() << " size = " <<aSplitData.ObjectNames.size() <<endl; 
 #endif
-    Handle(HYDROData_SplittedShapesGroup) aSplittedGroup;
-    if ( !aSplittedEdgesGroupsMap.contains( anObjName ) )
+    Handle(HYDROData_SplitShapesGroup) aSplitGroup;
+    if ( !aSplitEdgesGroupsMap.contains( anObjName ) )
     {
-      aSplittedGroup = addNewSplittedGroup( CALCULATION_GROUPS_PREF + anObjName );
-      aSplittedEdgesGroupsMap.insert( anObjName, aSplittedGroup );
+      aSplitGroup = addNewSplitGroup( CALCULATION_GROUPS_PREF + anObjName );
+      aSplitEdgesGroupsMap.insert( anObjName, aSplitGroup );
     }
     else
     {
-      aSplittedGroup = aSplittedEdgesGroupsMap[ anObjName ];
+      aSplitGroup = aSplitEdgesGroupsMap[ anObjName ];
     }
-    if ( aSplittedGroup.IsNull() )
+    if ( aSplitGroup.IsNull() )
       continue;
 
-    aSplittedGroup->AddShape( aSplitData.Shape );
+    aSplitGroup->AddShape( aSplitData.Shape );
   }
 }
 
@@ -693,14 +694,14 @@ void HYDROData_CalculationCase::RemoveRegions()
   myLab.FindChild( DataTag_ChildRegion ).ForgetAllAttributes();
 }
 
-HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplittedGroups() const
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplitGroups() const
 {
-  return GetReferenceObjects( DataTag_SplittedGroups );
+  return GetReferenceObjects( DataTag_SplitGroups );
 }
 
-void HYDROData_CalculationCase::RemoveSplittedGroups()
+void HYDROData_CalculationCase::RemoveSplitGroups()
 {
-  myLab.FindChild( DataTag_SplittedGroups ).ForgetAllAttributes();
+  myLab.FindChild( DataTag_SplitGroups ).ForgetAllAttributes();
 }
 
 double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const
@@ -950,14 +951,14 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(H
   return aNewRegion;
 }
 
-Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedGroup( const QString& theName )
+Handle(HYDROData_SplitShapesGroup) HYDROData_CalculationCase::addNewSplitGroup( const QString& theName )
 {
-  TDF_Label aNewLab = myLab.FindChild( DataTag_SplittedGroups ).NewChild();
+  TDF_Label aNewLab = myLab.FindChild( DataTag_SplitGroups ).NewChild();
 
-  Handle(HYDROData_SplittedShapesGroup) aNewGroup =
-    Handle(HYDROData_SplittedShapesGroup)::DownCast( 
-      HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLITTED_GROUP ) );
-  AddReferenceObject( aNewGroup, DataTag_SplittedGroups );
+  Handle(HYDROData_SplitShapesGroup) aNewGroup =
+    Handle(HYDROData_SplitShapesGroup)::DownCast( 
+      HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLIT_GROUP ) );
+  AddReferenceObject( aNewGroup, DataTag_SplitGroups );
 
   aNewGroup->SetName( theName );
 
@@ -987,9 +988,9 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
   HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
 
   // Get groups definitions
-  HYDROData_SequenceOfObjects aSplittedGroups = GetSplittedGroups();
+  HYDROData_SequenceOfObjects aSplitGroups = GetSplitGroups();
 
-  HYDROData_SequenceOfObjects::Iterator anIter( aSplittedGroups );
+  HYDROData_SequenceOfObjects::Iterator anIter( aSplitGroups );
   for ( ; anIter.More(); anIter.Next() )
   {
     // Get shapes group
@@ -1035,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;
 }
 
@@ -1291,6 +1297,7 @@ void HYDROData_CalculationCase::UpdateRegionsNames( const HYDROData_SequenceOfOb
 }
 
 void HYDROData_CalculationCase::DumpRegionsToPython( QStringList& theResList,
+                                                     const QString& thePyScriptPath,
                                                      MapOfTreatedObjects& theTreatedObjects,
                                                      const HYDROData_SequenceOfObjects& theRegions ) const
 {
@@ -1304,7 +1311,7 @@ void HYDROData_CalculationCase::DumpRegionsToPython( QStringList& theResList,
       continue;
 
     theTreatedObjects.insert( aRegion->GetName(), aRegion );
-    QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects );
+    QStringList aRegDump = aRegion->DumpToPython( thePyScriptPath, theTreatedObjects );
     theResList << aRegDump;
   }
 }