X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=134c3bd0b2996beb4d13914db545b34c115e382b;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=2c84a4fb295e1bf626005bcbf37198d14fe346ce;hpb=5a485d8a51393f35f548a8397f9ba71fdeaaeb9b;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 2c84a4fb..134c3bd0 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -21,7 +21,7 @@
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_CalculationDlg.h"
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 #include "HYDROGUI_Zone.h"
 #include "HYDROGUI_Region.h"
@@ -57,6 +57,7 @@ HYDROGUI_CalculationOp::HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool
   myActiveViewManager( NULL ),
   myPreviewViewManager( NULL ),
   myShowGeomObjects( true ),
+  myShowLandCoverMap( false ),
   myShowZones( false )
 {
   setName( myIsEdit ? tr( "EDIT_CALCULATION" ) : tr( "CREATE_CALCULATION" ) );
@@ -97,6 +98,13 @@ void HYDROGUI_CalculationOp::startOperation()
   QStringList anEntryList;
   HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetGeometryObjects( module() );
   getNamesAndEntries( aSeq, aList, anEntryList );
+  
+  QStringList List1;
+  QStringList EList1;
+
+  //add intersection polylines
+  AddInterPolylinesToList(aList, anEntryList);
+  
   aPanel->setAllGeomObjects( aList, anEntryList );
 
   // Get all polylines
@@ -109,18 +117,18 @@ void HYDROGUI_CalculationOp::startOperation()
   {
     aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() );
 
-    if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed() )
+    if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed(false) )
     { 
-      // Check the polyline shape
-      TopoDS_Shape aPolylineShape = aPolylineObj->GetShape();
-      if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) {
+//      // Check the polyline shape
+//      TopoDS_Shape aPolylineShape = aPolylineObj->GetShape();
+//      if ( !aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE ) {
         aPolylineName = aPolylineObj->GetName();
         if ( !aPolylineName.isEmpty() )
         {
           aList.append( aPolylineName );
           anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ) );
         }
-      }
+//      }
     }
   }
   aPanel->setPolylineNames( aList, anEntryList );
@@ -146,7 +154,10 @@ void HYDROGUI_CalculationOp::startOperation()
         aPanel->setBoundary( aPolylineName );
       }
 
-      aSeq = myEditedObject->GetGeometryObjects();
+      aSeq = myEditedObject->GetGeometryObjects();      
+      HYDROData_SequenceOfObjects anInterPolyList = myEditedObject->GetInterPolyObjects();
+      aSeq.Append(anInterPolyList);
+
       getNamesAndEntries( aSeq, aList, anEntryList );
       aPanel->includeGeomObjects( aList );
 
@@ -165,7 +176,29 @@ void HYDROGUI_CalculationOp::startOperation()
   aPanel->setObjectName( anObjectName );
   aPanel->setEditedObject( myEditedObject );
 
-  createPreview();
+  setGeomObjectsVisible( true );
+
+  createPreview( false );
+}
+
+void HYDROGUI_CalculationOp::AddInterPolylinesToList(QStringList& theList, QStringList& theEntryList)
+{
+  HYDROData_Iterator anIter( doc(), KIND_POLYLINEXY );
+  Handle(HYDROData_PolylineXY) aPolylineObj;
+  QString aPolylineName;
+  for ( ; anIter.More(); anIter.Next() )
+  {
+    aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anIter.Current() );
+    if ( !aPolylineObj.IsNull())
+    { 
+      aPolylineName = aPolylineObj->GetName();
+      if ( !aPolylineName.isEmpty() && !theList.contains(aPolylineName) )
+      {
+        theList.append( aPolylineName );
+        theEntryList.append(HYDROGUI_DataObject::dataObjectEntry( aPolylineObj ));
+      }
+    }
+  }
 }
 
 void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
@@ -214,15 +247,12 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
   connect( aPanel, SIGNAL( addGroups() ), SLOT( onAddGroups() ) );
   connect( aPanel, SIGNAL( removeGroups() ), SLOT( onRemoveGroups() ) );
 
-  connect( aPanel, SIGNAL( changeLandCoverMode( int ) ), SLOT( onChangeLandCoverMode( int ) ) );
-  connect( aPanel, SIGNAL( addLandCovers() ), SLOT( onAddLandCovers() ) );
-  connect( aPanel, SIGNAL( removeLandCovers() ), SLOT( onRemoveLandCovers() ) );
-  
   connect( aPanel, SIGNAL( orderChanged( bool& ) ), SLOT( onOrderChanged( bool& ) ) );
-  connect( aPanel, SIGNAL( orderLandCoverChanged( bool& ) ), SLOT( onOrderLandCoverChanged( bool& ) ) );
-    
+
+  connect( aPanel, SIGNAL( ruleChanged( bool& ) ), SLOT( onRuleChanged( bool& ) ) );
+
   connect( aPanel, SIGNAL( Next( const int ) ), SLOT( onNext( const int ) ) );
-  connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onBack( const int ) ) );
+  connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onHideZones( const int ) ) );
   //connect( aPanel, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onSelected( SUIT_DataObject* ) ) );
   connect( aPanel, SIGNAL( setMergeType( int, QString& ) ), SLOT( onSetMergeType( int, QString& ) ) );
   connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>& ) ),
