Commit 5926becc authored by David Cole's avatar David Cole
Browse files

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.57...

ENH: Merge changes from main tree into VTK-5-0 branch. (cvs -q up -j1.57 -j1.58 Graphics/vtkTensorGlyph.cxx)
parent 80065b3b
......@@ -27,7 +27,7 @@
#include "vtkPolyData.h"
#include "vtkTransform.h"
vtkCxxRevisionMacro(vtkTensorGlyph, "1.57");
vtkCxxRevisionMacro(vtkTensorGlyph, "1.57.12.1");
vtkStandardNewMacro(vtkTensorGlyph);
// Construct object with scaling on and scale factor 1.0. Eigenvalues are
......@@ -428,6 +428,31 @@ int vtkTensorGlyph::RequestData(
return 1;
}
void vtkTensorGlyph::SetSourceConnection(int id, vtkAlgorithmOutput* algOutput)
{
if (id < 0)
{
vtkErrorMacro("Bad index " << id << " for source.");
return;
}
int numConnections = this->GetNumberOfInputConnections(1);
if (id < numConnections)
{
this->SetNthInputConnection(1, id, algOutput);
}
else if (id == numConnections && algOutput)
{
this->AddInputConnection(1, algOutput);
}
else if (algOutput)
{
vtkWarningMacro("The source id provided is larger than the maximum "
"source id, using " << numConnections << " instead.");
this->AddInputConnection(1, algOutput);
}
}
void vtkTensorGlyph::SetSource(vtkPolyData *source)
{
this->SetInput(1, source);
......
Supports Markdown
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