Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix warnings about overriding deprecated methods

Browse Source 
The VS compiler gives a warning when you override a deprecated method.
Changed the StartScene and EndScene methods in Mapper to be non-virtual
with empty implementations. Deleted the corresponding methods from all
subclasses.
This commit is contained in:
Kenneth Moreland 2020-06-17 17:58:07 -06:00
parent 31feaed0f8
commit 3d991d1d84
8 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/rendering/Mapper.h
View File

@ -40,10 +40,10 @@ public:
virtual void SetActiveColorTable(const vtkm::cont::ColorTable& ct);
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() = 0;
void StartScene() {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() = 0;
void EndScene() {}
virtual void SetCanvas(vtkm::rendering::Canvas* canvas) = 0;
virtual vtkm::rendering::Canvas* GetCanvas() const = 0;

6
vtkm/rendering/MapperConnectivity.h
View File

@ -37,12 +37,6 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
vtkm::rendering::Mapper* NewCopy() const override;
void CreateDefaultView();

6
vtkm/rendering/MapperCylinder.h
View File

@ -68,12 +68,6 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const override;

5
vtkm/rendering/MapperPoint.h
View File

@ -79,11 +79,6 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const override;

6
vtkm/rendering/MapperQuad.h
View File

@ -44,12 +44,6 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const override;

6
vtkm/rendering/MapperRayTracer.h
View File

@ -38,12 +38,6 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
void SetCompositeBackground(bool on);
vtkm::rendering::Mapper* NewCopy() const override;
void SetShadingOn(bool on);

6
vtkm/rendering/MapperVolume.h
View File

@ -36,12 +36,6 @@ public:
const vtkm::rendering::Camera& camera,
const vtkm::Range& scalarRange) override;
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
vtkm::rendering::Mapper* NewCopy() const override;
void SetSampleDistance(const vtkm::Float32 distance);
void SetCompositeBackground(const bool compositeBackground);

6
vtkm/rendering/MapperWireframer.h
View File

@ -42,12 +42,6 @@ public:
bool GetIsOverlay() const;
void SetIsOverlay(bool isOverlay);
VTKM_DEPRECATED(1.6, "StartScene() does nothing")
virtual void StartScene() override {}
VTKM_DEPRECATED(1.6, "EndScene() does nothing")
virtual void EndScene() override {}
virtual void RenderCells(const vtkm::cont::DynamicCellSet& cellset,
const vtkm::cont::CoordinateSystem& coords,
const vtkm::cont::Field& scalarField,