X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=71f47ea772995f6a2441a8a4987af21af80bf8fb;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=3e1a5dc83dfa21297172dbdade6877075455d123;hpb=11ec2af6a8049f50cdd7b8f53da49f813b5d2c8f;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 3e1a5dc8..134c3bd0 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -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
@@ -25,12 +21,18 @@
 #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"
 
-#include <HYDROData_Polyline.h>
+#include <HYDROData_PolylineXY.h>
+#include <HYDROData_ShapesGroup.h>
 #include <HYDROData_Iterator.h>
-#include <HYDROData_Zone.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>
@@ -38,14 +40,25 @@
 
 #include <LightApp_Application.h>
 #include <LightApp_UpdateFlags.h>
+#include <LightApp_SelectionMgr.h>
+#include <LightApp_DataOwner.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" ) );
 }
@@ -58,119 +71,168 @@ HYDROGUI_CalculationOp::~HYDROGUI_CalculationOp()
 void HYDROGUI_CalculationOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
+  
+  // Begin transaction
+  startDocOperation();
 
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
   if ( !aPanel )
     return;
 
-  myRegionsList.clear();
+  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;
+  HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetGeometryObjects( module() );
+  getNamesAndEntries( aSeq, aList, anEntryList );
+  
+  QStringList List1;
+  QStringList EList1;
 
-  QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), "Case" );
+  //add intersection polylines
+  AddInterPolylinesToList(aList, anEntryList);
+  
+  aPanel->setAllGeomObjects( aList, anEntryList );
+
+  // Get all polylines
+  aList.clear();
+  anEntryList.clear();
+  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() && aPolylineObj->IsClosed(false) )
+    { 
+//      // 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 );
 
-  QStringList aSelectedZones, aRegions;
+  QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_CALCULATION_CASE_NAME" ) );
 
   myEditedObject.Nullify();
   if ( myIsEdit )
   {
-    myEditedObject = Handle(HYDROData_Calculation)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+    myEditedObject = Handle(HYDROData_CalculationCase)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
     if ( !myEditedObject.IsNull() )
     {
+      aPanel->setMode( myEditedObject->GetAssignmentMode() );
       anObjectName = myEditedObject->GetName();
-
-      Handle(HYDROData_Polyline) aBoundaryPolyline = myEditedObject->GetBoundaryPolyline();
-      if ( !aBoundaryPolyline.IsNull() )
+      aPolylineObj = myEditedObject->GetBoundaryPolyline();
+      if ( aPolylineObj.IsNull() )
       {
-        QString aPolylineName = aBoundaryPolyline->GetName();
-        aPanel->setPolylineName( aPolylineName );
+        aPanel->setBoundary( QString() );
       }
-
-      HYDROData_SequenceOfObjects aRefZones = myEditedObject->GetZones();
-      HYDROData_SequenceOfObjects::Iterator anIter( aRefZones );
-      for ( ; anIter.More(); anIter.Next() )
+      else
       {
-        Handle(HYDROData_Zone) aRefZone = 
-          Handle(HYDROData_Zone)::DownCast( anIter.Value() );
-        if ( aRefZone.IsNull() )
-          continue;
-
-        QString aRefZoneName = aRefZone->GetName();
-        if ( aRefZoneName.isEmpty() )
-          continue;
-
-        aSelectedZones.append( aRefZoneName );
+        aPolylineName = aPolylineObj->GetName();
+        aPanel->setBoundary( aPolylineName );
       }
 
-      HYDROData_SequenceOfObjects aDataRegions = myEditedObject->GetRegions();
-      anIter.Init( aDataRegions );
-      for ( ; anIter.More(); anIter.Next() )
-      {
-        Handle(HYDROData_Region) aDataRegion = 
-          Handle(HYDROData_Region)::DownCast( anIter.Value() );
-        if ( aDataRegion.IsNull() )
-          continue;
-
-        QString aRegionName = aDataRegion->GetName();
-        if ( aRegionName.isEmpty() )
-          continue;
+      aSeq = myEditedObject->GetGeometryObjects();      
+      HYDROData_SequenceOfObjects anInterPolyList = myEditedObject->GetInterPolyObjects();
+      aSeq.Append(anInterPolyList);
 
-        Region aRegion;
-        // aRegion.SplitData.Path = aSplitZone->GetPainterPath();
-        // aRegion.SplitData.ZoneNames ???
+      getNamesAndEntries( aSeq, aList, anEntryList );
+      aPanel->includeGeomObjects( aList );
 
-        aRegion.FillingColor = aDataRegion->GetFillingColor();
-        aRegion.BorderColor  = aDataRegion->GetBorderColor();
+      // set rules
+      setRules( HYDROData_CalculationCase::DataTag_CustomRules );      
+    }
+  }
+  else
+  {
+    myEditedObject =
+      Handle(HYDROData_CalculationCase)::DownCast( doc()->CreateObject( KIND_CALCULATION ) );
+    myEditedObject->SetName( anObjectName );
+    myEditedObject->SetAssignmentMode( (HYDROData_CalculationCase::AssignmentMode)aPanel->getMode() );
+  }
 
-        aRegion.RegionName = aRegionName;
+  aPanel->setObjectName( anObjectName );
+  aPanel->setEditedObject( myEditedObject );
 
-        aRegion.DataRegion = aDataRegion;
+  setGeomObjectsVisible( true );
 
-        myRegionsList.append( aRegion );
+  createPreview( false );
+}
 
-        aRegions.append( aRegionName );
+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 ));
       }
     }
   }
