X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=58d15770f88c2b5172aaafee04b51771aede958e;hb=cde2ec476486fcd7c9b7b38ce814c648d73e7fd3;hp=5ab5b3093d38276baaeb547b4f72d018c2645984;hpb=419118d6b16f91ec37912b242cfe7469a585d16e;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 5ab5b309..58d15770 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -17,7 +17,6 @@
 //
 
 #include "HYDROData_CalculationCase.h"
-
 #include "HYDROData_ArtificialObject.h"
 #include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_Document.h"
@@ -26,13 +25,23 @@
 #include "HYDROData_NaturalObject.h"
 #include "HYDROData_PolylineXY.h"
 #include "HYDROData_StricklerTable.h"
-#include "HYDROData_LandCover.h"
-#include "HYDROData_SplittedShapesGroup.h"
+#include "HYDROData_LandCoverMap.h"
+#include "HYDROData_SplitShapesGroup.h"
 #include "HYDROData_Region.h"
 #include "HYDROData_Tool.h"
 #include "HYDROData_GeomTool.h"
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
+#ifndef LIGHT_MODE
 #include <GEOMBase.h>
+#endif
+
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
 
 #include <QSet>
 
@@ -68,11 +77,17 @@
 
 #define EXPORT_NAME "HYDRO_" + GetName()
 
+#include <SALOME_NamingService.hxx>
+#include <SALOME_LifeCycleCORBA.hxx>
+
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
 
 HYDROData_CalculationCase::HYDROData_CalculationCase()
-: HYDROData_Entity()
+: HYDROData_Entity( Geom_2d_and_groups )
 {
 }
 
@@ -85,38 +100,17 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
   QString anOldCaseName = GetName();
   if ( anOldCaseName != theName )
   {
-    HYDROData_SequenceOfObjects aRegions = GetRegions();
+    // Update names of regions and its zones
+    UpdateRegionsNames( GetRegions(), anOldCaseName, theName );
 
-    HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
-    for ( ; anIter.More(); anIter.Next() )
-    {
-      Handle(HYDROData_Region) aRegion =
-        Handle(HYDROData_Region)::DownCast( anIter.Value() );
-      if ( aRegion.IsNull() )
-        continue;
-
-      HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegion );
-
-      HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
-      HYDROData_SequenceOfObjects::Iterator anIter( aZones );
-      for ( ; anIter.More(); anIter.Next() )
-      {
-        Handle(HYDROData_Zone) aRegZone =
-          Handle(HYDROData_Zone)::DownCast( anIter.Value() );
-        if ( aRegZone.IsNull() )
-          continue;
-
-        HYDROData_Tool::UpdateChildObjectName( anOldCaseName, theName, aRegZone );
-      }
-    }
-
-    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;
 
@@ -127,14 +121,15 @@ 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" );
 
   QString aCalculName = GetObjPyName();
 
-  AssignmentMode aMode = GetAssignmentMode();
+  AssignmentMode aMode = GetAssignmentMode();  
   QString aModeStr = aMode==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC";
   aResList << QString( "%0.SetAssignmentMode( %1 )" ).arg( aCalculName ).arg( aModeStr );
 
@@ -144,7 +139,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( "" );
 
@@ -172,7 +167,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
   }
 
   Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
-  setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+  setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
 
   if( aMode==AUTOMATIC )
     DumpRulesToPython( aCalculName, aResList );
@@ -183,20 +178,9 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
 
   if( aMode==MANUAL )
   {
-    // Now we restore the regions and zones order
-    HYDROData_SequenceOfObjects aRegions = GetRegions();
-    anIter.Init( aRegions );
-    for ( ; anIter.More(); anIter.Next() )
-    {
-      Handle(HYDROData_Region) aRegion =
-        Handle(HYDROData_Region)::DownCast( anIter.Value() );
-      if ( aRegion.IsNull() )
-        continue;
-
-      theTreatedObjects.insert( aRegion->GetName(), aRegion );
-      QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects );
-      aResList << aRegDump;
-    }
+    // Now we restore the
+    // - regions and zones order
+    DumpRegionsToPython( aResList, thePyScriptPath, theTreatedObjects, GetRegions() );   
   }
 
   // Export calculation case
@@ -268,6 +252,10 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects()
   if ( !aBoundaryPolyline.IsNull() )
     aResSeq.Append( aBoundaryPolyline );
 
