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
refs #661: patch to enable transparency functionality for land cover map objects...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_TranslateObstacleOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_TranslateObstacleOp.cxx
b/src/HYDROGUI/HYDROGUI_TranslateObstacleOp.cxx
index fe714aad218eeb1e577bf8b47ba1ecb6d5f3bf50..11104c0b00f5c19e18dfa7771336e836c674b700 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_TranslateObstacleOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_TranslateObstacleOp.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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-63,14
+59,12
@@
void HYDROGUI_TranslateObstacleOp::startOperation()
aPanel->reset();
// Get the edited object
aPanel->reset();
// Get the edited object
- myEditedObject = Handle(HYDROData_Obstacle)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ if ( isApplyAndClose() )
+ myEditedObject = Handle(HYDROData_Obstacle)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if ( myEditedObject.IsNull() ) {
abort();
return;
}
if ( myEditedObject.IsNull() ) {
abort();
return;
}
- else if ( myEditedObject->IsMustBeUpdated() ) {
- myEditedObject->Update();
- }
// Set the edited object name to the panel
aPanel->setName( myEditedObject->GetName() );
// Set the edited object name to the panel
aPanel->setName( myEditedObject->GetName() );
@@
-104,7
+98,8
@@
HYDROGUI_InputPanel* HYDROGUI_TranslateObstacleOp::createInputPanel() const
}
bool HYDROGUI_TranslateObstacleOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_TranslateObstacleOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_TranslateObstacleDlg* aPanel = ::qobject_cast<HYDROGUI_TranslateObstacleDlg*>( inputPanel() );
if ( !aPanel || myEditedObject.IsNull() ) {
{
HYDROGUI_TranslateObstacleDlg* aPanel = ::qobject_cast<HYDROGUI_TranslateObstacleDlg*>( inputPanel() );
if ( !aPanel || myEditedObject.IsNull() ) {