Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_v14_rc' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ZLevelsOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ZLevelsOp.cxx
b/src/HYDROGUI/HYDROGUI_ZLevelsOp.cxx
index e2b52b87e7cabf3550fa6daa06f25748a4a1f220..64d3c157a503e3d6bb09e47a5054e029d506f7e6 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ZLevelsOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ZLevelsOp.cxx
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 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) 2014-2015 EDF-R&D
// 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
@@
-84,6
+80,7
@@
void HYDROGUI_ZLevelsOp::startOperation()
// Show the dialog
if ( !myDlg ) {
myDlg = new HYDROGUI_ZLevelsDlg( module()->getApp()->desktop(), module() );
// Show the dialog
if ( !myDlg ) {
myDlg = new HYDROGUI_ZLevelsDlg( module()->getApp()->desktop(), module() );
+ connect( myDlg, SIGNAL( applyOrderAndClose() ), this, SLOT( onApplyAndClose() ) );
connect( myDlg, SIGNAL( applyOrder() ), this, SLOT( onApply() ) );
connect( myDlg, SIGNAL( rejected() ), this, SLOT( onCancel() ) );
}
connect( myDlg, SIGNAL( applyOrder() ), this, SLOT( onApply() ) );
connect( myDlg, SIGNAL( rejected() ), this, SLOT( onCancel() ) );
}
@@
-135,4
+132,11
@@
void HYDROGUI_ZLevelsOp::processCancel()
delete myDlg;
myDlg = 0;
}
delete myDlg;
myDlg = 0;
}
-}
\ No newline at end of file
+}
+
+void HYDROGUI_ZLevelsOp::onApplyAndClose()
+{
+ HYDROGUI_Operation::onApplyAndClose();
+ if ( myDlg )
+ myDlg->reject();
+}