Salome HOME
refs #669, #677: selection of land covers in extended mode without pressing Shift...
[modules/hydro.git] / src / HYDROGUI / HYDROGUI_CalculationOp.cxx
index 6fb6cfb4ab9b2ee538421a3440dbcfdf7886ad5f..01b65432010e76d407feca5feb2b3cacfef804a4 100644 (file)
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 #include "HYDROGUI_Region.h"
 
 #include <HYDROData_PolylineXY.h>
+#include <HYDROData_ShapesGroup.h>
 #include <HYDROData_Iterator.h>
+#include <HYDROData_ImmersibleZone.h>
 #include <HYDROData_Object.h>
 #include <HYDROData_Tool.h>
+#include <HYDROData_StricklerTable.h>
 
 #include <OCCViewer_ViewManager.h>
 #include <OCCViewer_ViewModel.h>
 
 #include <SUIT_MessageBox.h>
 #include <SUIT_Desktop.h>
+#include <SUIT_DataBrowser.h>
 
 #include <QApplication>
+#include <QKeySequence>
+#include <QShortcut>
 
 HYDROGUI_CalculationOp::HYDROGUI_CalculationOp( HYDROGUI_Module* theModule, bool theIsEdit )
 : HYDROGUI_Operation( theModule ),
   myIsEdit( theIsEdit ),
   myActiveViewManager( NULL ),
-  myPreviewViewManager( NULL )
+  myPreviewViewManager( NULL ),
+  myShowGeomObjects( true ),
+  myShowLandCoverMap( false ),
+  myShowZones( false )
 {
   setName( myIsEdit ? tr( "EDIT_CALCULATION" ) : tr( "CREATE_CALCULATION" ) );
 }
@@ -75,6 +80,19 @@ void HYDROGUI_CalculationOp::startOperation()
   if ( !aPanel )
     return;
 
+  SUIT_DataBrowser* aOb = ((LightApp_Application*)module()->application())->objectBrowser();
+  QList<QShortcut*> aShortcuts = aOb->findChildren<QShortcut*>();
+  QShortcut* aShortcut;
+  foreach( aShortcut, aShortcuts )
+  {
+    if ( aShortcut->key() == 
+      QKeySequence(((LightApp_Application*)module()->application())->objectBrowser()->shortcutKey( 
+      SUIT_DataBrowser::RenameShortcut ) ) )
+    {
+      aShortcut->setEnabled( false );
+    }
+  }
+
   aPanel->reset();
   QStringList aList;
   QStringList anEntryList;
@@ -116,6 +134,7 @@ void HYDROGUI_CalculationOp::startOperation()
     myEditedObject = Handle(HYDROData_CalculationCase)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
     if ( !myEditedObject.IsNull() )
     {
+      aPanel->setMode( myEditedObject->GetAssignmentMode() );
       anObjectName = myEditedObject->GetName();
       aPolylineObj = myEditedObject->GetBoundaryPolyline();
       if ( aPolylineObj.IsNull() )
@@ -127,22 +146,27 @@ void HYDROGUI_CalculationOp::startOperation()
         aPolylineName = aPolylineObj->GetName();
         aPanel->setBoundary( aPolylineName );
       }
+
       aSeq = myEditedObject->GetGeometryObjects();
       getNamesAndEntries( aSeq, aList, anEntryList );
       aPanel->includeGeomObjects( aList );
+
+      // set rules
+      setRules( HYDROData_CalculationCase::DataTag_CustomRules );      
     }
   }
   else
   {
     myEditedObject =
       Handle(HYDROData_CalculationCase)::DownCast( doc()->CreateObject( KIND_CALCULATION ) );
-    myEditedObject->SetName(anObjectName);
+    myEditedObject->SetName( anObjectName );
+    myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getMode() );
   }
 
   aPanel->setObjectName( anObjectName );
   aPanel->setEditedObject( myEditedObject );
 
-  createPreview();
+  createPreview( false );
 }
 
 void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
@@ -155,8 +179,8 @@ void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjec
   for ( ; anIter.More(); anIter.Next() )
   {
     Handle(HYDROData_Entity) anEntity = anIter.Value();
-    if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
-      continue;
+    //if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
+    //  continue;
 
     theNames.append( anEntity->GetName() );
     theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anEntity ) );
@@ -169,6 +193,7 @@ void HYDROGUI_CalculationOp::abortOperation()
   // Abort transaction
   abortDocOperation();
   HYDROGUI_Operation::abortOperation();
