Commit df188e90 authored by Cory Quammen's avatar Cory Quammen Committed by Kitware Robot

Merge topic 'bump-vtk'

68226f09 Turn off HyperTreeGrid-related tests and example for now
a38dc8f1 Fix compilation error due to change in vtkHyperTreeGrid
fb74c115 Bump VisItBridge
f5707539 Bump VTK
7c267a4c Change VTK_OVERRIDE to override in ParaView classes
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David E. DeMarle's avatarDavid E. DeMarle <dave.demarle@kitware.com>
Merge-request: !2939
parents 834eb0aa 68226f09
Pipeline #125928 failed with stage
in 0 seconds
......@@ -133,12 +133,12 @@ SET (TESTS_WITH_INLINE_COMPARES
${CMAKE_CURRENT_SOURCE_DIR}/Ensemble.xml
${CMAKE_CURRENT_SOURCE_DIR}/FastUniformGridSource.xml
${CMAKE_CURRENT_SOURCE_DIR}/FileSeries.xml
${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridAxisClip.xml
${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridAxisCut.xml
${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridAxisReflection.xml
${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridCellCenters.xml
${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridContour.xml
${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridPlaneCutter.xml
#${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridAxisClip.xml
#${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridAxisCut.xml
#${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridAxisReflection.xml
#${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridCellCenters.xml
#${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridContour.xml
#${CMAKE_CURRENT_SOURCE_DIR}/HyperTreeGridPlaneCutter.xml
${CMAKE_CURRENT_SOURCE_DIR}/LightAddRemove.xml
${CMAKE_CURRENT_SOURCE_DIR}/LineChartSelection.xml
${CMAKE_CURRENT_SOURCE_DIR}/LoadStateMultiView.xml
......
......@@ -344,6 +344,7 @@
{ "path": "vtkGPUInfoListArray.h" },
{ "path": "vtkRenderingCoreEnums.h" },
{ "path": "vtkTDxMotionEventInfo.h" },
{ "class": "vtkAbstractHyperTreeGridMapper" },
{ "class": "vtkAbstractMapper" },
{ "class": "vtkAbstractMapper3D" },
{ "class": "vtkAbstractPicker" },
......
......@@ -11,23 +11,23 @@ class VTK_EXPORT vtkCTHDataArray : public vtkDataArray
public:
static vtkCTHDataArray* New();
vtkTypeMacro(vtkCTHDataArray, vtkDataArray);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
// Description:
// Prepares for new data
void Initialize() VTK_OVERRIDE;
void Initialize() override;
// Description:
// Get the data type
int GetDataType() VTK_OVERRIDE { return VTK_DOUBLE; }
int GetDataType() override { return VTK_DOUBLE; }
int GetDataTypeSize() VTK_OVERRIDE { return static_cast<int>(sizeof(double)); }
int GetDataTypeSize() override { return static_cast<int>(sizeof(double)); }
// Description:
// Return the size, in bytes, of the lowest-level element of an
// array. For vtkDataArray and subclasses this is the size of the
// data type.
virtual int GetElementComponentSize() VTK_OVERRIDE { return this->GetDataTypeSize(); }
virtual int GetElementComponentSize() override { return this->GetDataTypeSize(); }
// Description:
// Set the dimensions the data will be contained within
......@@ -52,32 +52,32 @@ public:
// Description:
// Copy the tuple value into a user-provided array.
void GetTuple(vtkIdType i, double* tuple) VTK_OVERRIDE;
double* GetTuple(vtkIdType i) VTK_OVERRIDE;
void GetTuple(vtkIdType i, double* tuple) override;
double* GetTuple(vtkIdType i) override;
// Description:
// Returns an ArrayIterator over doubles, this will end up with a deep copy
vtkArrayIterator* NewIterator() VTK_OVERRIDE;
vtkArrayIterator* NewIterator() override;
vtkIdType LookupValue(vtkVariant value) VTK_OVERRIDE;
void LookupValue(vtkVariant value, vtkIdList* ids) VTK_OVERRIDE;
void SetVariantValue(vtkIdType vtkNotUsed(index), vtkVariant vtkNotUsed(value)) VTK_OVERRIDE
vtkIdType LookupValue(vtkVariant value) override;
void LookupValue(vtkVariant value, vtkIdList* ids) override;
void SetVariantValue(vtkIdType vtkNotUsed(index), vtkVariant vtkNotUsed(value)) override
{ /* TODO */}
// Description:
// Get the address of a particular data index. Performs no checks
// to verify that the memory has been allocated etc.
double* GetPointer(vtkIdType id);
void* GetVoidPointer(vtkIdType id) VTK_OVERRIDE { return this->GetPointer(id); }
void ExportToVoidPointer(void* out_ptr) VTK_OVERRIDE;
void* GetVoidPointer(vtkIdType id) override { return this->GetPointer(id); }
void ExportToVoidPointer(void* out_ptr) override;
int Allocate(vtkIdType sz, vtkIdType ext = 1000) VTK_OVERRIDE
int Allocate(vtkIdType sz, vtkIdType ext = 1000) override
{
BuildFallback();
return Fallback->Allocate(sz, ext);
}
void SetNumberOfComponents(int number) VTK_OVERRIDE
void SetNumberOfComponents(int number) override
{
this->Superclass::SetNumberOfComponents(number);
if (this->Fallback)
......@@ -86,7 +86,7 @@ public:
}
}
void SetNumberOfTuples(vtkIdType number) VTK_OVERRIDE
void SetNumberOfTuples(vtkIdType number) override
{
this->BuildFallback();
this->Fallback->SetNumberOfTuples(number);
......@@ -96,50 +96,50 @@ public:
// Description:
// A number of abstract functions from the super class that must not be called
void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray* aa) VTK_OVERRIDE
void SetTuple(vtkIdType i, vtkIdType j, vtkAbstractArray* aa) override
{
this->BuildFallback();
this->Fallback->SetTuple(i, j, aa);
}
void SetTuple(vtkIdType i, const float* f) VTK_OVERRIDE
void SetTuple(vtkIdType i, const float* f) override
{
this->BuildFallback();
this->Fallback->SetTuple(i, f);
}
void SetTuple(vtkIdType i, const double* d) VTK_OVERRIDE
void SetTuple(vtkIdType i, const double* d) override
{
this->BuildFallback();
this->Fallback->SetTuple(i, d);
}
void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray* aa) VTK_OVERRIDE
void InsertTuple(vtkIdType i, vtkIdType j, vtkAbstractArray* aa) override
{
this->BuildFallback();
this->Fallback->InsertTuple(i, j, aa);
}
void InsertTuple(vtkIdType i, const float* f) VTK_OVERRIDE
void InsertTuple(vtkIdType i, const float* f) override
{
this->BuildFallback();
this->Fallback->InsertTuple(i, f);
}
void InsertTuple(vtkIdType i, const double* d) VTK_OVERRIDE
void InsertTuple(vtkIdType i, const double* d) override
{
this->BuildFallback();
this->Fallback->InsertTuple(i, d);
}
void InsertTuples(vtkIdList* dstIds, vtkIdList* srcIds, vtkAbstractArray* source) VTK_OVERRIDE
void InsertTuples(vtkIdList* dstIds, vtkIdList* srcIds, vtkAbstractArray* source) override
{
this->BuildFallback();
this->Fallback->InsertTuples(dstIds, srcIds, source);
}
virtual void InsertTuples(
vtkIdType dstStart, vtkIdType n, vtkIdType srcStart, vtkAbstractArray* source) VTK_OVERRIDE
vtkIdType dstStart, vtkIdType n, vtkIdType srcStart, vtkAbstractArray* source) override
{
this->BuildFallback();
this->Fallback->InsertTuples(dstStart, n, srcStart, source);
}
vtkIdType InsertNextTuple(vtkIdType i, vtkAbstractArray* aa) VTK_OVERRIDE
vtkIdType InsertNextTuple(vtkIdType i, vtkAbstractArray* aa) override
{
this->BuildFallback();
vtkIdType ret = this->Fallback->InsertNextTuple(i, aa);
......@@ -147,7 +147,7 @@ public:
this->MaxId = this->Fallback->GetMaxId();
return ret;
}
vtkIdType InsertNextTuple(const float* f) VTK_OVERRIDE
vtkIdType InsertNextTuple(const float* f) override
{
this->BuildFallback();
vtkIdType ret = this->Fallback->InsertNextTuple(f);
......@@ -155,7 +155,7 @@ public:
this->MaxId = this->Fallback->GetMaxId();
return ret;
}
vtkIdType InsertNextTuple(const double* d) VTK_OVERRIDE
vtkIdType InsertNextTuple(const double* d) override
{
this->BuildFallback();
vtkIdType ret = this->Fallback->InsertNextTuple(d);
......@@ -164,51 +164,48 @@ public:
return ret;
}
void InsertVariantValue(vtkIdType idx, vtkVariant value) VTK_OVERRIDE
void InsertVariantValue(vtkIdType idx, vtkVariant value) override
{
this->BuildFallback();
return this->Fallback->InsertVariantValue(idx, value);
}
void RemoveTuple(vtkIdType id) VTK_OVERRIDE
void RemoveTuple(vtkIdType id) override
{
this->BuildFallback();
this->Fallback->RemoveTuple(id);
}
void RemoveFirstTuple() VTK_OVERRIDE
void RemoveFirstTuple() override
{
this->BuildFallback();
this->Fallback->RemoveFirstTuple();
}
void RemoveLastTuple() VTK_OVERRIDE
void RemoveLastTuple() override
{
this->BuildFallback();
this->Fallback->RemoveLastTuple();
}
void* WriteVoidPointer(vtkIdType i, vtkIdType j) VTK_OVERRIDE
void* WriteVoidPointer(vtkIdType i, vtkIdType j) override
{
this->BuildFallback();
return this->Fallback->WriteVoidPointer(i, j);
}
virtual void DeepCopy(vtkAbstractArray* aa) VTK_OVERRIDE
virtual void DeepCopy(vtkAbstractArray* aa) override
{
this->BuildFallback();
return this->Fallback->DeepCopy(aa);
}
virtual void DeepCopy(vtkDataArray* da) VTK_OVERRIDE
{
return this->DeepCopy((vtkAbstractArray*)da);
}
virtual void DeepCopy(vtkDataArray* da) override { return this->DeepCopy((vtkAbstractArray*)da); }
void SetVoidArray(void* p, vtkIdType id, int i, int j) VTK_OVERRIDE
void SetVoidArray(void* p, vtkIdType id, int i, int j) override
{
this->BuildFallback();
return this->Fallback->SetVoidArray(p, id, i, j);
}
void SetVoidArray(void* p, vtkIdType id, int i) VTK_OVERRIDE
void SetVoidArray(void* p, vtkIdType id, int i) override
{
this->BuildFallback();
return this->Fallback->SetVoidArray(p, id, i);
......@@ -218,7 +215,7 @@ public:
// Description:
// Since we don't allocate, this does nothing
// unless we're already falling back
void Squeeze() VTK_OVERRIDE
void Squeeze() override
{
if (this->Fallback)
{
......@@ -229,19 +226,19 @@ public:
}
// Description:
int Resize(vtkIdType numTuples) VTK_OVERRIDE
int Resize(vtkIdType numTuples) override
{
this->BuildFallback();
return this->Fallback->Resize(numTuples);
}
void DataChanged() VTK_OVERRIDE
void DataChanged() override
{
this->BuildFallback();
return this->Fallback->DataChanged();
}
void ClearLookup() VTK_OVERRIDE
void ClearLookup() override
{
this->BuildFallback();
return this->Fallback->ClearLookup();
......
......@@ -13,13 +13,13 @@ public:
vtkTypeMacro(vtkCPTestPipeline, vtkCPPipeline);
static vtkCPTestPipeline* New();
virtual int RequestDataDescription(vtkCPDataDescription* dataDescription) VTK_OVERRIDE
virtual int RequestDataDescription(vtkCPDataDescription* dataDescription) override
{
return this->ShouldOutput(dataDescription);
}
/// Execute the pipeline. Returns 1 for success and 0 for failure.
virtual int CoProcess(vtkCPDataDescription* dataDescription) VTK_OVERRIDE
virtual int CoProcess(vtkCPDataDescription* dataDescription) override
{
this->OutputCounter++;
if (this->ShouldOutput(dataDescription) == 0)
......
......@@ -26,7 +26,7 @@ class VTK_EXPORT vtkCPImplementedTestDriver : public vtkCPTestDriver
public:
static vtkCPImplementedTestDriver* New();
vtkTypeMacro(vtkCPImplementedTestDriver, vtkCPTestDriver);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE
void PrintSelf(ostream& os, vtkIndent indent) override
{
this->Superclass::PrintSelf(os, indent);
}
......
......@@ -37,15 +37,14 @@ class VTK_EXPORT vtkCustomUnstructuredGridBuilder : public vtkCPUnstructuredGrid
public:
static vtkCustomUnstructuredGridBuilder* New();
vtkTypeMacro(vtkCustomUnstructuredGridBuilder, vtkCPUnstructuredGridBuilder);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
/**
* Return a grid. BuiltNewGrid is set to 0 if the grids
* that were returned were already built before.
* vtkCustomUnstructuredGridBuilder will also delete the grid.
*/
virtual vtkDataObject* GetGrid(
unsigned long timeStep, double time, int& builtNewGrid) VTK_OVERRIDE;
virtual vtkDataObject* GetGrid(unsigned long timeStep, double time, int& builtNewGrid) override;
/**
* Customized function to build UnstructuredGrid.
......
......@@ -34,7 +34,7 @@ class VTKPVCATALYST_EXPORT vtkCPCxxHelper : public vtkObject
public:
static vtkCPCxxHelper* New();
vtkTypeMacro(vtkCPCxxHelper, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
protected:
vtkCPCxxHelper();
......
......@@ -29,7 +29,7 @@ class VTKPVCATALYST_EXPORT vtkCPDataDescription : public vtkObject
public:
static vtkCPDataDescription* New();
vtkTypeMacro(vtkCPDataDescription, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;
/// Set the time step and current simulation time.
void SetTimeData(double time, vtkIdType timeStep);
......
......@@ -59,7 +59,7 @@ class VTKPVCATALYST_EXPORT vtkCPProcessor : public vtkObject
public:
static vtkCPProcessor* New();
vtkTypeMacro(vtkCPProcessor, vtkObject);
void PrintSelf(ostream& os, vtkIndent indent) VTK_OVERRIDE;
void PrintSelf(ostream& os, vtkIndent indent) override;