Commit 210ee86d authored by Will Schroeder's avatar Will Schroeder
Browse files

Fixed #defines

parent fbbfe6b5
......@@ -98,7 +98,7 @@ public:
vtkGetMacro(ReadTexture,int)
vtkBooleanMacro(ReadTexture,int)
vtkSetClampMacro(PartNumber,int,1,LARGE_INTEGER);
vtkSetClampMacro(PartNumber,int,1,VTK_LARGE_INTEGER);
vtkGetMacro(PartNumber,int);
protected:
......
......@@ -58,12 +58,12 @@ public:
// Description:
// Set the minimum speed value.
vtkSetClampMacro(MinimumSpeed,float,0.0,LARGE_FLOAT);
vtkSetClampMacro(MinimumSpeed,float,0.0,VTK_LARGE_FLOAT);
vtkGetMacro(MinimumSpeed,float);
// Description:
// Set the maximum speed value.
vtkSetClampMacro(MaximumSpeed,float,0.0,LARGE_FLOAT);
vtkSetClampMacro(MaximumSpeed,float,0.0,VTK_LARGE_FLOAT);
vtkGetMacro(MaximumSpeed,float);
protected:
......
......@@ -47,7 +47,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
// vtkPolyData, vtkUnstructuredGrid), and in some cases, the datasets are
// implicitly composed of cells (e.g., vtkStructuredPoints).
// .SECTION Caveats
// The #define parameter MAX_CELL_SIZE represents the maximum number of points
// The #define VTK_MAX_CELL_SIZE represents the maximum number of points
// that a cell can have. This parameter is used throughout the code to specify
// sizes of arrays and other structures. As a programmer you must make sure
// that you do not create cells with more than this number of points. (The
......@@ -57,8 +57,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#ifndef __vtkCell_h
#define __vtkCell_h
#define MAX_CELL_SIZE 512
#define TOL 1.e-05 // Tolerance for geometric calculation
#define VTK_MAX_CELL_SIZE 512
#define VTK_TOL 1.e-05 // Tolerance for geometric calculation
#include "vtkObject.hh"
#include "vtkFloatPoints.hh"
......@@ -142,12 +142,12 @@ public:
// the cell. Thus the value dist2 may be checked to determine true in/out.
virtual int EvaluatePosition(float x[3], float closestPoint[3],
int& subId, float pcoords[3],
float& dist2, float weights[MAX_CELL_SIZE]) = 0;
float& dist2, float weights[VTK_MAX_CELL_SIZE]) = 0;
// Description:
// Determine global coordinate from subId and parametric coordinates
virtual void EvaluateLocation(int& subId, float pcoords[3],
float x[3], float weights[MAX_CELL_SIZE]) = 0;
float x[3], float weights[VTK_MAX_CELL_SIZE]) = 0;
// Description:
// Generate contouring primitives.
......
......@@ -123,7 +123,7 @@ inline int vtkCellArray::InsertNextCell(int npts, int* pts)
// Description:
// Create cells by specifying count, and then adding points one at a time using
// method InsertCellPoint(). WARNING: it is the user's responsibility not to
// exceed the maximum allowable points per cell (MAX_CELL_SIZE).
// exceed the maximum allowable points per cell (VTK_MAX_CELL_SIZE).
inline int vtkCellArray::InsertNextCell(int npts)
{
this->Location = this->Ia.InsertNextValue(npts) + 1;
......
......@@ -42,11 +42,11 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
// .SECTION Description
// vtkCellLocator is a spatial search object to quickly locate cells in 3-D.
// vtkCellLocator uses a uniform-level octree subdivision, where each octant
// carries an indication of whether it is empty or not, a list of the
// cells inside of it. (An octant is not empty if it has one or more cells
// inside of it). Typical operation are intersection with a line to return
// candidate cells, or intersection with another vtkCellLocator to return
// candidate cells.
// carries an indication of whether it is empty or not, and each leaf octant
// carries a list of the cells inside of it. (An octant is not empty if it
// has one or more cells inside of it). Typical operation are intersection
// with a line to return candidate cells, or intersection with another
// vtkCellLocator to return candidate cells.
// .SECTION Caveats
// Many other types of spatial locators have been developed such as
// variable depth-octrees and k-d trees. These are often more efficient
......@@ -94,13 +94,13 @@ public:
// Description:
// Specify the average number of cells in each octant.
vtkSetClampMacro(NumberOfCellsInOctant,int,1,LARGE_INTEGER);
vtkSetClampMacro(NumberOfCellsInOctant,int,1,VTK_LARGE_INTEGER);
vtkGetMacro(NumberOfCellsInOctant,int);
// Description:
// Specify absolute tolerance (in world coordinates) for performing
// intersection computations.
vtkSetClampMacro(Tolerance,float,0.0,LARGE_FLOAT);
vtkSetClampMacro(Tolerance,float,0.0,VTK_LARGE_FLOAT);
vtkGetMacro(Tolerance,float);
virtual int FindClosestCell(float x[3], float dist2, int& subId, float pcoords[3]);
......
......@@ -63,17 +63,17 @@ public:
// Description:
// Set the height of the cone.
vtkSetClampMacro(Height,float,0.0,LARGE_FLOAT)
vtkSetClampMacro(Height,float,0.0,VTK_LARGE_FLOAT)
vtkGetMacro(Height,float);
// Description:
// Set the radius of the cone.
vtkSetClampMacro(Radius,float,0.0,LARGE_FLOAT)
vtkSetClampMacro(Radius,float,0.0,VTK_LARGE_FLOAT)
vtkGetMacro(Radius,float);
// Description:
// Set the number of facets used to represent cone.
vtkSetClampMacro(Resolution,int,0,MAX_CELL_SIZE)
vtkSetClampMacro(Resolution,int,0,VTK_MAX_CELL_SIZE)
vtkGetMacro(Resolution,int);
// Description:
......
......@@ -51,10 +51,10 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "vtkDataSetToUnstructuredGridFilter.hh"
#define EXTRACT_POINT_SEEDED_REGIONS 1
#define EXTRACT_CELL_SEEDED_REGIONS 2
#define EXTRACT_SPECIFIED_REGIONS 3
#define EXTRACT_LARGEST_REGION 4
#define VTK_EXTRACT_POINT_SEEDED_REGIONS 1
#define VTK_EXTRACT_CELL_SEEDED_REGIONS 2
#define VTK_EXTRACT_SPECIFIED_REGIONS 3
#define VTK_EXTRACT_LARGEST_REGION 4
class vtkConnectivityFilter : public vtkDataSetToUnstructuredGridFilter
{
......@@ -82,7 +82,7 @@ public:
// Description:
// Extraction algorithm works recursively. In some systems the stack depth
// is limited. This methods specifies the maximum recursion depth.
vtkSetClampMacro(MaxRecursionDepth,int,10,LARGE_INTEGER);
vtkSetClampMacro(MaxRecursionDepth,int,10,VTK_LARGE_INTEGER);
vtkGetMacro(MaxRecursionDepth,int);
// Description:
......
......@@ -64,7 +64,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "vtkDataSetToPolyFilter.hh"
#define MAX_CONTOURS 256
#define VTK_MAX_CONTOURS 256
class vtkContourFilter : public vtkDataSetToPolyFilter
{
......@@ -77,7 +77,7 @@ public:
// Description:
// Return array of contour values (size of numContours).
vtkGetVectorMacro(Values,float,MAX_CONTOURS);
vtkGetVectorMacro(Values,float,VTK_MAX_CONTOURS);
void GenerateValues(int numContours, float range[2]);
void GenerateValues(int numContours, float range1, float range2);
......@@ -85,7 +85,7 @@ public:
protected:
void Execute();
float Values[MAX_CONTOURS];
float Values[VTK_MAX_CONTOURS];
int NumberOfContours;
float Range[2];
};
......
......@@ -58,17 +58,17 @@ public:
// Description:
// Set the length of the cube in the x-direction.
vtkSetClampMacro(XLength,float,0.0,LARGE_FLOAT);
vtkSetClampMacro(XLength,float,0.0,VTK_LARGE_FLOAT);
vtkGetMacro(XLength,float);
// Description:
// Set the length of the cube in the y-direction.
vtkSetClampMacro(YLength,float,0.0,LARGE_FLOAT);
vtkSetClampMacro(YLength,float,0.0,VTK_LARGE_FLOAT);
vtkGetMacro(YLength,float);
// Description:
// Set the length of the cube in the z-direction.
vtkSetClampMacro(ZLength,float,0.0,LARGE_FLOAT);
vtkSetClampMacro(ZLength,float,0.0,VTK_LARGE_FLOAT);
vtkGetMacro(ZLength,float);
// Description:
......
......@@ -60,17 +60,17 @@ public:
// Description:
// Set the height of the cylinder.
vtkSetClampMacro(Height,float,0.0,LARGE_FLOAT)
vtkSetClampMacro(Height,float,0.0,VTK_LARGE_FLOAT)
vtkGetMacro(Height,float);
// Description:
// Set the radius of the cylinder.
vtkSetClampMacro(Radius,float,0.0,LARGE_FLOAT)
vtkSetClampMacro(Radius,float,0.0,VTK_LARGE_FLOAT)
vtkGetMacro(Radius,float);
// Description:
// Set the number of facets used to define cylinder.
vtkSetClampMacro(Resolution,int,0,MAX_CELL_SIZE)
vtkSetClampMacro(Resolution,int,0,VTK_MAX_CELL_SIZE)
vtkGetMacro(Resolution,int);
// Description:
......
......@@ -51,8 +51,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "vtkObject.hh"
#include "vtkPointSet.hh"
#define ASCII 1
#define BINARY 2
#define VTK_ASCII 1
#define VTK_BINARY 2
class vtkDataReader : public vtkObject
......
......@@ -128,7 +128,7 @@ public:
// The parametric coordinates are provided in pcoords[3]. The interpolation
// weights are returned in weights[]. Tolerance is used to control how close
// the point is to be considered "in" the cell.
virtual int FindCell(float x[3], vtkCell *cell, float tol2, int& subId, float pcoords[3], float weights[MAX_CELL_SIZE]) = 0;
virtual int FindCell(float x[3], vtkCell *cell, float tol2, int& subId, float pcoords[3], float weights[VTK_MAX_CELL_SIZE]) = 0;
// Datasets are composite objects and need to check each part for MTime
unsigned long int GetMTime();
......
......@@ -43,8 +43,10 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
// vtkDataSetReader is a class that provides instance variables
// and methods to read any type of dataset in visualization library format.
// The output type of this class will vary depending upon the type of data
// file. Note: these formats are not standard. Use other more standard
// formats when you can.
// file.
// .SECTION Caveats
// These vtk formats are not standard. Use other more standard formats when
// you can.
#ifndef __vtkDataSetReader_h
#define __vtkDataSetReader_h
......
......@@ -51,8 +51,8 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "vtkWriter.hh"
#include "vtkDataSet.hh"
#define ASCII 1
#define BINARY 2
#define VTK_ASCII 1
#define VTK_BINARY 2
class vtkDataWriter : public vtkWriter
{
......@@ -73,7 +73,7 @@ public:
// Description:
// Specify file type (ASCII or BINARY) for vtk data file.
vtkSetClampMacro(FileType,int,ASCII,BINARY);
vtkSetClampMacro(FileType,int,VTK_ASCII,VTK_BINARY);
vtkGetMacro(FileType,int);
// Description:
......
......@@ -84,25 +84,25 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#include "vtkPolygon.hh"
#include "vtkLine.hh"
#define NUMBER_STATISTICS 12
#define TOLERANCE 1.0e-05
#define VTK_NUMBER_STATISTICS 12
#define VTK_TOLERANCE 1.0e-05
#define MAX_TRIS_PER_VERTEX MAX_CELL_SIZE
#define MAX_SQUAWKS 10
#define VTK_MAX_TRIS_PER_VERTEX VTK_MAX_CELL_SIZE
#define VTK_MAX_SQUAWKS 10
#define COMPLEX_VERTEX 0
#define SIMPLE_VERTEX 1
#define BOUNDARY_VERTEX 2
#define INTERIOR_EDGE_VERTEX 3
#define CORNER_VERTEX 4
#define VTK_COMPLEX_VERTEX 0
#define VTK_SIMPLE_VERTEX 1
#define VTK_BOUNDARY_VERTEX 2
#define VTK_INTERIOR_EDGE_VERTEX 3
#define VTK_CORNER_VERTEX 4
#define ELIMINATED_DISTANCE_TO_PLANE 5
#define ELIMINATED_DISTANCE_TO_EDGE 6
#define FAILED_DEGREE_TEST 7
#define FAILED_NON_MANIFOLD 8
#define FAILED_ZERO_AREA_TEST 9
#define FAILED_ZERO_NORMAL_TEST 10
#define FAILED_TO_TRIANGULATE 11
#define VTK_ELIMINATED_DISTANCE_TO_PLANE 5
#define VTK_ELIMINATED_DISTANCE_TO_EDGE 6
#define VTK_FAILED_DEGREE_TEST 7
#define VTK_FAILED_NON_MANIFOLD 8
#define VTK_FAILED_ZERO_AREA_TEST 9
#define VTK_FAILED_ZERO_NORMAL_TEST 10
#define VTK_FAILED_TO_TRIANGULATE 11
// Special structures for building loops
......@@ -195,13 +195,13 @@ public:
// Description:
// Specify the maximum number of iterations to attempt. If decimation target
// is reached first, this value will not be reached.
vtkSetClampMacro(MaximumIterations,int,1,LARGE_INTEGER);
vtkSetClampMacro(MaximumIterations,int,1,VTK_LARGE_INTEGER);
vtkGetMacro(MaximumIterations,int);
// Description:
// Specify the maximum sub-iterations to perform. If no triangles are deleted
// in a sub-iteration, the sub-iteration process is stopped.
vtkSetClampMacro(MaximumSubIterations,int,1,LARGE_INTEGER);
vtkSetClampMacro(MaximumSubIterations,int,1,VTK_LARGE_INTEGER);
vtkGetMacro(MaximumSubIterations,int);
// Description:
......@@ -240,7 +240,7 @@ public:
// If the number of triangles connected to a vertex exceeds "Degree", then
// the vertex is considered complex and is never deleted. (NOTE: the
// complexity of the triangulation algorithm is proportional to Degree^2.)
vtkSetClampMacro(Degree,int,25,MAX_CELL_SIZE);
vtkSetClampMacro(Degree,int,25,VTK_MAX_CELL_SIZE);
vtkGetMacro(Degree,int);
protected:
......@@ -259,7 +259,7 @@ protected:
int MaximumSubIterations; // maximum non-incrementing passes
float AspectRatio; // control triangle shape during triangulation
int Degree; // maximum number of triangles incident on vertex
int Stats[NUMBER_STATISTICS]; // keep track of interesting statistics
int Stats[VTK_NUMBER_STATISTICS]; // keep track of interesting statistics
int GenerateErrorScalars; // turn on/off vertex error scalar generation
void CreateOutput(int numPts, int numTris, int numEliminated,
......
......@@ -42,7 +42,9 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
// vtkDiskSource creates a polygonal disk with a hole in the center. The
// disk has zero height. The user can specify the inner and outer radius
// of the disk, and the radial and circumferential resolution of the
// polygonal representation.
// polygonal representation.
// .SECTION SEE ALSO
// If you desire to create a solid object you can use vtkLinearExtrusionFilter.
#ifndef __vtkDiskSource_h
#define __vtkDiskSource_h
......@@ -59,22 +61,22 @@ public:
// Description:
// Specify radius of hole in disc.
vtkSetClampMacro(InnerRadius,float,0.0,LARGE_FLOAT)
vtkSetClampMacro(InnerRadius,float,0.0,VTK_LARGE_FLOAT)
vtkGetMacro(InnerRadius,float);
// Description:
// Specify radius of disc.
vtkSetClampMacro(OuterRadius,float,0.0,LARGE_FLOAT)
vtkSetClampMacro(OuterRadius,float,0.0,VTK_LARGE_FLOAT)
vtkGetMacro(OuterRadius,float);
// Description:
// Set the number of points in radius direction.
vtkSetClampMacro(RadialResolution,int,1,LARGE_INTEGER)
vtkSetClampMacro(RadialResolution,int,1,VTK_LARGE_INTEGER)
vtkGetMacro(RadialResolution,int);
// Description:
// Set the number of points in circumferential direction.
vtkSetClampMacro(CircumferentialResolution,int,3,LARGE_INTEGER)
vtkSetClampMacro(CircumferentialResolution,int,3,VTK_LARGE_INTEGER)
vtkGetMacro(CircumferentialResolution,int);
protected:
......
......@@ -40,7 +40,7 @@ MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
=========================================================================*/
// .NAME vtkDividingCubes - create points lying on iso-surface
// .SECTION Description
// vtkDividingCubes is a filter that generates points laying on a surface
// vtkDividingCubes is a filter that generates points lying on a surface
// of constant scalar value (i.e., an iso-surface). Dense point clouds (i.e.,
// at screen resolution) will appear as a surface. Less dense clouds can be
// used as a source to generate streamlines or to generate "transparent"
......@@ -66,14 +66,14 @@ public:
// Description:
// Specify sub-voxel size at which to generate point..
vtkSetClampMacro(Distance,float,1.0e-06,LARGE_FLOAT);
vtkSetClampMacro(Distance,float,1.0e-06,VTK_LARGE_FLOAT);
vtkGetMacro(Distance,float);
// Description:
// Every "Increment" point is added to the list of points. This parameter, if
// set to a large value, can be used to limit the number of points while
// retaining good accuracy.
vtkSetClampMacro(Increment,int,1,LARGE_INTEGER);
vtkSetClampMacro(Increment,int,1,VTK_LARGE_INTEGER);
vtkGetMacro(Increment,int);
protected:
......
......@@ -74,7 +74,7 @@ public:
// Description:
// Multiply Gaussian splat distribution by this value.
vtkSetClampMacro(ScaleFactor,float,0.0,LARGE_FLOAT);
vtkSetClampMacro(ScaleFactor,float,0.0,VTK_LARGE_FLOAT);
vtkGetMacro(ScaleFactor,float);
// Description:
......@@ -86,7 +86,7 @@ public:
// Control the shape of elliptical splatting. Eccentricity is the ratio
// of the major axis (aligned along normal) to the minor (axes) aligned
// along other two axes.
vtkSetClampMacro(Eccentricity,float,0.001,LARGE_FLOAT);
vtkSetClampMacro(Eccentricity,float,0.001,VTK_LARGE_FLOAT);
vtkGetMacro(Eccentricity,float);
// Description:
......
......@@ -90,22 +90,22 @@ public:
// Description:
// Specify the minimum point id for point id selection.
vtkSetClampMacro(PointMinimum,int,0,LARGE_INTEGER);
vtkSetClampMacro(PointMinimum,int,0,VTK_LARGE_INTEGER);
vtkGetMacro(PointMinimum,int);
// Description:
// Specify the maximum point id for point id selection.
vtkSetClampMacro(PointMaximum,int,0,LARGE_INTEGER);
vtkSetClampMacro(PointMaximum,int,0,VTK_LARGE_INTEGER);
vtkGetMacro(PointMaximum,int);
// Description:
// Specify the minimum cell id for point id selection.
vtkSetClampMacro(CellMinimum,int,0,LARGE_INTEGER);
vtkSetClampMacro(CellMinimum,int,0,VTK_LARGE_INTEGER);
vtkGetMacro(CellMinimum,int);
// Description:
// Specify the maximum cell id for point id selection.
vtkSetClampMacro(CellMaximum,int,0,LARGE_INTEGER);
vtkSetClampMacro(CellMaximum,int,0,VTK_LARGE_INTEGER);
vtkGetMacro(CellMaximum,int);
void SetExtent(float xMin, float xMax, float yMin, float yMax, float zMin, float zMax);
......
......@@ -70,9 +70,9 @@ public:
vtkCellArray *lines, vtkCellArray *polys, vtkFloatScalars *s);
int EvaluatePosition(float x[3], float closestPoint[3],
int& subId, float pcoords[3],
float& dist2, float weights[MAX_CELL_SIZE]);
float& dist2, float weights[VTK_MAX_CELL_SIZE]);
void EvaluateLocation(int& subId, float pcoords[3], float x[3],
float weights[MAX_CELL_SIZE]);
float weights[VTK_MAX_CELL_SIZE]);
int IntersectWithLine(float p1[3], float p2[3], float tol, float& t,
float x[3], float pcoords[3], int& subId);
int Triangulate(int index, vtkFloatPoints &pts);
......
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