PAL7864, PAL7951, PAL7915

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_MultiEditDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index 77bffa19132eac4418998a1883f56887bc165961..d311b490e3900dfd661fbdb8dbd5d9c9d65c6145 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@ -97,7 +97,7 @@ SMESHGUI_MultiEditDlg::SMESHGUI_MultiEditDlg( QWidget*              theParent,
                                              const bool            the3d2d,
                                               const char*           theName )
 : QDialog( theParent, theName, false, 
-           WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
+           WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose )
 {
   myFilterDlg = 0;
   mySubmeshFilter = new SMESH_TypeFilter( SUBMESH );
@@ -148,6 +148,7 @@ QFrame* SMESHGUI_MultiEditDlg::createMainFrame( QWidget* theParent, const bool t
   myListBox->setSelectionMode( QListBox::Extended );
   myListBox->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding) );
 //  myListBox->setColumnMode( QListBox::FitToHeight );
+  myListBox->installEventFilter( this );
   
   myFilterBtn = new QPushButton( tr( "FILTER" )   , aFrame );
   myAddBtn    = new QPushButton( tr( "ADD" )      , aFrame );
@@ -232,6 +233,20 @@ SMESHGUI_MultiEditDlg::~SMESHGUI_MultiEditDlg()
   }
 }
 
+//=======================================================================
+// name    : SMESHGUI_MultiEditDlg::eventFilter
+// Purpose : event filter
+//=======================================================================
+bool SMESHGUI_MultiEditDlg::eventFilter( QObject* object, QEvent* event )
+{
+  if ( object == myListBox && event->type() == QEvent::KeyPress ) {
+    QKeyEvent* ke = (QKeyEvent*)event;
+    if ( ke->key() == Key_Delete )
+      onRemoveBtn();
+  }
+  return QDialog::eventFilter( object, event );
+}
+
 //=======================================================================
 // name    : SMESHGUI_MultiEditDlg::Init
 // Purpose : Init dialog fields, connect signals and slots, show dialog
