X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=fef44bd1741569f6fb7ffead13ba75e45e49d84e;hb=d398a8be8e0b0259b476b358d53d234ce4c82379;hp=07397d1a64ee1dbee12cd9ff728e10e38106dc1c;hpb=d6a8c59ee076938a924fcfd1e3f83ef1395b7336;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx
index 07397d1a..fef44bd1 100644
--- a/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@ -16,10 +16,6 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifdef WIN32
-  #pragma warning ( disable: 4251 )
-#endif
-
 #include "HYDROData_CalculationCase.h"
 #include "HYDROData_ArtificialObject.h"
 #include "HYDROData_IAltitudeObject.h"
@@ -29,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>
 
@@ -63,21 +69,18 @@
 #endif 
 #define CALCULATION_REGIONS_PREF GetName() + "_Reg"
 #define CALCULATION_ZONES_PREF GetName() + "_Zone"
-#define CALCULATION_LANDCOVER_ZONES_PREF GetName() + "_LandCoverZone"
 #define CALCULATION_GROUPS_PREF GetName() + "_"
 //#define DEB_CLASS2D 1
 #ifdef DEB_CLASS2D
 #include <BRepBuilderAPI_MakeVertex.hxx>
 #endif
 
-#ifdef WIN32
-  #pragma warning ( default: 4251 )
-#endif
-
 #define EXPORT_NAME "HYDRO_" + GetName()
 
+#ifndef LIGHT_MODE
 #include <SALOME_NamingService.hxx>
 #include <SALOME_LifeCycleCORBA.hxx>
+#endif
 
 #define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
@@ -100,18 +103,16 @@ void HYDROData_CalculationCase::SetName( const QString& theName )
   if ( anOldCaseName != theName )
   {
     // Update names of regions and its zones
-    UpdateRegionsNames( GetRegions( false ), anOldCaseName, theName );
-    // Update names of land cover regions and its zones
-    UpdateRegionsNames( GetRegions( true ), anOldCaseName, theName );
+    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;
 
@@ -122,7 +123,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" );
@@ -133,17 +135,13 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
   QString aModeStr = aMode==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC";
   aResList << QString( "%0.SetAssignmentMode( %1 )" ).arg( aCalculName ).arg( aModeStr );
 
-  AssignmentMode aModeLC = GetAssignmentLandCoverMode();
-  QString aModeLCStr = aModeLC==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC";
-  aResList << QString( "%0.SetAssignmentLandCoverMode( %1 )" ).arg( aCalculName ).arg( aModeLCStr );
-
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
   HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects );
   for ( ; anIter.More(); anIter.Next() )
   {
     Handle(HYDROData_Object) aRefGeomObj =
       Handle(HYDROData_Object)::DownCast( anIter.Value() );
-    setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
+    setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
   }
   aResList << QString( "" );
 
@@ -164,36 +162,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 );
-  if( aModeLC==AUTOMATIC )
-    DumpLandCoverRulesToPython( 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( false ) );   
-  }
-
-  if( aModeLC==MANUAL )
-  {
-    // Now we restore the
-    // - land cover regions and zones order
-    DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( true ) );
+    DumpRegionsToPython( aResList, thePyScriptPath, theTreatedObjects, GetRegions() );   
   }
 
   // Export calculation case
@@ -209,11 +198,12 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre
   aResList << "import GEOM";
   aResList << QString( "print \"Entry:\", %1" ).arg( anEntryVar );
   QString aGeomShapeName = aCalculName + "_geom";
-  aResList << QString( "%1 = salome.IDToObject( str( %2 ) )" ).arg( aGeomShapeName ).arg( anEntryVar );
-  aResList << QString( "print \"Geom shape:\", %1" ).arg( aGeomShapeName );
-  aResList << QString( "print \"Geom shape name:\", %1.GetName()" ).arg( aGeomShapeName );
+  aResList << QString( "HYDRO_%1 = salome.IDToObject( str( %2 ) )" ).arg( GetName() ).arg( anEntryVar );
+  aResList << QString( "print \"Geom shape:\", HYDRO_%1" ).arg( GetName() );
+  aResList << QString( "print \"Geom shape name:\", HYDRO_%1.GetName()" ).arg( GetName() );
 
-  DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
+
+  //DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
 
   aResList << QString( "" );
   return aResList;