@@ -233,13 +263,16 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
     SLOT( onClickedInZonesBrowser( SUIT_DataObject* ) ) );
   connect( aPanel, SIGNAL( objectsSelected() ), 
            SLOT( onObjectsSelected() ) );
-  connect( aPanel, SIGNAL( landCoversSelected() ), 
-           SLOT( onLandCoversSelected() ) );
+  connect( aPanel, SIGNAL( landCoverMapSelected( const QString & ) ), 
+           SLOT( onLandCoverMapSelected( const QString & ) ) );
   connect( aPanel, SIGNAL( boundarySelected( const QString & ) ), 
     SLOT( onBoundarySelected( const QString & ) ) );
   connect( aPanel, SIGNAL( StricklerTableSelected( const QString & ) ), 
     SLOT( onStricklerTableSelected( const QString & ) ) );
 
+  connect( aPanel, SIGNAL( regenerateColors() ), this, 
+    SLOT( onRegenerateColors() ) );
+
   return aPanel;
 }
 
@@ -286,25 +319,12 @@ void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjNa
 {
   bool anIsToUpdateViewer = false;
 
-  // Remove old presentations of land covers from the operation viewer  
-  Handle(HYDROData_Entity) anEntity;
-  Handle(HYDROData_LandCover) aLandCover;
-  HYDROData_SequenceOfObjects aLandCovers;
-  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers();
-  HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
-  for ( ; anIter.More(); anIter.Next() )
+  // Remove old presentation of land cover map from the operation viewer  
+  Handle(HYDROData_LandCoverMap) aLandCoverMap = myEditedObject->GetLandCoverMap();
+  if ( !aLandCoverMap.IsNull() )
   {
-    anEntity = anIter.Value();
-    if ( !anEntity.IsNull() )
-    {
-      aLandCover = Handle(HYDROData_LandCover)::DownCast( anEntity );
-      if ( !aLandCover.IsNull() )
-      {
-        aLandCovers.Append( aLandCover );
-        setObjectVisibility( aLandCover, false );
-        anIsToUpdateViewer = true;
-      }
-    }
+    setObjectVisibility( aLandCoverMap, false );
+    anIsToUpdateViewer = true;
   }
 
   // Set the selected Strickler table to the calculation case
@@ -322,19 +342,10 @@ void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjNa
         Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
         if ( !aCtx.IsNull() )
         {
-          HYDROData_SequenceOfObjects::Iterator anIter( aLandCovers );
-          for ( ; anIter.More(); anIter.Next() )
+          if ( !aLandCoverMap.IsNull() )
           {
-            anEntity = anIter.Value();
-            if ( !anEntity.IsNull() )
-            {
-              aLandCover = Handle(HYDROData_LandCover)::DownCast( anEntity );
-              if ( !aLandCover.IsNull() )
-              {
-                setObjectVisibility( aLandCover, true );
-                anIsToUpdateViewer = true;
-              }
-            }
+            setObjectVisibility( aLandCoverMap, true );
+            anIsToUpdateViewer = true;
           }          
         }
       }
@@ -386,45 +397,27 @@ void HYDROGUI_CalculationOp::onObjectsSelected()
     aLastShape->update( true, false );
 }
 
-void HYDROGUI_CalculationOp::onLandCoversSelected()
+void HYDROGUI_CalculationOp::onLandCoverMapSelected( const QString & theObjName )
 {
-  HYDROGUI_CalculationDlg* aPanel = 
-    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-
-  QStringList aSelectedObjs = aPanel->getSelectedLandCovers();
-  QMap<QString, bool> aSelectedObjsMap;
-  foreach( QString aName, aSelectedObjs )
-    aSelectedObjsMap[aName] = true;
-
+  bool anIsToUpdateViewer = false;
+  
+  // Remove old presentation of land cover map from the operation viewer  
+  Handle(HYDROData_LandCoverMap) aPrevLandCoverMap = myEditedObject->GetLandCoverMap();
+  if ( !aPrevLandCoverMap.IsNull() )
+  {
+    setObjectVisibility( aPrevLandCoverMap, false );
+    anIsToUpdateViewer = true;
+  }
 
-  // Select the appropriate land cover shape in the viewer
+  // Select the appropriate land cover map shape in the viewer
   selectionMgr()->clearSelected();
 
-  // Unhighlight all land covers except selected
-  HYDROGUI_Shape* aShape = 0, *aLastShape = 0;
-  Handle(HYDROData_Entity) anEntity;
-  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCovers();
-  HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
-  bool isSelected;
-  QString aName;
-  for ( ; anIter.More(); anIter.Next() )
-  {
-    anEntity = anIter.Value();
-    if ( !anEntity.IsNull() )
-    {
-      aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anEntity );
-      if ( aShape )
-      {
-        aName = anEntity->GetName();
-        isSelected = aSelectedObjsMap.contains( aName );
-        aShape->highlight( isSelected, false );
-        aShape->update( false, false );
-        aLastShape = aShape;
-      }
-    }
-  }
-  if( aLastShape )
-    aLastShape->update( true, false );
+  // Set the selected land cover map to the calculation case
+  Handle(HYDROData_LandCoverMap) aNewLandCoverMap = Handle(HYDROData_LandCoverMap)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_LAND_COVER_MAP ) );
+  myEditedObject->SetLandCoverMap( aNewLandCoverMap );
+
+  createPreview( true );
 }
 
 void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem )
