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
0022876: EDF 8425 SMESH: Get the normal of a face in the GUI
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index 24b96938dd71ef3c4559d7d6e145179087153ea9..73bb0f78c37a373a62b58dd38ef86af3bf319310 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-682,6
+682,8
@@
bool SMESHGUI_MergeDlg::ClickOnApply()
ListCoincident->clear();
ListCoincident->clear();
+ myEditCurrentArgument = (QWidget*)LineEditMesh;
+
SMESH::UpdateView();
SMESHGUI::Modified();
SMESH::UpdateView();
SMESHGUI::Modified();
@@
-833,6
+835,7
@@
void SMESHGUI_MergeDlg::onDetect()
ListCoincident->selectAll();
updateControls();
ListCoincident->selectAll();
updateControls();
+ SMESH::UpdateView();
}
//=================================================================================
}
//=================================================================================
@@
-843,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;
@@
-992,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 );
+ }
}
//=================================================================================
}
//=================================================================================
@@
-1048,6
+1060,11
@@
void SMESHGUI_MergeDlg::onRemoveElement()
myIsBusy = false;
onEditGroup();
myIsBusy = false;
onEditGroup();
+
+ if( ListCoincident->count() == 0 ) {
+ myEditCurrentArgument = (QWidget*)LineEditMesh;
+ SelectAllCB->setChecked( false );
+ }
}
//=================================================================================
}
//=================================================================================
@@
-1139,7
+1156,7
@@
void SMESHGUI_MergeDlg::SelectionIntoArgument()
if (!myActor)
myActor = SMESH::FindActorByObject(myMesh);
if (!myActor)
myActor = SMESH::FindActorByObject(myMesh);
- if ( myActor && myTypeId ==
1
) {
+ if ( myActor && myTypeId ==
1 && mySelector->IsSelectionEnabled()
) {
mySubMeshOrGroup = SMESH::SMESH_IDSource::_nil();
mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter);
mySubMeshOrGroup = SMESH::SMESH_IDSource::_nil();
mySelectionMgr->installFilter(myMeshOrSubMeshOrGroupFilter);
@@
-1292,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;