d25db19c87
The connected components filters had some simple issues that were
inconsistent with the operation of other filters.
* Set the output to the OutputFieldName defined in the filter rather
than hardcoding it to "component". The default value is still
"component", but now you can change it.
* Make sure the output field association is correct. The field
association for CellSetConnectivity is always cell and the field
association for ImageConnectivity is always point.
* Check that the field association for the input field of
ImageConnectivity is point. The filter will fail if it is not.
* Make both filters inherit from FilterCell instead of FilterField.
The superclasses are similar but the latter allows the user to set the
active cell set correctly.
* Properly get the cell set specified by GetActiveCellSetIndex.
Previously it was set to the active coordinates, which is wrong.
61 lines
2.0 KiB
C++
61 lines
2.0 KiB
C++
//=============================================================================
|
|
//
|
|
// Copyright (c) Kitware, Inc.
|
|
// All rights reserved.
|
|
// See LICENSE.txt for details.
|
|
//
|
|
// This software is distributed WITHOUT ANY WARRANTY; without even
|
|
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
// PURPOSE. See the above copyright notice for more information.
|
|
//
|
|
// Copyright 2018 National Technology & Engineering Solutions of Sandia, LLC (NTESS).
|
|
// Copyright 2018 UT-Battelle, LLC.
|
|
// Copyright 2018 Los Alamos National Security.
|
|
//
|
|
// Under the terms of Contract DE-NA0003525 with NTESS,
|
|
// the U.S. Government retains certain rights in this software.
|
|
// Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
|
|
// Laboratory (LANL), the U.S. Government retains certain rights in
|
|
// this software.
|
|
//
|
|
//=============================================================================
|
|
|
|
#ifndef vtk_m_filter_ImageConnectivity_h
|
|
#define vtk_m_filter_ImageConnectivity_h
|
|
|
|
#include <vtkm/filter/FilterCell.h>
|
|
#include <vtkm/worklet/connectivities/ImageConnectivity.h>
|
|
|
|
namespace vtkm
|
|
{
|
|
namespace filter
|
|
{
|
|
class ImageConnectivity : public vtkm::filter::FilterCell<ImageConnectivity>
|
|
{
|
|
public:
|
|
VTKM_CONT ImageConnectivity();
|
|
|
|
template <typename T, typename StorageType, typename DerivedPolicy>
|
|
VTKM_CONT vtkm::cont::DataSet DoExecute(const vtkm::cont::DataSet& input,
|
|
const vtkm::cont::ArrayHandle<T, StorageType>& field,
|
|
const vtkm::filter::FieldMetadata& fieldMetadata,
|
|
const vtkm::filter::PolicyBase<DerivedPolicy>&);
|
|
};
|
|
|
|
template <>
|
|
class FilterTraits<vtkm::filter::ImageConnectivity>
|
|
{
|
|
public:
|
|
struct InputFieldTypeList : vtkm::TypeListTagScalarAll
|
|
{
|
|
};
|
|
};
|
|
}
|
|
} // namespace vtkm::filter
|
|
|
|
#ifndef vtk_m_filter_ImageConnectivity_hxx
|
|
#include <vtkm/filter/ImageConnectivity.hxx>
|
|
#endif
|
|
|
|
#endif //vtk_m_filter_ImageConnectivity_h
|