Skip to content

Commit 7e7dba2

Browse files
committed
BUG: Fixes SIMPL to SIMPLNX Pipeline JSON Conversions
Signed-off-by: Michael Jackson <[email protected]>
1 parent 32c2c6d commit 7e7dba2

File tree

3 files changed

+28
-0
lines changed

3 files changed

+28
-0
lines changed

src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,3 +472,22 @@ Result<> CreateGeometryFilter::executeImpl(DataStructure& dataStructure, const A
472472
return warningResults;
473473
}
474474
} // namespace nx::core
475+
476+
namespace
477+
{
478+
namespace SIMPL
479+
{
480+
481+
} // namespace SIMPL
482+
} // namespace
483+
484+
Result<Arguments> CreateGeometryFilter::FromSIMPLJson(const nlohmann::json& json)
485+
{
486+
Arguments args = CreateGeometryFilter().getDefaultArguments();
487+
488+
std::vector<Result<>> results;
489+
490+
Result<> conversionResult = MergeResults(std::move(results));
491+
492+
return ConvertResultTo<Arguments>(std::move(conversionResult), std::move(args));
493+
}

src/Plugins/SimplnxCore/src/SimplnxCore/Filters/CreateGeometryFilter.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,13 @@ class SIMPLNXCORE_EXPORT CreateGeometryFilter : public IFilter
7070
static inline constexpr uint64 k_MoveArray = 1;
7171
static inline constexpr uint64 k_ReferenceArray = 2;
7272

73+
/**
74+
* @brief Reads SIMPL json and converts it simplnx Arguments.
75+
* @param json
76+
* @return Result<Arguments>
77+
*/
78+
static Result<Arguments> FromSIMPLJson(const nlohmann::json& json);
79+
7380
/**
7481
* @brief Returns the name of the filter.
7582
* @return

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <string>
99

1010
// clang-format off
11+
#include "SimplnxCore/Filters/CreateGeometryFilter.hpp"
1112
#include "SimplnxCore/Filters/AlignGeometriesFilter.hpp"
1213
#include "SimplnxCore/Filters/AlignSectionsFeatureCentroidFilter.hpp"
1314
#include "SimplnxCore/Filters/AlignSectionsListFilter.hpp"
@@ -133,6 +134,7 @@ namespace nx::core
133134
static const AbstractPlugin::SIMPLMapType k_SIMPL_to_SimplnxCore
134135
{
135136
// syntax std::make_pair {Dream3d UUID , Dream3dnx UUID, {}}}, // dream3d-class-name
137+
{nx::core::Uuid::FromString("9ac220b9-14f9-581a-9bac-5714467589cc").value(), {nx::core::FilterTraits<CreateGeometryFilter>::uuid, &CreateGeometryFilter::FromSIMPLJson}}, // CreateGeometryFilter
136138
{nx::core::Uuid::FromString("886f8b46-51b6-5682-a289-6febd10b7ef0").value(), {nx::core::FilterTraits<AlignSectionsFeatureCentroidFilter>::uuid, &AlignSectionsFeatureCentroidFilter::FromSIMPLJson}}, // AlignSectionsFeatureCentroid
137139
{nx::core::Uuid::FromString("ce1ee404-0336-536c-8aad-f9641c9458be").value(), {nx::core::FilterTraits<AlignGeometriesFilter>::uuid, &AlignGeometriesFilter::FromSIMPLJson}}, // AlignGeometriesFilter
138140
{nx::core::Uuid::FromString("accf8f6c-0551-5da3-9a3d-e4be41c3985c").value(), {nx::core::FilterTraits<AlignSectionsListFilter>::uuid, &AlignSectionsListFilter::FromSIMPLJson}}, // AlignSectionsListFilter

0 commit comments

Comments
 (0)