Changeset 3203 for branches


Ignore:
Timestamp:
Dec 14, 2012, 12:33:35 PM (12 years ago)
Author:
gah
Message:

quick fix up to build with vtk6.0pre

Location:
branches/Rappture 1.2/packages/vizservers/vtkvis
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/Rappture 1.2/packages/vizservers/vtkvis/RpContour2D.cpp

    r3189 r3203  
    99
    1010#include <vtkVersion.h>
    11 #if (VTK_MAJOR_VERSION >= 6)
    12 #define USE_VTK6
    13 #endif
    1411#include <vtkDataSet.h>
    1512#include <vtkPointData.h>

  • branches/Rappture 1.2/packages/vizservers/vtkvis/RpContour3D.cpp

    r3189 r3203  
    99
    1010#include <vtkVersion.h>
    11 #if (VTK_MAJOR_VERSION >= 6)
    12 #define USE_VTK6
    13 #endif
    1411#include <vtkDataSet.h>
    1512#include <vtkPointData.h>

  • branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

    r3189 r3203  
    1010
    1111#include <vtkVersion.h>
    12 #if (VTK_MAJOR_VERSION >= 6)
    13 #define USE_VTK6
    14 #endif
    1512#include <vtkSmartPointer.h>
    1613#include <vtkDataSet.h>

  • branches/Rappture 1.2/packages/vizservers/vtkvis/vtkRpAxisActor.cpp

    r3143 r3203  
    1414=========================================================================*/
    1515#include "vtkRpAxisActor.h"
    16 
    1716#include "vtkCamera.h"
    1817#include "vtkCellArray.h"
    … …  
    9190  this->TitleVector = vtkVectorText::New();
    9291  this->TitleMapper = vtkPolyDataMapper::New();
     92#ifdef USE_VTK6
     93  this->TitleMapper->SetInputData(this->TitleVector->GetOutput());
     94#else
    9395  this->TitleMapper->SetInput(this->TitleVector->GetOutput());
     96#endif
    9497  this->TitleActor = vtkFollower::New();
    9598  this->TitleActor->SetMapper(this->TitleMapper);
    … …  
    103106  this->Axis = vtkPolyData::New();
    104107  this->AxisMapper = vtkPolyDataMapper::New();
     108#ifdef USE_VTK6
     109  this->AxisMapper->SetInputData(this->Axis);
     110#else
    105111  this->AxisMapper->SetInput(this->Axis);
     112#endif
    106113  this->AxisActor = vtkActor::New();
    107114  this->AxisActor->SetMapper(this->AxisMapper);
    … …  
    860867      this->LabelVectors[i] = vtkVectorText::New();
    861868      this->LabelMappers[i] = vtkPolyDataMapper::New();
     869#ifdef USE_VTK6
     870      this->LabelMappers[i]->SetInputData(this->LabelVectors[i]->GetOutput());
     871#else
    862872      this->LabelMappers[i]->SetInput(this->LabelVectors[i]->GetOutput());
     873#endif
    863874      this->LabelActors[i] = vtkFollower::New();
    864875      this->LabelActors[i]->SetMapper(this->LabelMappers[i]);

  • branches/Rappture 1.2/packages/vizservers/vtkvis/vtkRpAxisActor2D.cpp

    r3143 r3203  
    9494  this->Axis = vtkPolyData::New();
    9595  this->AxisMapper = vtkPolyDataMapper2D::New();
     96#ifdef USE_VTK6
     97  this->AxisMapper->SetInputData(this->Axis);
     98#else
    9699  this->AxisMapper->SetInput(this->Axis);
     100#endif
    97101  this->AxisActor = vtkActor2D::New();
    98102  this->AxisActor->SetMapper(this->AxisMapper);

  • branches/Rappture 1.2/packages/vizservers/vtkvis/vtkRpCubeAxesActor2D.cpp

    r2864 r3203  
    693693  if ( this->Input )
    694694    {
     695#ifndef USE_VTK6
    695696    this->Input->Update();
     697#endif
    696698    this->Input->GetBounds(bounds);
    697699    for (i=0; i< 6; i++)
Note: See TracChangeset for help on using the changeset viewer.