Commit e307b4c7 authored by Julien Tierny's avatar Julien Tierny Committed by Marcus D. Hanwell
Browse files

minor corrections

parent 9cbd4c78
......@@ -242,7 +242,7 @@ vtkDataObject* vtkDataObjectTypes::NewDataObject(const char* type)
}
else if(strcmp(type, "vtkReebGraph") == 0)
{
return vtkReebGraph::New();
return vtkReebGraph::New();
}
#ifdef VTK_USE_N_WAY_ARRAYS
else if(strcmp(type, "vtkArrayData") == 0)
......
......@@ -1555,6 +1555,7 @@ void vtkGraph::RemoveVertexInternal(vtkIdType v, bool directed)
{
double x[3];
this->Points->GetPoint(lv, x);
// this->Points->GetPoint(lv);
this->Points->SetPoint(v, x);
this->Points->SetNumberOfPoints(lv);
}
......
......@@ -156,7 +156,8 @@ int vtkPolyDataAlgorithm::RequestUpdateExtent(
// an imaging style Execute method.
int vtkPolyDataAlgorithm::RequestData(
vtkInformation* request,
vtkInformationVector** vtkNotUsed( inputVector ),
vtkInformationVector** inputVector,
// vtkInformationVector** vtkNotUsed( inputVector ),
vtkInformationVector* outputVector)
{
// the default implimentation is to do what the old pipeline did find what
......
......@@ -160,9 +160,11 @@ int vtkAreaContourSpectrumFilter::RequestData(
criticalPoints.second =
(int) *(criticalPointIds->GetTuple(e.Target));
}
else
else
{
// invalid Reeb graph
return 0;
}
}
}while(eIt->HasNext());
......
......@@ -229,6 +229,7 @@ int vtkReebGraphSurfaceSkeletonFilter::RequestData(
subMesh->InsertNextCell(VTK_TRIANGLE, 3, vertexIds);
free(vertexIds);
visitedTriangles[tId] = true;
}
}
starTriangleList->Delete();
......@@ -249,9 +250,7 @@ int vtkReebGraphSurfaceSkeletonFilter::RequestData(
arcSkeleton.push_back(arcEntry);
free(criticalPoint);
if(vertexList->GetNumberOfTuples() > 50)
// very conservative safety margin, noticed some floating point
// exception in the contouring filter otherwise.
if(vertexList->GetNumberOfTuples() > 1)
{
for(int i = 0; i < NumberOfSamples; i++)
{
......
......@@ -30,11 +30,11 @@
// The filter outputs a vtkTable of points (double[3]). Each column contains the
// samples (sorted by function value) of the corresponding arc. The first and
// the last entry of the column corresponds to the critical nodes at the
// extremity of the arc.
// extremity of the arc (each column has NumberOfSamples + 2 entries).
//
// The skeleton can be rendered by linking the samples with geometrical
// primitives (for instance, spheres at critical nodes and cylinders between
// intermediary samples).
// intermediary samples, see Graphics/Testing/Cxx/TestReebGraph.cxx).
//
#ifndef __vtkReebGraphSurfaceSkeletonFilter_h
......@@ -52,7 +52,8 @@ class VTK_GRAPHICS_EXPORT vtkReebGraphSurfaceSkeletonFilter :
{
public:
static vtkReebGraphSurfaceSkeletonFilter* New();
vtkTypeRevisionMacro(vtkReebGraphSurfaceSkeletonFilter, vtkDataObjectAlgorithm);
vtkTypeRevisionMacro(vtkReebGraphSurfaceSkeletonFilter,
vtkDataObjectAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......
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