From 6efc3e4c7206bb6443dfa119489c7c499c22fc5a Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Fri, 21 Nov 2025 17:11:43 -0500 Subject: [PATCH 1/2] Update MergeColoniesFilter.cpp --- src/SimplnxReview/Filters/MergeColoniesFilter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SimplnxReview/Filters/MergeColoniesFilter.cpp b/src/SimplnxReview/Filters/MergeColoniesFilter.cpp index 6e00796..17a5205 100644 --- a/src/SimplnxReview/Filters/MergeColoniesFilter.cpp +++ b/src/SimplnxReview/Filters/MergeColoniesFilter.cpp @@ -240,7 +240,7 @@ Result MergeColoniesFilter::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureParentIdsArrayNameKey, k_FeatureParentIdsArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeaturePhasesArrayPathKey, k_FeaturePhasesArrayPath_Key)); - results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NewCellFeatureAttributeMatrixNameKey, + results.push_back(SIMPLConversion::Convert2Parameters(args, json, SIMPL::k_FeatureIdsArrayPathKey, SIMPL::k_NewCellFeatureAttributeMatrixNameKey, k_NewCellFeatureAttributeMatrixName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NonContiguousNeighborListArrayPathKey, k_NonContiguousNeighborListArrayPath_Key)); From 7081ddea321261ced0fb82f2a81263a62b51ae18 Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Tue, 6 Jan 2026 11:32:49 -0500 Subject: [PATCH 2/2] clang formatting --- src/SimplnxReview/Filters/MergeColoniesFilter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SimplnxReview/Filters/MergeColoniesFilter.cpp b/src/SimplnxReview/Filters/MergeColoniesFilter.cpp index 17a5205..893bbf1 100644 --- a/src/SimplnxReview/Filters/MergeColoniesFilter.cpp +++ b/src/SimplnxReview/Filters/MergeColoniesFilter.cpp @@ -240,8 +240,8 @@ Result MergeColoniesFilter::FromSIMPLJson(const nlohmann::json& json) results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureIdsArrayPathKey, k_FeatureIdsArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeatureParentIdsArrayNameKey, k_FeatureParentIdsArrayName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_FeaturePhasesArrayPathKey, k_FeaturePhasesArrayPath_Key)); - results.push_back(SIMPLConversion::Convert2Parameters(args, json, SIMPL::k_FeatureIdsArrayPathKey, SIMPL::k_NewCellFeatureAttributeMatrixNameKey, - k_NewCellFeatureAttributeMatrixName_Key)); + results.push_back(SIMPLConversion::Convert2Parameters( + args, json, SIMPL::k_FeatureIdsArrayPathKey, SIMPL::k_NewCellFeatureAttributeMatrixNameKey, k_NewCellFeatureAttributeMatrixName_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_NonContiguousNeighborListArrayPathKey, k_NonContiguousNeighborListArrayPath_Key)); results.push_back(SIMPLConversion::ConvertParameter(args, json, SIMPL::k_UseNonContiguousNeighborsKey, k_UseNonContiguousNeighbors_Key));