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

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

diff --git a/src/HYDROGUI/HYDROGUI_Operations.cxx b/src/HYDROGUI/HYDROGUI_Operations.cxx
index 75ca6f832714174cb3a11b9d1b622a7eed06100a..b1c5880127ccc45193f32b40bd019dce2a518962 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operations.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operations.cxx
@@ -796,10 +796,26 @@ void HYDROGUI_Module::onBathymetrySelection()
   if( isChecked )
     startOperation( BathymetrySelectionId );
   else
-    operation( BathymetrySelectionId )->abort();
+  {
+    LightApp_Operation* op = operation( BathymetryTextId );
+    if( op )
+      op->abort();
+
+    op = operation( BathymetrySelectionId );
+    if( op )
+      op->abort();
+  }
 }
 
 void HYDROGUI_Module::onBathymetryText()
 {
-  //TODO
+  QAction* a = qobject_cast<QAction*>( sender() );
+  if( !a )
+    return;
+
+  bool isChecked = a->isChecked();
+  if( isChecked )
+    startOperation( BathymetryTextId );
+  else
+    operation( BathymetryTextId )->abort();
 }