+  HYDROData_SequenceOfObjects aSeqOfGeomObjs = GetGeometryObjects();
+  aResSeq.Append( aSeqOfGeomObjs );
+
+  // Regions
   HYDROData_SequenceOfObjects aSeqOfRegions = GetRegions();
   aResSeq.Append( aSeqOfRegions );
 
@@ -281,45 +269,44 @@ 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() )
     return;
 
-  Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
-  HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
-  if ( aGeomObjects.IsEmpty() )
-    return;
-
-  HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
-
-  HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
-    HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
-  if ( aSplitObjects.isEmpty() )
-    return;
-
+  // Split to zones
   HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
 
-  HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
-  while( anIter.hasNext() )
-  {
-    const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
-    if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
-      aZonesList.append( aSplitData );
-    else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
-      anEdgesList.append( aSplitData );
+  Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
+  HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
+  if ( !aGeomObjects.IsEmpty() ) {
+    HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+
+    HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
+      HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
+    if ( !aSplitObjects.isEmpty() ) {
+      HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
+      while( anIter.hasNext() ) {
+        const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+        if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
+          aZonesList.append( aSplitData );
+        else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
+          anEdgesList.append( aSplitData );
+      }
+    }
   }
 
   switch( GetAssignmentMode() )
   {
   case MANUAL:
-    CreateRegionsDef( aDocument, aZonesList );
+    CreateRegionsDef( aDocument, aZonesList );    
     break;
   case AUTOMATIC:
-    CreateRegionsAuto( aDocument, aZonesList );
+    CreateRegionsAuto( aDocument, aZonesList );    
     break;
   }
+
   CreateEdgeGroupsDef( aDocument, anEdgesList );
 }
 
@@ -345,16 +332,17 @@ void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Documen
 void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
                                                    const HYDROData_SplitToZonesTool::SplitDataList& theZones )
 {
+  DEBTRACE("HYDROData_CalculationCase::CreateRegionsAuto");
   QMap<QString, Handle(HYDROData_Region)> aRegionsMap; //object name to region
   QMap<QString, QString> aRegionNameToObjNameMap;
   QString aZonesPref = CALCULATION_ZONES_PREF;
   HYDROData_PriorityQueue aPr( this, DataTag_CustomRules );
 
   // 1. First we create a default region for each object included into the calculation case
-  HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
-  for( int i=aGeomObjects.Lower(), n=aGeomObjects.Upper(); i<=n; i++ )
+  HYDROData_SequenceOfObjects anObjects = GetGeometryObjects();
+  for( int i = anObjects.Lower(), n = anObjects.Upper(); i<=n; i++ )
   {
-    Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( aGeomObjects.Value( i ) );
+    Handle(HYDROData_Entity) anObj = anObjects.Value( i );
     if( anObj.IsNull() )
       continue;
     QString anObjName = anObj->GetName();
@@ -370,9 +358,8 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
   while( anIter.hasNext() )
   {
     const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
-    HYDROData_Zone::MergeAltitudesType aMergeType;
-    Handle(HYDROData_Object) aRegObj =
-      Handle(HYDROData_Object)::DownCast( aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType ) );
+    HYDROData_Zone::MergeType aMergeType;
+    Handle(HYDROData_Entity) aRegObj = aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType );
     if( aRegObj.IsNull() )
       continue;
     Handle(HYDROData_Region) aRegion = aRegionsMap[aRegObj->GetName()];
@@ -385,6 +372,13 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
       qDebug( "Error in algorithm: unresolved conflicts" );
     }
 
+    Handle(HYDROData_Entity) aMergeEntity = aRegObj;
+    Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity );
+    if ( !aMergeObject.IsNull() ) {
+      DEBTRACE("aMergeEntity " << aMergeEntity->GetName().toStdString());
+      aMergeEntity = aMergeObject->GetAltitudeObject();
+    }
+
     switch( aMergeType )
     {
     case HYDROData_Zone::Merge_ZMIN:
@@ -393,8 +387,8 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
       break;
     case HYDROData_Zone::Merge_Object:
       aRegionZone->SetMergeType( aMergeType );
-      aRegionZone->RemoveMergeAltitude();
-      aRegionZone->SetMergeAltitude( aRegObj->GetAltitudeObject() );
+      aRegionZone->RemoveMergeObject();
+      aRegionZone->SetMergeObject( aMergeEntity );
       break;
     }
   }
