-// 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 "HYDROGUI_DataModel.h"
#include "HYDROGUI_Module.h"
-#include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
#include <SUIT_ViewManager.h>
+#include <SUIT_ViewModel.h>
HYDROGUI_AbstractDisplayer::HYDROGUI_AbstractDisplayer( HYDROGUI_Module* theModule )
: myModule( theModule )
// Now dig in the data model
HYDROData_SequenceOfObjects anObjectsToErase, anObjectsToDisplay;
+ SUIT_ViewModel* aViewer = module()->getViewManager( theViewerId )->getViewModel();
for( int i = 1, n = theObjs.Length(); i <= n; i++ )
{
const Handle(HYDROData_Entity)& anObj = theObjs.Value( i );
- if( anObj.IsNull() )
- anObjectsToErase.Append( anObj );
- else
+
+ if( module()->isObjectVisible( (size_t)aViewer, anObj ) )
+ {
anObjectsToDisplay.Append( anObj );
+ }
+ else
+ {
+ anObjectsToErase.Append( anObj );
+ }
}
if( anObjectsToErase.Length() )