+  module()->getApp()->updateObjectBrowser();
 }
 
 void HYDROGUI_CalculationOp::commitOperation()
@@ -184,77 +209,137 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
   HYDROGUI_CalculationDlg* aPanel = new HYDROGUI_CalculationDlg( module(), getName() );
 
   // Connect signals and slots
+  connect( aPanel, SIGNAL( changeMode( int ) ), SLOT( onChangeMode( int ) ) );  
   connect( aPanel, SIGNAL( addObjects() ), SLOT( onAddObjects() ) );
   connect( aPanel, SIGNAL( removeObjects() ), SLOT( onRemoveObjects() ) );
-  connect( aPanel, SIGNAL( splitZones() ), SLOT( onSplitZones() ) );
-  connect( aPanel, SIGNAL( hideZones() ), SLOT( onHideZones() ) );
-  connect( aPanel, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onSelected( SUIT_DataObject* ) ) );
+  connect( aPanel, SIGNAL( addGroups() ), SLOT( onAddGroups() ) );
+  connect( aPanel, SIGNAL( removeGroups() ), SLOT( onRemoveGroups() ) );
+
+  connect( aPanel, SIGNAL( orderChanged( bool& ) ), SLOT( onOrderChanged( 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( 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*>& ) ),
-    SLOT( onMoveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>& ) ) );
+  connect( aPanel, SIGNAL( moveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>&, bool ) ),
+    SLOT( onMoveZones( SUIT_DataObject*, const QList<SUIT_DataObject*>&, bool ) ) );
   connect( aPanel, SIGNAL( createRegion( const QList<SUIT_DataObject*>& ) ),
     SLOT( onCreateRegion( const QList<SUIT_DataObject*>& ) ) );
   connect( aPanel, SIGNAL( clickedInZonesBrowser( SUIT_DataObject* ) ),
     SLOT( onClickedInZonesBrowser( SUIT_DataObject* ) ) );
-  connect( aPanel, SIGNAL( objectSelected( const QString & ) ), 
-    SLOT( onObjectSelected( const QString & ) ) );
+  connect( aPanel, SIGNAL( objectsSelected() ), 
+           SLOT( onObjectsSelected() ) );
+  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;
 }
 
 void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName )
 {
+  bool anIsToUpdateViewer = false;
+
+  // Remove the old boundary from the operation viewer
+  Handle(HYDROData_PolylineXY) aPrevPolyline = 
+    myEditedObject->GetBoundaryPolyline();
+  if ( !aPrevPolyline.IsNull() )
+  {
+    setObjectVisibility( aPrevPolyline, false );
+    anIsToUpdateViewer = true;
+  }
+
   // Set the selected boundary polyline to the calculation case
-  Handle(HYDROData_PolylineXY) anObject;
-  Handle(AIS_InteractiveContext) aCtx;
-  if ( myPreviewViewManager ) 
+  Handle(HYDROData_PolylineXY) aNewPolyline = Handle(HYDROData_PolylineXY)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINEXY ) );
+  myEditedObject->SetBoundaryPolyline( aNewPolyline );
+
+  if ( myPreviewViewManager )
   {
-    if ( OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer() )
+    OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+    if ( aViewer )
     {
-      aCtx = aViewer->getAISContext();
+      if ( !aNewPolyline.IsNull() )
+      {
+        Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+        if ( !aCtx.IsNull() )
+        {
+          setObjectVisibility( aNewPolyline, true );
+          anIsToUpdateViewer = true;
+        }
+      }
+
+      if ( anIsToUpdateViewer )
+        module()->update( UF_OCCViewer );
     }
   }