@@ -423,7 +417,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() )
@@ -440,20 +434,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 );
   }
 }
 
@@ -468,7 +462,7 @@ bool HYDROData_CalculationCase::AddGeometryObject( const Handle(HYDROData_Object
   AddReferenceObject( theObject, DataTag_GeometryObject );
   
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_2d );
 
   return true;
 }
@@ -486,7 +480,7 @@ void HYDROData_CalculationCase::RemoveGeometryObject( const Handle(HYDROData_Obj
   RemoveReferenceObject( theObject->Label(), DataTag_GeometryObject );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 void HYDROData_CalculationCase::RemoveGeometryObjects()
@@ -494,7 +488,7 @@ void HYDROData_CalculationCase::RemoveGeometryObjects()
   ClearReferenceObjects( DataTag_GeometryObject );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_ShapesGroup)& theGroup )
@@ -508,7 +502,7 @@ bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_ShapesG
   AddReferenceObject( theGroup, DataTag_GeometryGroup );
   
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_Groups );
 
   return true;
 }
@@ -526,7 +520,7 @@ void HYDROData_CalculationCase::RemoveGeometryGroup( const Handle(HYDROData_Shap
   RemoveReferenceObject( theGroup->Label(), DataTag_GeometryGroup );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_Groups );
 }
 
 void HYDROData_CalculationCase::RemoveGeometryGroups()
@@ -534,7 +528,7 @@ void HYDROData_CalculationCase::RemoveGeometryGroups()
   ClearReferenceObjects( DataTag_GeometryGroup );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_Groups );
 }
 
 void HYDROData_CalculationCase::SetBoundaryPolyline( const Handle(HYDROData_PolylineXY)& thePolyline )
@@ -544,7 +538,8 @@ void HYDROData_CalculationCase::SetBoundaryPolyline( const Handle(HYDROData_Poly
   SetReferenceObject( thePolyline, DataTag_Polyline );
 
   // Indicate model of the need to update zones splitting
-  SetToUpdate( !IsEqual( aPrevPolyline, thePolyline ) || IsMustBeUpdated() );
+  if( !IsEqual( aPrevPolyline, thePolyline ) )
+    Changed( Geom_2d );
 }
 
 Handle(HYDROData_PolylineXY) HYDROData_CalculationCase::GetBoundaryPolyline() const
@@ -560,7 +555,7 @@ void HYDROData_CalculationCase::RemoveBoundaryPolyline()
   ClearReferenceObjects( DataTag_Polyline );
 
   // Indicate model of the need to update zones splitting
-  SetToUpdate( !aPrevPolyline.IsNull() || IsMustBeUpdated() );
+  Changed( Geom_2d );
 }
 
 void HYDROData_CalculationCase::SetStricklerTable( const Handle(HYDROData_StricklerTable)& theStricklerTable )
@@ -570,7 +565,8 @@ void HYDROData_CalculationCase::SetStricklerTable( const Handle(HYDROData_Strick
   SetReferenceObject( theStricklerTable, DataTag_StricklerTable );
 
   // Indicate model of the need to update land covers partition
-  SetToUpdate( !IsEqual( aPrevStricklerTable, theStricklerTable ) || IsMustBeUpdated() );
+  if( !IsEqual( aPrevStricklerTable, theStricklerTable ) )
+    Changed( Geom_No );
 }
 
 Handle(HYDROData_StricklerTable) HYDROData_CalculationCase::GetStricklerTable() const
@@ -586,48 +582,26 @@ void HYDROData_CalculationCase::RemoveStricklerTable()
   ClearReferenceObjects( DataTag_StricklerTable );
 
   // Indicate model of the need to update land covers partition
-  SetToUpdate( !aPrevStricklerTable.IsNull() || IsMustBeUpdated() );
-}
-
-bool HYDROData_CalculationCase::AddLandCover( const Handle(HYDROData_LandCover)& theLandCover )
-{
-  if ( HasReference( theLandCover, DataTag_LandCover ) )
-    return false; // Land cover is already in reference list
-
-  AddReferenceObject( theLandCover, DataTag_LandCover );
-  
-  // Indicate model of the need to update land covers partition
-  SetToUpdate( true );
-
-  return true;
-}
-
-HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetLandCovers() const
-{
-  return GetReferenceObjects( DataTag_LandCover );
+  Changed( Geom_No );
 }
 