@@ -265,14 +255,13 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects()
   if ( !aBoundaryPolyline.IsNull() )
     aResSeq.Append( aBoundaryPolyline );
 
+  HYDROData_SequenceOfObjects aSeqOfGeomObjs = GetGeometryObjects();
+  aResSeq.Append( aSeqOfGeomObjs );
+
   // Regions
-  HYDROData_SequenceOfObjects aSeqOfRegions = GetRegions( false );
+  HYDROData_SequenceOfObjects aSeqOfRegions = GetRegions();
   aResSeq.Append( aSeqOfRegions );
 
-  // Land cover regions
-  HYDROData_SequenceOfObjects aSeqOfLandCoverRegions = GetRegions( true );
-  aResSeq.Append( aSeqOfLandCoverRegions );
-
   return aResSeq;
 }
 
@@ -282,9 +271,8 @@ void HYDROData_CalculationCase::Update()
   SetWarning();
 
   // At first we remove previously created objects
-  RemoveRegions( false );
-  RemoveRegions( true );
-  RemoveSplittedGroups();
+  RemoveRegions();
+  RemoveSplitGroups();
 
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   if ( aDocument.IsNull() )
@@ -294,12 +282,15 @@ void HYDROData_CalculationCase::Update()
   HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
 
   Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
+
+  HYDROData_SequenceOfObjects InterPolys = GetInterPolyObjects();
+
   HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
   if ( !aGeomObjects.IsEmpty() ) {
     HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
 
     HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
-      HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
+      HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline, InterPolys );
     if ( !aSplitObjects.isEmpty() ) {
       HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
       while( anIter.hasNext() ) {
@@ -312,40 +303,13 @@ void HYDROData_CalculationCase::Update()
     }
   }
 
-  // Split to land cover zones
-  HYDROData_SplitToZonesTool::SplitDataList aLandCoverZonesList;
-
-  HYDROData_SequenceOfObjects aLandCovers = GetLandCovers();
-  if ( !aLandCovers.IsEmpty() ) {
-    HYDROData_SplitToZonesTool::SplitDataList aSplitLandCoverObjects =
-      HYDROData_SplitToZonesTool::Split( aLandCovers );
-    if ( !aSplitLandCoverObjects.isEmpty() ) {
-      HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitLandCoverObjects );
-      while( anIter.hasNext() ) {
-        const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
-        if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
-          aLandCoverZonesList.append( aSplitData );
-      }
-    }
-  }
-
   switch( GetAssignmentMode() )
   {
   case MANUAL:
-    CreateRegionsDef( aDocument, aZonesList, false );    
+    CreateRegionsDef( aDocument, aZonesList );    
     break;
   case AUTOMATIC:
-    CreateRegionsAuto( aDocument, aZonesList, false );    
-    break;
-  }
-
-  switch( GetAssignmentLandCoverMode() )
-  {
-  case MANUAL:
-    CreateRegionsDef( aDocument, aLandCoverZonesList, true );
-    break;
-  case AUTOMATIC:
-    CreateRegionsAuto( aDocument, aLandCoverZonesList, true );
+    CreateRegionsAuto( aDocument, aZonesList );    
     break;
   }
 
@@ -353,19 +317,18 @@ void HYDROData_CalculationCase::Update()
 }
 
 void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Document)& theDoc,
-                                                  const HYDROData_SplitToZonesTool::SplitDataList& theZones,
-                                                  const bool theLandCover )
+                                                  const HYDROData_SplitToZonesTool::SplitDataList& theZones )
 {
   // Create result regions for case, by default one zone for one region
   QString aRegsPref = CALCULATION_REGIONS_PREF;
-  QString aZonesPref = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF;
+  QString aZonesPref = CALCULATION_ZONES_PREF;
 
   HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theZones );
   while( anIter.hasNext() )
   {
     const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
     // Create new region
-    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegsPref, theLandCover );
+    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegsPref );
 
     // Add the zone for region
     Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone( theDoc, aZonesPref, aSplitData.Face(), aSplitData.ObjectNames );
@@ -373,17 +336,16 @@ void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Documen
 }
 
 void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
