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
0022106: EDF 2464 SMESH : Split quadrangles in 4 triangles
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_FilterLibraryDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
index c17dde1fa69a7b6b4bbfa2563b0651d8af7a95fe..f29839e8758368e6c9f9362651fc1e3f0fcbab76 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
@@
-269,7
+269,7
@@
QWidget* SMESHGUI_FilterLibraryDlg::createButtonFrame (QWidget* theParent)
aLay->addWidget(myButtons[ BTN_Help ]);
connect(myButtons[ BTN_OK ], SIGNAL(clicked()), SLOT(onOk()));
aLay->addWidget(myButtons[ BTN_Help ]);
connect(myButtons[ BTN_OK ], SIGNAL(clicked()), SLOT(onOk()));
- connect(myButtons[ BTN_Close ], SIGNAL(clicked()), SLOT(
onClose
()));
+ connect(myButtons[ BTN_Close ], SIGNAL(clicked()), SLOT(
reject
()));
connect(myButtons[ BTN_Apply ], SIGNAL(clicked()), SLOT(onApply()));
connect(myButtons[ BTN_Help ], SIGNAL(clicked()), SLOT(onHelp()));
connect(myButtons[ BTN_Apply ], SIGNAL(clicked()), SLOT(onApply()));
connect(myButtons[ BTN_Help ], SIGNAL(clicked()), SLOT(onHelp()));
@@
-337,7
+337,7
@@
void SMESHGUI_FilterLibraryDlg::Init (const QList<int>& theTypes,
setEnabled(true);
connect( mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
setEnabled(true);
connect( mySMESHGUI, SIGNAL(SignalDeactivateActiveDialog()), SLOT(onDeactivate()));
- connect( mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(
onClose
()));
+ connect( mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(
reject
()));
if (myMode == ADD_TO)
{
if (myMode == ADD_TO)
{
@@
-466,8
+466,7
@@
bool SMESHGUI_FilterLibraryDlg::onApply()
//=======================================================================
void SMESHGUI_FilterLibraryDlg::onOk()
{
//=======================================================================
void SMESHGUI_FilterLibraryDlg::onOk()
{
- if (onApply())
- {
+ if (onApply()) {
disconnect( mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
accept();
disconnect( mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
accept();
@@
-475,14
+474,14
@@
void SMESHGUI_FilterLibraryDlg::onOk()
}
//=======================================================================
}
//=======================================================================
-// name : SMESHGUI_FilterLibraryDlg::
onClose
+// name : SMESHGUI_FilterLibraryDlg::
reject
// Purpose : SLOT called when "Close" button pressed. Close dialog
//=======================================================================
// Purpose : SLOT called when "Close" button pressed. Close dialog
//=======================================================================
-void SMESHGUI_FilterLibraryDlg::
onClose
()
+void SMESHGUI_FilterLibraryDlg::
reject
()
{
disconnect( mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
{
disconnect( mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
- reject();
+
QDialog::
reject();
}
//=================================================================================
}
//=================================================================================
@@
-527,15
+526,6
@@
void SMESHGUI_FilterLibraryDlg::enterEvent(QEvent*)
setEnabled(true);
}
setEnabled(true);
}
-//=================================================================================
-// function : closeEvent()
-// purpose : Close dialog
-//=================================================================================
-void SMESHGUI_FilterLibraryDlg::closeEvent(QCloseEvent* e)
-{
- onClose();
-}
-
//=======================================================================
// name : SMESHGUI_FilterLibraryDlg::getFileName
// Purpose : Get file name
//=======================================================================
// name : SMESHGUI_FilterLibraryDlg::getFileName
// Purpose : Get file name