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 remote-tracking branch 'origin/BR_IMPROVEMENTS' into BR_v14_rc
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_RiverBottomOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx
b/src/HYDROGUI/HYDROGUI_RiverBottomOp.cxx
index 87ce6116616a8ad82d21f9b6ef1c8e3a123940e2..aeaadfb52176fe0d4045d14a5340af61f9b7ea88 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
// 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 )
{
HYDROGUI_RiverBottomOp::HYDROGUI_RiverBottomOp( HYDROGUI_Module* theModule )
: HYDROGUI_Operation( theModule )
{
- setName( tr( "FIND_
RIVER
_BOTTOM" ) );
+ setName( tr( "FIND_
STREAM
_BOTTOM" ) );
}
HYDROGUI_RiverBottomOp::~HYDROGUI_RiverBottomOp()
}
HYDROGUI_RiverBottomOp::~HYDROGUI_RiverBottomOp()
@@
-60,9
+56,12
@@
void HYDROGUI_RiverBottomOp::startOperation()
{
HYDROGUI_Operation::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()
}
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() )
{
Handle(HYDROData_Stream) aRiver = riverObject( aPanel->getRiverName() );
if ( aRiver.IsNull() )
{
- theErrorMsg = tr( "INCORRECT_
RIVER
_OBJECT" );
+ theErrorMsg = tr( "INCORRECT_
STREAM
_OBJECT" );
return false;
}
return false;
}