From: vsr <vsr@opencascade.com>
Date: Sat, 7 Jun 2008 07:35:01 +0000 (+0000)
Subject: Fix problem with coloring of the objects in the wireframe mode in VTK viewer (GEOM)
X-Git-Tag: V4_1_3~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1eb0283988d74573cf57169ebb7d780b06b5ad53;p=modules%2Fgeom.git

Fix problem with coloring of the objects in the wireframe mode in VTK viewer (GEOM)
---

diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx
index 6771efaa9..54c88608e 100644
--- a/src/OBJECT/GEOM_Actor.cxx
+++ b/src/OBJECT/GEOM_Actor.cxx
@@ -573,7 +573,6 @@ void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper)
     aMatrix->Delete();    
   } else
     this->Device->Render(ren, theMapper);
-
 }
 
 void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *)
@@ -671,7 +670,11 @@ vtkFloatingPointType GEOM_Actor::GetOpacity()
 void GEOM_Actor::SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b)
 {
   // enk:tested OK
-  myShadingFaceProp->SetColor(r,g,b);
+  myShadingFaceProp->SetColor(r,g,b);                          // shading color (Shading)
+  myIsolatedEdgeActor->GetProperty()->SetColor(r,g,b);         // standalone edge color (Wireframe)
+  myVertexActor->GetProperty()->SetColor(r,g,b);               // vertex actor (Shading/Wireframe)
+  myOneFaceEdgeActor->GetProperty()->SetColor(r,g,b);          // standalone face edge color (Wireframe)
+  mySharedEdgeActor->GetProperty()->SetColor(r,g,b);           // share edge color (Wireframe)
 }
 
 void GEOM_Actor::GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b)
@@ -684,7 +687,7 @@ void GEOM_Actor::GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFlo
   b = aRGB[2];
 }
 
-bool GEOM_Actor::IsInfinite()
+bool GEOM_Actor::IsInfinitive()
 {
   return (bool)(myShape.Infinite());
 }
diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h
index 3ecdce2b6..b37692e75 100644
--- a/src/OBJECT/GEOM_Actor.h
+++ b/src/OBJECT/GEOM_Actor.h
@@ -124,7 +124,7 @@ public:
   void SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b);
   void GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b);
 
-  virtual bool IsInfinite();
+  virtual bool IsInfinitive();
 
   // overloaded functions
   //! To map current selection to VTK representation