Implementation for tube filter.
This commit is contained in:
Dave Pugmire
parent
03e7b77fc9
commit
92348e28fd
File diff suppressed because it is too large
Load Diff
@ -10,6 +10,7 @@
|
||||
|
||||
#include <vtkm/cont/DataSetBuilderExplicit.h>
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
#include <vtkm/io/writer/VTKDataSetWriter.h>
|
||||
#include <vtkm/worklet/DispatcherMapField.h>
|
||||
#include <vtkm/worklet/Tube.h>
|
||||
|
||||
@ -41,102 +42,172 @@ void appendPts(vtkm::cont::DataSetBuilderExplicitIterative& dsb,
|
||||
ids.push_back(pid);
|
||||
}
|
||||
|
||||
void TestTubeWorklets()
|
||||
#if 0
|
||||
void TestTubeWorklets2()
|
||||
{
|
||||
std::cout << "Testing Tube Worklet" << std::endl;
|
||||
vtkm::cont::DataSetBuilderExplicitIterative dsb;
|
||||
|
||||
std::vector<vtkm::Id> ids;
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(0,0,4), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(1,0,3), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_LINE, ids);
|
||||
|
||||
|
||||
ids.clear();
|
||||
vtkm::FloatDefault x0 = 0, x1 = 6.28, dx = 0.05;
|
||||
//x1 = 6.28 / 6.;
|
||||
for (vtkm::FloatDefault x = x0; x < x1; x += dx)
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(x,vtkm::Cos(x),.5*vtkm::Sin(x)), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
|
||||
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(0,0,4), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(1,0,3), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(0,0,4), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(1,0,3), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_LINE, ids);
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(0,0,4), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(1,0,3), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_LINE, ids);
|
||||
|
||||
|
||||
ids.clear();
|
||||
for (vtkm::FloatDefault x = x0; x < x1; x += dx)
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(x,2+vtkm::Cos(x),.5*vtkm::Sin(x)), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
|
||||
vtkm::cont::DataSet ds = dsb.Create();
|
||||
ds.PrintSummary(std::cout);
|
||||
|
||||
vtkm::worklet::Tube tubeWorklet(13, 0.05f);
|
||||
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault,3>> newPoints;
|
||||
vtkm::cont::CellSetSingleType<> newCells;
|
||||
tubeWorklet.Run(ds.GetCoordinateSystem(0), ds.GetCellSet(0), newPoints, newCells);
|
||||
|
||||
vtkm::cont::DataSet ds2;
|
||||
ds2.AddCoordinateSystem(vtkm::cont::CoordinateSystem("coords", newPoints));
|
||||
ds2.AddCellSet(newCells);
|
||||
ds2.PrintSummary(std::cout);
|
||||
|
||||
vtkm::io::writer::VTKDataSetWriter writer("tube.vtk");
|
||||
writer.WriteDataSet(ds2);
|
||||
|
||||
if (1)
|
||||
{
|
||||
vtkm::io::writer::VTKDataSetWriter writer("poly.vtk");
|
||||
writer.WriteDataSet(ds);
|
||||
}
|
||||
|
||||
if (1)
|
||||
{
|
||||
dsb = vtkm::cont::DataSetBuilderExplicitIterative();
|
||||
int nPts = newPoints.GetNumberOfValues();
|
||||
ids.clear();
|
||||
auto portal = newPoints.GetPortalControl();
|
||||
for (int i = 0; i < nPts; i++)
|
||||
{
|
||||
vtkm::Id id = dsb.AddPoint(portal.Get(i));
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_VERTEX, {id});
|
||||
}
|
||||
ds = dsb.Create();
|
||||
vtkm::io::writer::VTKDataSetWriter writer("pts.vtk");
|
||||
writer.WriteDataSet(ds);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// Test with 3 polylines
|
||||
void TestTube1()
|
||||
{
|
||||
vtkm::cont::DataSetBuilderExplicitIterative dsb;
|
||||
std::vector<vtkm::Id> ids;
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(0, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(1, 0, 0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(0, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(1, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(2, 0, 0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
|
||||
|
||||
|
||||
|
||||
#if 0
|
||||
/*
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(3,1,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(4,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(5,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(6,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(7,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(8,0,0), ids);
|
||||
*/
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(0, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(1, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(2, 1, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(3, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(4, 0, 0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
std::cout<<"PolyLine: ids= "<<ids<<std::endl;
|
||||
ids.clear();
|
||||
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(0,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(1,0,0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_LINE, ids);
|
||||
ids.clear();
|
||||
|
||||
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(0,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(1,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(2,0,0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
ids.clear();
|
||||
|
||||
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(0,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(1,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(2,0,0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault,3>(3,0,0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
ids.clear();
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
//0-5
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(0,0,0));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(1,0,0));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(2,1,0));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(3,0,0));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(4,1,0));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(5,0,0));
|
||||
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, {0,1,2,3,4,5});
|
||||
|
||||
//6-7
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(0,0,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(0,0,2));
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, {6,7});
|
||||
|
||||
//8-9
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(0,1,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(0,1,2));
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_LINE, {8,9});
|
||||
|
||||
//10-12
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(0,0,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(1,0,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(1,1,1));
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_TRIANGLE, {10,11,12});
|
||||
|
||||
//13-20
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(0,0,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(1,0,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(2,1,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(3,0,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(4,1,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(5,0,1));
|
||||
dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(6,1,1));
|
||||
int x = dsb.AddPoint(vtkm::Vec<vtkm::FloatDefault,3>(7,0,1));
|
||||
std::cout<<"X= "<<x<<std::endl;
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, {13,14,15,16,17,18,19,20});
|
||||
#endif
|
||||
|
||||
vtkm::cont::DataSet ds = dsb.Create();
|
||||
ds.PrintSummary(std::cout);
|
||||
|
||||
vtkm::cont::CoordinateSystem pts;
|
||||
vtkm::cont::CellSetSingleType<> cells("polyLines");
|
||||
vtkm::worklet::Tube tubeWorklet(13, 0.05f);
|
||||
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault, 3>> newPoints;
|
||||
vtkm::cont::CellSetSingleType<> newCells;
|
||||
tubeWorklet.Run(ds.GetCoordinateSystem(0), ds.GetCellSet(0), newPoints, newCells);
|
||||
|
||||
vtkm::worklet::Tube tubeWorklet(2, 0.1f);
|
||||
tubeWorklet.Run(ds.GetCoordinateSystem(0), ds.GetCellSet(0));
|
||||
VTKM_TEST_ASSERT(newPoints.GetNumberOfValues() == 130, "Wrong number of points in Tube worklet");
|
||||
VTKM_TEST_ASSERT(newCells.GetCellShape(0) == vtkm::CELL_SHAPE_QUAD,
|
||||
"Wrong cell shape in Tube worklet");
|
||||
VTKM_TEST_ASSERT(newCells.GetNumberOfCells() == 117, "Wrong cell shape in Tube worklet");
|
||||
}
|
||||
|
||||
// Test with 2 polylines and 1 triangle (which should be skipped).
|
||||
void TestTube2()
|
||||
{
|
||||
vtkm::cont::DataSetBuilderExplicitIterative dsb;
|
||||
std::vector<vtkm::Id> ids;
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(0, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(1, 0, 0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(0, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(1, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(1, 1, 0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_TRIANGLE, ids);
|
||||
|
||||
ids.clear();
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(0, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(1, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(2, 1, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(3, 0, 0), ids);
|
||||
appendPts(dsb, vtkm::Vec<vtkm::FloatDefault, 3>(4, 0, 0), ids);
|
||||
dsb.AddCell(vtkm::CELL_SHAPE_POLY_LINE, ids);
|
||||
|
||||
vtkm::cont::DataSet ds = dsb.Create();
|
||||
|
||||
vtkm::worklet::Tube tubeWorklet(13, 0.05f);
|
||||
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault, 3>> newPoints;
|
||||
vtkm::cont::CellSetSingleType<> newCells;
|
||||
tubeWorklet.Run(ds.GetCoordinateSystem(0), ds.GetCellSet(0), newPoints, newCells);
|
||||
|
||||
VTKM_TEST_ASSERT(newPoints.GetNumberOfValues() == 91, "Wrong number of points in Tube worklet");
|
||||
VTKM_TEST_ASSERT(newCells.GetCellShape(0) == vtkm::CELL_SHAPE_QUAD,
|
||||
"Wrong cell shape in Tube worklet");
|
||||
VTKM_TEST_ASSERT(newCells.GetNumberOfCells() == 78, "Wrong cell shape in Tube worklet");
|
||||
}
|
||||
|
||||
void TestTubeWorklets()
|
||||
{
|
||||
std::cout << "Testing Tube Worklet" << std::endl;
|
||||
TestTube1();
|
||||
TestTube2();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user