refs #1278: by default objects in study are not expanded

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

diff --git a/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx b/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx
index 87ce6116616a8ad82d21f9b6ef1c8e3a123940e2..8311fd7b3d86fa9914cc8ee2a9bc75c003c4b426 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_RiverBottomOp.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
@@ -28,7 +24,7 @@
 #include "HYDROGUI_DataObject.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Shape.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_River.h>
@@ -49,7 +45,7 @@
 HYDROGUI_RiverBottomOp::HYDROGUI_RiverBottomOp( HYDROGUI_Module* theModule )
 : HYDROGUI_Operation( theModule )
 {
-  setName( tr( "FIND_RIVER_BOTTOM" ) );
+  setName( tr( "FIND_STREAM_BOTTOM" ) );
 }
 
 HYDROGUI_RiverBottomOp::~HYDROGUI_RiverBottomOp()
@@ -60,9 +56,12 @@ void HYDROGUI_RiverBottomOp::startOperation()
 {
   HYDROGUI_Operation::startOperation();
 
-  HYDROGUI_RiverBottomDlg* aPanel = ::qobject_cast<HYDROGUI_RiverBottomDlg*>( inputPanel() );
+  if ( isApplyAndClose() )
+  {
+    HYDROGUI_RiverBottomDlg* aPanel = ::qobject_cast<HYDROGUI_RiverBottomDlg*>( inputPanel() );
 
-  aPanel->reset();
+    aPanel->reset();
+  }
 }
 
 void HYDROGUI_RiverBottomOp::abortOperation()
@@ -91,7 +90,7 @@ bool HYDROGUI_RiverBottomOp::processApply( int& theUpdateFlags, QString& theErro
   Handle(HYDROData_Stream) aRiver = riverObject( aPanel->getRiverName() );
   if ( aRiver.IsNull() )
   {
-    theErrorMsg = tr( "INCORRECT_RIVER_OBJECT" );
+    theErrorMsg = tr( "INCORRECT_STREAM_OBJECT" );
     return false;
   }