-  // Remove the old boundary from the operation viewer
-  anObject = myEditedObject->GetBoundaryPolyline();
-  if ( !anObject.IsNull() )
-  {
-    module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anObject );
-  }
+}
+
+void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjName )
+{
+  bool anIsToUpdateViewer = false;
 
-  if ( theObjName.trimmed().isEmpty() )
+  // Remove old presentation of land cover map from the operation viewer  
+  Handle(HYDROData_LandCoverMap) aLandCoverMap = myEditedObject->GetLandCoverMap();
+  if ( !aLandCoverMap.IsNull() )
   {
-    // No polyline is selected
-    myEditedObject->RemoveBoundaryPolyline();
+    setObjectVisibility( aLandCoverMap, false );
+    anIsToUpdateViewer = true;
   }
-  else
+
+  // Set the selected Strickler table to the calculation case
+  Handle(HYDROData_StricklerTable) aNewStricklerTable = Handle(HYDROData_StricklerTable)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_STRICKLER_TABLE ) );
+  myEditedObject->SetStricklerTable( aNewStricklerTable );
+
+  if ( myPreviewViewManager )
   {
-    Handle(HYDROData_Entity) anEntity = 
-      HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINEXY );
-    if ( !anEntity.IsNull() )
+    OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+    if ( aViewer )
     {
-      anObject = Handle(HYDROData_PolylineXY)::DownCast( anEntity );
-      if ( !anObject.IsNull() )
+      if ( !aNewStricklerTable.IsNull() )
       {
-        myEditedObject->SetBoundaryPolyline( anObject );
+        Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
         if ( !aCtx.IsNull() )
         {
-          showObject( anEntity, aCtx );
+          if ( !aLandCoverMap.IsNull() )
+          {
+            setObjectVisibility( aLandCoverMap, true );
+            anIsToUpdateViewer = true;
+          }          
         }
       }
+
+      if ( anIsToUpdateViewer )
+        module()->update( UF_OCCViewer );
     }
   }
 }
 
-void HYDROGUI_CalculationOp::onObjectSelected ( const QString & theObjName )
+void HYDROGUI_CalculationOp::onObjectsSelected()
 {
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+
+  QStringList aSelectedObjs = aPanel->getSelectedGeomObjects();
+  QMap<QString, bool> aSelectedObjsMap;
+  foreach( QString aName, aSelectedObjs )
+    aSelectedObjsMap[aName] = true;
+
+
   // Select the appropriate geometry object shape in the viewer
   selectionMgr()->clearSelected();
 
   // Unhighlight all objects except selected
-  HYDROGUI_Shape* aShape;
-  HYDROGUI_Shape* aSelectedShape = 0;
+  HYDROGUI_Shape* aShape = 0, *aLastShape = 0;
   Handle(HYDROData_Entity) anEntity;
   HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryObjects();
   HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
@@ -269,27 +354,38 @@ void HYDROGUI_CalculationOp::onObjectSelected ( const QString & theObjName )
       if ( aShape )
       {
         aName = anEntity->GetName();
-        isSelected = ( aName == theObjName );
-        if ( isSelected )
-        {
-          aSelectedShape = aShape;
-        }
-        if ( aShape->isHighlighted() != isSelected )
-        {
-          if ( !isSelected )
-          {
-            aShape->highlight( isSelected );
-            aShape->update();
-          }
-        }
+        isSelected = aSelectedObjsMap.contains( aName );
+        aShape->highlight( isSelected, false );
+        aShape->update( false, false );
+        aLastShape = aShape;
       }
     }
   }
-  if ( aSelectedShape )
+  if( aLastShape )
+    aLastShape->update( true, false );
+}
+
+void HYDROGUI_CalculationOp::onLandCoverMapSelected( const QString & theObjName )
+{
+  bool anIsToUpdateViewer = false;
+  
+  // Remove old presentation of land cover map from the operation viewer  
+  Handle(HYDROData_LandCoverMap) aPrevLandCoverMap = myEditedObject->GetLandCoverMap();
+  if ( !aPrevLandCoverMap.IsNull() )
   {
-    aSelectedShape->highlight( true );
-    aSelectedShape->update();
+    setObjectVisibility( aPrevLandCoverMap, false );
+    anIsToUpdateViewer = true;
   }
+
+  // Select the appropriate land cover map shape in the viewer
+  selectionMgr()->clearSelected();
+
+  // 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 )
@@ -325,7 +421,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 )
@@ -347,41 +444,27 @@ void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, const
       HYDROGUI_CalculationDlg* aPanel = 
         ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
       if ( aPanel )
-      {
-        aPanel->setEditedObject(myEditedObject);
-      }
-      createPreview();
+        aPanel->refreshZonesBrowser();
+      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++ )
+  if ( createRegion( theZonesList ) )
   {
-    aZone = dynamic_cast<HYDROGUI_Zone*>( theZonesList.at( i ) );
-    if ( aZone )
-    {
-      aZonesList.append( aZone );
-    }
-  }
-  if ( aZonesList.length() > 0 )
-  {
-    module()->getDataModel()->createNewRegion( myEditedObject, aZonesList );
     HYDROGUI_CalculationDlg* aPanel = 
       ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
     if ( aPanel )
     {
-      aPanel->setEditedObject(myEditedObject);
+      aPanel->refreshZonesBrowser();
     }
-    createPreview();
+    createPreview( false );
   }
 }
 
