X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_AbstractDisplayer.cxx;h=afeb1ab2bb45a2455e074ef7a8df86110cce0152;hb=f34b90e9e4e02ba65419134d5d37a2e42aecfabf;hp=7817f3ccd693e78e24ac61f44d15d2f07ec4d17a;hpb=8c3bb27be497dd3fea078b26d8b801ed77579a47;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_AbstractDisplayer.cxx b/src/HYDROGUI/HYDROGUI_AbstractDisplayer.cxx
index 7817f3cc..afeb1ab2 100644
--- a/src/HYDROGUI/HYDROGUI_AbstractDisplayer.cxx
+++ b/src/HYDROGUI/HYDROGUI_AbstractDisplayer.cxx
@@ -26,6 +26,9 @@
 #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 )
 {
@@ -35,6 +38,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,
@@ -65,14 +78,20 @@ void HYDROGUI_AbstractDisplayer::Update( const HYDROData_SequenceOfObjects& theO
 
   // 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() )