X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=954e789f45028ac10c404ea4ff7056d38026ace0;hb=e7225e329739e01faed6682de0bc83cf84c28de6;hp=e826fb926f4e15ae7ff317c182ecc64c7b156502;hpb=3cf649c8f69e51265ec7e37a514791a96355f6cf;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index e826fb92..954e789f 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -30,10 +30,11 @@
 #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_ImmersibleZone.h>
 #include <HYDROData_Object.h>
+#include <HYDROData_Tool.h>
 
 #include <OCCViewer_ViewManager.h>
 #include <OCCViewer_ViewModel.h>
@@ -46,8 +47,11 @@
 
 #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 ),
@@ -75,11 +79,53 @@ void HYDROGUI_CalculationOp::startOperation()
   if ( !aPanel )
     return;
 
-  aPanel->reset();
+  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 );
+    }
+  }
 
-  QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), "Case" );
+  aPanel->reset();
+  QStringList aList;
+  QStringList anEntryList;
+  HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetGeometryObjects( module() );
+  getNamesAndEntries( aSeq, 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() )
+    { 
+      // 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 aSelectedObjects;
+  QString anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_CALCULATION_CASE_NAME" ) );
 
   myEditedObject.Nullify();
   if ( myIsEdit )
@@ -88,7 +134,20 @@ void HYDROGUI_CalculationOp::startOperation()
     if ( !myEditedObject.IsNull() )
     {
       anObjectName = myEditedObject->GetName();
-      updateGeomObjectsList(aPanel);
+      aPolylineObj = myEditedObject->GetBoundaryPolyline();
+      if ( aPolylineObj.IsNull() )
+      {
+        aPanel->setBoundary( QString() );
+      }
+      else
+      {
+        aPolylineName = aPolylineObj->GetName();
+        aPanel->setBoundary( aPolylineName );
+      }
+
+      aSeq = myEditedObject->GetGeometryObjects();
+      getNamesAndEntries( aSeq, aList, anEntryList );
+      aPanel->includeGeomObjects( aList );
     }
   }
   else
@@ -104,27 +163,22 @@ void HYDROGUI_CalculationOp::startOperation()
   createPreview();
 }
 
-void HYDROGUI_CalculationOp::updateGeomObjectsList( HYDROGUI_CalculationDlg* thePanel ) const
+void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
+                                                QStringList& theNames, QStringList& theEntries ) const
 {
-  Handle(HYDROData_Object) anObject;
-  Handle(HYDROData_Entity) anEntity;
-  QStringList aList;
-  // Update the list in the dialog
-  HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryObjects();
-  HYDROData_SequenceOfObjects::Iterator anIter( aSeq );
+ 
+  theNames.clear();
+  theEntries.clear();
+  HYDROData_SequenceOfObjects::Iterator anIter( theSeq );
   for ( ; anIter.More(); anIter.Next() )
   {
-    anEntity = anIter.Value();
-    if ( !anEntity.IsNull() )
-    {
-      anObject = Handle(HYDROData_Object)::DownCast( anEntity );
-      if ( !anObject.IsNull() )
-      {
-        aList.append( anObject->GetName() );
-      }
-    }
+    Handle(HYDROData_Entity) anEntity = anIter.Value();
+    //if ( !HYDROData_Tool::IsGeometryObject( anEntity ) )
+    //  continue;
+
+    theNames.append( anEntity->GetName() );
+    theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anEntity ) );
   }
-  thePanel->setSelectedGeomObjects( aList );
 }
 
 void HYDROGUI_CalculationOp::abortOperation()
@@ -133,6 +187,7 @@ void HYDROGUI_CalculationOp::abortOperation()
   // Abort transaction
   abortDocOperation();
   HYDROGUI_Operation::abortOperation();
+  module()->getApp()->updateObjectBrowser();
 }
 
 void HYDROGUI_CalculationOp::commitOperation()
@@ -150,9 +205,11 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
   // Connect signals and slots
   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( Next( const int ) ), SLOT( onNext( const int ) ) );
+  connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onHideZones() ) );
+  //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*>& ) ) );
@@ -160,10 +217,94 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const
     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( boundarySelected( const QString & ) ), 
+    SLOT( onBoundarySelected( const QString & ) ) );
 
   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) 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::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 = 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() )
+  {
+    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 );
+        aLastShape = aShape;
+      }
+    }
+  }
+  if( aLastShape )
+    aLastShape->update( true );
+}
+
 void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem )
 {
   HYDROGUI_Region* aRegionItem = dynamic_cast<HYDROGUI_Region*>(theItem);
@@ -220,7 +361,7 @@ void HYDROGUI_CalculationOp::onMoveZones( SUIT_DataObject* theRegionItem, const
         ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
       if ( aPanel )
       {
-        aPanel->setEditedObject(myEditedObject);
+        aPanel->refreshZonesBrowser();
       }
       createPreview();
     }
@@ -247,13 +388,13 @@ void HYDROGUI_CalculationOp::onCreateRegion( const QList<SUIT_DataObject*>& theZ
       ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
     if ( aPanel )
     {
-      aPanel->setEditedObject(myEditedObject);
+      aPanel->refreshZonesBrowser();
     }
     createPreview();
   }
 }
 
