X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=f6bd84498bef201b439aa22cf2c74f8d8cbe49dd;hb=4e1b53167581be7e084a3d71c075507bc6699c06;hp=2dabc9fa9714a77fdf10a696578d8754300225c3;hpb=7ec27726afa16572a7cab1d7936c8e899674050b;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index 2dabc9fa..f6bd8449 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@ -31,6 +31,7 @@
 #include "HYDROGUI_Region.h"
 
 #include <HYDROData_PolylineXY.h>
+#include <HYDROData_ShapesGroup.h>
 #include <HYDROData_Iterator.h>
 #include <HYDROData_Object.h>
 #include <HYDROData_Tool.h>
@@ -144,6 +145,7 @@ void HYDROGUI_CalculationOp::startOperation()
         aPolylineName = aPolylineObj->GetName();
         aPanel->setBoundary( aPolylineName );
       }
+
       aSeq = myEditedObject->GetGeometryObjects();
       getNamesAndEntries( aSeq, aList, anEntryList );
       aPanel->includeGeomObjects( aList );
@@ -172,8 +174,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 ) );
@@ -204,7 +206,9 @@ 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( Next( const int ) ), SLOT( onSplitZones() ) );
+  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& ) ) );
@@ -214,8 +218,8 @@ 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( objectSelected( const QString & ) ), 
-    SLOT( onObjectSelected( const QString & ) ) );
+  connect( aPanel, SIGNAL( objectsSelected() ), 
+           SLOT( onObjectsSelected() ) );
   connect( aPanel, SIGNAL( boundarySelected( const QString & ) ), 
     SLOT( onBoundarySelected( const QString & ) ) );
 
@@ -261,14 +265,22 @@ void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName )
   }
 }
 
-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 );
@@ -283,27 +295,15 @@ 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 );
+        aLastShape = aShape;
       }
     }
   }
-  if ( aSelectedShape )
-  {
-    aSelectedShape->highlight( true );
-    aSelectedShape->update();
-  }
+  if( aLastShape )
+    aLastShape->update( true );
 }
 
 void HYDROGUI_CalculationOp::onClickedInZonesBrowser( SUIT_DataObject* theItem )
@@ -395,7 +395,7 @@ void HYDROGUI_CalculationOp::onCreateRegion( const QList<SUIT_DataObject*>& theZ
   }
 }
 
-void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathymetryName )
+void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltitudeName )
 {
   HYDROGUI_CalculationDlg* aPanel = 
     ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
@@ -404,7 +404,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 )
       {
@@ -505,7 +505,7 @@ bool HYDROGUI_CalculationOp::processApply( int&     theUpdateFlags,
   if ( !aPanel )
     return false;
 
-  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced;
+  theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init;
 
   return true;
 }
@@ -553,43 +553,50 @@ 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;
-
-  QApplication::setOverrideCursor( Qt::WaitCursor );
-
-  QString aNewCaseName = aPanel->getObjectName();
-  QString anOldCaseName = myEditedObject->GetName();
+  if( theIndex==1 )
+  {
+    setAvailableGroups();
+  }
+  else if( theIndex==2 )
+  {
+    HYDROGUI_CalculationDlg* aPanel = 
+      ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
+    if ( !aPanel )
+      return;
 
-  bool anIsToUpdateOb = myIsEdit && anOldCaseName != aNewCaseName;
+    QApplication::setOverrideCursor( Qt::WaitCursor );
   
-  // At first we must to update the case name because of 
-  // automatic names generation for regions and zones
-  myEditedObject->SetName( aNewCaseName );
+    QString aNewCaseName = aPanel->getObjectName();
+    QString anOldCaseName = myEditedObject->GetName();
   
-  if ( myEditedObject->IsMustBeUpdated() )
-  {
-    myShowZones = true;
-    myEditedObject->Update();
+    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() )
+    {
+      myShowZones = true;
+      myEditedObject->Update();
 
-    //aPanel->setEditedObject( myEditedObject );
-    aPanel->refreshZonesBrowser();
+      //aPanel->setEditedObject( myEditedObject );
+      aPanel->refreshZonesBrowser();
 
-    createPreview();
-  }
-  else
-  {
-    setZonesVisible( true );
-  }
+      createPreview();
+    }
+    else
+    {
+      setZonesVisible( true );
+    }
 
-  if ( anIsToUpdateOb )
-    module()->getApp()->updateObjectBrowser( false );
+    if ( anIsToUpdateOb )
+      module()->getApp()->updateObjectBrowser( false );
 
-  QApplication::restoreOverrideCursor();
+    QApplication::restoreOverrideCursor();
+  }
 }
 
 void HYDROGUI_CalculationOp::onHideZones()
@@ -708,7 +715,7 @@ void HYDROGUI_CalculationOp::createPreview()
       }
 
       //Process the draw events for viewer
-      QApplication::processEvents();
+      QApplication::processEvents( QEventLoop::ExcludeUserInputEvents );
       if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() )
         vw->onTopView();
     }
@@ -768,4 +775,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 );
+}