-void HYDROData_CalculationCase::RemoveLandCover( const Handle(HYDROData_LandCover)& theLandCover )
+Handle(HYDROData_LandCoverMap) HYDROData_CalculationCase::GetLandCoverMap() const
 {
-  if ( theLandCover.IsNull() )
-    return;
-
-  RemoveReferenceObject( theLandCover->Label(), DataTag_LandCover );
-
-  // Indicate model of the need to update land cover partition
-  SetToUpdate( true );
+  Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast(
+    GetReferenceObject( DataTag_LandCoverMap ) );
+  return aMap;
 }
 
-void HYDROData_CalculationCase::RemoveLandCovers()
+void HYDROData_CalculationCase::SetLandCoverMap( const Handle(HYDROData_LandCoverMap)& theMap )
 {
-  ClearReferenceObjects( DataTag_LandCover );
-
-  // Indicate model of the need to update land cover partition
-  SetToUpdate( true );
+  SetReferenceObject( theMap, DataTag_LandCoverMap );
 }
 
 Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone )
 {
+  Changed( Geom_No );
+  Changed( Geom_No );
+  Changed( Geom_No );
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
   if ( aNewRegion.IsNull() )
@@ -645,7 +619,9 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe
   if ( theRegion.IsNull() )
     return false;
   
-  if ( HasReference( theRegion, DataTag_Region ) )
+  HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region;
+
+  if ( HasReference( theRegion, aDataTag ) )
     return false; // Object is already in reference list
 
   // Move the region from other calculation
@@ -654,7 +630,7 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe
   if ( !aFatherCalc.IsNull() && aFatherCalc->Label() != myLab )
   {
     Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
-    theRegion->CopyTo( aNewRegion );
+    theRegion->CopyTo( aNewRegion, true );
 
     aFatherCalc->RemoveRegion( theRegion );
 
@@ -662,7 +638,7 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe
   }
   else
   {
-    AddReferenceObject( theRegion, DataTag_Region );
+    AddReferenceObject( theRegion, aDataTag );
   }
 
   return true;
@@ -680,7 +656,6 @@ void HYDROData_CalculationCase::UpdateRegionsOrder()
     return;
 
   HYDROData_SequenceOfObjects aRegions = GetRegions();
-
   HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
   for ( ; anIter.More(); anIter.Next() )
   {
@@ -712,7 +687,8 @@ void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& th
   if ( theRegion.IsNull() )
     return;
 
-  RemoveReferenceObject( theRegion->Label(), DataTag_Region );
+  HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region;
+  RemoveReferenceObject( theRegion->Label(), aDataTag );
 
   // Remove region from data model
   Handle(HYDROData_CalculationCase) aFatherCalc = 
@@ -726,14 +702,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
@@ -750,10 +726,20 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
   Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
   if ( !aZone.IsNull() )
   {
+    //DEBTRACE("GetAltitudeForPoint Region " << theRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString());
     Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
     if ( IsEqual( aRefRegion, theRegion ) )
       aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+    else
+      {
+        DEBTRACE("GetAltitudeForPoint Region " << aRefRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString() << " ---------------------------");
+        aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+      }
   }
+  else
+    {
+      DEBTRACE(" --- GetAltitudeForPoint No Zone ---");
+    }
 
   return aResAltitude;
 }
@@ -761,38 +747,51 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
 double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                  thePoint,
                                                        const Handle(HYDROData_Zone)& theZone ) const
 {
+  //DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString());
   double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
   if ( theZone.IsNull() )
+  {
+	DEBTRACE("Zone nulle");
     return aResAltitude;
+  }
 
-  HYDROData_Zone::MergeAltitudesType aZoneMergeType = theZone->GetMergeType();
+  HYDROData_Zone::MergeType aZoneMergeType = theZone->GetMergeType();
+  //DEBTRACE("aZoneMergeType " << aZoneMergeType);
   if ( !theZone->IsMergingNeed() )
   {
     aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
+    //DEBTRACE("---");
   }
   else if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
   {
+	DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString() << " Merge_UNKNOWN");
     return aResAltitude;
   }
 
   HYDROData_IInterpolator* aZoneInterpolator = theZone->GetInterpolator();
   if ( aZoneMergeType == HYDROData_Zone::Merge_Object )
   {
-    Handle(HYDROData_IAltitudeObject) aMergeAltitude = theZone->GetMergeAltitude();
+    Handle(HYDROData_IAltitudeObject) aMergeAltitude = 
+      Handle(HYDROData_IAltitudeObject)::DownCast( theZone->GetMergeObject() );
     if ( !aMergeAltitude.IsNull() )
     {
       if ( aZoneInterpolator != NULL )
       {
+    	DEBTRACE("aZoneInterpolator != NULL");
         aZoneInterpolator->SetAltitudeObject( aMergeAltitude );
         aResAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
       }
       else
+      {
+    	DEBTRACE("aZoneInterpolator == NULL");
         aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+      }
     }
   }
   else
   {
-    HYDROData_SequenceOfObjects aZoneObjects = theZone->GetGeometryObjects();
+	//DEBTRACE("aZoneMergeType != HYDROData_Zone::Merge_Object");
+    HYDROData_SequenceOfObjects aZoneObjects = theZone->GetObjects();
     HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
     for ( ; anIter.More(); anIter.Next() )
     {
@@ -808,11 +807,15 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
       double aPointAltitude = 0.0;
       if ( aZoneInterpolator != NULL )
       {
+    	DEBTRACE("aZoneInterpolator != NULL");
         aZoneInterpolator->SetAltitudeObject( anObjAltitude );
         aPointAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
       }
       else
+      {
+    	//DEBTRACE("aZoneInterpolator == NULL");
         aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+      }
 
       if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
         continue;
@@ -848,6 +851,7 @@ NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
   const NCollection_Sequence<gp_XY>& thePoints,
   const Handle(HYDROData_Region)&    theRegion ) const
 {
+  //DEBTRACE("HYDROData_CalculationCase::GetAltitudesForPoints " << theRegion->GetName().toStdString());
   NCollection_Sequence<double> aResSeq;
 
   for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
@@ -878,6 +882,19 @@ NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
   return aResSeq;
 }
 
+double HYDROData_CalculationCase::GetStricklerCoefficientForPoint( const gp_XY& thePoint ) const
+{
+  Handle( HYDROData_LandCoverMap ) aMap = GetLandCoverMap();
+  Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+  if( aMap.IsNull() )
+    return 0.0;
+
+  QString aType;
+  aMap->FindByPoint( thePoint, aType );
+  double aCoeff = aTable->Get( aType, 0.0 );
+  return aCoeff;
+}
+
 Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
 {
   Handle(HYDROData_Region) aResRegion;
@@ -969,14 +986,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 );
 
@@ -985,24 +1002,30 @@ Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedG
 
 QString HYDROData_CalculationCase::Export( int theStudyId ) const
 {
+#ifdef LIGHT_MODE
+  return "";
+#else
   GEOM::GEOM_Gen_var aGEOMEngine = HYDROData_GeomTool::GetGeomGen();
   SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId );
   
-  QString aGeomObjEntry;
-  bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry );
+  QString aGeomObjEntry, anErrorMsg;
+  bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg );
   return isOK ? aGeomObjEntry : QString();
