From: apo <apo@opencascade.com>
Date: Fri, 24 Nov 2006 15:56:04 +0000 (+0000)
Subject: Remove dependencies from
X-Git-Tag: WP1_2_3_05-12-2006_cache_system~64
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e9fe4dee0d3bcb09e5d015442f89799e76a613ca;p=modules%2Fvisu.git

Remove dependencies from
#include "VISU_ColoredPrs3dCache_i.hh"
#include "VISU_ColoredPrs3dHolder_i.hh"
---

diff --git a/src/VISUGUI/VisuGUI_Displayer.cxx b/src/VISUGUI/VisuGUI_Displayer.cxx
index af25a1bc..49df36c6 100644
--- a/src/VISUGUI/VisuGUI_Displayer.cxx
+++ b/src/VISUGUI/VisuGUI_Displayer.cxx
@@ -30,7 +30,6 @@
 
 #include "VisuGUI_Tools.h"
 #include "VISU_ViewManager_i.hh"
-#include "VISU_ColoredPrs3dHolder_i.hh"
 #include "VISU_Actor.h"
 
 #include "VVTK_ViewModel.h"
@@ -268,7 +267,7 @@ bool VisuGUI_Displayer::canBeDisplayed( const QString& entry, const QString& vie
   {
     VISU::Base_i* aBase = dynamic_cast<VISU::Base_i*>(VISU::GetServant(anObj).in());
     if(aBase->GetType() == VISU::TCOLOREDPRS3DHOLDER)
-      return dynamic_cast<VISU::ColoredPrs3dHolder_i*>(aBase);
+      return true;
 
     return dynamic_cast<VISU::Prs3d_i*>(aBase);
   }
diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx
index ad1e41d6..9b2d8e73 100644
--- a/src/VISUGUI/VisuGUI_Tools.cxx
+++ b/src/VISUGUI/VisuGUI_Tools.cxx
@@ -37,8 +37,6 @@
 #include "VISU_Table_i.hh"
 #include "VISU_Mesh_i.hh"
 #include "VISU_ViewManager_i.hh"
-#include "VISU_ColoredPrs3dCache_i.hh"
-#include "VISU_ColoredPrs3dHolder_i.hh"
 
 #include "VISU_Actor.h"
 #include "VISU_ScalarMapAct.h"
@@ -306,10 +304,11 @@ namespace VISU
       return NULL;
 
     VISU::Base_i* aBase = dynamic_cast<VISU::Base_i*>(aServant.in());
-    if(aBase->GetType() == VISU::TCOLOREDPRS3DHOLDER)
-    {
-      VISU::ColoredPrs3dHolder_i* aHolder = dynamic_cast<VISU::ColoredPrs3dHolder_i*>(aBase);
-      return dynamic_cast<VISU::ColoredPrs3d_i*>(VISU::GetServant(aHolder->GetDevice()).in());
+    if(aBase->GetType() == VISU::TCOLOREDPRS3DHOLDER){
+      VISU::ColoredPrs3dHolder_var aHolder = VISU::ColoredPrs3dHolder::_narrow(anObject);
+      VISU::ColoredPrs3d_var aColoredPrs3d = aHolder->GetDevice();
+      aServant = VISU::GetServant(aColoredPrs3d);
+      aBase = dynamic_cast<VISU::Base_i*>(aServant.in());
     }
 
     return dynamic_cast<VISU::Prs3d_i*>(aBase);