-                                                   const HYDROData_SplitToZonesTool::SplitDataList& theZones,
-                                                   const bool theLandCover )
+                                                   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 = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF;
-  HYDROData_PriorityQueue aPr( this, theLandCover ? DataTag_CustomLandCoverRules : DataTag_CustomRules );
+  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 anObjects = theLandCover ? GetLandCovers() : GetGeometryObjects();
+  HYDROData_SequenceOfObjects anObjects = GetGeometryObjects();
   for( int i = anObjects.Lower(), n = anObjects.Upper(); i<=n; i++ )
   {
     Handle(HYDROData_Entity) anObj = anObjects.Value( i );
@@ -391,7 +353,7 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
       continue;
     QString anObjName = anObj->GetName();
     QString aRegName = anObjName + "_reg";
-    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, theLandCover, false );
+    Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, false );
     aRegionsMap.insert( anObjName, aRegion );
     aRegionNameToObjNameMap.insert( aRegName, anObjName );
   }
@@ -417,12 +379,10 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume
     }
 
     Handle(HYDROData_Entity) aMergeEntity = aRegObj;
-    if ( !theLandCover ) {
-      Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity );
-      if ( !aMergeObject.IsNull() ) {
-    	DEBTRACE("aMergeEntity " << aMergeEntity->GetName().toStdString());
-        aMergeEntity = aMergeObject->GetAltitudeObject();
-      }
+    Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity );
+    if ( !aMergeObject.IsNull() ) {
+      DEBTRACE("aMergeEntity " << aMergeEntity->GetName().toStdString());
+      aMergeEntity = aMergeObject->GetAltitudeObject();
     }
 
     switch( aMergeType )
@@ -463,7 +423,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() )
@@ -480,20 +440,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 );
   }
 }
 
@@ -631,48 +591,25 @@ void HYDROData_CalculationCase::RemoveStricklerTable()
   Changed( Geom_No );
 }
 
-bool HYDROData_CalculationCase::AddLandCover( const Handle(HYDROData_LandCover)& theLandCover )
+Handle(HYDROData_LandCoverMap) HYDROData_CalculationCase::GetLandCoverMap() const
 {
-  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
-  Changed( Geom_No );
-
-  return true;
+  Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast(
+    GetReferenceObject( DataTag_LandCoverMap ) );
+  return aMap;
 }
 
-HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetLandCovers() const
+void HYDROData_CalculationCase::SetLandCoverMap( const Handle(HYDROData_LandCoverMap)& theMap )
 {
-  return GetReferenceObjects( DataTag_LandCover );
+  SetReferenceObject( theMap, DataTag_LandCoverMap );
 }
 
-void HYDROData_CalculationCase::RemoveLandCover( const Handle(HYDROData_LandCover)& theLandCover )
+Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone )
 {
-  if ( theLandCover.IsNull() )
-    return;
-
-  RemoveReferenceObject( theLandCover->Label(), DataTag_LandCover );
-
-  // Indicate model of the need to update land cover partition
   Changed( Geom_No );
-}
-
-void HYDROData_CalculationCase::RemoveLandCovers()
-{
-  ClearReferenceObjects( DataTag_LandCover );
-
-  // Indicate model of the need to update land cover partition
   Changed( Geom_No );
-}
-
-Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone,
-                                                                  const bool theLandCover )
-{
+  Changed( Geom_No );
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-  Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF, theLandCover );
+  Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
   if ( aNewRegion.IsNull() )
     return aNewRegion;
 
@@ -681,16 +618,14 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(H
   return aNewRegion;
 }
 
-bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion,
-                                           const bool theLandCover )
+bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion )
 {
   Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
 
   if ( theRegion.IsNull() )
     return false;
   
-  HYDROData_CalculationCase::DataTag aDataTag = 
-    theLandCover ? DataTag_LandCoverRegion : DataTag_Region;
+  HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region;
 
   if ( HasReference( theRegion, aDataTag ) )
     return false; // Object is already in reference list
@@ -700,10 +635,10 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe
     Handle(HYDROData_CalculationCase)::DownCast( theRegion->GetFatherObject() );
   if ( !aFatherCalc.IsNull() && aFatherCalc->Label() != myLab )
   {
-    Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF, theLandCover );
+    Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF );
     theRegion->CopyTo( aNewRegion, true );
 
-    aFatherCalc->RemoveRegion( theRegion, theLandCover );
+    aFatherCalc->RemoveRegion( theRegion );
 
     theRegion->SetLabel( aNewRegion->Label() );
   }