+#endif
 }
 
+#ifndef LIGHT_MODE
 bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
                                         SALOMEDS::Study_ptr theStudy,
-                                        QString& theGeomObjEntry ) const
+                                        QString& theGeomObjEntry,
+                                        QString& theErrorMsg ) const
 {
   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
@@ -1020,6 +1043,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
   }
   
   // Get faces
+  bool isAllNotSubmersible = true;
   TopTools_ListOfShape aFaces;
   HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
   HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
@@ -1029,12 +1053,30 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
       Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
     if( aRegion.IsNull() || !aRegion->IsSubmersible() )
       continue;
+    
+    if ( isAllNotSubmersible )
+      isAllNotSubmersible = false;
 
     TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
     aFaces.Append( aRegionShape );
   }
 
-  return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );
+  bool aRes = false;
+
+  if ( aCaseRegions.IsEmpty() ) {
+    theErrorMsg = QString("the list of regions is empty.");
+  } else if ( isAllNotSubmersible ) {
+    theErrorMsg = QString("there are no submersible regions.");
+  } else {
+    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;
 }
 
 bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var                            theGeomEngine,
@@ -1191,6 +1233,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
 
   return true;
 }
+#endif
 
 void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag theDataTag,
                                             const bool theIsSetToUpdate )
@@ -1200,21 +1243,21 @@ void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag t
 
   // Indicate model of the need to update splitting
   if ( theIsSetToUpdate ) {
-    SetToUpdate( true );
+    Changed( Geom_2d );
   }
 }
 
 void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Entity)&    theObject1,
                                          HYDROData_PriorityType             thePriority,
                                          const Handle(HYDROData_Entity)&    theObject2,
