Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'set_scalar_range'

Browse Source 
6b534a43 Fixing a typo in Actor
c2f0dd5a Adding the ablitiy to set the scalar range of an Actor to get a consistent mapping of scalar values when running with MPI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !687
This commit is contained in:
Matt Larsen 2017-02-10 05:08:05 +00:00 committed by Kitware Robot
commit a608124d1b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vtkm/rendering/Actor.cxx
View File

@ -107,7 +107,7 @@ const vtkm::cont::DynamicCellSet &Actor::GetCells() const
return this->Internals->Cells;
}
const vtkm::cont::CoordinateSystem &Actor::GetCoordiantes() const
const vtkm::cont::CoordinateSystem &Actor::GetCoordinates() const
{
return this->Internals->Coordinates;
}
@ -132,5 +132,10 @@ const vtkm::Bounds &Actor::GetSpatialBounds() const
return this->Internals->SpatialBounds;
}
void Actor::SetScalarRange(const vtkm::Range &scalarRange)
{
this->Internals->ScalarRange = scalarRange;
}
}
} // namespace vtkm::rendering

4
vtkm/rendering/Actor.h
View File

@ -46,7 +46,7 @@ public:
const vtkm::cont::DynamicCellSet &GetCells() const;
const vtkm::cont::CoordinateSystem &GetCoordiantes() const;
const vtkm::cont::CoordinateSystem &GetCoordinates() const;
const vtkm::cont::Field &GetScalarField() const;
@ -56,6 +56,8 @@ public:
const vtkm::Bounds &GetSpatialBounds() const;
void SetScalarRange(const vtkm::Range &scalarRange);
private:
struct InternalsType;
std::shared_ptr<InternalsType> Internals;