-void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathymetryName )
+void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theMergeObjectName )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
@@ -390,11 +473,11 @@ void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathy
     HYDROGUI_Zone* aZone = aPanel->getCurrentZone();
     if ( aZone )
     {
-      aZone->setMergeType( theMergeType, theBathymetryName );
+      aZone->setMergeType( theMergeType, theMergeObjectName );
       HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
       if ( aShape )
       {
-        aShape->update();
+        aShape->update( true, false );
       }
     }
     aPanel->refreshZonesBrowser();
@@ -428,7 +511,7 @@ void HYDROGUI_CalculationOp::onAddObjects()
   if ( !anAddedList.isEmpty() )
   {
     aPanel->includeGeomObjects( anAddedList );
-    createPreview();
+    createPreview( false );
   }
 }
 
@@ -451,17 +534,18 @@ void HYDROGUI_CalculationOp::onRemoveObjects()
     if ( anObject.IsNull() )
       continue;
 
-    module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anObject );
+    setObjectVisibility( anObject, false );
     myEditedObject->RemoveGeometryObject( anObject );
   }
 
+  module()->update( UF_OCCViewer );
   aPanel->excludeGeomObjects( aSelectedList );
 }
 
 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
@@ -471,7 +555,82 @@ bool HYDROGUI_CalculationOp::confirmRegionsChange() const
       // If there are already defined zones then ask a user to confirm zones recalculation
       isConfirmed = ( SUIT_MessageBox::question( module()->getApp()->desktop(),
                                tr( "REGIONS_CHANGED" ),
-                               tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION" ),
+                               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::confirmOrderChange() 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( "ORDER_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::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( 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( "MODE_CHANGED" ),
+                               tr( "CONFIRM_SPLITTING_ZONES_RECALCULATION_MODE" ),
                                QMessageBox::Yes | QMessageBox::No,
                                QMessageBox::No ) == QMessageBox::Yes );
     }
@@ -483,31 +642,87 @@ bool HYDROGUI_CalculationOp::confirmRegionsChange() const
   return isConfirmed;
 }
 
+bool HYDROGUI_CalculationOp::confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const
+{
+  HYDROData_WarningType aType = theWarning.Type;
+  if ( aType == WARN_OK ) {
+    return true;
+  }
+
+  QString aTitle;
+  QString aMsg;
+  switch ( aType )
+  {
+    case WARN_EMPTY_REGIONS:
+      aTitle = tr( "EMPTY_REGIONS" );
+      aMsg = tr( "CONFIRM_CONTINUE_WITH_OBJECTS_NOT_INCLUDED_TO_REGION" ).arg( theWarning.Data );
+      break;
+    default:
+      aTitle = tr( "WARNING" );
+      aMsg = theWarning.Data;
+  }
+
+
+  int anAnswer = SUIT_MessageBox::warning( module()->getApp()->desktop(),
+                                           aTitle, aMsg,
+                                           QMessageBox::Yes | QMessageBox::No,
+                                           QMessageBox::No );
+
+  return ( anAnswer == QMessageBox::Yes );
+}
+
 bool HYDROGUI_CalculationOp::processApply( int&     theUpdateFlags,
-                                           QString& theErrorMsg )
+                                           QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
   if ( !aPanel )
     return false;
 
