ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-08 10:47:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022571: [CEA 1152] if selection disabled, impossible to select a mesh in "Merge nodes" in manual mode

Browse Source
This commit is contained in:
mpa 2014-04-29 12:48:37 +04:00
parent 1c75225c81
commit a13c835567
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
View File

@ -835,6 +835,7 @@ void SMESHGUI_MergeDlg::onDetect()
ListCoincident->selectAll(); ListCoincident->selectAll();
updateControls(); updateControls();
SMESH::UpdateView();
} }
//================================================================================= //=================================================================================
@ -845,6 +846,10 @@ void SMESHGUI_MergeDlg::onSelectGroup()
{ {
if (myIsBusy || !myActor) if (myIsBusy || !myActor)
return; return;
if( ListCoincident->count() != ListCoincident->selectedItems().count() )
SelectAllCB->setChecked( false );
myEditCurrentArgument = (QWidget*)ListCoincident; myEditCurrentArgument = (QWidget*)ListCoincident;
myIsBusy = true; myIsBusy = true;
@ -994,6 +999,11 @@ void SMESHGUI_MergeDlg::onRemoveGroup()
updateControls(); updateControls();
SMESH::UpdateView(); SMESH::UpdateView();
myIsBusy = false; myIsBusy = false;
if( ListCoincident->count() == 0 ) {
myEditCurrentArgument = (QWidget*)LineEditMesh;
SelectAllCB->setChecked( false );
}
} }
//================================================================================= //=================================================================================
@ -1050,6 +1060,11 @@ void SMESHGUI_MergeDlg::onRemoveElement()
myIsBusy = false; myIsBusy = false;
onEditGroup(); onEditGroup();
if( ListCoincident->count() == 0 ) {
myEditCurrentArgument = (QWidget*)LineEditMesh;
SelectAllCB->setChecked( false );
}
} }
//================================================================================= //=================================================================================
@ -1294,12 +1309,14 @@ void SMESHGUI_MergeDlg::onTypeChanged (int id)
GroupCoincidentWidget->show(); GroupCoincidentWidget->show();
SMESH::SetPointRepresentation(true); SMESH::SetPointRepresentation(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(NodeSelection); if( mySelector->IsSelectionEnabled() )
aViewWindow->SetSelectionMode(NodeSelection);
} }
else { else {
GroupCoincident->show(); GroupCoincident->show();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(CellSelection); if( mySelector->IsSelectionEnabled() )
aViewWindow->SetSelectionMode(CellSelection);
} }
GroupEdit->show(); GroupEdit->show();
break; break;