@@ -301,9 +316,12 @@ SMESH::long_array_var SMESHGUI_MultiEditDlg::getIds()
   if ( myToAllChk->isChecked() )
   {
     myIds.Clear();
-    if ( myActor != 0 )
+    SMESH_Actor * anActor = SMESH::FindActorByObject( myMesh );
+    if ( !anActor )
+      anActor = myActor;
+    if ( anActor != 0 )
     {
-      TVisualObjPtr aVisualObj = myActor->GetObject();
+      TVisualObjPtr aVisualObj = anActor->GetObject();
       vtkUnstructuredGrid* aGrid = aVisualObj->GetUnstructuredGrid();
       if ( aGrid != 0 )
       {
@@ -350,11 +368,7 @@ void SMESHGUI_MultiEditDlg::onClose()
   disconnect( SMESHGUI::GetSMESHGUI(), 0, this, 0 );
   SMESHGUI::GetSMESHGUI()->ResetState();
   
-  SMESH::RemoveFilter(SMESHGUI_EdgeFilter);
-  SMESH::RemoveFilter(SMESHGUI_FaceFilter);
-  SMESH::RemoveFilter(SMESHGUI_VolumeFilter);
-  SMESH::RemoveFilter(SMESHGUI_QuadFilter);
-  SMESH::RemoveFilter(SMESHGUI_TriaFilter);
+  SMESH::RemoveFilters();
   SMESH::SetPickable();
 
   mySelection->ClearIObjects();
@@ -372,9 +386,6 @@ void SMESHGUI_MultiEditDlg::onSelectionDone()
   if ( myBusy || !isEnabled() ) return;
   myBusy = true;
 
-  myMesh = SMESH::SMESH_Mesh::_nil();
-  myActor = 0;
-
   int nbSel = mySelection->IObjectCount();
   myListBox->clearSelection();
 
@@ -431,14 +442,14 @@ void SMESHGUI_MultiEditDlg::onSelectionDone()
 
   if ( nbSel == 1 ) {
     myActor = SMESH::FindActorByEntry(mySelection->firstIObject()->getEntry());
-    if ( !myActor && !myMesh->_is_nil() )
+    if (!myActor)
       myActor = SMESH::FindActorByObject( myMesh );
     VTKViewer_InteractorStyleSALOME* aStyle = SMESH::GetInteractorStyle();
     Handle(VTKViewer_Filter) aFilter = aStyle->GetFilter( myFilterType );
-    if ( !aFilter.IsNull() && myActor ) {
+    if ( !aFilter.IsNull() )
       aFilter->SetActor( myActor );
-      //SMESH::SetPickable( myActor );
-    }
+//if ( myActor )
+//    SMESH::SetPickable(myActor);
   }
   myBusy = false;
 
@@ -543,6 +554,7 @@ bool SMESHGUI_MultiEditDlg::isIdValid( const int theId ) const
   VTKViewer_InteractorStyleSALOME* aStyle = SMESH::GetInteractorStyle();
   Handle(SMESHGUI_Filter) aFilter =
     Handle(SMESHGUI_Filter)::DownCast( aStyle->GetFilter( myFilterType ) );
+
   return ( !aFilter.IsNull() && aFilter->IsObjValid( theId ) );
 }
 
@@ -572,7 +584,7 @@ void SMESHGUI_MultiEditDlg::onAddBtn()
       SMESH::SMESH_subMesh_var aSubMesh = SMESH::IObjectToInterface<SMESH::SMESH_subMesh>( anIter.Value() );
       if ( !aSubMesh->_is_nil() )
       {
-        if ( !myMesh->_is_nil() && aSubMesh->GetFather()->GetId() == myMesh->GetId() )
+        if ( aSubMesh->GetFather()->GetId() == myMesh->GetId() )
         {
           SMESH::long_array_var anIds = aSubMesh->GetElementsId();
           for ( int i = 0, n = anIds->length(); i < n; i++ )
@@ -591,9 +603,9 @@ void SMESHGUI_MultiEditDlg::onAddBtn()
     {
       SMESH::SMESH_GroupBase_var aGroup =
         SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>( anIter.Value() );
-      if ( !aGroup->_is_nil() && ( aGroup->GetType() == SMESH::FACE || aGroup->GetType() == SMESH::VOLUME ) )
+      if ( !aGroup->_is_nil() && ( aGroup->GetType() == SMESH::FACE && entityType() == 0 || aGroup->GetType() == SMESH::VOLUME && entityType() == 1 ) )
       {
-        if ( !myMesh->_is_nil() && aGroup->GetMesh()->GetId() == myMesh->GetId() )
+        if ( aGroup->GetMesh()->GetId() == myMesh->GetId() )
         {
           SMESH::long_array_var anIds = aGroup->GetListOfID();
           for ( int i = 0, n = anIds->length(); i < n; i++ )
@@ -831,27 +843,20 @@ void SMESHGUI_MultiEditDlg::onToAllChk()
 //=======================================================================
 void SMESHGUI_MultiEditDlg::setSelectionMode()
 {
-  SMESH::RemoveFilter(SMESHGUI_EdgeFilter);
-  SMESH::RemoveFilter(SMESHGUI_FaceFilter);
-  SMESH::RemoveFilter(SMESHGUI_VolumeFilter);
-  SMESH::RemoveFilter(SMESHGUI_QuadFilter);
-  SMESH::RemoveFilter(SMESHGUI_TriaFilter);
-  SMESH::SetPickable();
-
+  SMESH::RemoveFilters();
+    
   mySelection->ClearIObjects();
   mySelection->ClearFilters();
   
-  if ( mySubmeshChk->isChecked() )
-  {
+  if ( mySubmeshChk->isChecked() ) {
     QAD_Application::getDesktop()->SetSelectionMode( ActorSelection, true );
     mySelection->AddFilter( mySubmeshFilter );
   }
-  else if ( myGroupChk->isChecked() )
-  {
+  else if ( myGroupChk->isChecked() ) {
     QAD_Application::getDesktop()->SetSelectionMode( ActorSelection, true );
     mySelection->AddFilter( myGroupFilter );
   }
-  if ( myFilterType == SMESHGUI_VolumeFilter ) {
+  if ( entityType() ) {
     QAD_Application::getDesktop()->SetSelectionMode( VolumeSelection, true );
     SMESH::SetFilter( new SMESHGUI_VolumesFilter() );
   }
@@ -920,15 +925,13 @@ void SMESHGUI_MultiEditDlg::on3d2dChanged(int type)
 
     emit ListContensChanged();
     
-    updateButtons();
-
     if ( type )
       myFilterType = SMESHGUI_VolumeFilter;
     else 
       myFilterType = SMESHGUI_FaceFilter;
-    setSelectionMode();
 
-    myActor = 0;
+    updateButtons();
+    setSelectionMode();
   }
 }