+}
 
-  // collect information about existing zones
-  QStringList aZones;
-
-  HYDROData_Iterator anIter( doc(), KIND_ZONE );
+void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
+                                                QStringList& theNames, QStringList& theEntries ) const
+{
+ 
+  theNames.clear();
+  theEntries.clear();
+  HYDROData_SequenceOfObjects::Iterator anIter( theSeq );
   for ( ; anIter.More(); anIter.Next() )
   {
-    Handle(HYDROData_Zone) aZoneObj = 
-      Handle(HYDROData_Zone)::DownCast( anIter.Current() );
-    if ( aZoneObj.IsNull() )
-      continue;
-
-    QString aZoneName = aZoneObj->GetName();
-    if ( aZoneName.isEmpty() )
-      continue;
+    Handle(HYDROData_Entity) anEntity = anIter.Value();
+    //if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
+    //  continue;
 
-    aZones.append( aZoneName );
+    theNames.append( anEntity->GetName() );
+    theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anEntity ) );
   }
-
-  aPanel->setObjectName( anObjectName );
-
-  aPanel->setZones( aZones );
-  aPanel->setSelectedZones( aSelectedZones );
-  aPanel->setRegions( aRegions );
-
-  createPreview();
 }
 
 void HYDROGUI_CalculationOp::abortOperation()
 {
   closePreview();
-
+  // Abort transaction
+  abortDocOperation();
   HYDROGUI_Operation::abortOperation();
+  module()->getApp()->updateObjectBrowser();
 }
 
 void HYDROGUI_CalculationOp::commitOperation()
 {
   closePreview();
-
+  // Commit transaction
+  commitDocOperation();
   HYDROGUI_Operation::commitOperation();
 }
 
@@ -179,151 +241,1011 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
   HYDROGUI_CalculationDlg* aPanel = new HYDROGUI_CalculationDlg( module(), getName() );
 
   // Connect signals and slots
-  connect( aPanel, SIGNAL( SplitZones() ), this, SLOT( onSplitZones() ) );
+  connect( aPanel, SIGNAL( changeMode( int ) ), SLOT( onChangeMode( int ) ) );  
+  connect( aPanel, SIGNAL( addObjects() ), SLOT( onAddObjects() ) );
+  connect( aPanel, SIGNAL( removeObjects() ), SLOT( onRemoveObjects() ) );
+  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( createRegion( const QList<SUIT_DataObject*>& ) ),
+    SLOT( onCreateRegion( const QList<SUIT_DataObject*>& ) ) );
+  connect( aPanel, SIGNAL( clickedInZonesBrowser( SUIT_DataObject* ) ),
+    SLOT( onClickedInZonesBrowser( SUIT_DataObject* ) ) );
+  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;
 }
 
