X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_RiverBottomOp.cxx;h=aeaadfb52176fe0d4045d14a5340af61f9b7ea88;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=87ce6116616a8ad82d21f9b6ef1c8e3a123940e2;hpb=e1d46e66d9b3c89854d2b81c8b1673791f78d390;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx b/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx index 87ce6116..aeaadfb5 100644 --- 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 @@ -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( inputPanel() ); + if ( isApplyAndClose() ) + { + HYDROGUI_RiverBottomDlg* aPanel = ::qobject_cast( 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; }