Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1c75225
)
0022571: [CEA 1152] if selection disabled, impossible to select a mesh in "Merge...
author
mpa
<mpa@opencascade.com>
Tue, 29 Apr 2014 08:48:37 +0000
(12:48 +0400)
committer
mpa
<mpa@opencascade.com>
Tue, 29 Apr 2014 08:48:37 +0000
(12:48 +0400)
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
patch
|
blob
|
history
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index 99c7d49edff9b72dc7bf7164a7d63018f1812b3e..046bd063c7f71b280a438b4cfed5e9801ae9771e 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@
-835,6
+835,7
@@
void SMESHGUI_MergeDlg::onDetect()
ListCoincident->selectAll();
updateControls();
ListCoincident->selectAll();
updateControls();
+ SMESH::UpdateView();
}
//=================================================================================
}
//=================================================================================
@@
-845,6
+846,10
@@
void SMESHGUI_MergeDlg::onSelectGroup()
{
if (myIsBusy || !myActor)
return;
{
if (myIsBusy || !myActor)
return;
+
+ if( ListCoincident->count() != ListCoincident->selectedItems().count() )
+ SelectAllCB->setChecked( false );
+
myEditCurrentArgument = (QWidget*)ListCoincident;
myIsBusy = true;
myEditCurrentArgument = (QWidget*)ListCoincident;
myIsBusy = true;
@@
-994,6
+999,11
@@
void SMESHGUI_MergeDlg::onRemoveGroup()
updateControls();
SMESH::UpdateView();
myIsBusy = false;
updateControls();
SMESH::UpdateView();
myIsBusy = false;
+
+ if( ListCoincident->count() == 0 ) {
+ myEditCurrentArgument = (QWidget*)LineEditMesh;
+ SelectAllCB->setChecked( false );
+ }
}
//=================================================================================
}
//=================================================================================
@@
-1050,6
+1060,11
@@
void SMESHGUI_MergeDlg::onRemoveElement()
myIsBusy = false;
onEditGroup();
myIsBusy = false;
onEditGroup();
+
+ if( ListCoincident->count() == 0 ) {
+ myEditCurrentArgument = (QWidget*)LineEditMesh;
+ SelectAllCB->setChecked( false );
+ }
}
//=================================================================================
}
//=================================================================================
@@
-1294,12
+1309,14
@@
void SMESHGUI_MergeDlg::onTypeChanged (int id)
GroupCoincidentWidget->show();
SMESH::SetPointRepresentation(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
GroupCoincidentWidget->show();
SMESH::SetPointRepresentation(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(NodeSelection);
+ if( mySelector->IsSelectionEnabled() )
+ aViewWindow->SetSelectionMode(NodeSelection);
}
else {
GroupCoincident->show();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
}
else {
GroupCoincident->show();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
- aViewWindow->SetSelectionMode(CellSelection);
+ if( mySelector->IsSelectionEnabled() )
+ aViewWindow->SetSelectionMode(CellSelection);
}
GroupEdit->show();
break;
}
GroupEdit->show();
break;