-// 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
-// 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
#include <SVTK_ViewModel.h>
#include <SVTK_ViewWindow.h>
#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+//#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_InteractiveObject.hxx>
#include <SUIT_ViewManager.h>
#include <SUIT_Accel.h>
}
}
+void HYDROGUI_VTKPrsDisplayer::DisplayAll( const int theViewerId,
+ const bool theIsForced,
+ const bool theDoFitAll )
+{
+ HYDROGUI_AbstractDisplayer::DisplayAll( theViewerId, theIsForced, theDoFitAll );
+
+ bool isEraseScalarBar = true;
+
+ SVTK_Viewer* aViewer = module()->getVTKViewer( theViewerId );
+ if( aViewer )
+ {
+ SALOME_ListIO aListIO;
+ aViewer->GetVisible( aListIO );
+
+ HYDROGUI_VTKPrs* aPrs;
+ SALOME_ListIteratorOfListIO anIter( aListIO );
+ for( ; anIter.More(); anIter.Next() )
+ {
+ Handle(SALOME_InteractiveObject) aPrsObj = anIter.Value();
+ if ( !aPrsObj.IsNull() )
+ {
+ Handle(HYDROData_Entity) anObj =
+ module()->getDataModel()->objectByEntry( aPrsObj->getEntry() );
+ aPrs = module()->getObjectVTKPrs( (size_t)aViewer, anObj );
+ if( aPrs->needScalarBar() )
+ {
+ isEraseScalarBar = false;
+ break;
+ }
+ }
+ }
+ }
+
+ if( isEraseScalarBar )
+ EraseScalarBar( theViewerId );
+}
+
void HYDROGUI_VTKPrsDisplayer::EraseAll( const int theViewerId )
{
SVTK_Viewer* aViewer = module()->getVTKViewer( theViewerId );
if( aViewer )
{
- aViewer->EraseAll( true );
+ aViewer->EraseAll( 0, true );
module()->removeViewVTKPrs( (size_t)aViewer );
EraseScalarBar( theViewerId );
}