-bool HYDROGUI_CalculationOp::processApply( int&     theUpdateFlags,
-                                           QString& theErrorMsg )
+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) aNewPolyline = Handle(HYDROData_PolylineXY)::DownCast(
+    HYDROGUI_Tool::FindObjectByName( module(), theObjName, KIND_POLYLINEXY ) );
+  myEditedObject->SetBoundaryPolyline( aNewPolyline );
+
+  if ( myPreviewViewManager )
+  {
+    OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+    if ( aViewer )
+    {
+      if ( !aNewPolyline.IsNull() )
+      {
+        Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+        if ( !aCtx.IsNull() )
+        {
+          setObjectVisibility( aNewPolyline, true );
+          anIsToUpdateViewer = true;
+        }
+      }
+
+      if ( anIsToUpdateViewer )
+        module()->update( UF_OCCViewer );
+    }
+  }
+}
+
+void HYDROGUI_CalculationOp::onStricklerTableSelected ( const QString & theObjName )
+{
+  bool anIsToUpdateViewer = false;
+
+  // Remove old presentation of land cover map from the operation viewer  
+  Handle(HYDROData_LandCoverMap) aLandCoverMap = myEditedObject->GetLandCoverMap();
+  if ( !aLandCoverMap.IsNull() )
+  {
+    setObjectVisibility( aLandCoverMap, false );
+    anIsToUpdateViewer = true;
+  }
+
+  // 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 )
+  {
+    OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+    if ( aViewer )
+    {
+      if ( !aNewStricklerTable.IsNull() )
+      {
+        Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+        if ( !aCtx.IsNull() )
+        {
+          if ( !aLandCoverMap.IsNull() )
+          {
+            setObjectVisibility( aLandCoverMap, true );
+            anIsToUpdateViewer = true;
+          }          
+        }
+      }
+
+      if ( anIsToUpdateViewer )
+        module()->update( UF_OCCViewer );
+    }
+  }
+}
+
+void HYDROGUI_CalculationOp::onObjectsSelected()
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-  if ( !aPanel )
-    return false;
 
-  QString anObjectName = aPanel->getObjectName().simplified();
-  if ( anObjectName.isEmpty() )
+  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 = 0, *aLastShape = 0;
+  Handle(HYDROData_Entity) anEntity;
+  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryObjects();
+  HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
+  bool isSelected;
+  QString aName;
+  for ( ; anIter.More(); anIter.Next() )
   {
-    theErrorMsg = tr( "INCORRECT_OBJECT_NAME" );
-    return false;
+    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 );
+}
+
+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() )
+  {
+    setObjectVisibility( aPrevLandCoverMap, false );
+    anIsToUpdateViewer = true;
   }
 
-  // check that there are no other objects with the same name in the document
-  if( !myIsEdit || ( !myEditedObject.IsNull() && myEditedObject->GetName() != anObjectName ) )
+  // 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 )
+{
+  HYDROGUI_Region* aRegionItem = dynamic_cast<HYDROGUI_Region*>(theItem);
+  HYDROGUI_Zone* aZoneItem;
+  selectionMgr()->clearSelected();
+  if ( aRegionItem )
   {
-    Handle(HYDROData_Object) anObject = HYDROGUI_Tool::FindObjectByName( module(), anObjectName );
-    if ( !anObject.IsNull() )
+    // Select a region in preview
+    SUIT_DataOwnerPtrList aList( true );
+    DataObjectList aZones = aRegionItem->children();
+    for ( int i = 0; i < aZones.length(); i++ )
     {
-      theErrorMsg = tr( "OBJECT_EXISTS_IN_DOCUMENT" ).arg( anObjectName );
-      return false;
+      aZoneItem = dynamic_cast<HYDROGUI_Zone*>(aZones.at(i));
+      if ( aZoneItem )
+      {
+        aList.append( SUIT_DataOwnerPtr( new LightApp_DataOwner( aZoneItem->entry() ) ) );
+      }
     }
+    selectionMgr()->setSelected( aList );
   }
+  else
+  {
+    // select a single zone
+    aZoneItem = dynamic_cast<HYDROGUI_Zone*>(theItem);
+    if ( aZoneItem )
+    {
+      SUIT_DataOwnerPtrList aList( true );
+      aList.append( SUIT_DataOwnerPtr( new LightApp_DataOwner( aZoneItem->entry() ) ) );
+      selectionMgr()->setSelected( aList );
+    }
+  }
+}
 
