Commit 90892d44 authored by hrchilds's avatar hrchilds

Renaming:

1) PublicFilters -> AbstractFilters
2) avtXYZFilter -> avtXYZExpression



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@3192 18c085ea-50e0-402c-830e-de6fd14e8384
parent 81fcbb33
......@@ -37,10 +37,10 @@
*****************************************************************************/
// ************************************************************************* //
// avtBinaryMathFilter.C //
// avtBinaryMathExpression.C //
// ************************************************************************* //
#include <avtBinaryMathFilter.h>
#include <avtBinaryMathExpression.h>
#include <vtkCellData.h>
#include <vtkDataSet.h>
......@@ -50,7 +50,7 @@
// ****************************************************************************
// Method: avtBinaryMathFilter constructor
// Method: avtBinaryMathExpression constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
......@@ -61,14 +61,14 @@
//
// ****************************************************************************
avtBinaryMathFilter::avtBinaryMathFilter()
avtBinaryMathExpression::avtBinaryMathExpression()
{
;
}
// ****************************************************************************
// Method: avtBinaryMathFilter destructor
// Method: avtBinaryMathExpression destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
......@@ -79,14 +79,14 @@ avtBinaryMathFilter::avtBinaryMathFilter()
//
// ****************************************************************************
avtBinaryMathFilter::~avtBinaryMathFilter()
avtBinaryMathExpression::~avtBinaryMathExpression()
{
;
}
// ****************************************************************************
// Method: avtBinaryMathFilter::DeriveVariable
// Method: avtBinaryMathExpression::DeriveVariable
//
// Purpose:
// Derives a variable based on two variables in the input dataset.
......@@ -138,7 +138,7 @@ avtBinaryMathFilter::~avtBinaryMathFilter()
// ****************************************************************************
vtkDataArray *
avtBinaryMathFilter::DeriveVariable(vtkDataSet *in_ds)
avtBinaryMathExpression::DeriveVariable(vtkDataSet *in_ds)
{
// Our first operand is in the active variable. We don't know if it's
// point data or cell data, so check which one is non-NULL.
......@@ -245,7 +245,7 @@ avtBinaryMathFilter::DeriveVariable(vtkDataSet *in_ds)
// ****************************************************************************
// Method: avtBinaryMathFilter::CreateArray
// Method: avtBinaryMathExpression::CreateArray
//
// Purpose:
// Creates an array to write the output into. Most derived types want
......@@ -258,14 +258,14 @@ avtBinaryMathFilter::DeriveVariable(vtkDataSet *in_ds)
// ****************************************************************************
vtkDataArray *
avtBinaryMathFilter::CreateArray(vtkDataArray *in1)
avtBinaryMathExpression::CreateArray(vtkDataArray *in1)
{
return in1->NewInstance();
}
// ****************************************************************************
// Method: avtBinaryMathFilter::GetVariableDimension
// Method: avtBinaryMathExpression::GetVariableDimension
//
// Purpose:
// Determines what the variable dimension of the output is.
......@@ -276,7 +276,7 @@ avtBinaryMathFilter::CreateArray(vtkDataArray *in1)
// ****************************************************************************
int
avtBinaryMathFilter::GetVariableDimension(void)
avtBinaryMathExpression::GetVariableDimension(void)
{
if (*(GetInput()) == NULL)
return avtMultipleInputExpressionFilter::GetVariableDimension();
......@@ -297,7 +297,7 @@ avtBinaryMathFilter::GetVariableDimension(void)
// ****************************************************************************
// Method: avtBinaryMathFilter::FilterUnderstandsTransformedRectMesh
// Method: avtBinaryMathExpression::FilterUnderstandsTransformedRectMesh
//
// Purpose:
// If this filter returns true, this means that it correctly deals
......@@ -312,9 +312,11 @@ avtBinaryMathFilter::GetVariableDimension(void)
//
// ****************************************************************************
bool
avtBinaryMathFilter::FilterUnderstandsTransformedRectMesh()
avtBinaryMathExpression::FilterUnderstandsTransformedRectMesh()
{
// simple binary math operates only on variables and
// shouldn't be directly affected by coordinates
return true;
}
......@@ -37,7 +37,7 @@
*****************************************************************************/
// ************************************************************************* //
// avtBinaryMathFilter.h //
// avtBinaryMathExpression.h //
// ************************************************************************* //
#ifndef AVT_BINARY_MATH_FILTER_H
......@@ -50,7 +50,7 @@ class vtkDataArray;
// ****************************************************************************
// Class: avtBinaryMathFilter
// Class: avtBinaryMathExpression
//
// Purpose:
// A filter that performs a calculation on two variables.
......@@ -80,14 +80,14 @@ class vtkDataArray;
//
// ****************************************************************************
class EXPRESSION_API avtBinaryMathFilter
class EXPRESSION_API avtBinaryMathExpression
: public avtMultipleInputExpressionFilter
{
public:
avtBinaryMathFilter();
virtual ~avtBinaryMathFilter();
avtBinaryMathExpression();
virtual ~avtBinaryMathExpression();
virtual const char *GetType(void) { return "avtBinaryMathFilter";};
virtual const char *GetType(void) { return "avtBinaryMathExpression";};
virtual const char *GetDescription(void) = 0;
virtual int NumVariableArguments() { return 2; }
......
......@@ -37,14 +37,14 @@
*****************************************************************************/
// ************************************************************************* //
// avtComparisonFilter.C //
// avtComparisonExpression.C //
// ************************************************************************* //
#include <avtComparisonFilter.h>
#include <avtComparisonExpression.h>
// ****************************************************************************
// Method: avtComparisonFilter constructor
// Method: avtComparisonExpression constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
......@@ -55,14 +55,14 @@
//
// ****************************************************************************
avtComparisonFilter::avtComparisonFilter()
avtComparisonExpression::avtComparisonExpression()
{
;
}
// ****************************************************************************
// Method: avtComparisonFilter destructor
// Method: avtComparisonExpression destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
......@@ -73,7 +73,7 @@ avtComparisonFilter::avtComparisonFilter()
//
// ****************************************************************************
avtComparisonFilter::~avtComparisonFilter()
avtComparisonExpression::~avtComparisonExpression()
{
;
}
......
......@@ -37,19 +37,19 @@
*****************************************************************************/
// ************************************************************************* //
// avtComparisonFilter.h //
// avtComparisonExpression.h //
// ************************************************************************* //
#ifndef AVT_COMPARISON_FILTER_H
#define AVT_COMPARISON_FILTER_H
#include <avtBinaryMathFilter.h>
#include <avtBinaryMathExpression.h>
#include <vtkUnsignedCharArray.h>
// ****************************************************************************
// Class: avtComparisonFilter
// Class: avtComparisonExpression
//
// Purpose:
// This is the base class for any expression that compares two arrays
......@@ -65,11 +65,11 @@
//
// ****************************************************************************
class avtComparisonFilter : public avtBinaryMathFilter
class avtComparisonExpression : public avtBinaryMathExpression
{
public:
avtComparisonFilter();
virtual ~avtComparisonFilter();
avtComparisonExpression();
virtual ~avtComparisonExpression();
protected:
virtual int GetNumberOfComponentsInOutput() { return 1; };
......
......@@ -37,10 +37,10 @@
*****************************************************************************/
// ************************************************************************* //
// avtUnaryMathFilter.C //
// avtUnaryMathExpression.C //
// ************************************************************************* //
#include <avtUnaryMathFilter.h>
#include <avtUnaryMathExpression.h>
#include <vtkCellData.h>
#include <vtkDataArray.h>
......@@ -52,7 +52,7 @@
// ****************************************************************************
// Method: avtUnaryMathFilter constructor
// Method: avtUnaryMathExpression constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
......@@ -63,14 +63,14 @@
//
// ****************************************************************************
avtUnaryMathFilter::avtUnaryMathFilter()
avtUnaryMathExpression::avtUnaryMathExpression()
{
;
}
// ****************************************************************************
// Method: avtUnaryMathFilter destructor
// Method: avtUnaryMathExpression destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
......@@ -81,14 +81,14 @@ avtUnaryMathFilter::avtUnaryMathFilter()
//
// ****************************************************************************
avtUnaryMathFilter::~avtUnaryMathFilter()
avtUnaryMathExpression::~avtUnaryMathExpression()
{
;
}
// ****************************************************************************
// Method: avtUnaryMathFilter::DeriveVariable
// Method: avtUnaryMathExpression::DeriveVariable
//
// Purpose:
// Derives a variable based on the input dataset.
......@@ -151,7 +151,7 @@ avtUnaryMathFilter::~avtUnaryMathFilter()
// ****************************************************************************
vtkDataArray *
avtUnaryMathFilter::DeriveVariable(vtkDataSet *in_ds)
avtUnaryMathExpression::DeriveVariable(vtkDataSet *in_ds)
{
int i;
......@@ -302,7 +302,7 @@ avtUnaryMathFilter::DeriveVariable(vtkDataSet *in_ds)
// ****************************************************************************
// Method: avtUnaryMathFilter::CreateArray
// Method: avtUnaryMathExpression::CreateArray
//
// Purpose:
// Creates an array to write the output into. Most derived types want
......@@ -315,14 +315,14 @@ avtUnaryMathFilter::DeriveVariable(vtkDataSet *in_ds)
// ****************************************************************************
vtkDataArray *
avtUnaryMathFilter::CreateArray(vtkDataArray *in1)
avtUnaryMathExpression::CreateArray(vtkDataArray *in1)
{
return in1->NewInstance();
}
// ****************************************************************************
// Method: avtUnaryMathFilter::GetVariableDimension
// Method: avtUnaryMathExpression::GetVariableDimension
//
// Purpose:
// Determines what the variable dimension of the output is.
......@@ -333,7 +333,7 @@ avtUnaryMathFilter::CreateArray(vtkDataArray *in1)
// ****************************************************************************
int
avtUnaryMathFilter::GetVariableDimension(void)
avtUnaryMathExpression::GetVariableDimension(void)
{
if (*(GetInput()) == NULL)
return avtSingleInputExpressionFilter::GetVariableDimension();
......@@ -358,7 +358,7 @@ avtUnaryMathFilter::GetVariableDimension(void)
// ****************************************************************************
// Method: avtUnaryMathFilter::FilterUnderstandsTransformedRectMesh
// Method: avtUnaryMathExpression::FilterUnderstandsTransformedRectMesh
//
// Purpose:
// If this filter returns true, this means that it correctly deals
......@@ -373,9 +373,11 @@ avtUnaryMathFilter::GetVariableDimension(void)
//
// ****************************************************************************
bool
avtUnaryMathFilter::FilterUnderstandsTransformedRectMesh()
avtUnaryMathExpression::FilterUnderstandsTransformedRectMesh()
{
// simple unary math operates only on variables and
// shouldn't be directly affected by coordinates
return true;
}
......@@ -37,7 +37,7 @@
*****************************************************************************/
// ************************************************************************* //
// avtUnaryMathFilter.h //
// avtUnaryMathExpression.h //
// ************************************************************************* //
#ifndef AVT_UNARY_MATH_FILTER_H
......@@ -50,7 +50,7 @@ class vtkDataArray;
// ****************************************************************************
// Class: avtUnaryMathFilter
// Class: avtUnaryMathExpression
//
// Purpose:
// A filter that performs a calculation on a single variable.
......@@ -80,13 +80,13 @@ class vtkDataArray;
//
// ****************************************************************************
class EXPRESSION_API avtUnaryMathFilter : public avtSingleInputExpressionFilter
class EXPRESSION_API avtUnaryMathExpression : public avtSingleInputExpressionFilter
{
public:
avtUnaryMathFilter();
virtual ~avtUnaryMathFilter();
avtUnaryMathExpression();
virtual ~avtUnaryMathExpression();
virtual const char *GetType(void) { return "avtUnaryMathFilter";};
virtual const char *GetType(void) { return "avtUnaryMathExpression";};
virtual const char *GetDescription(void) = 0;
protected:
......
......@@ -37,10 +37,10 @@
*****************************************************************************/
// ************************************************************************* //
// avtConditionalFilter.C //
// avtConditionalExpression.C //
// ************************************************************************* //
#include <avtConditionalFilter.h>
#include <avtConditionalExpression.h>
#include <snprintf.h>
......@@ -55,7 +55,7 @@
// ****************************************************************************
// Method: avtConditionalFilter constructor
// Method: avtConditionalExpression constructor
//
// Purpose:
// Defines the constructor. Note: this should not be inlined in the
......@@ -66,14 +66,14 @@
//
// ****************************************************************************
avtConditionalFilter::avtConditionalFilter()
avtConditionalExpression::avtConditionalExpression()
{
;
}
// ****************************************************************************
// Method: avtConditionalFilter destructor
// Method: avtConditionalExpression destructor
//
// Purpose:
// Defines the destructor. Note: this should not be inlined in the header
......@@ -84,14 +84,14 @@ avtConditionalFilter::avtConditionalFilter()
//
// ****************************************************************************
avtConditionalFilter::~avtConditionalFilter()
avtConditionalExpression::~avtConditionalExpression()
{
;
}
// ****************************************************************************
// Method: avtConditionalFilter::DeriveVariable
// Method: avtConditionalExpression::DeriveVariable
//
// Purpose:
// Selects between two arrays based on a condition.
......@@ -113,7 +113,7 @@ avtConditionalFilter::~avtConditionalFilter()
// ****************************************************************************
vtkDataArray *
avtConditionalFilter::DeriveVariable(vtkDataSet *in_ds)
avtConditionalExpression::DeriveVariable(vtkDataSet *in_ds)
{
// Our first operand is in the active variable. We don't know if it's
// point data or cell data, so check which one is non-NULL.
......@@ -219,7 +219,7 @@ avtConditionalFilter::DeriveVariable(vtkDataSet *in_ds)
// ****************************************************************************
// Method: avtConditionalFilter::FilterUnderstandsTransformedRectMesh
// Method: avtConditionalExpression::FilterUnderstandsTransformedRectMesh
//
// Purpose:
// If this filter returns true, this means that it correctly deals
......@@ -234,7 +234,7 @@ avtConditionalFilter::DeriveVariable(vtkDataSet *in_ds)
//
// ****************************************************************************
bool
avtConditionalFilter::FilterUnderstandsTransformedRectMesh()
avtConditionalExpression::FilterUnderstandsTransformedRectMesh()
{
// simple conditionals operate only on variables and
// shouldn't be directly affected by coordinates
......
......@@ -37,7 +37,7 @@
*****************************************************************************/
// ************************************************************************* //