Commit 7efc254d authored by Dave DeMarle's avatar Dave DeMarle
Browse files

COMP: fix macro redefinition comp warning

Change-Id: Ib877b5c85111b360a79b7395f25ec52f1e3a6799
parent 3342a327
/*=========================================================================
Program: Visualization Toolkit
Module: TestBlurAndSobelPasses.cxx
Module: TestValuePainter.cxx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -33,7 +33,7 @@
#include <set>
#define MAX 10
#define TESTVP_MAX 10
void PrepArray(bool byName, bool drawCell, int arrayIndex, int arrayComponent,
vtkDataSet *dataset, vtkDataArray *values, vtkValuePainter *painter,
......@@ -132,13 +132,13 @@ int TestValuePainter(int argc, char* argv[])
vectors->SetName("Point Vector Array 1");
dataset->GetPointData()->AddArray(vectors);
double vector[3];
for (unsigned int i = 0; i < MAX; i++)
for (unsigned int i = 0; i < TESTVP_MAX; i++)
{
for (unsigned int j = 0; j < MAX; j++)
for (unsigned int j = 0; j < TESTVP_MAX; j++)
{
points->InsertNextPoint(i,j,0.0);
scalars->InsertNextValue((double)i/MAX+10);
vector[0] = sin((double)j/MAX*6.1418);
scalars->InsertNextValue((double)i/TESTVP_MAX+10);
vector[0] = sin((double)j/TESTVP_MAX*6.1418);
vector[1] = 1.0;
vector[2] = 1.0;
vtkMath::Normalize(vector);
......@@ -156,18 +156,18 @@ int TestValuePainter(int argc, char* argv[])
vectors->SetNumberOfComponents(3);
vectors->SetName("Cell Vector Array 1");
dataset->GetCellData()->AddArray(vectors);
for (unsigned int i = 0; i < (MAX-1); i++)
for (unsigned int i = 0; i < (TESTVP_MAX-1); i++)
{
for (unsigned int j = 0; j < (MAX-1); j++)
for (unsigned int j = 0; j < (TESTVP_MAX-1); j++)
{
cells->InsertNextCell(4);
cells->InsertCellPoint(i*MAX +j);
cells->InsertCellPoint(i*MAX +j+1);
cells->InsertCellPoint((i+1)*MAX+j+1);
cells->InsertCellPoint((i+1)*MAX+j);
cells->InsertCellPoint(i*TESTVP_MAX +j);
cells->InsertCellPoint(i*TESTVP_MAX +j+1);
cells->InsertCellPoint((i+1)*TESTVP_MAX+j+1);
cells->InsertCellPoint((i+1)*TESTVP_MAX+j);
scalars->InsertNextValue((double)i/(MAX-1)-10);
vector[0] = sin((double)j/(MAX-1)*6.1418);
scalars->InsertNextValue((double)i/(TESTVP_MAX-1)-10);
vector[0] = sin((double)j/(TESTVP_MAX-1)*6.1418);
vector[1] = 1.0;
vector[2] = 1.0;
vtkMath::Normalize(vector);
......
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