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

ENH: New GetVectorMacro

parent 475364bf
...@@ -39,7 +39,7 @@ public: ...@@ -39,7 +39,7 @@ public:
protected: protected:
virtual void Execute() virtual void Execute()
{vlErrorMacro(<< "Execute is a Filter subclass responsability");}; {vlErrorMacro(<< "Execute is a Filter subclass responsibility");};
char Updating; char Updating;
void (*StartMethod)(void *); void (*StartMethod)(void *);
void *StartMethodArg; void *StartMethodArg;
......
...@@ -49,7 +49,7 @@ public: ...@@ -49,7 +49,7 @@ public:
// Description: // Description:
// Set the number of divisions in x-y-z directions. // Set the number of divisions in x-y-z directions.
vlSetVector3Macro(Divisions,int); vlSetVector3Macro(Divisions,int);
vlGetVectorMacro(Divisions,int); vlGetVectorMacro(Divisions,int,3);
// Description: // Description:
// Boolean controls whether automatic subdivision size is computed // Boolean controls whether automatic subdivision size is computed
......
...@@ -43,10 +43,10 @@ public: ...@@ -43,10 +43,10 @@ public:
void EvaluateNormal(float x, float y, float z, float n[3]); void EvaluateNormal(float x, float y, float z, float n[3]);
vlSetVector3Macro(Normal,float); vlSetVector3Macro(Normal,float);
vlGetVectorMacro(Normal,float); vlGetVectorMacro(Normal,float,3);
vlSetVector3Macro(Origin,float); vlSetVector3Macro(Origin,float);
vlGetVectorMacro(Origin,float); vlGetVectorMacro(Origin,float,3);
protected: protected:
float Normal[3]; float Normal[3];
......
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
void SetCoefficients(float a[10]); void SetCoefficients(float a[10]);
void SetCoefficients(float a0, float a1, float a2, float a3, float a4, void SetCoefficients(float a0, float a1, float a2, float a3, float a4,
float a5, float a6, float a7, float a8, float a9); float a5, float a6, float a7, float a8, float a9);
vlGetVectorMacro(Coefficients,float); vlGetVectorMacro(Coefficients,float,10);
protected: protected:
float Coefficients[10]; float Coefficients[10];
......
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
vlGetMacro(Radius,float); vlGetMacro(Radius,float);
vlSetVector3Macro(Origin,float); vlSetVector3Macro(Origin,float);
vlGetVectorMacro(Origin,float); vlGetVectorMacro(Origin,float,3);
protected: protected:
float Radius; float Radius;
......
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
// specific object methods // specific object methods
void SetDimensions(int i, int j, int k); void SetDimensions(int i, int j, int k);
void SetDimensions(int dim[3]); void SetDimensions(int dim[3]);
vlGetVectorMacro(Dimensions,int); vlGetVectorMacro(Dimensions,int,3);
int GetDataDimension(); int GetDataDimension();
......
...@@ -46,13 +46,13 @@ public: ...@@ -46,13 +46,13 @@ public:
// Set the aspect ratio of the cubical cells that compose the structured // Set the aspect ratio of the cubical cells that compose the structured
// point set. // point set.
vlSetVector3Macro(AspectRatio,float); vlSetVector3Macro(AspectRatio,float);
vlGetVectorMacro(AspectRatio,float); vlGetVectorMacro(AspectRatio,float,3);
// Description: // Description:
// Set the origin of the data. The origin plus aspect ratio determine the // Set the origin of the data. The origin plus aspect ratio determine the
// position in space of the structured points. // position in space of the structured points.
vlSetVector3Macro(Origin,float); vlSetVector3Macro(Origin,float);
vlGetVectorMacro(Origin,float); vlGetVectorMacro(Origin,float,3);
protected: protected:
float Origin[3]; float Origin[3];
......
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