Commit e5e5f436 authored by Berk Geveci's avatar Berk Geveci
Browse files

Fixed compile issues resulting from VTK merge

parent eef78de8
...@@ -61,7 +61,7 @@ int TestLinePlotAxisFonts(int, char * []) ...@@ -61,7 +61,7 @@ int TestLinePlotAxisFonts(int, char * [])
// Add multiple line plots, setting the colors etc // Add multiple line plots, setting the colors etc
vtkPlot *line = chart->AddPlot(vtkChart::LINE); vtkPlot *line = chart->AddPlot(vtkChart::LINE);
line->SetInput(table.GetPointer(), 0, 1); line->SetInputData(table.GetPointer(), 0, 1);
line->SetColor(0, 255, 0, 255); line->SetColor(0, 255, 0, 255);
line->SetWidth(1.0); line->SetWidth(1.0);
......
...@@ -99,17 +99,17 @@ vtkAxisActor::vtkAxisActor() ...@@ -99,17 +99,17 @@ vtkAxisActor::vtkAxisActor()
this->AxisLinesActor->SetMapper(this->AxisLinesMapper); this->AxisLinesActor->SetMapper(this->AxisLinesMapper);
this->Gridlines = vtkPolyData::New(); this->Gridlines = vtkPolyData::New();
this->GridlinesMapper = vtkPolyDataMapper::New(); this->GridlinesMapper = vtkPolyDataMapper::New();
this->GridlinesMapper->SetInput(this->Gridlines); this->GridlinesMapper->SetInputData(this->Gridlines);
this->GridlinesActor = vtkActor::New(); this->GridlinesActor = vtkActor::New();
this->GridlinesActor->SetMapper(this->GridlinesMapper); this->GridlinesActor->SetMapper(this->GridlinesMapper);
this->InnerGridlines = vtkPolyData::New(); this->InnerGridlines = vtkPolyData::New();
this->InnerGridlinesMapper = vtkPolyDataMapper::New(); this->InnerGridlinesMapper = vtkPolyDataMapper::New();
this->InnerGridlinesMapper->SetInput(this->InnerGridlines); this->InnerGridlinesMapper->SetInputData(this->InnerGridlines);
this->InnerGridlinesActor = vtkActor::New(); this->InnerGridlinesActor = vtkActor::New();
this->InnerGridlinesActor->SetMapper(this->InnerGridlinesMapper); this->InnerGridlinesActor->SetMapper(this->InnerGridlinesMapper);
this->Gridpolys = vtkPolyData::New(); this->Gridpolys = vtkPolyData::New();
this->GridpolysMapper = vtkPolyDataMapper::New(); this->GridpolysMapper = vtkPolyDataMapper::New();
this->GridpolysMapper->SetInput(this->Gridpolys); this->GridpolysMapper->SetInputData(this->Gridpolys);
this->GridpolysActor = vtkActor::New(); this->GridpolysActor = vtkActor::New();
this->GridpolysActor->SetMapper(this->GridpolysMapper); this->GridpolysActor->SetMapper(this->GridpolysMapper);
......
...@@ -211,7 +211,7 @@ vtkPolarAxesActor::vtkPolarAxesActor() : vtkActor() ...@@ -211,7 +211,7 @@ vtkPolarAxesActor::vtkPolarAxesActor() : vtkActor()
// Create and set polar arcs and ancillary objects, with default color white // Create and set polar arcs and ancillary objects, with default color white
this->PolarArcs = vtkPolyData::New(); this->PolarArcs = vtkPolyData::New();
this->PolarArcsMapper = vtkPolyDataMapper::New(); this->PolarArcsMapper = vtkPolyDataMapper::New();
this->PolarArcsMapper->SetInput( this->PolarArcs ); this->PolarArcsMapper->SetInputData( this->PolarArcs );
this->PolarArcsActor = vtkActor::New(); this->PolarArcsActor = vtkActor::New();
this->PolarArcsActor->SetMapper( this->PolarArcsMapper ); this->PolarArcsActor->SetMapper( this->PolarArcsMapper );
this->PolarArcsActor->GetProperty()->SetColor( 1., 1., 1. ); this->PolarArcsActor->GetProperty()->SetColor( 1., 1., 1. );
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
#include "vtkActor.h" #include "vtkActor.h"
#include "vtkCamera.h" #include "vtkCamera.h"
#include "vtkPLOT3DReader.h" #include "vtkMultiBlockDataSet.h"
#include "vtkMultiBlockPLOT3DReader.h"
#include "vtkPolyDataMapper.h" #include "vtkPolyDataMapper.h"
#include "vtkProperty2D.h" #include "vtkProperty2D.h"
#include "vtkRegressionTestImage.h" #include "vtkRegressionTestImage.h"
...@@ -38,8 +39,8 @@ int TestScalarBar( int argc, char *argv[] ) ...@@ -38,8 +39,8 @@ int TestScalarBar( int argc, char *argv[] )
vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/combq.bin"); vtkTestUtilities::ExpandDataFileName(argc, argv, "Data/combq.bin");
// Start by loading some data. // Start by loading some data.
vtkSmartPointer<vtkPLOT3DReader> pl3d = vtkSmartPointer<vtkMultiBlockPLOT3DReader> pl3d =
vtkSmartPointer<vtkPLOT3DReader>::New(); vtkSmartPointer<vtkMultiBlockPLOT3DReader>::New();
pl3d->SetXYZFileName(fname); pl3d->SetXYZFileName(fname);
pl3d->SetQFileName(fname2); pl3d->SetQFileName(fname2);
pl3d->SetScalarFunctionNumber(100); pl3d->SetScalarFunctionNumber(100);
...@@ -52,7 +53,7 @@ int TestScalarBar( int argc, char *argv[] ) ...@@ -52,7 +53,7 @@ int TestScalarBar( int argc, char *argv[] )
// An outline is shown for context. // An outline is shown for context.
vtkSmartPointer<vtkStructuredGridGeometryFilter> outline = vtkSmartPointer<vtkStructuredGridGeometryFilter> outline =
vtkSmartPointer<vtkStructuredGridGeometryFilter>::New(); vtkSmartPointer<vtkStructuredGridGeometryFilter>::New();
outline->SetInputConnection(pl3d->GetOutputPort()); outline->SetInputData(pl3d->GetOutput()->GetBlock(0));
outline->SetExtent(0,100,0,100,9,9); outline->SetExtent(0,100,0,100,9,9);
vtkSmartPointer<vtkPolyDataMapper> outlineMapper = vtkSmartPointer<vtkPolyDataMapper> outlineMapper =
......
...@@ -166,7 +166,7 @@ vtkScalarBarActor::vtkScalarBarActor() ...@@ -166,7 +166,7 @@ vtkScalarBarActor::vtkScalarBarActor()
this->DrawBackground = 0; this->DrawBackground = 0;
this->Background = vtkPolyData::New(); this->Background = vtkPolyData::New();
this->BackgroundMapper = vtkPolyDataMapper2D::New(); this->BackgroundMapper = vtkPolyDataMapper2D::New();
this->BackgroundMapper->SetInput(this->Background); this->BackgroundMapper->SetInputData(this->Background);
this->BackgroundActor = vtkActor2D::New(); this->BackgroundActor = vtkActor2D::New();
this->BackgroundActor->SetMapper(this->BackgroundMapper); this->BackgroundActor->SetMapper(this->BackgroundMapper);
this->BackgroundActor->GetPositionCoordinate()->SetReferenceCoordinate(this->PositionCoordinate); this->BackgroundActor->GetPositionCoordinate()->SetReferenceCoordinate(this->PositionCoordinate);
...@@ -174,7 +174,7 @@ vtkScalarBarActor::vtkScalarBarActor() ...@@ -174,7 +174,7 @@ vtkScalarBarActor::vtkScalarBarActor()
this->DrawFrame = 0; this->DrawFrame = 0;
this->Frame = vtkPolyData::New(); this->Frame = vtkPolyData::New();
this->FrameMapper = vtkPolyDataMapper2D::New(); this->FrameMapper = vtkPolyDataMapper2D::New();
this->FrameMapper->SetInput(this->Frame); this->FrameMapper->SetInputData(this->Frame);
this->FrameActor = vtkActor2D::New(); this->FrameActor = vtkActor2D::New();
this->FrameActor->SetMapper(this->FrameMapper); this->FrameActor->SetMapper(this->FrameMapper);
this->FrameActor->GetPositionCoordinate()->SetReferenceCoordinate(this->PositionCoordinate); this->FrameActor->GetPositionCoordinate()->SetReferenceCoordinate(this->PositionCoordinate);
......
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