@@ -460,7 +453,8 @@ void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem )
   }
 }
 
-void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, const QList<SUIT_DataObject*>& theZonesList )
+void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem,
+                                          const QList<SUIT_DataObject*>& theZonesList )
 {
   HYDROGUI_Region* aRegion = dynamic_cast<HYDROGUI_Region*>(theRegionItem);
   if ( aRegion )
@@ -482,41 +476,27 @@ void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, const
       HYDROGUI_CalculationDlg* aPanel = 
         ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
       if ( aPanel )
-      {
         aPanel->refreshZonesBrowser();
-      }
-      createPreview();
+      createPreview( false );
     }
   }
 }
 
 void HYDROGUI_CalculationOp::onCreateRegion( const QList<SUIT_DataObject*>& theZonesList )
 {
-  QList<HYDROGUI_Zone*> aZonesList;
-  HYDROGUI_Zone* aZone;
-  // Get a list of dropped zones
-  for ( int i = 0; i < theZonesList.length(); i++ )
-  {
-    aZone = dynamic_cast<HYDROGUI_Zone*>( theZonesList.at( i ) );
-    if ( aZone )
-    {
-      aZonesList.append( aZone );
-    }
-  }
-  if ( aZonesList.length() > 0 )
+  if ( createRegion( theZonesList ) )
   {
-    module()->getDataModel()->createNewRegion( myEditedObject, aZonesList );
     HYDROGUI_CalculationDlg* aPanel = 
       ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
     if ( aPanel )
     {
       aPanel->refreshZonesBrowser();
     }
-    createPreview();
+    createPreview( false );
   }
 }
 
-void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltitudeName )
+void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theMergeObjectName )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
@@ -525,7 +505,7 @@ void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltit
     HYDROGUI_Zone* aZone = aPanel->getCurrentZone();
     if ( aZone )
     {
-      aZone->setMergeType( theMergeType, theAltitudeName );
+      aZone->setMergeType( theMergeType, theMergeObjectName );
       HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
       if ( aShape )
       {
@@ -560,10 +540,21 @@ void HYDROGUI_CalculationOp::onAddObjects()
       anAddedList.append( anObject->GetName() );
   }
 
+  for (int i = 0; i < aSelectedList.length(); i++)
+  {
+    Handle(HYDROData_PolylineXY) aPoly = Handle(HYDROData_PolylineXY)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
+    if ( aPoly.IsNull() )
+      continue;
+
+    if ( myEditedObject->AddInterPoly( aPoly ) )
+      anAddedList.append( aPoly->GetName() );
+  }
+
   if ( !anAddedList.isEmpty() )
   {
     aPanel->includeGeomObjects( anAddedList );
-    createPreview();
+    createPreview( false );
   }
 }
 
@@ -590,6 +581,17 @@ void HYDROGUI_CalculationOp::onRemoveObjects()
     myEditedObject->RemoveGeometryObject( anObject );
   }
 
+  for (int i = 0; i < aSelectedList.length(); i++)
+  {
+    Handle(HYDROData_PolylineXY) aPoly = Handle(HYDROData_PolylineXY)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) );
+    if ( aPoly.IsNull() )
+      continue;
+
+    setObjectVisibility( aPoly, false );
+    myEditedObject->RemoveInterPolyObject ( aPoly ); 
+  }
+
   module()->update( UF_OCCViewer );
   aPanel->excludeGeomObjects( aSelectedList );
 }
