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

alter interface of scalar renderer result

Browse Source
This commit is contained in:
Matt Larsen 2020-02-18 09:45:31 -08:00
parent 5fc77cb585
commit a7363c283c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/rendering/ScalarRenderer.cxx
View File

@ -22,7 +22,6 @@
#include <vtkm/rendering/raytracing/SphereIntersector.h>
#include <vtkm/rendering/raytracing/TriangleExtractor.h>
#include <vtkm/io/writer/VTKDataSetWriter.h>
namespace vtkm
{
@ -183,7 +182,7 @@ ScalarRenderer::Result ScalarRenderer::Render(const vtkm::rendering::Camera& cam
return result;
}
void ScalarRenderer::Result::SaveVTK(const std::string filename)
vtkm::cont::DataSet ScalarRenderer::Result::ToDataSet()
{
if (Scalars.size() == 0)
{
@ -212,8 +211,7 @@ void ScalarRenderer::Result::SaveVTK(const std::string filename)
result.AddField(vtkm::cont::Field("depth", vtkm::cont::Field::Association::CELL_SET, Depths));
vtkm::io::writer::VTKDataSetWriter writer(filename + ".vtk");
writer.WriteDataSet(result);
return result;
}
}
} // vtkm::rendering

2
vtkm/rendering/ScalarRenderer.h
View File

@ -42,7 +42,7 @@ public:
std::vector<std::string> ScalarNames;
std::map<std::string, vtkm::Range> Ranges;
void SaveVTK(const std::string filename);
vtkm::cont::DataSet ToDataSet();
};
ScalarRenderer::Result Render(const vtkm::rendering::Camera& camera);

6
vtkm/rendering/testing/UnitTestScalarRenderer.cxx
View File

@ -8,9 +8,9 @@
// PURPOSE. See the above copyright notice for more information.
//============================================================================
#include <vtkm/io/writer/VTKDataSetWriter.h>
#include <vtkm/rendering/ScalarRenderer.h>
#include <vtkm/rendering/testing/RenderTest.h>
#include <vtkm/source/Tangle.h>
namespace
{
@ -30,7 +30,9 @@ void RenderTests()
renderer.SetInput(dataset);
vtkm::rendering::ScalarRenderer::Result res = renderer.Render(camera);
res.SaveVTK("scalar");
vtkm::cont::DataSet result = res.ToDataSet();
vtkm::io::writer::VTKDataSetWriter writer("scalar.vtk");
writer.WriteDataSet(result);
}
} //namespace