X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSVTK%2FSVTK_Trihedron.cxx;h=e752e67602b43820ba8cf979c1578e10bb22dff6;hb=refs%2Fheads%2Fngr%2Fpython3_dev_pv5.4;hp=45751cfec523a7e16a2337c203dd95a162b3e113;hpb=f830c97c748d8f8a6a7eccc8e3a58e19066a1181;p=modules%2Fgui.git diff --git a/src/SVTK/SVTK_Trihedron.cxx b/src/SVTK/SVTK_Trihedron.cxx index 45751cfec..e752e6760 100644 --- a/src/SVTK/SVTK_Trihedron.cxx +++ b/src/SVTK/SVTK_Trihedron.cxx @@ -1,24 +1,30 @@ -// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D -// +// Copyright (C) 2007-2016 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 +// // 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. -// -// This library is distributed in the hope that it will be useful -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// License as published by the Free Software Foundation; either +// 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 +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + #include "SVTK_Trihedron.h" #include "SALOME_Actor.h" +#include "VTKViewer_Algorithm.h" + #include #include #include @@ -41,18 +47,21 @@ int SVTK_Trihedron ::GetVisibleActorCount(vtkRenderer* theRenderer) { - vtkActorCollection* aCollection = theRenderer->GetActors(); + VTK::ActorCollectionCopy aCopy(theRenderer->GetActors()); + vtkActorCollection* aCollection = aCopy.GetActors(); aCollection->InitTraversal(); int aCount = 0; while(vtkActor* aProp = aCollection->GetNextActor()) { if(aProp->GetVisibility()) + { if(SALOME_Actor* anActor = SALOME_Actor::SafeDownCast(aProp)) { if(!anActor->IsInfinitive()) - aCount++; + aCount++; } - else if ( !OwnActor( anActor ) ) { - aCount++; + else if ( !OwnActor( aProp ) ) { + aCount++; } + } } return aCount; }