-  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+  if( !myIsEdit )
+  {
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( myEditedObject );
+    theBrowseObjectsEntries.append( anEntry );
+  }
+
+  // For manual mode priority rules are redundant
+  if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL ) {
+    myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, false );
+  }
+  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
 
   return true;
 }
 
 void HYDROGUI_CalculationOp::onApply()
 {
+  // Check warnings
+  HYDROData_Warning aWarning = myEditedObject->GetLastWarning();
+  if ( aWarning.Type != WARN_OK ) {
+    if ( !confirmContinueWithWarning( aWarning ) ) {
+      // Go back to the first page
+      HYDROGUI_CalculationDlg* aPanel = 
+        ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+      if ( aPanel ) {
+        aPanel->onFirstPage();
+      }
+      return;
+    }
+  }
+
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
   int anUpdateFlags = 0;
   QString anErrorMsg;
+  QStringList aBrowseObjectsEntries;
 
   bool aResult = false;
   
   try
   {
-    aResult = processApply( anUpdateFlags, anErrorMsg );
+    aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
   }
   catch ( Standard_Failure )
   {
@@ -526,6 +741,7 @@ void HYDROGUI_CalculationOp::onApply()
   {
     module()->update( anUpdateFlags );
     commit();
+    browseObjects( aBrowseObjectsEntries );
   }
   else
   {
@@ -539,52 +755,286 @@ void HYDROGUI_CalculationOp::onApply()
   }
 }
 
-void HYDROGUI_CalculationOp::onSplitZones()
+void HYDROGUI_CalculationOp::onNext( const int theIndex )
 {
-  HYDROGUI_CalculationDlg* aPanel = 
-    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-  if ( !aPanel )
-    return;
+  if( theIndex==1 )
+  {
+    setAvailableGroups();
+  }
+  else if( theIndex==2 )
+  {
+    // Land cover map panel
+     HYDROGUI_CalculationDlg* aPanel = 
+      ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+    if ( !aPanel )
+      return;
 
-  QApplication::setOverrideCursor( Qt::WaitCursor );
+    setLandCoverMapVisible( true );
 
-  QString aNewCaseName = aPanel->getObjectName();
-  QString anOldCaseName = myEditedObject->GetName();
+    QStringList aList;
+    QStringList anEntryList;
 
-  bool anIsToUpdateOb = myIsEdit && anOldCaseName != aNewCaseName;
-  
-  // At first we must to update the case name because of 
-  // automatic names generation for regions and zones
-  myEditedObject->SetName( aNewCaseName );
+    // 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;
+
+    aList.clear();
+    anEntryList.clear();
+    anIter = HYDROData_Iterator( doc(), KIND_STRICKLER_TABLE );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      aStricklerTableObj = Handle(HYDROData_StricklerTable)::DownCast( anIter.Current() );
+
+      if ( !aStricklerTableObj.IsNull() )
+      { 
+        aStricklerTableName = aStricklerTableObj->GetName();
+        if ( !aStricklerTableName.isEmpty() )
+        {
+          aList.append( aStricklerTableName );
+          anEntryList.append( HYDROGUI_DataObject::dataObjectEntry( aStricklerTableObj ) );
+        }        
+      }
+    }
+    aPanel->setStricklerTableNames( aList, anEntryList );
+    //@ASL: bool anUpdateState = myEditedObject->IsMustBeUpdated();
+    if ( !aList.isEmpty() )
+      aPanel->setStricklerTable( aList.at( 0 ), false );
+    //@ASL: myEditedObject->SetToUpdate( anUpdateState );
+
+    if ( !myEditedObject.IsNull() )
+    {
+      if ( myIsEdit )
+      {      
+        // Select the certain Strickler table object in combo-box
+        aStricklerTableObj = myEditedObject->GetStricklerTable();
+        if ( aStricklerTableObj.IsNull() )
+        {
+          aPanel->setStricklerTable( QString() );
+        }
+        else
+        {
+          aStricklerTableName = aStricklerTableObj->GetName();
+          aPanel->setStricklerTable( aStricklerTableName );
+        }
+
+        // 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 )
+  {
+    HYDROGUI_CalculationDlg* aPanel = 
+      ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+    if ( !aPanel )
+      return;
+
+    QApplication::setOverrideCursor( Qt::WaitCursor );
+
+    setGeomObjectsVisible( false );
+    setLandCoverMapVisible( false );
+
+    QString aNewCaseName = aPanel->getObjectName();
+    QString anOldCaseName = myEditedObject->GetName();
+    bool isNameChanged = anOldCaseName != aNewCaseName;
   
-  if ( myEditedObject->IsMustBeUpdated() )
+    bool anIsToUpdateOb = isNameChanged;
+
+    // At first we must to update the case name because of 
+    // automatic names generation for regions and zones
+    myEditedObject->SetName( aNewCaseName );
+    
+    // Zones: set parameters for automatic mode
+    int aMode = aPanel->getMode();
+    if ( aMode == HYDROData_CalculationCase::AUTOMATIC )
+    {
+      // Set objects in the specified order
+      if( myEditedObject->IsMustBeUpdated(  HYDROData_Entity::Geom_2d ) )
+      {
+        myEditedObject->RemoveGeometryObjects();
+        foreach ( const QString& aName, aPanel->getAllGeomObjects() )
+        {
+          Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast( 
+            HYDROGUI_Tool::FindObjectByName( module(), aName ) );
+          if ( anObject.IsNull() )
+          {
+            continue;
+          }
+          myEditedObject->AddGeometryObject( anObject );
+        }
+
+        // Clear priority rules
+        //@ASL if ( myEditedObject->GetRulesCount() > 0 ) {
+          myEditedObject->ClearRules( HYDROData_CalculationCase::DataTag_CustomRules, true );
+        //@ASL }
+        // Set priority rules
+        foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) {
+          myEditedObject->AddRule( aRule.Object1, aRule.Priority,
+                                  aRule.Object2, aRule.MergeType,
+                                  HYDROData_CalculationCase::DataTag_CustomRules );
+        }
+      }
+    }
+    aPanel->setEditZonesEnabled( aMode == HYDROData_CalculationCase::MANUAL );
+
+    if ( myEditedObject->IsMustBeUpdated( HYDROData_Entity::Geom_All ) )
+    {
+      myShowZones = true;
+      myEditedObject->Update();
+      
+      AssignDefaultZonesColors();
+
+      //aPanel->setEditedObject( myEditedObject );
+      aPanel->refreshZonesBrowser();
+    
+      closePreview( false );
+      createPreview( false );
+
+      anIsToUpdateOb = true;
+    }
+    else
+    {
+      // Show zones
+      setZonesVisible( true );
+
+      if ( isNameChanged ) {
+        module()->getDataModel()->updateObjectTree( myEditedObject );
+      }
+    }
+
+    QApplication::restoreOverrideCursor();
+  }  
+}
+
+void HYDROGUI_CalculationOp::onHideZones( const int theIndex )
+{
+  if( theIndex==1 )
   {
-    myShowZones = true;
-    myEditedObject->SplitGeometryObjects();
+    setGeomObjectsVisible( true );
 
-    aPanel->setEditedObject( myEditedObject );
+    closePreview( false );
+    createPreview( false );
+  }
+  if( theIndex==2 )
+  {
+    setLandCoverMapVisible( true );
 
-    createPreview();
+    closePreview( false );
+    createPreview( true );
+
+    // Hide zones
+    setZonesVisible( false );
   }
-  else
+  else if( theIndex==3 )
   {
+    AssignDefaultZonesColors();
+
+    closePreview( false );
+    createPreview( false );
+
+    // Show zones
     setZonesVisible( true );
   }
+}
 
-  if ( anIsToUpdateOb )
-    module()->getApp()->updateObjectBrowser( false );
+void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
+{
+  myShowZones = theIsVisible;
+  HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
+  HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
+  HYDROData_SequenceOfObjects aZones;
+  Handle(HYDROData_Region) aRegion;
+  if ( myPreviewViewManager ) 
+  {
+    if ( OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer() )
+    {
+      Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+      if ( !aCtx.IsNull() )
+      {
+        for ( ; aRegionsIter.More(); aRegionsIter.Next() )
+        {
+          aRegion = Handle(HYDROData_Region)::DownCast( aRegionsIter.Value() );
+          if ( !aRegion.IsNull() )
+          {
+            aZones = aRegion->GetZones();
+            HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
+            for ( ; aZonesIter.More(); aZonesIter.Next() )
+            {
+              setObjectVisibility( aZonesIter.Value(), theIsVisible );
+            }
+          }
+        }
+      }
 
-  QApplication::restoreOverrideCursor();
+      module()->update( UF_OCCViewer );
+    }
+  }
 }
 
-void HYDROGUI_CalculationOp::onHideZones()
+void HYDROGUI_CalculationOp::setGeomObjectsVisible( bool theIsVisible )
 {
-  setZonesVisible( false );
+  myShowGeomObjects = theIsVisible;
+
+  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryObjects();
+
+  HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
+  for ( ; anIter.More(); anIter.Next() ) {
+    setObjectVisibility( anIter.Value(), theIsVisible );
+  }
 }
 
-void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
+void HYDROGUI_CalculationOp::setLandCoverMapVisible( bool theIsVisible )
+{
+  myShowLandCoverMap = theIsVisible;
+  setObjectVisibility( myEditedObject->GetLandCoverMap(), theIsVisible );  
+}
+
+void HYDROGUI_CalculationOp::AssignDefaultZonesColors()
 {
-  myShowZones = theIsVisible;
   HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
   HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
   HYDROData_SequenceOfObjects aZones;
@@ -596,6 +1046,7 @@ void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
       Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
       if ( !aCtx.IsNull() )
       {
+        int aCounter = 0;        
         for ( ; aRegionsIter.More(); aRegionsIter.Next() )
         {
           aRegion = Handle(HYDROData_Region)::DownCast( aRegionsIter.Value() );
@@ -605,13 +1056,15 @@ void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
             HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
             for ( ; aZonesIter.More(); aZonesIter.Next() )
             {
-              if ( theIsVisible )
+              // Zone
+              Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() );
+              if ( !aZone.IsNull() )
               {
-                showObject( aZonesIter.Value(), aCtx );
-              }
-              else
-              {
-                module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZonesIter.Value() );
+                QColor aFillingColor = GenerateDefaultZonesColor(++aCounter);
+                while (aFillingColor == Qt::red)
+                  aFillingColor = GenerateDefaultZonesColor(++aCounter);
+                
+                aZone->SetColor(aFillingColor);
               }
             }
           }
@@ -621,10 +1074,89 @@ void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
   }
 }
 
