From c2f0dd5a640da6f3adcbe549cb2c540367c0d3c9 Mon Sep 17 00:00:00 2001 From: Matt Larsen Date: Thu, 9 Feb 2017 15:38:40 -0800 Subject: [PATCH 1/2] Adding the ablitiy to set the scalar range of an Actor to get a consistent mapping of scalar values when running with MPI --- vtkm/rendering/Actor.cxx | 5 +++++ vtkm/rendering/Actor.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/vtkm/rendering/Actor.cxx b/vtkm/rendering/Actor.cxx index f39840c5e..57609d940 100644 --- a/vtkm/rendering/Actor.cxx +++ b/vtkm/rendering/Actor.cxx @@ -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 diff --git a/vtkm/rendering/Actor.h b/vtkm/rendering/Actor.h index d70f33bee..c530a6d9f 100644 --- a/vtkm/rendering/Actor.h +++ b/vtkm/rendering/Actor.h @@ -56,6 +56,8 @@ public: const vtkm::Bounds &GetSpatialBounds() const; + void SetScalarRange(const vtkm::Range &scalarRange); + private: struct InternalsType; std::shared_ptr Internals; From 6b534a438f1584abb59547dfde6dfbe6b87d0f2b Mon Sep 17 00:00:00 2001 From: Matt Larsen Date: Thu, 9 Feb 2017 15:59:37 -0800 Subject: [PATCH 2/2] Fixing a typo in Actor --- vtkm/rendering/Actor.cxx | 2 +- vtkm/rendering/Actor.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vtkm/rendering/Actor.cxx b/vtkm/rendering/Actor.cxx index 57609d940..ee20b74c2 100644 --- a/vtkm/rendering/Actor.cxx +++ b/vtkm/rendering/Actor.cxx @@ -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; } diff --git a/vtkm/rendering/Actor.h b/vtkm/rendering/Actor.h index c530a6d9f..fff68c4d9 100644 --- a/vtkm/rendering/Actor.h +++ b/vtkm/rendering/Actor.h @@ -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;