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
Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ZLayers.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ZLayers.cxx
b/src/HYDROGUI/HYDROGUI_ZLayers.cxx
index 828f6963db735f69f774ee6974d30087e9d4e4cd..4cd49e8b055dd0218ae9cd15150ed444e1c372be 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ZLayers.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ZLayers.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
@@
-27,7
+23,7
@@
void SetZLayerForPrs( const Handle(PrsMgr_Presentation)& thePrs, int theLayerId );
void SetZLayerForPrs( const Handle(PrsMgr_Presentation)& thePrs, int theLayerId );
-void SetPrsZLayer( const Handle
_PrsMgr_PresentableObject
& thePresentableObject,
+void SetPrsZLayer( const Handle
(PrsMgr_PresentableObject)
& thePresentableObject,
const int theMode, const int theLayerId )
{
PrsMgr_Presentations& aPresentations = thePresentableObject->Presentations();
const int theMode, const int theLayerId )
{
PrsMgr_Presentations& aPresentations = thePresentableObject->Presentations();
@@
-41,9
+37,10
@@
void SetPrsZLayer( const Handle_PrsMgr_PresentableObject& thePresentableObject,
}
}
}
}
-void SetZLayerSettings( const Handle
_V3d_Viewer
& theViewer3d, int theLayerId, bool theIsOrdered )
+void SetZLayerSettings( const Handle
(V3d_Viewer)
& theViewer3d, int theLayerId, bool theIsOrdered )
{
{
- if ( theViewer3d.IsNull() || theLayerId < 0 ) {
+ if ( theViewer3d.IsNull() /*|| theLayerId < 0*/ )
+ {
return;
}
return;
}
@@
-68,7
+65,7
@@
void SetZLayerSettings( const Handle_V3d_Viewer& theViewer3d, int theLayerId, bo
theViewer3d->SetZLayerSettings( theLayerId, aSettings );
}
theViewer3d->SetZLayerSettings( theLayerId, aSettings );
}
-int CreateTopZLayer( const Handle
_V3d_Viewer
& theViewer3d )
+int CreateTopZLayer( const Handle
(V3d_Viewer)
& theViewer3d )
{
int aTopZLayer = -1;
{
int aTopZLayer = -1;
@@
-80,7
+77,7
@@
int CreateTopZLayer( const Handle_V3d_Viewer& theViewer3d )
}
}
-HYDROGUI_ZLayersIterator::HYDROGUI_ZLayersIterator( const Handle
_V3d_Viewer
& theViewer )
+HYDROGUI_ZLayersIterator::HYDROGUI_ZLayersIterator( const Handle
(V3d_Viewer)
& theViewer )
: myIndex( 0 ), myNewZLayer( -1 ), myViewer( theViewer )
{
Init( theViewer );
: myIndex( 0 ), myNewZLayer( -1 ), myViewer( theViewer )
{
Init( theViewer );
@@
-90,15
+87,18
@@
HYDROGUI_ZLayersIterator::~HYDROGUI_ZLayersIterator()
{
}
{
}
-void HYDROGUI_ZLayersIterator::Init( const Handle
_V3d_Viewer
& theViewer )
+void HYDROGUI_ZLayersIterator::Init( const Handle
(V3d_Viewer)
& theViewer )
{
TColStd_SequenceOfInteger anExistingZLayers;
theViewer->GetAllZLayers( anExistingZLayers );
int n = anExistingZLayers.Length();
{
TColStd_SequenceOfInteger anExistingZLayers;
theViewer->GetAllZLayers( anExistingZLayers );
int n = anExistingZLayers.Length();
- myZLayers.resize( n );
- for( int i=1; i<=n; i++ )
- myZLayers[i-1] = anExistingZLayers( i );
+ for( int i=1; i<=n; i++ ) {
+ int aLayerId = anExistingZLayers( i );
+ if ( aLayerId >= 0 ) {
+ myZLayers.push_back( aLayerId );
+ }
+ }
myIndex = 0;
}
myIndex = 0;
}