@@ -715,9 +650,9 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe
   return true;
 }
 
-HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions( const bool theLandCover ) const
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions() const
 {
-  return GetReferenceObjects( theLandCover ? DataTag_LandCoverRegion : DataTag_Region );
+  return GetReferenceObjects( DataTag_Region );
 }
 
 void HYDROData_CalculationCase::UpdateRegionsOrder()
@@ -726,10 +661,7 @@ void HYDROData_CalculationCase::UpdateRegionsOrder()
   if ( aDocument.IsNull() )
     return;
 
-  HYDROData_SequenceOfObjects aRegions = GetRegions( false );
-  HYDROData_SequenceOfObjects aRegionsLC = GetRegions( true );
-  aRegions.Append( aRegionsLC );
-
+  HYDROData_SequenceOfObjects aRegions = GetRegions();
   HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
   for ( ; anIter.More(); anIter.Next() )
   {
@@ -756,14 +688,12 @@ void HYDROData_CalculationCase::UpdateRegionsOrder()
   }
 }
 
-void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion,
-                                              const bool theLandCover )
+void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion )
 {
   if ( theRegion.IsNull() )
     return;
 
-  HYDROData_CalculationCase::DataTag aDataTag = 
-    theLandCover ? DataTag_LandCoverRegion : DataTag_Region;
+  HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region;
   RemoveReferenceObject( theRegion->Label(), aDataTag );
 
   // Remove region from data model
@@ -773,43 +703,44 @@ void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& th
     theRegion->Remove();
 }
 
-void HYDROData_CalculationCase::RemoveRegions( const bool theLandCover )
+void HYDROData_CalculationCase::RemoveRegions()
 {
-  myLab.FindChild( theLandCover ? DataTag_ChildLandCoverRegion : DataTag_ChildRegion ).ForgetAllAttributes();
+  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
 {
-  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false );
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
   return GetAltitudeForPoint( thePoint, aZone );
 }
 
 double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                    thePoint,
-                                                       const Handle(HYDROData_Region)& theRegion ) const
+                                                       const Handle(HYDROData_Region)& theRegion,
+                                                       int theMethod) const
 {
   double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
 
-  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false );
+  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 );
+      aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
     else
       {
         DEBTRACE("GetAltitudeForPoint Region " << aRefRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString() << " ---------------------------");
-        aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+        aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
       }
   }
   else
@@ -821,7 +752,8 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
 }
 
 double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&                  thePoint,
-                                                       const Handle(HYDROData_Zone)& theZone ) const
+                                                       const Handle(HYDROData_Zone)& theZone,
+                                                       int theMethod) const
 {
   //DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString());
   double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
@@ -890,7 +822,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
       else
       {
     	//DEBTRACE("aZoneInterpolator == NULL");
-        aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+        aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint, theMethod );
       }
 
       if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
