40ad325699
In FilterDataSet::MapFieldOntoOutput, it was getting each field to map using the traits reserved for the active field. However, when mapping a field outside of the DoExecute, we want to consider a broader set of types.
69 lines
2.3 KiB
C++
69 lines
2.3 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.
|
|
//============================================================================
|
|
|
|
#include <vtkm/filter/FieldMetadata.h>
|
|
#include <vtkm/filter/FilterTraits.h>
|
|
#include <vtkm/filter/PolicyDefault.h>
|
|
|
|
#include <vtkm/filter/internal/ResolveFieldTypeAndExecute.h>
|
|
#include <vtkm/filter/internal/ResolveFieldTypeAndMap.h>
|
|
|
|
namespace vtkm
|
|
{
|
|
namespace filter
|
|
{
|
|
|
|
//----------------------------------------------------------------------------
|
|
template <typename Derived>
|
|
inline VTKM_CONT FilterDataSet<Derived>::FilterDataSet()
|
|
: CoordinateSystemIndex(0)
|
|
{
|
|
}
|
|
|
|
//----------------------------------------------------------------------------
|
|
template <typename Derived>
|
|
inline VTKM_CONT FilterDataSet<Derived>::~FilterDataSet()
|
|
{
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <typename Derived>
|
|
template <typename DerivedPolicy>
|
|
inline VTKM_CONT vtkm::cont::DataSet FilterDataSet<Derived>::PrepareForExecution(
|
|
const vtkm::cont::DataSet& input,
|
|
vtkm::filter::PolicyBase<DerivedPolicy> policy)
|
|
{
|
|
return (static_cast<Derived*>(this))->DoExecute(input, policy);
|
|
}
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <typename Derived>
|
|
template <typename DerivedPolicy>
|
|
inline VTKM_CONT bool FilterDataSet<Derived>::MapFieldOntoOutput(
|
|
vtkm::cont::DataSet& result,
|
|
const vtkm::cont::Field& field,
|
|
vtkm::filter::PolicyBase<DerivedPolicy> policy)
|
|
{
|
|
bool valid = false;
|
|
|
|
vtkm::filter::FieldMetadata metaData(field);
|
|
using FunctorType = internal::ResolveFieldTypeAndMap<Derived, DerivedPolicy>;
|
|
FunctorType functor(static_cast<Derived*>(this), result, metaData, policy, valid);
|
|
|
|
vtkm::cont::CastAndCall(vtkm::filter::ApplyPolicyFieldNotActive(field, policy), functor);
|
|
|
|
//the bool valid will be modified by the map algorithm to hold if the
|
|
//mapping occurred or not. If the mapping was good a new field has been
|
|
//added to the result that was passed in.
|
|
return valid;
|
|
}
|
|
}
|
|
}
|