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
patch for correct immersible zone color in preview
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ZLayers.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ZLayers.cxx
b/src/HYDROGUI/HYDROGUI_ZLayers.cxx
index 3e06521d5a25fb67c97bb38117e65d6b76787148..0fe911d488f0c16f487867dbcf95a4674bd53326 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
@@
-25,32
+21,26
@@
#include <PrsMgr_ModedPresentation.hxx>
#include <TColStd_SequenceOfInteger.hxx>
#include <PrsMgr_ModedPresentation.hxx>
#include <TColStd_SequenceOfInteger.hxx>
-class PrsMgr_PresentationManager
+void SetZLayerForPrs( const Handle(PrsMgr_Presentation)& thePrs, int theLayerId );
+
+void SetPrsZLayer( const Handle_PrsMgr_PresentableObject& thePresentableObject,
+ const int theMode, const int theLayerId )
{
{
-public:
- static void SetZLayer( const Handle_PrsMgr_PresentableObject& thePresentableObject,
- const Standard_Integer theMode,
- const Standard_Integer theLayerId )
+ PrsMgr_Presentations& aPresentations = thePresentableObject->Presentations();
+ for (Standard_Integer aIdx = 1; aIdx <= aPresentations.Length (); aIdx++)
{
{
-
PrsMgr_Presentations& aPresentations = thePresentableObject->Presentations
();
-
for (Standard_Integer aIdx = 1; aIdx <= aPresentations.Length (); aIdx++
)
+
Handle(PrsMgr_Presentation) aPrs = aPresentations (aIdx).Presentation
();
+
if ( aPresentations (aIdx).Mode() == theMode
)
{
{
- Handle(PrsMgr_Presentation) aPrs = aPresentations (aIdx).Presentation ();
- if ( aPresentations (aIdx).Mode() == theMode )
- aPrs->SetZLayer (theLayerId);
+ SetZLayerForPrs( aPrs, theLayerId );
}
}
}
}
-};
-
-void SetPrsZLayer( const Handle_PrsMgr_PresentableObject& thePresentableObject,
- const int theMode, const int theLayerId )
-{
- PrsMgr_PresentationManager::SetZLayer( thePresentableObject, theMode, theLayerId );
}
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;
}
@@
-103,9
+93,12
@@
void HYDROGUI_ZLayersIterator::Init( const Handle_V3d_Viewer& theViewer )
theViewer->GetAllZLayers( anExistingZLayers );
int n = anExistingZLayers.Length();
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;
}