@@ -925,16 +857,17 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY&
 
 NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints( 
   const NCollection_Sequence<gp_XY>& thePoints,
-  const Handle(HYDROData_Region)&    theRegion ) const
+  const Handle(HYDROData_Region)&    theRegion,
+  int theMethod) const
 {
-  //DEBTRACE("HYDROData_CalculationCase::GetAltitudesForPoints " << theRegion->GetName().toStdString());
+  DEBTRACE("HYDROData_CalculationCase::GetAltitudesForPoints " << theRegion->GetName().toStdString());
   NCollection_Sequence<double> aResSeq;
 
   for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
   {
     const gp_XY& thePnt = thePoints.Value( i );
     
-    double anAltitude = GetAltitudeForPoint( thePnt, theRegion );
+    double anAltitude = GetAltitudeForPoint( thePnt, theRegion, theMethod );
     aResSeq.Append( anAltitude );
   }
 
@@ -943,7 +876,8 @@ NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
 
 NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints( 
   const NCollection_Sequence<gp_XY>& thePoints,
-  const Handle(HYDROData_Zone)&      theZone ) const
+  const Handle(HYDROData_Zone)&      theZone,
+  int theMethod) const
 {
   NCollection_Sequence<double> aResSeq;
 
@@ -951,7 +885,7 @@ NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
   {
     const gp_XY& thePnt = thePoints.Value( i );
     
-    double anAltitude = GetAltitudeForPoint( thePnt, theZone );
+    double anAltitude = GetAltitudeForPoint( thePnt, theZone, theMethod );
     aResSeq.Append( anAltitude );
   }
 
@@ -960,54 +894,47 @@ NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
 
 double HYDROData_CalculationCase::GetStricklerCoefficientForPoint( const gp_XY& thePoint ) const
 {
-    double aCoeff = 0;
-    Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
-    if ( !aDocument.IsNull() )
-        aCoeff = aDocument->GetDefaultStricklerCoefficient();
-
-    Handle(HYDROData_LandCover) aLandCover;
-    Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, Standard_True );
-    if ( !aZone.IsNull() )
-    {
-        HYDROData_SequenceOfObjects anObjList = aZone->GetObjects();
-        if ( anObjList.Length() == 1 )
-            aLandCover = Handle(HYDROData_LandCover)::DownCast( anObjList.First() );
-        else
-            aLandCover = Handle(HYDROData_LandCover)::DownCast( aZone->GetMergeObject() );
-    }
+  Handle( HYDROData_LandCoverMap ) aMap = GetLandCoverMap();
+  Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+  if( aMap.IsNull() )
+    return 0.0;
 
-    if ( !aLandCover.IsNull() )
-    {
-        QString aType = aLandCover->GetStricklerType();
-        Handle(HYDROData_StricklerTable) aTable = GetStricklerTable();
-        if ( !aTable.IsNull() )
-        {
-            if ( aTable->GetTypes().contains( aType ) )
-                aCoeff = aTable->Get( aType, aCoeff );
-        }
-    }
+  QString aType;
+  aMap->FindByPoint( thePoint, aType );
+  double aCoeff = aTable->Get( aType, 0.0 );
+  return aCoeff;
+}
+
+std::vector<double> HYDROData_CalculationCase::GetStricklerCoefficientForPoints(const std::vector<gp_XY>& thePoints,
+  double DefValue, bool UseMax ) const
+{
+  Handle( HYDROData_LandCoverMap ) aLCM = GetLandCoverMap();
+  Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+  std::vector<double> theCoeffs;
+  if( aLCM.IsNull() || aTable.IsNull() )
+    return theCoeffs;
 
-    return aCoeff;
+  aLCM->ClassifyPoints(thePoints, aTable, theCoeffs, DefValue, UseMax );
+
+  return theCoeffs;
 }
 
-Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint,
-                                                                        const bool theLandCover ) const
+Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
 {
   Handle(HYDROData_Region) aResRegion;
 
-  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, theLandCover );
+  Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
   if ( !aZone.IsNull() )
     aResRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
 
   return aResRegion;
 }
 
-Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint,
-                                                                    const bool theLandCover ) const
+Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint ) const
 {
   Handle(HYDROData_Zone) aResZone;
 
-  HYDROData_SequenceOfObjects aRegions = GetRegions( theLandCover );
+  HYDROData_SequenceOfObjects aRegions = GetRegions();
 
   HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
   for ( ; anIter.More() && aResZone.IsNull(); anIter.Next() )
@@ -1068,30 +995,29 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi
 
 Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(HYDROData_Document)& theDoc,
                                                                   const QString& thePrefixOrName,
-                                                                  const bool theLandCover,
                                                                   bool isPrefix )
 {
-  TDF_Label aNewLab = myLab.FindChild( theLandCover ? DataTag_ChildLandCoverRegion : DataTag_ChildRegion ).NewChild();
+  TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild();
   int aTag = aNewLab.Tag();
 
   Handle(HYDROData_Region) aNewRegion =
     Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) );
-  AddRegion( aNewRegion, theLandCover );
+  AddRegion( aNewRegion );
 
   QString aRegionName = isPrefix ? HYDROData_Tool::GenerateObjectName( theDoc, thePrefixOrName ) : thePrefixOrName;
-  aNewRegion->SetName( aRegionName );
+  aNewRegion->SetName( aRegionName, true );
 
   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 );
 
@@ -1100,14 +1026,19 @@ 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, 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,
@@ -1116,9 +1047,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
@@ -1138,7 +1069,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var  theGeomEngine,
   // Get faces
   bool isAllNotSubmersible = true;
   TopTools_ListOfShape aFaces;
