Commit acbb3147 authored by David Gobbi's avatar David Gobbi
Browse files

COMP: Fix dashboard warnings

parent 934427d8
......@@ -62,6 +62,7 @@ POSSIBILITY OF SUCH DAMAGES.
#include "vtkMath.h"
#include "vtkLine.h"
#include "vtkImageData.h"
#include "vtkPolyData.h"
#include "vtkInformation.h"
#include "vtkInformationVector.h"
#include "vtkStreamingDemandDrivenPipeline.h"
......@@ -352,6 +353,7 @@ void vtkPolyDataToImageStencil::ThreadedExecute(
// 4) for each (y,z) integer index, find all the stored x values
// and use them to create the vtkStencilData
// the spacing and origin of the generated stencil
double *spacing = data->GetSpacing();
double *origin = data->GetOrigin();
......@@ -390,6 +392,11 @@ void vtkPolyDataToImageStencil::ThreadedExecute(
int idxY, idxZ;
for (idxZ = extent[4]; idxZ <= extent[5]; idxZ++)
{
if (id == 0 && extent[4] != extent[5])
{
this->UpdateProgress((idxZ - extent[4])*1.0/(extent[5] - extent[4]));
}
double z = idxZ*spacing[2] + origin[2];
slice->PrepareForNewData();
......@@ -560,6 +567,8 @@ int vtkPolyDataToImageStencil::RequestData(
int extent[6];
data->GetExtent(extent);
// ThreadedExecute is only called from a single thread for
// now, but it could as easily be called from ThreadedRequestData
this->ThreadedExecute(data, extent, 0);
return 1;
......
......@@ -14,7 +14,7 @@
=========================================================================*/
/*=========================================================================
Copyright (c) 2004 Atamai, Inc.
Copyright (c) 2008 Atamai, Inc.
Use, modification and redistribution of the software, in source or
binary forms, are permitted provided that the following terms and
......@@ -51,12 +51,14 @@ POSSIBILITY OF SUCH DAMAGES.
#define __vtkPolyDataToImageStencil_h
#include "vtkImageStencilSource.h"
#include "vtkPolyData.h"
class vtkMergePoints;
class vtkDataSet;
class vtkPolyData;
class vtkImageData;
class VTK_EXPORT vtkPolyDataToImageStencil : public vtkImageStencilSource
class VTK_HYBRID_EXPORT vtkPolyDataToImageStencil :
public vtkImageStencilSource
{
public:
static vtkPolyDataToImageStencil* New();
......
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