Skip to content

Commit cad0018

Browse files
nyoungbqimikejackson
authored andcommitted
Update ExtractVertexGeometry conversion
1 parent bbe111a commit cad0018

File tree

3 files changed

+35
-0
lines changed

3 files changed

+35
-0
lines changed

src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "ExtractVertexGeometryFilter.hpp"
2+
#include <simplnx/Utilities/SIMPLConversion.hpp>
23

34
#include "SimplnxCore/Filters/Algorithms/ExtractVertexGeometry.hpp"
45

@@ -207,4 +208,29 @@ Result<> ExtractVertexGeometryFilter::executeImpl(DataStructure& dataStructure,
207208

208209
return ExtractVertexGeometry(dataStructure, messageHandler, shouldCancel, &inputValues)();
209210
}
211+
212+
namespace
213+
{
214+
namespace SIMPL
215+
{
216+
constexpr StringLiteral k_IncludedDataArrayPathsKey = "IncludedDataArrayPaths";
217+
constexpr StringLiteral k_SelectedDataContainerNameKey = "SelectedDataContainerName";
218+
constexpr StringLiteral k_VertexDataContainerNameKey = "VertexDataContainerName";
219+
} // namespace SIMPL
220+
} // namespace
221+
222+
Result<Arguments> ExtractVertexGeometryFilter::FromSIMPLJson(const nlohmann::json& json)
223+
{
224+
Arguments args = ExtractVertexGeometryFilter().getDefaultArguments();
225+
226+
std::vector<Result<>> results;
227+
228+
results.push_back(SIMPLConversion::ConvertParameter<SIMPLConversion::MultiDataArraySelectionFilterParameterConverter>(args, json, SIMPL::k_IncludedDataArrayPathsKey, k_IncludedDataArrayPaths_Key));
229+
results.push_back(SIMPLConversion::ConvertParameter<SIMPLConversion::StringToDataPathFilterParameterConverter>(args, json, SIMPL::k_SelectedDataContainerNameKey, k_InputGeometryPath_Key));
230+
results.push_back(SIMPLConversion::ConvertParameter<SIMPLConversion::StringToDataPathFilterParameterConverter>(args, json, SIMPL::k_VertexDataContainerNameKey, k_VertexGeometryPath_Key));
231+
232+
Result<> conversionResult = MergeResults(std::move(results));
233+
234+
return ConvertResultTo<Arguments>(std::move(conversionResult), std::move(args));
235+
}
210236
} // namespace nx::core

src/Plugins/SimplnxCore/src/SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ class SIMPLNXCORE_EXPORT ExtractVertexGeometryFilter : public IFilter
3535
static constexpr StringLiteral k_VertexAttrMatrixName_Key = "output_vertex_attr_matrix_name";
3636
static constexpr StringLiteral k_SharedVertexListName_Key = "output_shared_vertex_list_name";
3737

38+
/**
39+
* @brief Reads SIMPL json and converts it simplnx Arguments.
40+
* @param json
41+
* @return Result<Arguments>
42+
*/
43+
static Result<Arguments> FromSIMPLJson(const nlohmann::json& json);
44+
3845
/**
3946
* @brief Returns the name of the filter.
4047
* @return

src/Plugins/SimplnxCore/src/SimplnxCore/SimplnxCoreLegacyUUIDMapping.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
#include "SimplnxCore/Filters/ExecuteProcessFilter.hpp"
7272
#include "SimplnxCore/Filters/ExtractComponentAsArrayFilter.hpp"
7373
#include "SimplnxCore/Filters/ExtractInternalSurfacesFromTriangleGeometryFilter.hpp"
74+
#include "SimplnxCore/Filters/ExtractVertexGeometryFilter.hpp"
7475
#include "SimplnxCore/Filters/FillBadDataFilter.hpp"
7576
#include "SimplnxCore/Filters/IdentifySampleFilter.hpp"
7677
#include "SimplnxCore/Filters/InitializeImageGeomCellDataFilter.hpp"
@@ -218,6 +219,7 @@ namespace nx::core
218219
{nx::core::Uuid::FromString("79d59b85-01e8-5c4a-a6e1-3fd3e2ceffb4").value(), {nx::core::FilterTraits<ExtractComponentAsArrayFilter>::uuid, &ExtractComponentAsArrayFilter::FromSIMPLJson}}, // ExtractComponentAsArray
219220
{nx::core::Uuid::FromString("8a2308ec-86cd-5636-9a0a-6c7d383e9e7f").value(), {nx::core::FilterTraits<ExecuteProcessFilter>::uuid, &ExecuteProcessFilter::FromSIMPLJson}}, // ExecuteProcessFilter
220221
{nx::core::Uuid::FromString("1b4b9941-62e4-52f2-9918-15d48147ab88").value(), {nx::core::FilterTraits<ExtractComponentAsArrayFilter>::uuid, &ExtractComponentAsArrayFilter::FromSIMPLJson}}, // RemoveComponentFromArray
222+
{nx::core::Uuid::FromString("bc8a91ca-0cee-59c6-b5cb-acc1aab8617f").value(), {nx::core::FilterTraits<ExtractVertexGeometryFilter>::uuid, &ExtractVertexGeometryFilter::FromSIMPLJson}}, // ExtractVertexGeometry
221223
{nx::core::Uuid::FromString("7aa33007-4186-5d7f-ba9d-d0a561b3351d").value(), {nx::core::FilterTraits<TriangleCentroidFilter>::uuid, &TriangleCentroidFilter::FromSIMPLJson}}, // TriangleCentroid
222224
{nx::core::Uuid::FromString("1966e540-759c-5798-ae26-0c6a3abc65c0").value(), {nx::core::FilterTraits<ResampleImageGeomFilter>::uuid, &ResampleImageGeomFilter::FromSIMPLJson}}, // ResampleImageGeom
223225
{nx::core::Uuid::FromString("e25d9b4c-2b37-578c-b1de-cf7032b5ef19").value(), {nx::core::FilterTraits<RotateSampleRefFrameFilter>::uuid, &RotateSampleRefFrameFilter::FromSIMPLJson}}, // RotateSampleRefFrame

0 commit comments

Comments
 (0)