Commit 6f56dcd3 authored by Brian Wylie's avatar Brian Wylie

ENH: Just taking out some timers in vtkPerturbCoincidentVertices.

ENH: Rewiring internal pipeline to make vtkRemoveHiddenData the very last filter.
NOTE: vtkRemoveHiddenData is getting executed (RequestData) for every mouse movement across the view.
parent dae53cd8
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <vtkstd/vector> #include <vtkstd/vector>
vtkCxxRevisionMacro(vtkPerturbCoincidentVertices, "1.15"); vtkCxxRevisionMacro(vtkPerturbCoincidentVertices, "1.16");
vtkStandardNewMacro(vtkPerturbCoincidentVertices); vtkStandardNewMacro(vtkPerturbCoincidentVertices);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
vtkPerturbCoincidentVertices::vtkPerturbCoincidentVertices() vtkPerturbCoincidentVertices::vtkPerturbCoincidentVertices()
...@@ -315,16 +315,8 @@ int vtkPerturbCoincidentVertices::RequestData( ...@@ -315,16 +315,8 @@ int vtkPerturbCoincidentVertices::RequestData(
vtkGraph* input = vtkGraph::GetData(inputVector[0]); vtkGraph* input = vtkGraph::GetData(inputVector[0]);
vtkGraph* output = vtkGraph::GetData(outputVector); vtkGraph* output = vtkGraph::GetData(outputVector);
vtkSmartPointer<vtkTimerLog> timer =
vtkSmartPointer<vtkTimerLog>::New();
timer->StartTimer();
this->SimpleSpiralPerturbation(input, output, 1.0); this->SimpleSpiralPerturbation(input, output, 1.0);
timer->StopTimer();
vtkDebugMacro("Spiral Time: " << timer->GetElapsedTime() << endl);
return 1; return 1;
} }
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
vtkCxxRevisionMacro(vtkRenderedGraphRepresentation, "1.21"); vtkCxxRevisionMacro(vtkRenderedGraphRepresentation, "1.22");
vtkStandardNewMacro(vtkRenderedGraphRepresentation); vtkStandardNewMacro(vtkRenderedGraphRepresentation);
vtkRenderedGraphRepresentation::vtkRenderedGraphRepresentation() vtkRenderedGraphRepresentation::vtkRenderedGraphRepresentation()
...@@ -148,9 +148,9 @@ vtkRenderedGraphRepresentation::vtkRenderedGraphRepresentation() ...@@ -148,9 +148,9 @@ vtkRenderedGraphRepresentation::vtkRenderedGraphRepresentation()
</graphviz> </graphviz>
*/ */
this->RemoveHiddenGraph->SetInputConnection(this->Layout->GetOutputPort()); this->Coincident->SetInputConnection(this->Layout->GetOutputPort());
this->Coincident->SetInputConnection(this->RemoveHiddenGraph->GetOutputPort()); this->RemoveHiddenGraph->SetInputConnection(this->Coincident->GetOutputPort());
this->EdgeLayout->SetInputConnection(this->Coincident->GetOutputPort()); this->EdgeLayout->SetInputConnection(this->RemoveHiddenGraph->GetOutputPort());
this->VertexDegree->SetInputConnection(this->EdgeLayout->GetOutputPort()); this->VertexDegree->SetInputConnection(this->EdgeLayout->GetOutputPort());
this->ApplyColors->SetInputConnection(this->VertexDegree->GetOutputPort()); this->ApplyColors->SetInputConnection(this->VertexDegree->GetOutputPort());
...@@ -160,7 +160,7 @@ vtkRenderedGraphRepresentation::vtkRenderedGraphRepresentation() ...@@ -160,7 +160,7 @@ vtkRenderedGraphRepresentation::vtkRenderedGraphRepresentation()
this->VertexActor->SetMapper(this->VertexMapper); this->VertexActor->SetMapper(this->VertexMapper);
// Outline actor // Outline actor
this->OutlineGlyph->SetInputConnection(this->Coincident->GetOutputPort()); this->OutlineGlyph->SetInputConnection(this->RemoveHiddenGraph->GetOutputPort());
this->OutlineMapper->SetInputConnection(this->OutlineGlyph->GetOutputPort()); this->OutlineMapper->SetInputConnection(this->OutlineGlyph->GetOutputPort());
this->OutlineActor->SetMapper(this->OutlineMapper); this->OutlineActor->SetMapper(this->OutlineMapper);
......
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