Skip to content

Commit

Permalink
[DE] Fixed compile error due to VTK 7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bilke committed Mar 23, 2017
1 parent 1de02b9 commit ab19c7f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 2 additions & 3 deletions Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "VtkColorLookupTable.h"

#include <vtkCellData.h>
#include <vtkFloatArray.h>
#include <vtkInformation.h>
#include <vtkInformationVector.h>
#include <vtkLookupTable.h>
Expand All @@ -28,7 +29,6 @@
#include <vtkPolyData.h>
#include <vtkSmartPointer.h>
#include <vtkStreamingDemandDrivenPipeline.h>
#include <vtkFloatArray.h>

vtkStandardNewMacro(VtkColorByHeightFilter);

Expand All @@ -52,7 +52,7 @@ void VtkColorByHeightFilter::PrintSelf( ostream& os, vtkIndent indent )
os << indent << "Interpolation Type:" << static_cast<int>(ColorLookupTable->getInterpolationType()) << endl;
}

unsigned long VtkColorByHeightFilter::GetMTime()
vtkMTimeType VtkColorByHeightFilter::GetMTime()
{
unsigned long t1, t2;

Expand Down Expand Up @@ -115,4 +115,3 @@ void VtkColorByHeightFilter::SetTableRangeScaling( double scale )
this->ColorLookupTable->SetTableRange(
this->_tableRange[0] * scale, this->_tableRange[1] * scale);
}

4 changes: 3 additions & 1 deletion Applications/DataExplorer/VtkVis/VtkColorByHeightFilter.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

// ** INCLUDES **
#include "VtkAlgorithmProperties.h"

#include <vtkPolyDataAlgorithm.h>
#include <vtkType.h>

class VtkColorLookupTable;

Expand Down Expand Up @@ -47,7 +49,7 @@ class VtkColorByHeightFilter : public vtkPolyDataAlgorithm, public VtkAlgorithmP
vtkGetObjectMacro(ColorLookupTable,VtkColorLookupTable);

/// @brief This filter gets updated when the color look-up table was modified.
virtual unsigned long GetMTime() override;
virtual vtkMTimeType GetMTime() override;

/// @brief Sets user properties.
void SetUserProperty(QString name, QVariant value) override
Expand Down

0 comments on commit ab19c7f

Please sign in to comment.