-void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathymetryName )
+void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltitudeName )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
@@ -262,7 +403,7 @@ void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathy
     HYDROGUI_Zone* aZone = aPanel->getCurrentZone();
     if ( aZone )
     {
-      aZone->setMergeType( theMergeType, theBathymetryName );
+      aZone->setMergeType( theMergeType, theAltitudeName );
       HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
       if ( aShape )
       {
@@ -275,33 +416,33 @@ void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathy
 
 void HYDROGUI_CalculationOp::onAddObjects()
 {
+  HYDROGUI_CalculationDlg* aPanel = 
+    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+  if ( !aPanel )
+    return;
+
   // Add geometry objects selected in the module browser to the calculation case
-  Handle(HYDROData_Object) anObject;
-  Handle(HYDROData_Entity) anEntity;
-  QStringList aList;
-  HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( module() );
-  for( Standard_Integer anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ )
+  QStringList aSelectedList = aPanel->getSelectedAvailableGeomObjects();
+  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+    return;
+
+  QStringList anAddedList;
+  for (int i = 0; i < aSelectedList.length(); i++)
   {
-    anEntity = aSeq.Value( anIndex );
-    if ( !anEntity.IsNull() )
-    {
-      anObject = Handle(HYDROData_Object)::DownCast( anEntity );
-      if( !anObject.IsNull() )
-      {
-        if (myEditedObject->AddGeometryObject( anObject ))
-        {
-          aList.append( anObject->GetName() );
-        }
-      }
-    }
+    Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) );
+    if ( anObject.IsNull() )
+      continue;
+
+    if ( myEditedObject->AddGeometryObject( anObject ) )
+      anAddedList.append( anObject->GetName() );
   }
-  HYDROGUI_CalculationDlg* aPanel = 
-    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-  if ( aPanel )
+
+  if ( !anAddedList.isEmpty() )
   {
-    updateGeomObjectsList( aPanel );
+    aPanel->includeGeomObjects( anAddedList );
+    createPreview();
   }
-  createPreview();
 }
 
 void HYDROGUI_CalculationOp::onRemoveObjects()
@@ -309,37 +450,69 @@ void HYDROGUI_CalculationOp::onRemoveObjects()
   // Remove selected objects from the calculation case
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-  if ( aPanel )
+  if ( !aPanel )
+    return;
+
+  QStringList aSelectedList = aPanel->getSelectedGeomObjects();
+  if ( aSelectedList.isEmpty() || !confirmRegionsChange() )
+    return;
+
+  for (int i = 0; i < aSelectedList.length(); i++)
   {
-    QStringList aList = aPanel->getSelectedGeomObjects();
-    Handle(HYDROData_Object) anObject;
-    Handle(HYDROData_Entity) anEntity;
-    for (int i = 0; i < aList.length(); i++)
+    Handle(HYDROData_Object) anObject = Handle(HYDROData_Object)::DownCast( 
+      HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) );
+    if ( anObject.IsNull() )
+      continue;
+
+    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();
+  if ( !isConfirmed )
+  {
+    // If not modified check if the case has already defined regions with zones
+    HYDROData_SequenceOfObjects aSeq = myEditedObject->GetRegions();
+    if ( aSeq.Length() > 0 )
     {
-      anEntity = HYDROGUI_Tool::FindObjectByName( module(), aList.at(i) );
-      if ( !anEntity.IsNull() )
-      {
-        anObject = Handle(HYDROData_Object)::DownCast( anEntity );
-        if ( !anObject.IsNull() )
-        {
-          module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anObject );
-          myEditedObject->RemoveGeometryObject( anObject );
-        }
-      }
+      // 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" ),
+                               QMessageBox::Yes | QMessageBox::No,
+                               QMessageBox::No ) == QMessageBox::Yes );
+    }
+    else
+    {
+      isConfirmed = true; // No regions - no zones - nothing to recalculate
     }
-    updateGeomObjectsList( aPanel );
   }
+  return isConfirmed;
 }
 
 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;
+  if( !myIsEdit )
+  {
+    QString anEntry = HYDROGUI_DataObject::dataObjectEntry( myEditedObject );
+    theBrowseObjectsEntries.append( anEntry );
+  }
+
+  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
 
   return true;
 }
@@ -350,12 +523,13 @@ void HYDROGUI_CalculationOp::onApply()
 
   int anUpdateFlags = 0;
   QString anErrorMsg;