@@ -597,7 +599,7 @@ void HYDROGUI_CalculationOp::onRemoveObjects()
 bool HYDROGUI_CalculationOp::confirmRegionsChange() const
 {
   // Check if the case is already modified or not
-  bool isConfirmed = myEditedObject->IsMustBeUpdated();
+  bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
   if ( !isConfirmed )
   {
     // If not modified check if the case has already defined regions with zones
@@ -622,7 +624,7 @@ bool HYDROGUI_CalculationOp::confirmRegionsChange() const
 bool HYDROGUI_CalculationOp::confirmOrderChange() const
 {
   // Check if the case is already modified or not
-  bool isConfirmed = myEditedObject->IsMustBeUpdated();
+  bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
   if ( !isConfirmed )
   {
     // If not modified check if the case has already defined regions with zones
@@ -644,10 +646,35 @@ bool HYDROGUI_CalculationOp::confirmOrderChange() const
   return isConfirmed;
 }
 
+bool HYDROGUI_CalculationOp::confirmRuleChange() const
+{
+  // Check if the case is already modified or not
+  bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
+  if ( !isConfirmed )
+  {
+    // If not modified check if the case has already defined regions with zones
+    HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
+    if ( aSeq.Length() > 0 )
+    {
+      // If there are already defined zones then ask a user to confirm zones recalculation
+      isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
+                               tr( "RULE_CHANGED" ),
+                               tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION_REGIONS" ),
+                               QMessageBox::Yes | QMessageBox::No,
+                               QMessageBox::No ) == QMessageBox::Yes );
+    }
+    else
+    {
+      isConfirmed = true; // No regions - no zones - nothing to recalculate
+    }
+  }
+  return isConfirmed;
+}
+
 bool HYDROGUI_CalculationOp::confirmModeChange() const
 {
   // Check if the case is already modified or not
-  bool isConfirmed = myEditedObject->IsMustBeUpdated();
+  bool isConfirmed = myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d );
   if ( !isConfirmed )
   {
     // If not modified check if the case has already defined regions with zones
@@ -698,58 +725,6 @@ bool HYDROGUI_CalculationOp::confirmContinueWithWarning( const HYDROData_Warning
   return ( anAnswer == QMessageBox::Yes );
 }
 
-bool HYDROGUI_CalculationOp::confirmLandCoverModeChange() const
-{
-  // Check if the case is already modified or not
-  bool isConfirmed = myEditedObject->IsMustBeUpdated();
-  if ( !isConfirmed )
-  {
-    // If not modified check if the case has already defined regions with zones
-    // TODO: adapt HYDROData_CalculationCase class to process regions constructed for land covers
-    /*HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCoverRegions();
-    if ( aSeq.Length() > 0 )
-    {*/
-      // If there are already defined zones then ask a user to confirm zones recalculation
-      isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
-                               tr( "MODE_CHANGED" ),
-                               tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_MODE" ),
-                               QMessageBox::Yes | QMessageBox::No,
-                               QMessageBox::No ) == QMessageBox::Yes );
-    /*}
-    else
-    {
-      isConfirmed = true; // No regions - no zones - nothing to recalculate
-    }*/
-  }
-  return isConfirmed;
-}
-
-bool HYDROGUI_CalculationOp::confirmLandCoverOrderChange() const
-{
-  // Check if the case is already modified or not
-  bool isConfirmed = myEditedObject->IsMustBeUpdated();
-  if ( !isConfirmed )
-  {
-    // If not modified check if the case has already defined regions with zones
-    // TODO: adapt HYDROData_CalculationCase class to process regions constructed for land covers
-    /*HYDROData_SequenceOfObjects aSeq = myEditedObject->GetLandCoverRegions();
-    if ( aSeq.Length() > 0 )
-    {*/
-      // If there are already defined zones then ask a user to confirm zones recalculation
-      isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
-                               tr( "ORDER_CHANGED" ),
-                               tr( "CONFIRM_LAND_COVER_PARTITION_RECALCULATION_REGIONS" ),
-                               QMessageBox::Yes | QMessageBox::No,
-                               QMessageBox::No ) == QMessageBox::Yes );
-    /*}
-    else
-    {
-      isConfirmed = true; // No regions - no zones - nothing to recalculate
-    }*/
-  }
-  return isConfirmed;
-}
-
 bool HYDROGUI_CalculationOp::processApply( int&     theUpdateFlags,
                                            QString& theErrorMsg,
                                            QStringList& theBrowseObjectsEntries )
@@ -769,9 +744,6 @@ bool HYDROGUI_CalculationOp::processApply( int&     theUpdateFlags,
   if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL ) {
     myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, false );
   }
-  if ( aPanel->getLandCoverMode() == HYDROData_CalculationCase::MANUAL ) {
-    myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules, false );
-  }
  
   theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
 
@@ -845,23 +817,57 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
   }
   else if( theIndex==2 )
   {
-    // Land covers panel
+    // Land cover map panel
      HYDROGUI_CalculationDlg* aPanel = 
       ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
     if ( !aPanel )
       return;
 
+    setLandCoverMapVisible( true );
+
     QStringList aList;
     QStringList anEntryList;
-    HYDROData_SequenceOfObjects aSeq;
 
+    // Get all land cover map objects to fill in combo-box
+    Handle(HYDROData_LandCoverMap) aLandCoverMapObj;
+    QString aLandCoverMapName;
+
+    aList.clear();
+    anEntryList.clear();
+    HYDROData_Iterator anIter( doc(), KIND_LAND_COVER_MAP );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      aLandCoverMapObj = Handle(HYDROData_LandCoverMap)::DownCast( anIter.Current() );
+
+      if ( !aLandCoverMapObj.IsNull() )
+      { 
+        aLandCoverMapName = aLandCoverMapObj->GetName();
+        if ( !aLandCoverMapName.isEmpty() )
+        {
+          aList.append( aLandCoverMapName );
+          anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aLandCoverMapObj ) );
+        }
+      }
+    }
+    aPanel->setLandCoverMapsNames( aList, anEntryList );
+    aLandCoverMapObj = myEditedObject->GetLandCoverMap();
+    if ( !aList.isEmpty() )
+    {
+      if ( aLandCoverMapObj.IsNull() )
+        aPanel->setLandCoverMap( aList.at( 0 ), false );
+      else if ( myIsEdit )
+        aPanel->setLandCoverMap( aList.at( 0 ), true );
+      else
+        aPanel->setLandCoverMap( aList.at( aList.indexOf( aLandCoverMapObj->GetName() ) ), true );
+    }
+
+    // Get all Strickler table objects to fill in combo-box
     Handle(HYDROData_StricklerTable) aStricklerTableObj;
     QString aStricklerTableName;
 