-void HYDROGUI_CalculationOp::createPreview()
+QColor HYDROGUI_CalculationOp::GenerateDefaultZonesColor( int theIndex,
+                                                          float theSaturation/* = 0.5*/,
+                                                          float theValue/* = 0.95*/ ) const
+{
+  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 )
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  HYDROData_ListOfRules aRules;
+  Handle(HYDROData_Entity) anObject1, anObject2;
+  HYDROData_PriorityType aPriority;
+  HYDROData_Zone::MergeType aMergeType;
+  HYDROData_CalculationCase::DataTag aDataTag = HYDROData_CalculationCase::DataTag_CustomRules;
+  for ( int anIndex = 0; ; anIndex++ )
+  {
+    if ( myEditedObject->GetRule( anIndex, anObject1, aPriority, anObject2, aMergeType, theDataTag ) ) {
+      HYDROData_CustomRule aRule;
+      aRule.Object1 = anObject1;
+      aRule.Object2 = anObject2;
+      aRule.Priority = aPriority;
+      aRule.MergeType = aMergeType;
+
+      aRules << aRule;
+    }
+    else
+      break;
+  }
+
+  if ( theDataTag == HYDROData_CalculationCase::DataTag_CustomRules )
+    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( const bool theLandCoverMap )
 {
   LightApp_Application* anApp = module()->getApp();
-  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryObjects();
+  HYDROData_SequenceOfObjects aSeq;
+  if ( theLandCoverMap && myShowLandCoverMap )
+  {
+    aSeq.Append( myEditedObject->GetLandCoverMap() );
+  }
+  else if ( !theLandCoverMap && myShowGeomObjects )
+  {
+    HYDROData_SequenceOfObjects aSeqGO = myEditedObject->GetGeometryObjects();
+    aSeq.Append( aSeqGO );
+  }
+
   Handle(HYDROData_Entity) anEntity;
 
   if ( myShowZones )
@@ -687,28 +1219,28 @@ void HYDROGUI_CalculationOp::createPreview()
       HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
       for ( ; anIter.More(); anIter.Next() )
       {
-        showObject( anIter.Value(), aCtx );
+        setObjectVisibility( anIter.Value(), true );
       }
 
       //Process the draw events for viewer
-      QApplication::processEvents();
+      QApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
       if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
         vw->onTopView();
     }