-  Handle(HYDROData_Document) aDocument = doc();
+void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem,
+                                          const QList<SUIT_DataObject*>& theZonesList )
+{
+  HYDROGUI_Region* aRegion = dynamic_cast<HYDROGUI_Region*>(theRegionItem);
+  if ( aRegion )
+  {
+    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 )
+    {
+      aRegion->addZones( aZonesList );
+      HYDROGUI_CalculationDlg* aPanel = 
+        ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+      if ( aPanel )
+        aPanel->refreshZonesBrowser();
+      createPreview( false );
+    }
+  }
+}
 
-  Handle(HYDROData_Calculation) aCalculObj = myIsEdit ? myEditedObject :
-    Handle(HYDROData_Calculation)::DownCast( aDocument->CreateObject( KIND_CALCULATION ) );
-  if ( aCalculObj.IsNull() )
-    return false;
+void HYDROGUI_CalculationOp::onCreateRegion( const QList<SUIT_DataObject*>& theZonesList )
+{
+  if ( createRegion( theZonesList ) )
+  {
+    HYDROGUI_CalculationDlg* aPanel = 
+      ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+    if ( aPanel )
+    {
+      aPanel->refreshZonesBrowser();
+    }
+    createPreview( false );
+  }
+}
+
+void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theMergeObjectName )
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( aPanel )
+  {
+    HYDROGUI_Zone* aZone = aPanel->getCurrentZone();
+    if ( aZone )
+    {
+      aZone->setMergeType( theMergeType, theMergeObjectName );
+      HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
+      if ( aShape )
+      {
+        aShape->update( true, false );
+      }
+    }
+    aPanel->refreshZonesBrowser();
+  }
+}
 
-  aCalculObj->SetName( anObjectName );
+void HYDROGUI_CalculationOp::onAddObjects()
+{
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
 
-  QString aPolylineName = aPanel->getPolylineName();
-  Handle(HYDROData_Polyline) aBndPolyline = Handle(HYDROData_Polyline)::DownCast(
-      HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINE ) );
+  // Add geometry objects selected in the module browser to the calculation case
+  QStringList aSelectedList = aPanel->getSelectedAvailableGeomObjects();
+  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+    return;
 
-  aCalculObj->SetBoundaryPolyline( aBndPolyline );
+  QStringList anAddedList;
+  for (int i = 0; i < aSelectedList.length(); i++)
+  {
+    Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
+    if ( anObject.IsNull() )
+      continue;
 
-  QStringList aRefZoneNames = aPanel->getSelectedZones();
-  HYDROData_SequenceOfObjects aRefZones = 
-    HYDROGUI_Tool::FindObjectsByNames( module(), aRefZoneNames, KIND_ZONE );
+    if ( myEditedObject->AddGeometryObject( anObject ) )
+      anAddedList.append( anObject->GetName() );
+  }
 
-  aCalculObj->SetZones( aRefZones );
+  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;
 
-  HYDROData_SequenceOfObjects aRegions;
+    if ( myEditedObject->AddInterPoly( aPoly ) )
+      anAddedList.append( aPoly->GetName() );
+  }
 
-  RegionsList::iterator anIter = myRegionsList.begin();
-  for ( ; anIter != myRegionsList.end(); ++anIter )
+  if ( !anAddedList.isEmpty() )
   {
-    const Region& aRegion = *anIter;
+    aPanel->includeGeomObjects( anAddedList );
+    createPreview( false );
+  }
+}
 
-    if ( !aRegion.DataRegion.IsNull() )
-    {
-      //No need to create new but use old zone
-      aRegions.Append( aRegion.DataRegion );
+void HYDROGUI_CalculationOp::onRemoveObjects()
+{
+  // Remove selected objects from the calculation case
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
+  QStringList aSelectedList = aPanel->getSelectedGeomObjects();
+  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+    return;
+
+  for (int i = 0; i < aSelectedList.length(); i++)
+  {
+    Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) );
+    if ( anObject.IsNull() )
       continue;
-    }
 