-    // Get all Strickler table objects to fill in combo-box
     aList.clear();
     anEntryList.clear();
-    HYDROData_Iterator anIter( doc(), KIND_STRICKLER_TABLE );      
+    anIter = HYDROData_Iterator( doc(), KIND_STRICKLER_TABLE );
     for ( ; anIter.More(); anIter.Next() )
     {
       aStricklerTableObj = Handle(HYDROData_StricklerTable)::DownCast( anIter.Current() );
@@ -877,19 +883,11 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       }
     }
     aPanel->setStricklerTableNames( aList, anEntryList );
+    //@ASL: bool anUpdateState = myEditedObject->IsMustBeUpdated();
     if ( !aList.isEmpty() )
       aPanel->setStricklerTable( aList.at( 0 ), false );
+    //@ASL: myEditedObject->SetToUpdate( anUpdateState );
 
-    // Fill in list widget with all available land covers
-    aSeq = HYDROGUI_Tool::GetLandCovers( module() );
-    getNamesAndEntries( aSeq, aList, anEntryList );
-    aPanel->setAllLandCovers( aList, anEntryList );
-
-    // Set list of included land covers
-    aSeq = myEditedObject->GetLandCovers();
-    getNamesAndEntries( aSeq, aList, anEntryList );
-    aPanel->includeLandCovers( aList, true );
-    
     if ( !myEditedObject.IsNull() )
     {
       if ( myIsEdit )
@@ -906,17 +904,21 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
           aPanel->setStricklerTable( aStricklerTableName );
         }
 
-        // Set mode (Auto or Manual) to defined priority of land covers
-        aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() );
-
-        // Set rules defined on land covers
-        setRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules );
-      }
-      else
-      {
-        myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getLandCoverMode() );
+        // Select the certain land cover map object in combo-box
+        if ( aLandCoverMapObj.IsNull() )
+        {
+          aPanel->setLandCoverMap( QString() );
+        }
+        else
+        {
+          aLandCoverMapName = aLandCoverMapObj->GetName();
+          aPanel->setLandCoverMap( aLandCoverMapName );
+        }
       }
     }
+
+    closePreview( false );
+    createPreview( true );
   }
   else if( theIndex==3 )
   {
@@ -928,7 +930,8 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
     QApplication::setOverrideCursor( Qt::WaitCursor );
 
     setGeomObjectsVisible( false );
-  
+    setLandCoverMapVisible( false );
+
     QString aNewCaseName = aPanel->getObjectName();
     QString anOldCaseName = myEditedObject->GetName();
     bool isNameChanged = anOldCaseName != aNewCaseName;
@@ -939,12 +942,12 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
     // automatic names generation for regions and zones
     myEditedObject->SetName( aNewCaseName );
     
-    // Set parameters for automatic mode
+    // Zones: set parameters for automatic mode
     int aMode = aPanel->getMode();
     if ( aMode == HYDROData_CalculationCase::AUTOMATIC )
     {
       // Set objects in the specified order
-      if( myEditedObject->IsMustBeUpdated() )
+      if( myEditedObject->IsMustBeUpdated(  HYDROData_Entity::Geom_2d ) )
       {
         myEditedObject->RemoveGeometryObjects();
         foreach ( const QString& aName, aPanel->getAllGeomObjects() )
@@ -971,8 +974,8 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       }
     }
     aPanel->setEditZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
-         
-    if ( myEditedObject->IsMustBeUpdated() )
+
+    if ( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) )
     {
       myShowZones = true;
       myEditedObject->Update();
@@ -982,15 +985,14 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       //aPanel->setEditedObject( myEditedObject );
       aPanel->refreshZonesBrowser();
     
-      closePreview();
-      createPreview();
+      closePreview( false );
+      createPreview( false );
 
       anIsToUpdateOb = true;
-
-      myEditedObject->SetToUpdate( true );
     }
     else
     {
+      // Show zones
       setZonesVisible( true );
 
       if ( isNameChanged ) {
@@ -998,67 +1000,41 @@ void HYDROGUI_CalculationOp::onNext( const int theIndex )
       }
     }
 
-    // Move this code to processing od the last panel (see below)
-    if ( anIsToUpdateOb ) {
-      SUIT_DataBrowser* anObjBrowser = ((LightApp_Application*)module()->application())->objectBrowser();
-      if ( anObjBrowser ) {
-        anObjBrowser->updateTree( module()->getDataModel()->getDataObject( myEditedObject ), false );
-      }
-    }
-
     QApplication::restoreOverrideCursor();