+
+    module()->update( UF_OCCViewer | UF_FitAll );
   }
 }
 
-void HYDROGUI_CalculationOp::showObject( Handle(HYDROData_Entity) theEntity, Handle(AIS_InteractiveContext) theCtx )
+void HYDROGUI_CalculationOp::setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible )
 {
-  if ( !theEntity.IsNull() )
-  {
-    HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, theEntity );
-    if ( !aShape )
-    {
-      aShape = new HYDROGUI_Shape( theCtx, theEntity );
-      module()->setObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, theEntity, aShape );
-    }
-    aShape->update();
+  if ( theEntity.IsNull() || !myPreviewViewManager ) {
+    return;
+  }
+
+  OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+  if ( aViewer ) {
+    module()->setObjectVisible( (size_t)aViewer, theEntity, theIsVisible );
   }
 }
 
@@ -717,22 +1249,191 @@ 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*>();
+  QShortcut* aShortcut;
+  foreach( aShortcut, aShortcuts )
+  {
+    if ( aShortcut->key() == 
+      QKeySequence( ((LightApp_Application*)module()->application())->objectBrowser()->shortcutKey( 
+      SUIT_DataBrowser::RenameShortcut ) ) )
+    {
+      aShortcut->setEnabled( true );
+    }
+  }
+
+
   if( myPreviewViewManager )
   {
-    disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
-                this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
+    // Hide all the displayed objects in the preview view
+    OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+    if ( aViewer ) {
+      size_t aViewId = (size_t)aViewer;
+      HYDROData_Iterator anIterator( doc() );
+      for( ; anIterator.More(); anIterator.Next() ) {
+        Handle(HYDROData_Entity) anObject = anIterator.Current();
+        if( !anObject.IsNull() ) {
+          module()->setObjectVisible( aViewId, anObject, false );
+        }
+      }
+    }
+
+    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;
   }
 }
 