-    Handle(HYDROData_Region) aDataRegion =
-      Handle(HYDROData_Region)::DownCast( aDocument->CreateObject( KIND_REGION ) );
-    if( aDataRegion.IsNull() )
+    setObjectVisibility( anObject, false );
+    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;
 
-    // Fill the zone data
-    aDataRegion->SetName( aRegion.RegionName );
-    aDataRegion->SetBorderColor( aRegion.BorderColor );
-    aDataRegion->SetFillingColor( aRegion.FillingColor );
+    setObjectVisibility( aPoly, false );
+    myEditedObject->RemoveInterPolyObject ( aPoly ); 
+  }
+
+  module()->update( UF_OCCViewer );
+  aPanel->excludeGeomObjects( aSelectedList );
+}
 
-    aRegions.Append( aDataRegion );
+bool HYDROGUI_CalculationOp::confirmRegionsChange() 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( "REGIONS_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;
+}
 
-  aCalculObj->SetRegions( aRegions );
+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;
+}
 
-  theUpdateFlags = UF_Model;
+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;
+}
 
-  return true;
+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 );
+    }
+    else
+    {
+      isConfirmed = true; // No regions - no zones - nothing to recalculate
+    }
+  }
+  return isConfirmed;
 }
 
-void HYDROGUI_CalculationOp::onSplitZones()
+bool HYDROGUI_CalculationOp::confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const
 {
-  myRegionsList.clear();
+  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,
+                                           QStringList& theBrowseObjectsEntries )
+{
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
   if ( !aPanel )
-    return;
+    return false;
 
-  QApplication::setOverrideCursor( Qt::WaitCursor );
+  if( !myIsEdit )
+  {
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( myEditedObject );
+    theBrowseObjectsEntries.append( anEntry );
+  }
 
-  QString aPolylineName = aPanel->getPolylineName();
-  Handle(HYDROData_Polyline) aBndPolyline = Handle(HYDROData_Polyline)::DownCast(
-      HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINE ) );
+  // 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;
 
-  QStringList aZoneNames = aPanel->getSelectedZones();
-  HYDROData_SequenceOfObjects aZones = 
-    HYDROGUI_Tool::FindObjectsByNames( module(), aZoneNames, KIND_ZONE );
+  return true;
+}
 
-  QStringList aResSplittedZones;
+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;
+    }
+  }
 
-  HYDROGUI_SplitZonesTool::SplitDataList aSplittedZones =
-    HYDROGUI_SplitZonesTool::SplitZones( aZones, aBndPolyline );
+  QApplication::setOverrideCursor( Qt::WaitCursor );
 
-  QString aSplitZonesPrefix = aPanel->getSplitZonesPrefix();
-  QStringList aUsedNames;
+  int anUpdateFlags = 0;
+  QString anErrorMsg;
+  QStringList aBrowseObjectsEntries;
 
-  HYDROGUI_SplitZonesTool::SplitDataListIterator anIter( aSplittedZones );
-  while( anIter.hasNext() )
+  bool aResult = false;
+  
+  try
   {
-    Region aRegion;
-    aRegion.SplitData = anIter.next();
+    aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
+  }
+  catch ( Standard_Failure )
+  {
+    Handle(Standard_Failure) aFailure = Standard_Failure::Caught();
+    anErrorMsg = aFailure->GetMessageString();
+    aResult = false;
+  }
+  catch ( ... )
+  {
+    aResult = false;
+  }
+  
+  QApplication::restoreOverrideCursor();
+
+  if ( aResult )
+  {
+    module()->update( anUpdateFlags );
+    commit();
+    browseObjects( aBrowseObjectsEntries );
+  }
+  else
+  {
+    abort();
+    QString aMsg = tr( "INPUT_VALID_DATA" );
+    if( !anErrorMsg.isEmpty() )
+      aMsg.prepend( anErrorMsg + "\n" );
+    SUIT_MessageBox::critical( module()->getApp()->desktop(),
+                               tr( "INSUFFICIENT_INPUT_DATA" ),
+                               aMsg ); 
+  }
+}
+
+void HYDROGUI_CalculationOp::onNext( const int theIndex )
+{
+  if( theIndex==1 )
+  {
+    setAvailableGroups();
+  }
+  else if( theIndex==2 )
+  {
+    // Land cover map panel
+     HYDROGUI_CalculationDlg* aPanel = 
+      ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+    if ( !aPanel )
+      return;
+
+    setLandCoverMapVisible( true );
+
+    QStringList aList;
+    QStringList anEntryList;
 
-    aRegion.FillingColor = HYDROGUI_Tool::GenerateFillingColor( module(), aRegion.SplitData.ZoneNames );
-    aRegion.BorderColor  = QColor( HYDROData_Zone::DefaultBorderColor() );
+    // 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 );
+    }
 
-    aRegion.RegionName = HYDROGUI_Tool::GenerateObjectName( module(), aSplitZonesPrefix, aUsedNames );
+    // Get all Strickler table objects to fill in combo-box
+    Handle(HYDROData_StricklerTable) aStricklerTableObj;
+    QString aStricklerTableName;
 
-    aUsedNames.append( aRegion.RegionName );
+    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 );
 
