Commit acad3a41 authored by Andrew Heather's avatar Andrew Heather
Browse files

BUG: Corrected missing setOpacity for contourFilter and cuttingPlane. Fixes #7

parent f8a8c546
......@@ -85,8 +85,7 @@ Foam::functionObjects::runTimePostPro::contourFilter::contourFilter
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
bool Foam::functionObjects::runTimePostPro::contourFilter::
addGeometry
bool Foam::functionObjects::runTimePostPro::contourFilter::addGeometry
(
const scalar position,
vtkRenderer* renderer
......@@ -280,8 +279,7 @@ addGeometry
}
void Foam::functionObjects::runTimePostPro::contourFilter::
addGeometryToScene
void Foam::functionObjects::runTimePostPro::contourFilter::addGeometryToScene
(
const scalar position,
vtkRenderer* renderer
......
......@@ -299,14 +299,6 @@ void Foam::functionObjects::runTimePostPro::geometryPatches::updateActors
}
surface::updateActors(position);
surfaceActor_->GetProperty()->SetOpacity(opacity(position));
vector sc = surfaceColour_->value(position);
surfaceActor_->GetProperty()->SetColor(sc[0], sc[1], sc[2]);
vector ec = edgeColour_->value(position);
surfaceActor_->GetProperty()->SetEdgeColor(ec[0], ec[1], ec[2]);
}
......
......@@ -248,14 +248,6 @@ void Foam::functionObjects::runTimePostPro::geometrySurface::updateActors
}
surface::updateActors(position);
surfaceActor_->GetProperty()->SetOpacity(opacity(position));
vector sc = surfaceColour_->value(position);
surfaceActor_->GetProperty()->SetColor(sc[0], sc[1], sc[2]);
vector ec = edgeColour_->value(position);
surfaceActor_->GetProperty()->SetEdgeColor(ec[0], ec[1], ec[2]);
}
......
......@@ -290,19 +290,29 @@ void Foam::functionObjects::runTimePostPro::surface::updateActors
const scalar position
)
{
if (!featureEdges_)
if (!visible_)
{
return;
}
vtkProperty* edgeProp = edgeActor_->GetProperty();
surfaceActor_->GetProperty()->SetOpacity(opacity(position));
edgeProp->SetLineWidth(2);
edgeProp->SetOpacity(opacity(position));
const vector sc = surfaceColour_->value(position);
surfaceActor_->GetProperty()->SetColor(sc[0], sc[1], sc[2]);
const vector ec = edgeColour_->value(position);
edgeProp->SetColor(ec[0], ec[1], ec[2]);
edgeProp->SetEdgeColor(ec[0], ec[1], ec[2]);
surfaceActor_->GetProperty()->SetEdgeColor(ec[0], ec[1], ec[2]);
if (featureEdges_)
{
vtkProperty* edgeProp = edgeActor_->GetProperty();
edgeProp->SetLineWidth(2);
edgeProp->SetOpacity(opacity(position));
edgeProp->SetColor(ec[0], ec[1], ec[2]);
edgeProp->SetEdgeColor(ec[0], ec[1], ec[2]);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment