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
Fix regression of SALOME_TESTS/Grids/smesh/3D_mesh_Extrusion_01/B2
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SmoothingDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
index d752a128aa14b55783e5f57f20407b43f4966511..caa4c51194fd1f1de33e69da4e28144d19cace2c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-111,8
+111,8
@@
SMESHGUI_SmoothingDlg::SMESHGUI_SmoothingDlg( SMESHGUI* theModule )
: QDialog( SMESH::GetDesktop( theModule ) ),
mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
: QDialog( SMESH::GetDesktop( theModule ) ),
mySMESHGUI( theModule ),
mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
- my
FilterDlg(0
),
- my
SelectedObject(SMESH::SMESH_IDSource::_nil()
)
+ my
SelectedObject(SMESH::SMESH_IDSource::_nil()
),
+ my
FilterDlg(0
)
{
QPixmap image0 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_DLG_SMOOTHING")));
QPixmap image1 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_SELECT")));
{
QPixmap image0 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_DLG_SMOOTHING")));
QPixmap image1 (SMESH::GetResourceMgr( mySMESHGUI )->loadPixmap("SMESH", tr("ICON_SELECT")));
@@
-566,6
+566,7
@@
void SMESHGUI_SmoothingDlg::onTextChange (const QString& theNewText)
void SMESHGUI_SmoothingDlg::SelectionIntoArgument()
{
if (myBusy) return;
void SMESHGUI_SmoothingDlg::SelectionIntoArgument()
{
if (myBusy) return;
+ if (myFilterDlg && myFilterDlg->isVisible()) return; // filter dlg active
// clear
QString aString = "";
// clear
QString aString = "";
@@
-574,7
+575,8
@@
void SMESHGUI_SmoothingDlg::SelectionIntoArgument()
BusyLocker lock( myBusy );
if (myEditCurrentArgument == LineEditElements ||
BusyLocker lock( myBusy );
if (myEditCurrentArgument == LineEditElements ||
- myEditCurrentArgument == LineEditNodes) {
+ myEditCurrentArgument == LineEditNodes)
+ {
myEditCurrentArgument->setText(aString);
if (myEditCurrentArgument == LineEditElements) {
myNbOkElements = 0;
myEditCurrentArgument->setText(aString);
if (myEditCurrentArgument == LineEditElements) {
myNbOkElements = 0;