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
Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_AbstractDisplayer.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_AbstractDisplayer.cxx
b/src/HYDROGUI/HYDROGUI_AbstractDisplayer.cxx
index 7817f3ccd693e78e24ac61f44d15d2f07ec4d17a..7ef7aec2030efdc57d32d03637af6b155c761ef5 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_AbstractDisplayer.cxx
+++ b/
src/HYDROGUI/HYDROGUI_AbstractDisplayer.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
@@
-26,6
+22,9
@@
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
+#include <SUIT_ViewManager.h>
+#include <SUIT_ViewModel.h>
+
HYDROGUI_AbstractDisplayer::HYDROGUI_AbstractDisplayer( HYDROGUI_Module* theModule )
: myModule( theModule )
{
HYDROGUI_AbstractDisplayer::HYDROGUI_AbstractDisplayer( HYDROGUI_Module* theModule )
: myModule( theModule )
{
@@
-35,6
+34,16
@@
HYDROGUI_AbstractDisplayer::~HYDROGUI_AbstractDisplayer()
{
}
{
}
+bool HYDROGUI_AbstractDisplayer::IsApplicable( const int theViewerId ) const
+{
+ return IsApplicable( myModule->getViewManager( theViewerId ) );
+}
+
+bool HYDROGUI_AbstractDisplayer::IsApplicable( const SUIT_ViewManager* theViewMgr ) const
+{
+ return ( theViewMgr && ( theViewMgr->getType() == GetType() ) );
+}
+
void HYDROGUI_AbstractDisplayer::UpdateAll( const int theViewerId,
const bool theIsInit,
const bool theIsForced,
void HYDROGUI_AbstractDisplayer::UpdateAll( const int theViewerId,
const bool theIsInit,
const bool theIsForced,
@@
-65,14
+74,20
@@
void HYDROGUI_AbstractDisplayer::Update( const HYDROData_SequenceOfObjects& theO
// Now dig in the data model
HYDROData_SequenceOfObjects anObjectsToErase, anObjectsToDisplay;
// 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 );
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 );
anObjectsToDisplay.Append( anObj );
+ }
+ else
+ {
+ anObjectsToErase.Append( anObj );
+ }
}
if( anObjectsToErase.Length() )
}
if( anObjectsToErase.Length() )