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

This commit is contained in:
vsr 2008-06-07 07:35:01 +00:00
parent 550107541f
commit 1eb0283988
2 changed files with 7 additions and 4 deletions

View File

@ -573,7 +573,6 @@ void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *theMapper)
aMatrix->Delete(); aMatrix->Delete();
} else } else
this->Device->Render(ren, theMapper); this->Device->Render(ren, theMapper);
} }
void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *) void GEOM_Actor::ReleaseGraphicsResources(vtkWindow *)
@ -671,7 +670,11 @@ vtkFloatingPointType GEOM_Actor::GetOpacity()
void GEOM_Actor::SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b) void GEOM_Actor::SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b)
{ {
// enk:tested OK // 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) 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]; b = aRGB[2];
} }
bool GEOM_Actor::IsInfinite() bool GEOM_Actor::IsInfinitive()
{ {
return (bool)(myShape.Infinite()); return (bool)(myShape.Infinite());
} }

View File

@ -124,7 +124,7 @@ public:
void SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b); void SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b);
void GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b); void GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b);
virtual bool IsInfinite(); virtual bool IsInfinitive();
// overloaded functions // overloaded functions
//! To map current selection to VTK representation //! To map current selection to VTK representation