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 branch 'BR_v14_rc' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImmersibleZoneOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
index 5778c6f133362aa95a66f5744b5b81277c6fef13..678d8059680af73ba72bbc589df2d754c376232b 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.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
@@
-82,7
+78,8
@@
void HYDROGUI_ImmersibleZoneOp::startOperation()
if ( myIsEdit )
{
if ( myIsEdit )
{
- myEditedObject = Handle(HYDROData_ImmersibleZone)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
+ if ( isApplyAndClose() )
+ myEditedObject = Handle(HYDROData_ImmersibleZone)::DownCast( HYDROGUI_Tool::GetSelectedObject( module() ) );
if( !myEditedObject.IsNull() )
{
anObjectName = myEditedObject->GetName();
if( !myEditedObject.IsNull() )
{
anObjectName = myEditedObject->GetName();
@@
-99,12
+96,12
@@
void HYDROGUI_ImmersibleZoneOp::startOperation()
aPanel->setObjectName( anObjectName );
aPanel->setPolylineNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_POLYLINEXY ) );
aPanel->setObjectName( anObjectName );
aPanel->setPolylineNames( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_POLYLINEXY ) );
- aPanel->set
BathymetryName
s( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_BATHYMETRY ) );
+ aPanel->set
AdditionalParam
s( HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_BATHYMETRY ) );
aPanel->blockSignals( false );
aPanel->setPolylineName( aSelectedPolyline );
aPanel->blockSignals( false );
aPanel->setPolylineName( aSelectedPolyline );
- aPanel->set
Bathymetry
Name( aSelectedBathymetry );
+ aPanel->set
SelectedAdditionalParam
Name( aSelectedBathymetry );
}
void HYDROGUI_ImmersibleZoneOp::abortOperation()
}
void HYDROGUI_ImmersibleZoneOp::abortOperation()
@@
-165,7
+162,7
@@
bool HYDROGUI_ImmersibleZoneOp::processApply( int& theUpdateFlags,
HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINEXY ) );
}
HYDROGUI_Tool::FindObjectByName( module(), aPolylineName, KIND_POLYLINEXY ) );
}
- QString aBathymetryName = aPanel->get
Bathymetry
Name();
+ QString aBathymetryName = aPanel->get
SelectedAdditionalParam
Name();
if ( !aBathymetryName.isEmpty() )
{
aZoneBathymetry = Handle(HYDROData_Bathymetry)::DownCast(
if ( !aBathymetryName.isEmpty() )
{
aZoneBathymetry = Handle(HYDROData_Bathymetry)::DownCast(