-    aResSplittedZones.append( aRegion.RegionName );
+    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 );
+        }
+      }
+    }
 
-    myRegionsList.append( aRegion );
+    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 );
 
-  aPanel->setRegions( aResSplittedZones );
+    QString aNewCaseName = aPanel->getObjectName();
+    QString anOldCaseName = myEditedObject->GetName();
+    bool isNameChanged = anOldCaseName != aNewCaseName;
   
-  createPreview();
+    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 );
 
-  QApplication::restoreOverrideCursor();
+    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 )
+  {
+    setGeomObjectsVisible( true );
+
+    closePreview( false );
+    createPreview( false );
+  }
+  if( theIndex==2 )
+  {
+    setLandCoverMapVisible( true );
+
+    closePreview( false );
+    createPreview( true );
+
+    // Hide zones
+    setZonesVisible( false );
+  }
+  else if( theIndex==3 )
+  {
+    AssignDefaultZonesColors();
+
+    closePreview( false );
+    createPreview( false );
+
+    // Show zones
+    setZonesVisible( true );
+  }
+}
+
+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 );
+            }
+          }
+        }
+      }
+
+      module()->update( UF_OCCViewer );
+    }
+  }
+}
+
+void HYDROGUI_CalculationOp::setGeomObjectsVisible( bool theIsVisible )
+{
+  myShowGeomObjects = theIsVisible;
+
+  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryObjects();
+
+  HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
+  for ( ; anIter.More(); anIter.Next() ) {
+    setObjectVisibility( anIter.Value(), theIsVisible );
+  }
+}
+
+void HYDROGUI_CalculationOp::setLandCoverMapVisible( bool theIsVisible )
+{
+  myShowLandCoverMap = theIsVisible;
+  setObjectVisibility( myEditedObject->GetLandCoverMap(), theIsVisible );  
+}
+
+void HYDROGUI_CalculationOp::AssignDefaultZonesColors()
+{
+  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() )
+      {
+        int aCounter = 0;        
+        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() )
+            {
+              // Zone
+              Handle(HYDROData_Zone) aZone = Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() );
+              if ( !aZone.IsNull() )
+              {
+                QColor aFillingColor = GenerateDefaultZonesColor(++aCounter);
+                while (aFillingColor == Qt::red)
+                  aFillingColor = GenerateDefaultZonesColor(++aCounter);
+                
+                aZone->SetColor(aFillingColor);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+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()
+void HYDROGUI_CalculationOp::createPreview( const bool theLandCoverMap )
 {
   LightApp_Application* anApp = module()->getApp();
+  HYDROData_SequenceOfObjects aSeq;
+  if ( theLandCoverMap && myShowLandCoverMap )
+  {
+    aSeq.Append( myEditedObject->GetLandCoverMap() );
+  }
+  else if ( !theLandCoverMap && myShowGeomObjects )
+  {
+    HYDROData_SequenceOfObjects aSeqGO = myEditedObject->GetGeometryObjects();
+    HYDROData_SequenceOfObjects aSeqP = myEditedObject->GetInterPolyObjects();
+    aSeq.Append( aSeqGO );
+    aSeq.Append( aSeqP );
+  }
+
+  Handle(HYDROData_Entity) anEntity;
+
+  if ( myShowZones )
+  {
+    // Gather zones for displaying
+    HYDROData_SequenceOfObjects aRegions = myEditedObject->GetRegions();
+    HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
+    HYDROData_SequenceOfObjects aZones;
+    Handle(HYDROData_Region) aRegion;
+    for ( ; aRegionsIter.More(); aRegionsIter.Next() )
+    {
+      anEntity = aRegionsIter.Value();
+      if ( !anEntity.IsNull() )
+      {
+        aRegion = Handle(HYDROData_Region)::DownCast( anEntity );
+        if ( !aRegion.IsNull() )
+        {
+          aZones = aRegion->GetZones();
+          aSeq.Append( aZones );
+        }
+      }
+    }
+  }
+
+  // Get a boundary polyline if any
+  if (Handle(HYDROData_PolylineXY) aBPoly = myEditedObject->GetBoundaryPolyline())
+    aSeq.Append( aBPoly );
+
+  module()->removeViewShapes( HYDROGUI_Module::VMR_PreviewCaseZones );
 
   if ( !myActiveViewManager )
   {
-    if ( myRegionsList.isEmpty() )
+    if ( aSeq.IsEmpty() )
       return;
 
     myActiveViewManager = anApp->activeViewManager();
@@ -351,25 +1273,34 @@ void HYDROGUI_CalculationOp::createPreview()
     Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
     if ( !aCtx.IsNull() )
     {
-      RegionsList::iterator anIter = myRegionsList.begin();
-      for ( ; anIter != myRegionsList.end(); ++anIter )
+      HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
+      for ( ; anIter.More(); anIter.Next() )
       {
-        Region& aRegion = *anIter;
-        if ( aRegion.Shape )
-          delete aRegion.Shape;
-
-        aRegion.Shape = new HYDROGUI_Shape( aCtx );
-
-        aRegion.Shape->setFillingColor( aRegion.FillingColor, false );
-        aRegion.Shape->setBorderColor( aRegion.BorderColor, false );
-        aRegion.Shape->setPath( aRegion.SplitData.Path, true );
+        const Handle(HYDROData_Entity)& ent = anIter.Value();
+        if (!ent.IsNull())
+          setObjectVisibility( ent, true );
       }
 
       //Process the draw events for viewer
-      QApplication::processEvents();
-      if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
-        vw->onTopView();
+      QApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
     }
+
+    module()->update( UF_OCCViewer | UF_FitAll );
+
+    if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
+      vw->onTopView();
+  }
+}
+
+void HYDROGUI_CalculationOp::setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible )
+{
+  if ( theEntity.IsNull() || !myPreviewViewManager ) {
+    return;
+  }
+
+  OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer();
+  if ( aViewer ) {
+    module()->setObjectVisible( (size_t)aViewer, theEntity, theIsVisible );
   }
 }
 