+void HYDROGUI_CalculationOp::setAvailableGroups()
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+      ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+
+  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryGroups();
+  QStringList aList, anEntryList;
+  getNamesAndEntries( aSeq, aList, anEntryList );
+
+  QStringList aGroupsNames;
+
+  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 ) );
+    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 ) );
+      aGroupsNames.append( aGroup->GetName() );
+    }
+  }
+  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 ) );
+      if ( !aGeomGroup.IsNull() && !aGroupsNames.contains( aGeomGroup->GetName() ) ) {
+        myEditedObject->RemoveGeometryGroup( aGeomGroup );
+      }
+    }
+  }
+
+  aPanel->setAvailableGroups( aGroupsNames );
+  aPanel->includeGroups( aList );
+
+  //@ASL: bool isUpdated = myEditedObject->IsMustBeUpdated();
+}
+
+void HYDROGUI_CalculationOp::onAddGroups()
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
 
+  // Add geometry objects selected in the module browser to the calculation case
+  QStringList aSelectedList = aPanel->getSelectedAvailableGroups();
+  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+    return;
+
+  QStringList anAddedList;
+  for (int i = 0; i < aSelectedList.length(); i++)
+  {
+    Handle(HYDROData_ShapesGroup) aGroup = Handle(HYDROData_ShapesGroup)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
+    if ( aGroup.IsNull() )
+      continue;
+
+    if ( myEditedObject->AddGeometryGroup( aGroup ) )
+      anAddedList.append( aGroup->GetName() );
+  }
+
+  if ( !anAddedList.isEmpty() )
+  {
+    aPanel->includeGroups( anAddedList );
+  }
+}
+
+void HYDROGUI_CalculationOp::onRemoveGroups()
+{
+  // Remove selected objects from the calculation case
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  QStringList aSelectedList = aPanel->getSelectedGroups();
+  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+    return;
+
+  for (int i = 0; i < aSelectedList.length(); i++)
+  {
+    Handle(HYDROData_ShapesGroup) aGroup = Handle(HYDROData_ShapesGroup)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) );
+    if ( aGroup.IsNull() )
+      continue;
+
+    myEditedObject->RemoveGeometryGroup( aGroup );
+  }
+
+  aPanel->excludeGroups( aSelectedList );
+}
+
+void HYDROGUI_CalculationOp::onChangeMode( int theMode )
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  if ( !confirmModeChange() ) {
+    aPanel->setMode( myEditedObject->GetAssignmentMode() );
+    return;
+  }
+
+  myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)theMode );
+  aPanel->setMode( theMode );
+}
+
+void HYDROGUI_CalculationOp::onOrderChanged( bool& isConfirmed )
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  isConfirmed = confirmOrderChange();
+  if( isConfirmed )
+    myEditedObject->Changed( HYDROData_Entity::Geom_2d );
+}
+
+void HYDROGUI_CalculationOp::onRuleChanged( bool& isConfirmed )
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  isConfirmed = confirmRuleChange();
+  if( isConfirmed )
+    myEditedObject->Changed( HYDROData_Entity::Geom_2d );
+}
+
+void HYDROGUI_CalculationOp::onRegenerateColors()
+{
+  // For geometry zones
+  AssignDefaultZonesColors();
+  setZonesVisible( false );
+  setZonesVisible( true );
+}