+  }  
+}
+
+void HYDROGUI_CalculationOp::onHideZones( const int theIndex )
+{
+  if( theIndex==1 )
+  {
+    setGeomObjectsVisible( true );
+
+    closePreview( false );
+    createPreview( false );
   }
-  else if( theIndex==4 )
+  if( theIndex==2 )
   {
-    // Partition of Land covers panel
-    HYDROGUI_CalculationDlg* aPanel = 
-      ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-    if ( !aPanel )
-      return;
+    setLandCoverMapVisible( true );
 
-    QApplication::setOverrideCursor( Qt::WaitCursor );
+    closePreview( false );
+    createPreview( true );
 
-    // Set parameters for automatic mode
-    int aMode = aPanel->getLandCoverMode();
-    if ( aMode == HYDROData_CalculationCase::AUTOMATIC )
-    {
-      // Set objects in the specified order
-      if( myEditedObject->IsMustBeUpdated() )
-      {
-        myEditedObject->RemoveLandCovers();
-        foreach ( const QString& aName, aPanel->getAllLandCovers() )
-        {
-          Handle(HYDROData_LandCover) aLandCover = Handle(HYDROData_LandCover)::DownCast( 
-            HYDROGUI_Tool::FindObjectByName( module(), aName ) );
-          if ( aLandCover.IsNull() )
-          {
-            continue;
-          }
-          myEditedObject->AddLandCover( aLandCover );
-        }
+    // Hide zones
+    setZonesVisible( false );
+  }
+  else if( theIndex==3 )
+  {
+    AssignDefaultZonesColors();
 
-        // Clear priority rules
-        myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomLandCoverRules, true );
-        // Set priority rules
-        foreach ( const HYDROData_CustomRule& aRule, aPanel->getLandCoverRules() ) {
-          myEditedObject->AddRule( aRule.Object1, aRule.Priority,
-                                   aRule.Object2, HYDROData_Zone::Merge_Object,
-                                   HYDROData_CalculationCase::DataTag_CustomLandCoverRules );
-        }
-      }
-    }
-    aPanel->setEditLandCoversEnabled( aMode == HYDROData_CalculationCase::MANUAL );
+    closePreview( false );
+    createPreview( false );
 
-    QApplication::restoreOverrideCursor();
+    // Show zones
+    setZonesVisible( true );
   }
 }
 
-void HYDROGUI_CalculationOp::onBack( const int theIndex )
-{
-  setGeomObjectsVisible( theIndex != 2 );
-  setZonesVisible( false );
-}
-
 void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
 {
   myShowZones = theIsVisible;
@@ -1105,6 +1081,12 @@ void HYDROGUI_CalculationOp::setGeomObjectsVisible( bool theIsVisible )
   }
 }
 
+void HYDROGUI_CalculationOp::setLandCoverMapVisible( bool theIsVisible )
+{
+  myShowLandCoverMap = theIsVisible;
+  setObjectVisibility( myEditedObject->GetLandCoverMap(), theIsVisible );  
+}
+
 void HYDROGUI_CalculationOp::AssignDefaultZonesColors()
 {
   HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
@@ -1150,30 +1132,14 @@ QColor HYDROGUI_CalculationOp::GenerateDefaultZonesColor( int theIndex,
                                                           float theSaturation/* = 0.5*/,
                                                           float theValue/* = 0.95*/ ) const
 {
-  float aGoldenRatioConjugate = (float)(360./582.);
-  float aHue = (float)(rand()%100);
-  aHue += aGoldenRatioConjugate*theIndex;
-  aHue -= floor(aHue);
-
-  float aR = 0., aG = 0., aB = 0.;
-  int aHueInt = (int)(aHue*6.);
-  float aF = aHue*6. - aHueInt;
-  float aP = theValue * (1. - theSaturation);
-  float aQ = theValue * (1. - aF*theSaturation);
-  float aT = theValue * (1. - (1. - aF) * theSaturation);
-  switch (aHueInt)
-  {
-  case 0: { aR = theValue; aG = aT; aB = aP; break; }
-  case 1: { aR = aQ; aG = theValue; aB = aP; break; }
-  case 2: { aR = aP; aG = theValue; aB = aT; break; }
-  case 3: { aR = aP; aG = aQ; aB = theValue; break; }
-  case 4: { aR = aT; aG = aP; aB = theValue; break; }
-  case 5: { aR = theValue; aG = aP; aB = aQ; break; }
-  default: break;
-  }
-
-  QColor aColor = QColor( (int)(aR*256.), (int)(aG*256.), (int)(aB*256.) );
-  return ( aColor.isValid() ? aColor : HYDROData_ImmersibleZone::DefaultFillingColor() );
+  float aHue = ( rand()%1000 ) * 0.001f;
+
+  QColor aColor;
+  aColor.setHsl( (int)(aHue*255.), 128, 128 );
+  int r = aColor.red();
+  int g = aColor.green();
+  int b = aColor.blue();
+  return ( aColor.isValid() ? aColor : Qt::darkBlue );
 }
 
 void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDataTag )
@@ -1186,7 +1152,7 @@ void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDat
   HYDROData_ListOfRules aRules;
   Handle(HYDROData_Entity) anObject1, anObject2;
   HYDROData_PriorityType aPriority;
-  HYDROData_Zone::MergeAltitudesType aMergeType;
+  HYDROData_Zone::MergeType aMergeType;
   HYDROData_CalculationCase::DataTag aDataTag = HYDROData_CalculationCase::DataTag_CustomRules;
   for ( int anIndex = 0; ; anIndex++ )
   {
@@ -1204,20 +1170,49 @@ void HYDROGUI_CalculationOp::setRules( HYDROData_CalculationCase::DataTag theDat
   }
 
   if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomRules )
