Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#18097 [CEA] Mesh group not updated in the view after a compute with other hypotheses
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_DeleteGroupDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
index ac5a1c686b0bfbba699b15325f67e154384246e5..d930761dfa5fe13fba10b05e077e2ee3fe6a64ed 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-37,13
+37,13
@@
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h>
#include <SUIT_MessageBox.h>
#include <SUIT_ResourceMgr.h>
+#include <SUIT_OverrideCursor.h>
#include <SalomeApp_Study.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx>
#include <SalomeApp_Study.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
#include <SVTK_Selection.h>
#include <SVTK_ViewWindow.h>
#include <SVTK_Selection.h>
#include <SVTK_ViewWindow.h>
@@
-74,8
+74,8
@@
//=================================================================================
SMESHGUI_DeleteGroupDlg::SMESHGUI_DeleteGroupDlg (SMESHGUI* theModule):
QDialog(SMESH::GetDesktop(theModule)),
//=================================================================================
SMESHGUI_DeleteGroupDlg::SMESHGUI_DeleteGroupDlg (SMESHGUI* theModule):
QDialog(SMESH::GetDesktop(theModule)),
- myS
electionMgr(SMESH::GetSelectionMgr(theModule)
),
- myS
MESHGUI(theModule
)
+ myS
MESHGUI(theModule
),
+ myS
electionMgr(SMESH::GetSelectionMgr(theModule)
)
{
setModal(false);
setWindowTitle(tr("CAPTION"));
{
setModal(false);
setWindowTitle(tr("CAPTION"));
@@
-90,7
+90,7
@@
SMESHGUI_DeleteGroupDlg::SMESHGUI_DeleteGroupDlg (SMESHGUI* theModule):
aDlgLay->addWidget(aMainFrame);
aDlgLay->addWidget(aBtnFrame);
aDlgLay->addWidget(aMainFrame);
aDlgLay->addWidget(aBtnFrame);
- myHelpFileName = "deleting_groups
_page
.html";
+ myHelpFileName = "deleting_groups.html";
Init();
}
Init();
}
@@
-146,7
+146,7
@@
QWidget* SMESHGUI_DeleteGroupDlg::createButtonFrame (QWidget* theParent)
// connect signals and slots
connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk()));
// connect signals and slots
connect(myOkBtn, SIGNAL(clicked()), SLOT(onOk()));
- connect(myCloseBtn, SIGNAL(clicked()), SLOT(
onClose
()));
+ connect(myCloseBtn, SIGNAL(clicked()), SLOT(
reject
()));
connect(myApplyBtn, SIGNAL(clicked()), SLOT(onApply()));
connect(myHelpBtn, SIGNAL(clicked()), SLOT(onHelp()));
connect(myApplyBtn, SIGNAL(clicked()), SLOT(onApply()));
connect(myHelpBtn, SIGNAL(clicked()), SLOT(onHelp()));
@@
-173,10
+173,10
@@
void SMESHGUI_DeleteGroupDlg::Init ()
// selection and SMESHGUI
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
// selection and SMESHGUI
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
connect(mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
- connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(
onClose
()));
+ connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(
reject
()));
// set selection mode
// set selection mode
- mySelectionMgr->installFilter(new SMESH_TypeFilter(GROUP));
+ mySelectionMgr->installFilter(new SMESH_TypeFilter(
SMESH::
GROUP));
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
onSelectionDone();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
onSelectionDone();
@@
-194,7
+194,7
@@
bool SMESHGUI_DeleteGroupDlg::isValid()
return false;
}
return false;
}
- return !
mySMESHGUI->isActive
StudyLocked();
+ return !
SMESHGUI::is
StudyLocked();
}
//=================================================================================
}
//=================================================================================
@@
-206,11
+206,13
@@
bool SMESHGUI_DeleteGroupDlg::onApply()
if (!isValid())
return false;
if (!isValid())
return false;
+ SUIT_OverrideCursor wc;
+
myBlockSelection = true;
QList<SMESH::SMESH_GroupBase_var>::iterator anIter;
for (anIter = myListGrp.begin(); anIter != myListGrp.end(); ++anIter) {
myBlockSelection = true;
QList<SMESH::SMESH_GroupBase_var>::iterator anIter;
for (anIter = myListGrp.begin(); anIter != myListGrp.end(); ++anIter) {
- SMESH::SMESH_Mesh_
pt
r aMesh = (*anIter)->GetMesh();
+ SMESH::SMESH_Mesh_
va
r aMesh = (*anIter)->GetMesh();
if (!aMesh->_is_nil())
aMesh->RemoveGroupWithContents(*anIter);
}
if (!aMesh->_is_nil())
aMesh->RemoveGroupWithContents(*anIter);
}
@@
-218,6
+220,12
@@
bool SMESHGUI_DeleteGroupDlg::onApply()
myListBox->clear();
myListGrp.clear();
mySelectionMgr->clearSelected();
myListBox->clear();
myListGrp.clear();
mySelectionMgr->clearSelected();
+
+ /** Erase graphical objects **/
+ SALOME_ListIteratorOfListIO anIterIO (myListGrpIO);
+ for ( ; anIterIO.More(); anIterIO.Next())
+ SMESH::RemoveVisualObjectWithActors( anIterIO.Value()->getEntry(), /*fromAllViews=*/true );
+
SMESH::UpdateView();
SMESHGUI::Modified();
mySMESHGUI->updateObjBrowser(true);
SMESH::UpdateView();
SMESHGUI::Modified();
mySMESHGUI->updateObjBrowser(true);
@@
-233,14
+241,14
@@
bool SMESHGUI_DeleteGroupDlg::onApply()
void SMESHGUI_DeleteGroupDlg::onOk()
{
if (onApply())
void SMESHGUI_DeleteGroupDlg::onOk()
{
if (onApply())
-
onClose
();
+
reject
();
}
//=================================================================================
}
//=================================================================================
-// function :
onClose
()
+// function :
reject
()
// purpose : SLOT called when "Close" button pressed. Close dialog
//=================================================================================
// purpose : SLOT called when "Close" button pressed. Close dialog
//=================================================================================
-void SMESHGUI_DeleteGroupDlg::
onClose
()
+void SMESHGUI_DeleteGroupDlg::
reject
()
{
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
{
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
@@
-248,7
+256,7
@@
void SMESHGUI_DeleteGroupDlg::onClose()
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
mySelectionMgr->clearFilters();
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
mySelectionMgr->clearFilters();
- reject();
+
QDialog::
reject();
}
//=================================================================================
}
//=================================================================================
@@
-285,6
+293,7
@@
void SMESHGUI_DeleteGroupDlg::onSelectionDone()
return;
myListGrp.clear();
return;
myListGrp.clear();
+ myListGrpIO.Clear();
QStringList aNames;
SALOME_ListIO aListIO;
QStringList aNames;
SALOME_ListIO aListIO;
@@
-296,6
+305,7
@@
void SMESHGUI_DeleteGroupDlg::onSelectionDone()
if (!aGroup->_is_nil()) {
aNames.append(aGroup->GetName());
myListGrp.append(aGroup);
if (!aGroup->_is_nil()) {
aNames.append(aGroup->GetName());
myListGrp.append(aGroup);
+ myListGrpIO.Append( anIter.Value() );
}
}
}
}
@@
-305,7
+315,7
@@
void SMESHGUI_DeleteGroupDlg::onSelectionDone()
//=================================================================================
// function : onDeactivate()
//=================================================================================
// function : onDeactivate()
-// purpose : SLOT called when dialog must be deativated
+// purpose : SLOT called when dialog must be dea
c
tivated
//=================================================================================
void SMESHGUI_DeleteGroupDlg::onDeactivate()
{
//=================================================================================
void SMESHGUI_DeleteGroupDlg::onDeactivate()
{
@@
-323,16
+333,7
@@
void SMESHGUI_DeleteGroupDlg::enterEvent (QEvent*)
setEnabled(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
setEnabled(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
- mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
-}
-
-//=================================================================================
-// function : closeEvent()
-// purpose :
-//=================================================================================
-void SMESHGUI_DeleteGroupDlg::closeEvent (QCloseEvent*)
-{
- onClose();
+ mySelectionMgr->installFilter(new SMESH_TypeFilter (SMESH::GROUP));
}
//=================================================================================
}
//=================================================================================