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 405f5f8948253fae783b0a6c4c4b01871f739292..678d8059680af73ba72bbc589df2d754c376232b 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.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
@@
-28,6
+24,7
@@
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_UpdateFlags.h"
#include "HYDROGUI_Shape.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_UpdateFlags.h"
+#include "HYDROGUI_DataObject.h"
#include <HYDROData_Bathymetry.h>
#include <HYDROData_Iterator.h>
#include <HYDROData_Bathymetry.h>
#include <HYDROData_Iterator.h>
@@
-43,6
+40,7
@@
#include <SUIT_Desktop.h>
#include <TopoDS.hxx>
#include <SUIT_Desktop.h>
#include <TopoDS.hxx>
+#include <TopoDS_Face.hxx>
#include <TopoDS_Wire.hxx>
#include <QApplication>
#include <TopoDS_Wire.hxx>
#include <QApplication>
@@
-80,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();
@@
-97,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()
@@
-128,7
+127,8
@@
HYDROGUI_InputPanel* HYDROGUI_ImmersibleZoneOp::createInputPanel() const
}
bool HYDROGUI_ImmersibleZoneOp::processApply( int& theUpdateFlags,
}
bool HYDROGUI_ImmersibleZoneOp::processApply( int& theUpdateFlags,
- QString& theErrorMsg )
+ QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries )
{
HYDROGUI_ImmersibleZoneDlg* aPanel = ::qobject_cast<HYDROGUI_ImmersibleZoneDlg*>( inputPanel() );
if ( !aPanel )
{
HYDROGUI_ImmersibleZoneDlg* aPanel = ::qobject_cast<HYDROGUI_ImmersibleZoneDlg*>( inputPanel() );
if ( !aPanel )
@@
-162,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(
@@
-194,7
+194,11
@@
bool HYDROGUI_ImmersibleZoneOp::processApply( int& theUpdateFlags,
closePreview();
if( !myIsEdit )
closePreview();
if( !myIsEdit )
+ {
module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aZoneObj, true );
module()->setObjectVisible( HYDROGUI_Tool::GetActiveOCCViewId( module() ), aZoneObj, true );
+ QString anEntry = HYDROGUI_DataObject::dataObjectEntry( aZoneObj );
+ theBrowseObjectsEntries.append( anEntry );
+ }
module()->setIsToUpdate( aZoneObj );
module()->setIsToUpdate( aZoneObj );
@@
-250,7
+254,7
@@
void HYDROGUI_ImmersibleZoneOp::onCreatePreview( const QString& thePolylineName
TopoDS_Face aFace;
if( !aZoneShape.IsNull() )
aFace = TopoDS::Face( aZoneShape );
TopoDS_Face aFace;
if( !aZoneShape.IsNull() )
aFace = TopoDS::Face( aZoneShape );
- myPreviewPrs->setFace( aFace );
+ myPreviewPrs->setFace( aFace
, true, true, ""
);
}
QApplication::restoreOverrideCursor();
}
QApplication::restoreOverrideCursor();