-    aPanel->setRules( aRules );
-  else if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomLandCoverRules )
-    aPanel->setLandCoverRules( aRules );
+    aPanel->setRules( aRules );  
+}
+
+bool HYDROGUI_CalculationOp::createRegion( const QList<SUIT_DataObject*>& theZonesList )
+{
+  bool aRetValue = false;
+
+  QList<HYDROGUI_Zone*> aZonesList;
+  HYDROGUI_Zone* aZone;
+  // Get a list of dropped zones
+  for ( int i = 0; i < theZonesList.length(); i++ )
+  {
+    aZone = dynamic_cast<HYDROGUI_Zone*>( theZonesList.at( i ) );
+    if ( aZone )
+    {
+      aZonesList.append( aZone );
+    }
+  }
+  if ( aZonesList.length() > 0 )
+  {
+    module()->getDataModel()->createNewRegion( myEditedObject, aZonesList );
+    aRetValue = true;
+  }
+   
+  return aRetValue;
 }
 
-void HYDROGUI_CalculationOp::createPreview()
+void HYDROGUI_CalculationOp::createPreview( const bool theLandCoverMap )
 {
   LightApp_Application* anApp = module()->getApp();
   HYDROData_SequenceOfObjects aSeq;
-  if ( myShowGeomObjects )
+  if ( theLandCoverMap && myShowLandCoverMap )
+  {
+    aSeq.Append( myEditedObject->GetLandCoverMap() );
+  }
+  else if ( !theLandCoverMap && myShowGeomObjects )
   {
-    HYDROData_SequenceOfObjects aGeomObj = myEditedObject->GetGeometryObjects();
-    aSeq.Append( aGeomObj );
+    HYDROData_SequenceOfObjects aSeqGO = myEditedObject->GetGeometryObjects();
+    HYDROData_SequenceOfObjects aSeqP = myEditedObject->GetInterPolyObjects();
+    aSeq.Append( aSeqGO );
+    aSeq.Append( aSeqP );
   }
+
   Handle(HYDROData_Entity) anEntity;
 
   if ( myShowZones )
@@ -1243,7 +1238,8 @@ void HYDROGUI_CalculationOp::createPreview()
   }
 
   // Get a boundary polyline if any
-  aSeq.Append( myEditedObject->GetBoundaryPolyline() );
+  if (Handle(HYDROData_PolylineXY) aBPoly = myEditedObject->GetBoundaryPolyline())
+    aSeq.Append( aBPoly );
 
   module()->removeViewShapes( HYDROGUI_Module::VMR_PreviewCaseZones );
 
@@ -1280,16 +1276,19 @@ void HYDROGUI_CalculationOp::createPreview()
       HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
       for ( ; anIter.More(); anIter.Next() )
       {
-        setObjectVisibility( anIter.Value(), true );
+        const Handle(HYDROData_Entity)& ent = anIter.Value();
+        if (!ent.IsNull())
+          setObjectVisibility( ent, true );
       }
 
       //Process the draw events for viewer
       QApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
-      if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
-        vw->onTopView();
     }
 
     module()->update( UF_OCCViewer | UF_FitAll );
+
+    if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
+      vw->onTopView();
   }
 }
 
@@ -1310,7 +1309,7 @@ void HYDROGUI_CalculationOp::onLastViewClosed( SUIT_ViewManager* theViewManager
   closePreview();
 }
 
-void HYDROGUI_CalculationOp::closePreview()
+void HYDROGUI_CalculationOp::closePreview( bool theRemoveViewManager )
 {
   SUIT_DataBrowser* aOb = ((LightApp_Application*)module()->application())->objectBrowser();
   QList<QShortcut*> aShortcuts = aOb->findChildren<QShortcut*>();
@@ -1341,14 +1340,17 @@ void HYDROGUI_CalculationOp::closePreview()
       }
     }
 
-    disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
-                this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
+    if ( theRemoveViewManager )
+    {
+      disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
+                  this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
 
-    module()->getApp()->removeViewManager( myPreviewViewManager ); // myPreviewViewManager is deleted here
-    myPreviewViewManager = NULL;
+      module()->getApp()->removeViewManager( myPreviewViewManager ); // myPreviewViewManager is deleted here
+      myPreviewViewManager = NULL;
+    }
   }
 