+  QStringList aBrowseObjectsEntries;
 
   bool aResult = false;
   
   try
   {
-    aResult = processApply( anUpdateFlags, anErrorMsg );
+    aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
   }
   catch ( Standard_Failure )
   {
@@ -374,6 +548,7 @@ void HYDROGUI_CalculationOp::onApply()
   {
     module()->update( anUpdateFlags );
     commit();
+    browseObjects( aBrowseObjectsEntries );
   }
   else
   {
@@ -387,30 +562,50 @@ void HYDROGUI_CalculationOp::onApply()
   }
 }
 
-void HYDROGUI_CalculationOp::onSplitZones()
+void HYDROGUI_CalculationOp::onNext( const int theIndex )
 {
-  QApplication::setOverrideCursor( Qt::WaitCursor );
-
-  if ( myEditedObject->IsMustBeUpdated() )
+  if( theIndex==1 )
+  {
+    setAvailableGroups();
+  }
+  else if( theIndex==2 )
   {
-    myShowZones = true;
-    myEditedObject->SplitGeometryObjects();
-
     HYDROGUI_CalculationDlg* aPanel = 
       ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
-    if ( aPanel )
+    if ( !aPanel )
+      return;
+
+    QApplication::setOverrideCursor( Qt::WaitCursor );
+  
+    QString aNewCaseName = aPanel->getObjectName();
+    QString anOldCaseName = myEditedObject->GetName();
+  
+    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 );
+  
+    if ( myEditedObject->IsMustBeUpdated() )
     {
-      aPanel->setEditedObject( myEditedObject );
+      myShowZones = true;
+      myEditedObject->Update();
+
+      //aPanel->setEditedObject( myEditedObject );
+      aPanel->refreshZonesBrowser();
+
+      createPreview();
+    }
+    else
+    {
+      setZonesVisible( true );
     }
 
-    createPreview();
-  }
-  else
-  {
-    setZonesVisible( true );
-  }
+    if ( anIsToUpdateOb )
+      module()->getApp()->updateObjectBrowser( false );
 
-  QApplication::restoreOverrideCursor();
+    QApplication::restoreOverrideCursor();
+  }
 }
 
 void HYDROGUI_CalculationOp::onHideZones()
@@ -425,31 +620,29 @@ void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible )
   HYDROData_SequenceOfObjects::Iterator aRegionsIter( aRegions );
   HYDROData_SequenceOfObjects aZones;
   Handle(HYDROData_Region) aRegion;
-  if ( OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer() )
+  if ( myPreviewViewManager ) 
   {
-    Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
-    if ( !aCtx.IsNull() )
+    if ( OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer() )
     {
-      for ( ; aRegionsIter.More(); aRegionsIter.Next() )
+      Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext();
+      if ( !aCtx.IsNull() )
       {
-        aRegion = Handle(HYDROData_Region)::DownCast( aRegionsIter.Value() );
-        if ( !aRegion.IsNull() )
+        for ( ; aRegionsIter.More(); aRegionsIter.Next() )
         {
-          aZones = aRegion->GetZones();
-          HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
-          for ( ; aZonesIter.More(); aZonesIter.Next() )
+          aRegion = Handle(HYDROData_Region)::DownCast( aRegionsIter.Value() );
+          if ( !aRegion.IsNull() )
           {
-            if ( theIsVisible )
-            {
-              showObject( aZonesIter.Value(), aCtx );
-            }
-            else
+            aZones = aRegion->GetZones();
+            HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones );
+            for ( ; aZonesIter.More(); aZonesIter.Next() )
             {
-              module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZonesIter.Value() );
+              setObjectVisibility( aZonesIter.Value(), theIsVisible );
             }
           }
         }
       }
+
+      module()->update( UF_OCCViewer );
     }
   }
 }
@@ -482,6 +675,9 @@ void HYDROGUI_CalculationOp::createPreview()
     }
   }
 
+  // Get a boundary polyline if any
+  aSeq.Append( myEditedObject->GetBoundaryPolyline() );
+
   module()->removeViewShapes( HYDROGUI_Module::VMR_PreviewCaseZones );
 
   if ( !myActiveViewManager )
@@ -517,28 +713,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 );
   }
 }
 
@@ -549,8 +745,35 @@ void HYDROGUI_CalculationOp::onLastViewClosed( SUIT_ViewManager* theViewManager
 
 void HYDROGUI_CalculationOp::closePreview()
 {
+  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 )
   {
+    // 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 );
+        }
+      }
+    }
+
     disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ),
                 this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) );
 
@@ -565,4 +788,95 @@ void HYDROGUI_CalculationOp::closePreview()
   }
 }
 
+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() ) {
+    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 );
+
+  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 );
+}