Commit a74f68ce authored by Will Schroeder's avatar Will Schroeder
Browse files

*** empty log message ***

parent 4cdc99b2
......@@ -37,7 +37,7 @@ public:
vlCharScalars(const int sz, const int ext=1000):S(sz,ext){};
~vlCharScalars() {};
char *GetClassName() {return "vlCharScalars";};
int NumberOfScalars() {return (this->S.GetMaxId()+1);};
int GetNumberOfScalars() {return (this->S.GetMaxId()+1);};
void Reset() {this->S.Reset();};
void Squeeze() {this->S.Squeeze();};
vlCharScalars &operator=(const vlCharScalars& cs);
......
......@@ -42,7 +42,7 @@ public:
// reference counting.
// Number of points in cell
int NumberOfPoints() {return this->PointIds.NumberOfIds();};
int GetNumberOfPoints() {return this->PointIds.GetNumberOfIds();};
// Dimensionality of cell (0,1,2, or 3)
virtual int CellDimension() = 0;
......
......@@ -33,8 +33,8 @@ public:
// dataset interface
vlDataSet *MakeObject() {return this->DataSet->MakeObject();};
int NumberOfCells() {return this->DataSet->NumberOfCells();}
int NumberOfPoints() {return this->DataSet->NumberOfPoints();}
int GetNumberOfCells() {return this->DataSet->GetNumberOfCells();}
int GetNumberOfPoints() {return this->DataSet->GetNumberOfPoints();}
float *GetPoint(int i) {return this->DataSet->GetPoint(i);}
vlCell *GetCell(int cellId) {return this->DataSet->GetCell(cellId);}
void Initialize();
......
......@@ -6,9 +6,11 @@
Date: $Date$
Version: $Revision$
This file is part of the Visualization Library. No part of this file or its
contents may be copied, reproduced or altered in any way without the express
written consent of the authors.
Description:
---------------------------------------------------------------------------
This file is part of the Visualization Library. No part of this file
or its contents may be copied, reproduced or altered in any way
without the express written consent of the authors.
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen 1993, 1994
......@@ -34,8 +36,8 @@ public:
void PrintSelf(ostream& os, vlIndent indent);
virtual vlDataSet *MakeObject() = 0;
virtual int NumberOfCells() = 0;
virtual int NumberOfPoints() = 0;
virtual int GetNumberOfCells() = 0;
virtual int GetNumberOfPoints() = 0;
virtual float *GetPoint(int ptId) = 0;
virtual vlCell *GetCell(int cellId) = 0;
virtual vlMapper *MakeMapper() = 0;
......
......@@ -35,7 +35,7 @@ public:
vlFloatNormals(const int sz, const int ext=1000):N(3*sz,3*ext){};
~vlFloatNormals() {};
char *GetClassName() {return "vlFloatNormals";};
int NumberOfNormals() {return (N.GetMaxId()+1)/3;};
int GetNumberOfNormals() {return (N.GetMaxId()+1)/3;};
void Reset() {this->N.Reset();};
void Squeeze() {this->N.Squeeze();};
vlFloatNormals &operator=(const vlFloatNormals& fn);
......
......@@ -35,7 +35,7 @@ public:
vlFloatPoints(const int sz, const int ext=1000):P(3*sz,3*ext){};
~vlFloatPoints() {};
char *GetClassName() {return "vlFloatPoints";};
int NumberOfPoints() {return (P.GetMaxId()+1)/3;};
int GetNumberOfPoints() {return (P.GetMaxId()+1)/3;};
void Reset() {this->P.Reset();};
void Squeeze() {this->P.Squeeze();};
vlFloatPoints &operator=(const vlFloatPoints& fp);
......
......@@ -35,7 +35,7 @@ public:
vlFloatScalars(const int sz, const int ext=1000):S(sz,ext){};
~vlFloatScalars() {};
char *GetClassName() {return "vlFloatScalars";};
int NumberOfScalars() {return (this->S.GetMaxId()+1);};
int GetNumberOfScalars() {return (this->S.GetMaxId()+1);};
void Reset() {this->S.Reset();};
void Squeeze() {this->S.Squeeze();};
vlFloatScalars &operator=(const vlFloatScalars& fs);
......
......@@ -40,7 +40,7 @@ public:
char *GetClassName() {return "vlFloatTCoords";};
void operator+=(const vlFloatTCoords& ftc) {this->TC += ftc.TC;};
int NumberOfTCoords() {return (this->TC.GetMaxId()+1)/this->Dimension;};
int GetNumberOfTCoords() {return (this->TC.GetMaxId()+1)/this->Dimension;};
void Reset() {this->TC.Reset();};
void Squeeze() {this->TC.Squeeze();};
......
......@@ -35,7 +35,7 @@ public:
vlFloatVectors(const int sz, const int ext=1000):V(3*sz,3*ext){};
~vlFloatVectors() {};
char *GetClassName() {return "vlFloatVectors";};
int NumberOfVectors() {return (V.GetMaxId()+1)/3;};
int GetNumberOfVectors() {return (V.GetMaxId()+1)/3;};
void Reset() {this->V.Reset();};
void Squeeze() {this->V.Squeeze();};
vlFloatVectors &operator=(const vlFloatVectors& fv);
......
......@@ -11,7 +11,7 @@ public:
vlIdList(const int sz, const int ext=100):Ia(sz,ext) {};
~vlIdList() {};
int NumberOfIds() {return (this->Ia.GetMaxId() + 1);};
int GetNumberOfIds() {return (this->Ia.GetMaxId() + 1);};
int GetId(const int i) {return this->Ia[i];};
void SetId(const int i, const int id) {this->Ia[i]=id;};
void InsertId(const int i, const int id) {this->Ia.InsertValue(i,id);};
......
......@@ -29,7 +29,7 @@ class vlNormals : public vlObject
public:
virtual ~vlNormals() {};
virtual vlNormals *MakeObject(int sze, int ext=1000) = 0;
virtual int NumberOfNormals() = 0;
virtual int GetNumberOfNormals() = 0;
virtual float *GetNormal(int i) = 0;
virtual void SetNormal(int i,float x[3]) = 0; // fast insert
virtual void InsertNormal(int i, float x[3]) = 0; // allocates memory as necessary
......
......@@ -30,7 +30,7 @@ public:
vlPoints();
virtual ~vlPoints() {};
virtual vlPoints *MakeObject(int sze, int ext=1000) = 0;
virtual int NumberOfPoints() = 0;
virtual int GetNumberOfPoints() = 0;
virtual float *GetPoint(int i) = 0;
virtual void SetPoint(int i,float x[3]) = 0; // fast insert
virtual void InsertPoint(int i, float x[3]) = 0; // allocates memory as necessary
......
......@@ -37,8 +37,8 @@ public:
// dataset interface
vlDataSet *MakeObject();
int NumberOfPoints();
int NumberOfCells();
int GetNumberOfPoints();
int GetNumberOfCells();
float *GetPoint(int ptId) {return this->Points->GetPoint(ptId);};
vlCell *GetCell(int cellId);
vlMapper *MakeMapper();
......@@ -64,10 +64,10 @@ public:
void SetStrips (vlCellArray* s);
vlCellArray *GetStrips();
int NumberOfVerts();
int NumberOfLines();
int NumberOfPolys();
int NumberOfStrips();
int GetNumberOfVerts();
int GetNumberOfLines();
int GetNumberOfPolys();
int GetNumberOfStrips();
// following stuff supports cell structure
vlBooleanMacro(LoadVerts,int);
......
......@@ -37,7 +37,7 @@ public:
vlShortScalars(const int sz, const int ext=1000):S(sz,ext){};
~vlShortScalars() {};
char *GetClassName() {return "vlShortScalars";};
int NumberOfScalars() {return (this->S.GetMaxId()+1);};
int GetNumberOfScalars() {return (this->S.GetMaxId()+1);};
void Reset() {this->S.Reset();};
void Squeeze() {this->S.Squeeze();};
vlShortScalars &operator=(const vlShortScalars& ss);
......
......@@ -30,7 +30,7 @@ public:
vlScalars();
virtual ~vlScalars() {};
virtual vlScalars *MakeObject(int sze, int ext=1000) = 0;
virtual int NumberOfScalars() = 0;
virtual int GetNumberOfScalars() = 0;
virtual float GetScalar(int i) = 0;
virtual void SetScalar(int i, float s) = 0; // fast insert
virtual void InsertScalar(int i, float s) = 0; // allocates memory as necessary
......
......@@ -44,8 +44,8 @@ public:
// dataset interface
vlDataSet *MakeObject() {return new vlStructuredPoints(*this);};
int NumberOfCells();
int NumberOfPoints();
int GetNumberOfCells();
int GetNumberOfPoints();
float *GetPoint(int ptId);
vlCell *GetCell(int cellId);
vlMapper *MakeMapper() {return (vlMapper *)0;};
......
......@@ -30,7 +30,7 @@ public:
vlTCoords(int dim=2) {this->Dimension=dim;};
virtual ~vlTCoords() {};
virtual vlTCoords *MakeObject(int sze, int d=2, int ext=1000) = 0;
virtual int NumberOfTCoords() = 0;
virtual int GetNumberOfTCoords() = 0;
virtual float *GetTCoord(int i) = 0;
virtual void SetTCoord(int i,float *x) = 0; // fast insert
virtual void InsertTCoord(int i, float *x) = 0; // allocates memory as necessary
......
......@@ -30,7 +30,7 @@ public:
vlVectors();
virtual ~vlVectors() {};
virtual vlVectors *MakeObject(int sze, int ext=1000) = 0;
virtual int NumberOfVectors() = 0;
virtual int GetNumberOfVectors() = 0;
virtual float *GetVector(int i) = 0;
virtual void SetVector(int i,float x[3]) = 0; // fast insert
virtual void InsertVector(int i, float x[3]) = 0; // allocates memory as necessary
......
......@@ -123,7 +123,7 @@ float *vlCell::GetBounds ()
bounds[0] = bounds[2] = bounds[4] = LARGE_FLOAT;
bounds[1] = bounds[3] = bounds[5] = -LARGE_FLOAT;
for (i=0; i<this->Points.NumberOfPoints(); i++)
for (i=0; i<this->Points.GetNumberOfPoints(); i++)
{
x = this->Points.GetPoint(i);
for (j=0; j<3; j++)
......
......@@ -97,7 +97,7 @@ void vlContourFilter::Execute()
for (i=0; i<this->NumberOfContours; i++)
{
value = this->Values[i];
for (cellId=0; cellId<Input->NumberOfCells(); cellId++)
for (cellId=0; cellId<Input->GetNumberOfCells(); cellId++)
{
cell = Input->GetCell(cellId);
cellPts = cell->GetPointIds();
......
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