-                                         HYDROData_Zone::MergeAltitudesType theMergeType,
+                                         HYDROData_Zone::MergeType          theMergeType,
                                          HYDROData_CalculationCase::DataTag theDataTag )
 {
   TDF_Label aRulesLab = myLab.FindChild( theDataTag );
   HYDROData_PriorityQueue::AddRule( aRulesLab, theObject1, thePriority, theObject2, theMergeType );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 QString HYDROData_CalculationCase::DumpRules() const
@@ -1229,7 +1272,7 @@ void HYDROData_CalculationCase::SetAssignmentMode( AssignmentMode theMode )
   TDataStd_Integer::Set( aModeLab, ( int ) theMode );
 
   // Indicate model of the need to update splitting
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentMode() const
@@ -1260,33 +1303,62 @@ void HYDROData_CalculationCase::SetWarning( HYDROData_WarningType theType, const
   myLastWarning.Data = theData;
 }
 
+void HYDROData_CalculationCase::UpdateRegionsNames( const HYDROData_SequenceOfObjects& theRegions,
+                                                    const QString& theOldCaseName,
+                                                    const QString& theName )
+{
+  HYDROData_SequenceOfObjects::Iterator anIter( theRegions );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( anIter.Value() );
+    if ( aRegion.IsNull() )
+      continue;
+
+    HYDROData_Tool::UpdateChildObjectName( theOldCaseName, theName, aRegion );
+
+    HYDROData_SequenceOfObjects aZones = aRegion->GetZones();
+    HYDROData_SequenceOfObjects::Iterator anIter( aZones );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      Handle(HYDROData_Zone) aRegZone =
+        Handle(HYDROData_Zone)::DownCast( anIter.Value() );
+      if ( aRegZone.IsNull() )
+        continue;
+
+      HYDROData_Tool::UpdateChildObjectName( theOldCaseName, theName, aRegZone );
+    }
+  }
+}
+
+void HYDROData_CalculationCase::DumpRegionsToPython( QStringList& theResList,
+                                                     const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects,
+                                                     const HYDROData_SequenceOfObjects& theRegions ) const
+{
+  HYDROData_SequenceOfObjects::Iterator anIter;
+  anIter.Init( theRegions );
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( anIter.Value() );
+    if ( aRegion.IsNull() )
+      continue;
+
+    theTreatedObjects.insert( aRegion->GetName(), aRegion );
+    QStringList aRegDump = aRegion->DumpToPython( thePyScriptPath, theTreatedObjects );
+    theResList << aRegDump;
+  }
+}
+
 bool HYDROData_CalculationCase::GetRule( int theIndex, 
                                          Handle(HYDROData_Entity)&           theObject1,
                                          HYDROData_PriorityType&             thePriority,
                                          Handle(HYDROData_Entity)&           theObject2,
-                                         HYDROData_Zone::MergeAltitudesType& theMergeType,
+                                         HYDROData_Zone::MergeType&          theMergeType,
                                          HYDROData_CalculationCase::DataTag& theDataTag) const
 {
   TDF_Label aRulesLab = myLab.FindChild( theDataTag );
   return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex,
     theObject1, thePriority, theObject2, theMergeType );
 }
-
-void HYDROData_CalculationCase::SetAssignmentLandCoverMode( AssignmentMode theMode )
-{
-  TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentLandCoverMode );
-  TDataStd_Integer::Set( aModeLab, ( int ) theMode );
-
-  // Indicate model of the need to update land covers partition
-  SetToUpdate( true );
-}
-
-HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentLandCoverMode() const
-{
-  Handle(TDataStd_Integer) aModeAttr;
-  bool isOK = myLab.FindChild( DataTag_AssignmentLandCoverMode ).FindAttribute( TDataStd_Integer::GetID(), aModeAttr );
-  if( isOK )
-    return ( AssignmentMode ) aModeAttr->Get();
-  else
-    return MANUAL;
-}