-  HYDROData_SequenceOfObjects aCaseRegions = GetRegions( false );
+  HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
   HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
   for ( ; aRegionIter.More(); aRegionIter.Next() )
   {
@@ -1164,6 +1095,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;
 }
 
@@ -1321,6 +1257,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var
 
   return true;
 }
+#endif
 
 void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag theDataTag,
                                             const bool theIsSetToUpdate )
@@ -1353,12 +1290,6 @@ QString HYDROData_CalculationCase::DumpRules() const
   return HYDROData_PriorityQueue::DumpRules( aRulesLab );
 }
 
-QString HYDROData_CalculationCase::DumpLandCoverRules() const
-{
-  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomLandCoverRules );
-  return HYDROData_PriorityQueue::DumpRules( aRulesLab );
-}
-
 void HYDROData_CalculationCase::SetAssignmentMode( AssignmentMode theMode )
 {
   TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentMode );
@@ -1385,13 +1316,6 @@ void HYDROData_CalculationCase::DumpRulesToPython( const QString& theCalcCaseNam
   HYDROData_PriorityQueue::DumpRulesToPython( aRulesLab, theCalcCaseName, theScript );
 }
 
-void HYDROData_CalculationCase::DumpLandCoverRulesToPython( const QString& theCalcCaseName,
-                                                            QStringList& theScript ) const
-{
-  TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomLandCoverRules );
-  HYDROData_PriorityQueue::DumpRulesToPython( aRulesLab, theCalcCaseName, theScript );
-}
-
 HYDROData_Warning HYDROData_CalculationCase::GetLastWarning() const
 {
   return myLastWarning;
@@ -1432,22 +1356,33 @@ void HYDROData_CalculationCase::UpdateRegionsNames( const HYDROData_SequenceOfOb
 }
 
 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( theTreatedObjects );
-    theResList << aRegDump;
-  }
+  anIter.Init(theRegions);
+  for (int ireg = 1; anIter.More(); anIter.Next(), ireg++)
+    {
+      Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast(anIter.Value());
+      if (aRegion.IsNull())
+        continue;
+      QString defRegName = this->GetName();
+      QString regSuffix = QString("_Reg_%1").arg(ireg);
+      defRegName += regSuffix;
+      theTreatedObjects.insert(aRegion->GetName(), aRegion);
+      QStringList aRegDump = aRegion->DumpToPython(thePyScriptPath, theTreatedObjects, defRegName);
+      theResList << aRegDump;
+    }
+  for (anIter.Init(theRegions); anIter.More(); anIter.Next())
+    {
+      Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast(anIter.Value());
+      if (aRegion.IsNull())
+        continue;
+      QStringList aRegDump;
+      aRegion->SetNameInDumpPython(aRegDump);
+      theResList << aRegDump;
+    }
 }
 
 bool HYDROData_CalculationCase::GetRule( int theIndex, 
@@ -1462,21 +1397,31 @@ bool HYDROData_CalculationCase::GetRule( int theIndex,
     theObject1, thePriority, theObject2, theMergeType );
 }
 
-void HYDROData_CalculationCase::SetAssignmentLandCoverMode( AssignmentMode theMode )
+bool HYDROData_CalculationCase::AddInterPoly( const Handle(HYDROData_PolylineXY)& theInterPolyline )
 {
-  TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentLandCoverMode );
-  TDataStd_Integer::Set( aModeLab, ( int ) theMode );
+  HYDROData_CalculationCase::DataTag aDataTag = DataTag_InterPoly;
 
-  // Indicate model of the need to update land covers partition
-  Changed( Geom_No );
+  if ( HasReference( theInterPolyline, aDataTag ) )
+    return false; 
+
+  AddReferenceObject( theInterPolyline, aDataTag );
+
+  return true;
 }
 
-HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentLandCoverMode() const
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetInterPolyObjects() 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;
+  return GetReferenceObjects( DataTag_InterPoly ); 
+}
+
+void HYDROData_CalculationCase::RemoveInterPolyObject( const Handle(HYDROData_PolylineXY)& theInterPolyline ) 
+{
+  if ( theInterPolyline.IsNull() )
+    return;
+
+  RemoveReferenceObject( theInterPolyline->Label(), DataTag_InterPoly );
+
 }
+
+
+