Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ZLevelsOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ZLevelsOp.cxx b/src/HYDROGUI/HYDROGUI_ZLevelsOp.cxx
index 3f7c1eaf732e55ca72ae2f5dbaee49911b2edf11..916044265214780ad2010f27a7a6e3848c4b9170 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ZLevelsOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ZLevelsOp.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  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
-// 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
@@ -25,7 +21,7 @@
 #include "HYDROGUI_ZLevelsDlg.h"
 #include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 #include "HYDROGUI_ListSelector.h"
 
@@ -84,6 +80,7 @@ void HYDROGUI_ZLevelsOp::startOperation()
   // 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() ) );
   }
@@ -135,4 +132,11 @@ void HYDROGUI_ZLevelsOp::processCancel()
     delete myDlg;
     myDlg = 0;
   }
-}
\ No newline at end of file
+}
+
+void HYDROGUI_ZLevelsOp::onApplyAndClose()
+{
+  HYDROGUI_Operation::onApplyAndClose();
+  if ( myDlg )
+    myDlg->reject();
+}