Import of shapefile - bug fixes; #refs 614

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ZLayers.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ZLayers.cxx b/src/HYDROGUI/HYDROGUI_ZLayers.cxx
index 30e7dd7a3725d6d9b601b1cec09995d79c487c28..0fe911d488f0c16f487867dbcf95a4674bd53326 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ZLayers.cxx
+++ b/src/HYDROGUI/HYDROGUI_ZLayers.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
@@ -43,7 +39,8 @@ void SetPrsZLayer( const Handle_PrsMgr_PresentableObject& thePresentableObject,
 
 void SetZLayerSettings( const Handle_V3d_Viewer& theViewer3d, int theLayerId, bool theIsOrdered )
 {
-  if ( theViewer3d.IsNull() || theLayerId < 0 ) {
+  if ( theViewer3d.IsNull() /*|| theLayerId < 0*/ )
+  {
     return;
   }
 
@@ -96,9 +93,12 @@ void HYDROGUI_ZLayersIterator::Init( const Handle_V3d_Viewer& theViewer )
   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;
 }