@@ -378,33 +1309,191 @@ void HYDROGUI_CalculationOp::onLastViewClosed( SUIT_ViewManager* theViewManager
   closePreview();
 }
 
-void HYDROGUI_CalculationOp::closePreview()
+void HYDROGUI_CalculationOp::closePreview( bool theRemoveViewManager )
 {
-  RegionsList::iterator anIter= myRegionsList.begin();
-  for ( ; anIter != myRegionsList.end(); ++anIter )
+  SUIT_DataBrowser* aOb = ((LightApp_Application*)module()->application())->objectBrowser();
+  QList<QShortcut*> aShortcuts = aOb->findChildren<QShortcut*>();
+  QShortcut* aShortcut;
+  foreach( aShortcut, aShortcuts )
   {
-    Region& aRegion = *anIter;
-    if ( aRegion.Shape )
+    if ( aShortcut->key() == 
+      QKeySequence( ((LightApp_Application*)module()->application())->objectBrowser()->shortcutKey( 
+      SUIT_DataBrowser::RenameShortcut ) ) )
     {
-      delete aRegion.Shape;
-      aRegion.Shape = NULL;
+      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 );
+        }
+      }
+    }
 
-    module()->getApp()->removeViewManager( myPreviewViewManager ); // myPreviewViewManager is deleted here
-    myPreviewViewManager = NULL;
+    if ( theRemoveViewManager )
+    {
+      disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
+                  this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
+
+      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 );
+}