An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 30aa1f8f authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by David C. Lonie
Browse files

Rename as vtkGenericDataArray and vtkSoADataArrayTemplate.

parent b6bf3c31
......@@ -104,9 +104,8 @@ include_directories(${VTK_SOURCE_DIR}/ThirdParty/utf8/source)
SET(Module_SRCS
vtkAbstractArray.cxx
vtkAgnosticArrayHelpers.cxx
vtkAnimationCue.cxx
vtkAngularPeriodicDataArray.txx
vtkAnimationCue.cxx
vtkArrayCoordinates.cxx
vtkArray.cxx
vtkArrayExtents.cxx
......@@ -143,6 +142,7 @@ SET(Module_SRCS
vtkGarbageCollector.cxx
vtkGarbageCollectorManager.cxx
vtkGaussianRandomSequence.cxx
vtkGenericDataArrayHelper.cxx
vtkIdListCollection.cxx
vtkIdList.cxx
vtkIdTypeArray.cxx
......@@ -239,17 +239,13 @@ SET(Module_SRCS
set(${vtk-module}_HDRS
vtkABI.h
vtkAgnosticArray.h
vtkAgnosticArrayLookupHelper.h
vtkAgnosticArrayTupleIterator.h
vtkAgnosticArray.txx
vtkAngularPeriodicDataArray.h
vtkArrayInterpolate.h
vtkArrayInterpolate.txx
vtkArrayIteratorIncludes.h
vtkArrayIteratorTemplate.h
vtkArrayIteratorTemplate.txx
vtkArrayIteratorTemplateImplicit.txx
vtkArrayIteratorTemplate.txx
vtkArrayPrint.h
vtkArrayPrint.txx
vtkAtomicTypeConcepts.h
......@@ -257,6 +253,10 @@ set(${vtk-module}_HDRS
vtkAutoInit.h
vtkDataArrayIteratorMacro.h
vtkDataArrayTemplateImplicit.txx
vtkGenericDataArray.h
vtkGenericDataArrayLookupHelper.h
vtkGenericDataArrayTupleIterator.h
vtkGenericDataArray.txx
vtkIOStream.h
vtkIOStreamFwd.h
vtkInformationInternals.h
......@@ -266,8 +266,8 @@ set(${vtk-module}_HDRS
vtkPeriodicDataArray.h
vtkSetGet.h
vtkSmartPointer.h
vtkSoAArrayTemplate.h
vtkSoAArrayTemplate.txx
vtkSoADataArrayTemplate.h
vtkSoADataArrayTemplate.txx
vtkTemplateAliasMacro.h
vtkTypeTraits.h
vtkTypedDataArray.h
......@@ -495,10 +495,9 @@ configure_file(
set_source_files_properties(
# vtkObjectBase is marked ABSTRACT so that instantiators are happy.
vtkAbstractArray
vtkAgnosticArrayHelpers
vtkArray
vtkArrayIterator
vtkArrayIteratorTemplate
vtkArray
vtkCallbackCommand
vtkCommand
vtkCommonInformationKeyManager
......@@ -507,6 +506,7 @@ set_source_files_properties(
vtkFloatingPointExceptions
vtkFunctionSet
vtkGaussianRandomSequence
vtkGenericDataArrayHelpers
vtkInformationDataObjectKey
vtkInformationDoubleKey
vtkInformationDoubleVectorKey
......@@ -567,26 +567,27 @@ set_source_files_properties(
vtkDataArrayPrivate.txx
vtkABI.h
vtkAgnosticArrayHelpers.h
vtkAngularPeriodicDataArray.txx
vtkArrayInterpolate.h
vtkArrayInterpolate.txx
vtkArrayIteratorIncludes.h
vtkArrayIteratorTemplate.h
vtkArrayIteratorTemplate.txx
vtkArrayIteratorTemplateImplicit.txx
vtkArrayIteratorTemplate.txx
vtkArrayPrint.h
vtkArrayPrint.txx
vtkAtomicTypeConcepts.h
vtkAtomicTypes.h
vtkAutoInit.h
vtkDataArrayTemplate.txx
vtkDataArrayTemplateHelper.cxx
vtkDataArrayTemplateImplicit.txx
vtkDataArrayTemplate.txx
vtkDenseArray.txx
vtkGenericDataArrayHelpers.h
vtkIOStream.h
vtkIOStreamFwd.h
vtkInformationInternals.h
vtkIOStreamFwd.h
vtkMathUtilities.h
vtkMappedDataArray.txx
vtkNew.h
......
......@@ -7,7 +7,7 @@ set(TestXMLFileOutputWindow_ARGS ${CMAKE_BINARY_DIR}/Testing/Temporary/XMLFileOu
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_DATA NO_VALID NO_OUTPUT
UnitTestMath.cxx
TestAgnosticArray.cxx
TestGenericDataArray.cxx
TestAngularPeriodicDataArray.cxx
TestArrayAPI.cxx
TestArrayAPIConvenience.cxx
......
/*=========================================================================
Program: Visualization Toolkit
Module: TestAgnosticArray.cxx
Module: TestGenericDataArray.cxx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -11,15 +11,15 @@
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkSoAArrayTemplate.h"
#include "vtkSoADataArrayTemplate.h"
int TestAgnosticArray(int, char**)
int TestGenericDataArray(int, char**)
{
typedef vtkSoAArrayTemplate<float> vtkFloatArray2;
vtkSoAArrayTemplate<float>* array = vtkSoAArrayTemplate<float>::New();
typedef vtkSoADataArrayTemplate<float> vtkFloatArray2;
vtkSoADataArrayTemplate<float>* array = vtkSoADataArrayTemplate<float>::New();
array->SetNumberOfComponents(3);
array->SetNumberOfTuples(100);
vtkWriteableAgnosticArrayMacro(array,
vtkWriteableGenericDataArrayMacro(array,
for (ARRAY_TYPE::TupleIteratorType iter = ARRAY->Begin(), max = ARRAY->End(); iter != max; ++iter)
{
iter[0] = 1;
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkAgnosticArray.h
Module: vtkGenericDataArray.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,33 +12,33 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkAgnosticArray
// .NAME vtkGenericDataArray
// .SECTION Description
#ifndef vtkAgnosticArray_h
#define vtkAgnosticArray_h
#ifndef vtkGenericDataArray_h
#define vtkGenericDataArray_h
#include "vtkDataArray.h"
#include "vtkSmartPointer.h"
#include "vtkTypeTemplate.h"
#include "vtkTypeTraits.h"
#include "vtkAgnosticArrayLookupHelper.h"
#include "vtkAgnosticArrayHelpers.h"
#include "vtkAgnosticArrayTupleIterator.h"
#include "vtkGenericDataArrayLookupHelper.h"
#include "vtkGenericDataArrayHelper.h"
#include "vtkGenericDataArrayTupleIterator.h"
#include <cassert>
template<class DerivedT,
class ScalarTypeT,
class TupleTypeT,
class TupleIteratorTypeT=vtkAgnosticArrayTupleIterator<DerivedT>,
class TupleIteratorTypeT=vtkGenericDataArrayTupleIterator<DerivedT>,
class ScalarReturnTypeT=ScalarTypeT&>
class vtkAgnosticArray : public vtkTypeTemplate<
vtkAgnosticArray<DerivedT, ScalarTypeT, TupleTypeT, TupleIteratorTypeT, ScalarReturnTypeT>,
class vtkGenericDataArray : public vtkTypeTemplate<
vtkGenericDataArray<DerivedT, ScalarTypeT, TupleTypeT, TupleIteratorTypeT, ScalarReturnTypeT>,
vtkDataArray>
{
typedef
vtkAgnosticArray<DerivedT, ScalarTypeT, TupleTypeT, TupleIteratorTypeT, ScalarReturnTypeT> SelfType;
vtkGenericDataArray<DerivedT, ScalarTypeT, TupleTypeT, TupleIteratorTypeT, ScalarReturnTypeT> SelfType;
public:
typedef ScalarTypeT ScalarType;
typedef ScalarReturnTypeT ScalarReturnType;
......@@ -276,12 +276,12 @@ public:
virtual vtkArrayIterator* NewIterator() { return NULL;}
protected:
vtkAgnosticArray()
vtkGenericDataArray()
: Lookup(*this)
{
}
virtual ~vtkAgnosticArray()
virtual ~vtkGenericDataArray()
{
}
......@@ -298,17 +298,17 @@ protected:
return true;
}
vtkAgnosticArrayLookupHelper<SelfType> Lookup;
vtkGenericDataArrayLookupHelper<SelfType> Lookup;
private:
vtkAgnosticArray(const vtkAgnosticArray&); // Not implemented.
void operator=(const vtkAgnosticArray&); // Not implemented.
vtkGenericDataArray(const vtkGenericDataArray&); // Not implemented.
void operator=(const vtkGenericDataArray&); // Not implemented.
std::vector<double> LegacyTuple;
};
#include "vtkAgnosticArray.txx"
#include "vtkGenericDataArray.txx"
#include <typeinfo>
#define vtkAgnosticArrayMacroCase(arrayT, scalarT, array, call) \
#define vtkGenericDataArrayMacroCase(arrayT, scalarT, array, call) \
if (typeid(*array) == typeid(arrayT<scalarT>)) \
{ \
typedef arrayT<scalarT> ARRAY_TYPE; \
......@@ -316,36 +316,36 @@ private:
call; \
}
#define vtkWriteableAgnosticArrayMacro(array, call) \
vtkAgnosticArrayMacroCase(vtkSoAArrayTemplate, float, array, call) \
else vtkAgnosticArrayMacroCase(vtkSoAArrayTemplate, double, array, call) \
#define vtkWriteableGenericDataArrayMacro(array, call) \
vtkGenericDataArrayMacroCase(vtkSoADataArrayTemplate, float, array, call) \
else vtkGenericDataArrayMacroCase(vtkSoADataArrayTemplate, double, array, call) \
else \
{ \
vtkGenericWarningMacro("Unknown type " << typeid(*array).name()); \
abort(); \
}
#define vtkConstAgnosticArrayMacro(array, call) \
vtkAgnosticArrayMacroCase(vtkSoAArrayTemplate, const float, array, call) \
else vtkAgnosticArrayMacroCase(vtkSoAArrayTemplate, const double, array, call) \
else vtkWriteableAgnosticArrayMacro(array, call)
#define vtkConstGenericDataArrayMacro(array, call) \
vtkGenericDataArrayMacroCase(vtkSoADataArrayTemplate, const float, array, call) \
else vtkGenericDataArrayMacroCase(vtkSoADataArrayTemplate, const double, array, call) \
else vtkWriteableGenericDataArrayMacro(array, call)
#define vtkWriteableAgnosticArrayMacro2(array1, array2, call) \
vtkWriteableAgnosticArrayMacro(array1, \
#define vtkWriteableGenericDataArrayMacro2(array1, array2, call) \
vtkWriteableGenericDataArrayMacro(array1, \
typedef ARRAY_TYPE ARRAY_TYPE1; \
ARRAY_TYPE1* ARRAY1 = ARRAY; \
vtkWriteableAgnosticArrayMacro(array2, \
vtkWriteableGenericDataArrayMacro(array2, \
typedef ARRAY_TYPE2 ARRAY_TYPE; \
ARRAY_TYPE2* ARRAY2 = ARRAY; \
call; \
)\
)
#define vtkAgnosticArrayMacro2(inarray, outarray, call) \
vtkConstAgnosticArrayMacro(inarray, \
#define vtkGenericDataArrayMacro2(inarray, outarray, call) \
vtkConstGenericDataArrayMacro(inarray, \
typedef ARRAY_TYPE IN_ARRAY_TYPE; \
IN_ARRAY_TYPE* IN_ARRAY = ARRAY; \
vtkWriteableAgnosticArrayMacro(outarray, \
vtkWriteableGenericDataArrayMacro(outarray, \
typedef ARRAY_TYPE OUT_ARRAY_TYPE; \
OUT_ARRAY_TYPE* OUT_ARRAY = ARRAY; \
call; \
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkAgnosticArray.txx
Module: vtkGenericDataArray.txx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -15,15 +15,15 @@
#include "vtkObjectFactory.h"
#include "vtkIdList.h"
#include "vtkAgnosticArrayHelpers.h"
#include "vtkGenericDataArrayHelper.h"
#include "vtkVariantCast.h"
#define vtkAgnosticArrayT(returnType) \
#define vtkGenericDataArrayT(returnType) \
template <class D, class S, class T, class TI, class SR> \
returnType vtkAgnosticArray<D, S, T, TI, SR>
returnType vtkGenericDataArray<D, S, T, TI, SR>
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::InsertTuples(
vtkGenericDataArrayT(void)::InsertTuples(
vtkIdList *dstIds, vtkIdList *srcIds, vtkAbstractArray *source)
{
// XXX Should these be implemented in vtkDataArray?
......@@ -64,13 +64,13 @@ vtkAgnosticArrayT(void)::InsertTuples(
for (vtkIdType cc=0; cc < numIds; ++cc)
{
vtkAgnosticArrayHelpers::SetTuple(this, dstIds->GetId(cc), source, srcIds->GetId(cc));
vtkGenericDataArrayHelper::SetTuple(this, dstIds->GetId(cc), source, srcIds->GetId(cc));
}
this->DataChanged();
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::InsertTuples(vtkIdType dstStart, vtkIdType n,
vtkGenericDataArrayT(void)::InsertTuples(vtkIdType dstStart, vtkIdType n,
vtkIdType srcStart, vtkAbstractArray* source)
{
// XXX Should these be implemented in vtkDataArray?
......@@ -111,37 +111,37 @@ vtkAgnosticArrayT(void)::InsertTuples(vtkIdType dstStart, vtkIdType n,
for (vtkIdType cc=0; cc < n; ++cc)
{
vtkAgnosticArrayHelpers::SetTuple(this, dstStart + cc, source, srcStart + cc);
vtkGenericDataArrayHelper::SetTuple(this, dstStart + cc, source, srcStart + cc);
}
this->DataChanged();
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(double *)::GetTuple(vtkIdType i)
vtkGenericDataArrayT(double *)::GetTuple(vtkIdType i)
{
// XXX Should these be implemented in vtkDataArray?
this->LegacyTuple.resize(this->GetNumberOfComponents());
vtkAgnosticArrayHelpers::GetTuple(this, i, &this->LegacyTuple[0]);
vtkGenericDataArrayHelper::GetTuple(this, i, &this->LegacyTuple[0]);
return &this->LegacyTuple[0];
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::GetTuple(vtkIdType i, double * tuple)
vtkGenericDataArrayT(void)::GetTuple(vtkIdType i, double * tuple)
{
// XXX Should these be implemented in vtkDataArray?
vtkAgnosticArrayHelpers::GetTuple(this, i, tuple);
vtkGenericDataArrayHelper::GetTuple(this, i, tuple);
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source)
vtkGenericDataArrayT(void)::SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray *source)
{
// XXX Should these be implemented in vtkDataArray?
vtkAgnosticArrayHelpers::SetTuple(this, i, source, j);
vtkGenericDataArrayHelper::SetTuple(this, i, source, j);
this->DataChanged();
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::SetTuple(vtkIdType i, const float *source)
vtkGenericDataArrayT(void)::SetTuple(vtkIdType i, const float *source)
{
// XXX Should these be implemented in vtkDataArray?
for (int cc=0, max=this->GetNumberOfComponents(); cc < max; ++cc)
......@@ -152,7 +152,7 @@ vtkAgnosticArrayT(void)::SetTuple(vtkIdType i, const float *source)
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::SetTuple(vtkIdType i, const double *source)
vtkGenericDataArrayT(void)::SetTuple(vtkIdType i, const double *source)
{
// XXX Should these be implemented in vtkDataArray?
for (int cc=0, max=this->GetNumberOfComponents(); cc < max; ++cc)
......@@ -163,7 +163,7 @@ vtkAgnosticArrayT(void)::SetTuple(vtkIdType i, const double *source)
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::RemoveTuple(vtkIdType id)
vtkGenericDataArrayT(void)::RemoveTuple(vtkIdType id)
{
if (id < 0 || id >= this->GetNumberOfTuples())
{
......@@ -198,27 +198,27 @@ vtkAgnosticArrayT(void)::RemoveTuple(vtkIdType id)
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::SetVoidArray(void*, vtkIdType, int)
vtkGenericDataArrayT(void)::SetVoidArray(void*, vtkIdType, int)
{
vtkErrorMacro("SetVoidArray is not supported by this class.");
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void*)::WriteVoidPointer(vtkIdType id, vtkIdType number)
vtkGenericDataArrayT(void*)::WriteVoidPointer(vtkIdType id, vtkIdType number)
{
vtkErrorMacro("WriteVoidPointer is not supported by this class.");
return NULL;
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void*)::GetVoidPointer(vtkIdType)
vtkGenericDataArrayT(void*)::GetVoidPointer(vtkIdType)
{
vtkErrorMacro("GetVoidPointer is not supported by this class.");
return NULL;
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(vtkIdType)::LookupValue(vtkVariant valueVariant)
vtkGenericDataArrayT(vtkIdType)::LookupValue(vtkVariant valueVariant)
{
bool valid = true;
ScalarType value = vtkVariantCast<ScalarType>(valueVariant, &valid);
......@@ -230,13 +230,13 @@ vtkAgnosticArrayT(vtkIdType)::LookupValue(vtkVariant valueVariant)
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(vtkIdType)::LookupTypedValue(ScalarType value)
vtkGenericDataArrayT(vtkIdType)::LookupTypedValue(ScalarType value)
{
return this->Lookup.LookupValue(value);
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::LookupValue(vtkVariant valueVariant, vtkIdList* ids)
vtkGenericDataArrayT(void)::LookupValue(vtkVariant valueVariant, vtkIdList* ids)
{
ids->Reset();
bool valid = true;
......@@ -248,14 +248,14 @@ vtkAgnosticArrayT(void)::LookupValue(vtkVariant valueVariant, vtkIdList* ids)
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::LookupTypedValue(ScalarType value, vtkIdList* ids)
vtkGenericDataArrayT(void)::LookupTypedValue(ScalarType value, vtkIdList* ids)
{
ids->Reset();
this->Lookup.LookupValue(value, ids);
}
//-----------------------------------------------------------------------------
vtkAgnosticArrayT(void)::SetVariantValue(vtkIdType idx, vtkVariant valueVariant)
vtkGenericDataArrayT(void)::SetVariantValue(vtkIdType idx, vtkVariant valueVariant)
{
bool valid = true;
ScalarType value = vtkVariantCast<ScalarType>(valueVariant, &valid);
......@@ -267,4 +267,4 @@ vtkAgnosticArrayT(void)::SetVariantValue(vtkIdType idx, vtkVariant valueVariant)
}
}
#undef vtkAgnosticArrayT
#undef vtkGenericDataArrayT
/*=========================================================================
Program: Visualization Toolkit
Module: vtkAgnosticArrayHelpers.cxx
Module: vtkGenericDataArrayHelper.cxx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,10 +12,10 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkAgnosticArrayHelpers.h"
#include "vtkGenericDataArrayHelper.h"
#include "vtkObjectFactory.h"
#include "vtkSoAArrayTemplate.h"
#include "vtkSoADataArrayTemplate.h"
//============================================================================
namespace
......@@ -47,17 +47,17 @@ namespace
//----------------------------------------------------------------------------
vtkAgnosticArrayHelpers::vtkAgnosticArrayHelpers()
vtkGenericDataArrayHelper::vtkGenericDataArrayHelper()
{
}
//----------------------------------------------------------------------------
vtkAgnosticArrayHelpers::~vtkAgnosticArrayHelpers()
vtkGenericDataArrayHelper::~vtkGenericDataArrayHelper()
{
}
//----------------------------------------------------------------------------
void vtkAgnosticArrayHelpers::SetTuple(
void vtkGenericDataArrayHelper::SetTuple(
vtkAbstractArray* dest, vtkIdType destTuple,
vtkAbstractArray* source, vtkIdType sourceTuple)
{
......@@ -72,18 +72,18 @@ void vtkAgnosticArrayHelpers::SetTuple(
return;
}
vtkAgnosticArrayMacro2(dest, source,
vtkGenericDataArrayMacro2(dest, source,
vtkSetTuple(OUT_ARRAY, destTuple, IN_ARRAY, sourceTuple));
}
//----------------------------------------------------------------------------
void vtkAgnosticArrayHelpers::GetTuple(vtkAbstractArray* source, vtkIdType tuple, double* buffer)
void vtkGenericDataArrayHelper::GetTuple(vtkAbstractArray* source, vtkIdType tuple, double* buffer)
{
vtkConstAgnosticArrayMacro(source, vtkGetTuple(ARRAY, tuple, buffer));
vtkConstGenericDataArrayMacro(source, vtkGetTuple(ARRAY, tuple, buffer));
}
//----------------------------------------------------------------------------
void vtkAgnosticArrayHelpers::PrintSelf(ostream& os, vtkIndent indent)
void vtkGenericDataArrayHelper::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os, indent);
}
/*=========================================================================
Program: Visualization Toolkit
Module: vtkAgnosticArrayHelpers.h
Module: vtkGenericDataArrayHelper.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,19 +12,19 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkAgnosticArrayHelpers
// .NAME vtkGenericDataArrayHelper
// .SECTION Description
#ifndef vtkAgnosticArrayHelpers_h
#define vtkAgnosticArrayHelpers_h
#ifndef vtkGenericDataArrayHelper_h
#define vtkGenericDataArrayHelper_h
#include "vtkObject.h"
class vtkAbstractArray;
class VTKCOMMONCORE_EXPORT vtkAgnosticArrayHelpers : public vtkObject
class VTKCOMMONCORE_EXPORT vtkGenericDataArrayHelper : public vtkObject
{
public:
vtkTypeMacro(vtkAgnosticArrayHelpers, vtkObject);
vtkTypeMacro(vtkGenericDataArrayHelper, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
static void SetTuple(vtkAbstractArray* dest, vtkIdType destTuple,
......@@ -33,12 +33,12 @@ public:
static void GetTuple(vtkAbstractArray* source, vtkIdType tuple, double* buffer);
//BTX
protected:
vtkAgnosticArrayHelpers();
~vtkAgnosticArrayHelpers();
vtkGenericDataArrayHelper();
~vtkGenericDataArrayHelper();
private:
vtkAgnosticArrayHelpers(const vtkAgnosticArrayHelpers&); // Not implemented.
void operator=(const vtkAgnosticArrayHelpers&); // Not implemented.
vtkGenericDataArrayHelper(const vtkGenericDataArrayHelper&); // Not implemented.
void operator=(const vtkGenericDataArrayHelper&); // Not implemented.
//ETX
};
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkAgnosticArrayLookupHelper.h
Module: vtkGenericDataArrayLookupHelper.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,12 +12,12 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkAgnosticArrayLookupHelper - internal class used by
// vtkAgnosticArray to support LookupValue.
// .NAME vtkGenericDataArrayLookupHelper - internal class used by
// vtkGenericDataArray to support LookupValue.
// .SECTION Description
#ifndef vtkAgnosticArrayLookupHelper_h
#define vtkAgnosticArrayLookupHelper_h
#ifndef vtkGenericDataArrayLookupHelper_h
#define vtkGenericDataArrayLookupHelper_h
#include <algorithm>
#include "vtkIdList.h"
......@@ -30,7 +30,7 @@ namespace detail
}
template <class ArrayTypeT>
class vtkAgnosticArrayLookupHelper
class vtkGenericDataArrayLookupHelper
{
public:
typedef ArrayTypeT ArrayType;
......@@ -38,12 +38,12 @@ public:
typedef typename ArrayType::TupleIteratorType TupleIteratorType;
// Constructor.
vtkAgnosticArrayLookupHelper(ArrayType& associatedArray)
vtkGenericDataArrayLookupHelper(ArrayType& associatedArray)
: AssociatedArray(associatedArray),
SortedArray(NULL)
{
}
~vtkAgnosticArrayLookupHelper()
~vtkGenericDataArrayLookupHelper()
{
this->ClearLookup();
}
......@@ -91,8 +91,8 @@ public:
}
private:
vtkAgnosticArrayLookupHelper(const vtkAgnosticArrayLookupHelper&); // Not implemented.
void operator=(const vtkAgnosticArrayLookupHelper&); // Not implemented.
vtkGenericDataArrayLookupHelper(const vtkGenericDataArrayLookupHelper&); // Not implemented.
void operator=(const vtkGenericDataArrayLookupHelper&); // Not implemented.
struct ValueWithIndex
{
......