-  if( myActiveViewManager )
+  if( myActiveViewManager && theRemoveViewManager )
   {
     HYDROGUI_Tool::SetActiveViewManager( module(), myActiveViewManager );
     myActiveViewManager = NULL;
@@ -1369,15 +1371,15 @@ void HYDROGUI_CalculationOp::setAvailableGroups()
   HYDROData_SequenceOfObjects anObjs = myEditedObject->GetGeometryObjects();
   for( int anIndex = 1, aLength = anObjs.Length(); anIndex <= aLength; anIndex++ )
   {
-    Handle_HYDROData_Object anObj = Handle_HYDROData_Object::DownCast( anObjs.Value( anIndex ) );
+    Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( anObjs.Value( anIndex ) );
     HYDROData_SequenceOfObjects aGroups = anObj->GetGroups();
     for( int aGIndex = 1, aGLength = aGroups.Length(); aGIndex <= aGLength; aGIndex++ )
     {
-      Handle_HYDROData_ShapesGroup aGroup = Handle_HYDROData_ShapesGroup::DownCast( aGroups.Value( aGIndex ) );
+      Handle(HYDROData_ShapesGroup) aGroup = Handle(HYDROData_ShapesGroup)::DownCast( aGroups.Value( aGIndex ) );
       aGroupsNames.append( aGroup->GetName() );
     }
   }
-  if( myEditedObject->IsMustBeUpdated() ) {
+  if( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_2d ) ) {
     for( int anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ ) {
       Handle(HYDROData_ShapesGroup) aGeomGroup =
         Handle(HYDROData_ShapesGroup)::DownCast( aSeq.Value( anIndex ) );
@@ -1390,7 +1392,7 @@ void HYDROGUI_CalculationOp::setAvailableGroups()
   aPanel->setAvailableGroups( aGroupsNames );
   aPanel->includeGroups( aList );
 
-  bool isUpdated = myEditedObject->IsMustBeUpdated();
+  //@ASL: bool isUpdated = myEditedObject->IsMustBeUpdated();
 }
 
 void HYDROGUI_CalculationOp::onAddGroups()
@@ -1448,81 +1450,6 @@ void HYDROGUI_CalculationOp::onRemoveGroups()
   aPanel->excludeGroups( aSelectedList );
 }
 
-void HYDROGUI_CalculationOp::onChangeLandCoverMode( int theMode )
-{
-  HYDROGUI_CalculationDlg* aPanel = 
-    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-  if ( !aPanel )
-    return;
-
-  if ( !confirmLandCoverModeChange() ) {
-    aPanel->setLandCoverMode( myEditedObject->GetAssignmentLandCoverMode() );
-    return;
-  }
-
-  myEditedObject->SetAssignmentLandCoverMode( (HYDROData_CalculationCase::AssignmentMode)theMode );
-  aPanel->setLandCoverMode( theMode );
-}
-
-void HYDROGUI_CalculationOp::onAddLandCovers()
-{
-  HYDROGUI_CalculationDlg* aPanel = 
-    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-  if ( !aPanel )
-    return;
-
-  // Add land covers selected in the module browser to the calculation case
-  QStringList aSelectedList = aPanel->getSelectedAvailableLandCovers();
-  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
-    return;
-
-  QStringList anAddedList;
-  for (int i = 0; i < aSelectedList.length(); i++)
-  {
-    Handle(HYDROData_LandCover) anObject = Handle(HYDROData_LandCover)::DownCast( 
-      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
-    if ( anObject.IsNull() )
-      continue;
-
-    if ( myEditedObject->AddLandCover( anObject ) )
-      anAddedList.append( anObject->GetName() );
-  }
-
-  if ( !anAddedList.isEmpty() )
-  {
-    aPanel->includeLandCovers( anAddedList, false );
-    // TODO: create preview of included land covers
-    //createPreview();
-  }
-}
-
-void HYDROGUI_CalculationOp::onRemoveLandCovers()
-{
-  // Remove selected objects from the calculation case
-  HYDROGUI_CalculationDlg* aPanel = 
-    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-  if ( !aPanel )
-    return;
-
-  QStringList aSelectedList = aPanel->getSelectedLandCovers();
-  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
-    return;
-
-  for (int i = 0; i < aSelectedList.length(); i++)
-  {
-    Handle(HYDROData_LandCover) anObject = Handle(HYDROData_LandCover)::DownCast( 
-      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) );
-    if ( anObject.IsNull() )
-      continue;
-
-    setObjectVisibility( anObject, false );
-    myEditedObject->RemoveLandCover( anObject );
-  }
-
-  module()->update( UF_OCCViewer );
-  aPanel->excludeLandCovers( aSelectedList );
-}
-
 void HYDROGUI_CalculationOp::onChangeMode( int theMode )
 {
   HYDROGUI_CalculationDlg* aPanel = 
@@ -1548,17 +1475,25 @@ void HYDROGUI_CalculationOp::onOrderChanged( bool& isConfirmed )
 
   isConfirmed = confirmOrderChange();
   if( isConfirmed )
-    myEditedObject->SetToUpdate( true );
+    myEditedObject->Changed( HYDROData_Entity::Geom_2d );
 }
 
-void HYDROGUI_CalculationOp::onOrderLandCoverChanged( bool& isConfirmed )
+void HYDROGUI_CalculationOp::onRuleChanged( bool& isConfirmed )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
   if ( !aPanel )
     return;
 
-  isConfirmed = confirmLandCoverOrderChange();
+  isConfirmed = confirmRuleChange();
   if( isConfirmed )
-    myEditedObject->SetToUpdate( true );
+    myEditedObject->Changed( HYDROData_Entity::Geom_2d );
+}
+
+void HYDROGUI_CalculationOp::onRegenerateColors()
+{
+  // For geometry zones
+  AssignDefaultZonesColors();
+  setZonesVisible( false );
+  setZonesVisible( true );
 }