Skip to content

Commit 274aeb6

Browse files
committed
Revert "BUG: Add empty implementation to convert SIMPL Json parameters to SIMPLNX Parameters"
This reverts commit e065e18.
1 parent 98809b4 commit 274aeb6

9 files changed

+3
-52
lines changed

src/SimplnxReview/Filters/ComputeGroupingDensityFilter.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include "ComputeGroupingDensityFilter.hpp"
21

32
#include "SimplnxReview/Filters/Algorithms/ComputeGroupingDensity.hpp"
43

src/SimplnxReview/Filters/ComputeGroupingDensityFilter.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ class SIMPLNXREVIEW_EXPORT ComputeGroupingDensityFilter : public IFilter
3434
static inline constexpr StringLiteral k_CheckedFeaturesName_Key = "checked_features_name";
3535
static inline constexpr StringLiteral k_GroupingDensitiesName_Key = "grouping_densities_name";
3636

37-
/**
38-
* @brief Reads SIMPL json and converts it simplnx Arguments.
39-
* @param json
40-
* @return Result<Arguments>
41-
*/
42-
static Result<Arguments> FromSIMPLJson(const nlohmann::json& json);
43-
4437
/**
4538
* @brief Returns the name of the filter.
4639
* @return

src/SimplnxReview/Filters/ComputeLocalAverageCAxisMisalignmentsFilter.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ class SIMPLNXREVIEW_EXPORT ComputeLocalAverageCAxisMisalignmentsFilter : public
3535
static inline constexpr StringLiteral k_LocalCAxisMisalignmentsName_Key = "local_c_axis_misalignments_name";
3636
static inline constexpr StringLiteral k_UnbiasedLocalCAxisMisalignmentsName_Key = "unbiased_local_c_axis_misalignments_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-
4538
/**
4639
* @brief Returns the name of the filter.
4740
* @return

src/SimplnxReview/Filters/ComputeMicroTextureRegionsFilter.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ class SIMPLNXREVIEW_EXPORT ComputeMicroTextureRegionsFilter : public IFilter
3030
static inline constexpr StringLiteral k_MicroTextureRegionNumCellsArrayName_Key = "micro_texture_region_num_cells_array_name";
3131
static inline constexpr StringLiteral k_MicroTextureRegionFractionOccupiedArrayName_Key = "micro_texture_region_fraction_occupied_array_name";
3232

33-
/**
34-
* @brief Reads SIMPL json and converts it simplnx Arguments.
35-
* @param json
36-
* @return Result<Arguments>
37-
*/
38-
static Result<Arguments> FromSIMPLJson(const nlohmann::json& json);
39-
4033
/**
4134
* @brief Returns the name of the filter.
4235
* @return

src/SimplnxReview/Filters/ComputeSaltykovSizesFilter.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,6 @@ class SIMPLNXREVIEW_EXPORT ComputeSaltykovSizesFilter : public IFilter
2929
static inline constexpr StringLiteral k_EquivalentDiametersArrayPath_Key = "equivalent_diameters_array_path";
3030
static inline constexpr StringLiteral k_SaltykovEquivalentDiametersName_Key = "saltykov_equivalent_diameters_name";
3131

32-
/**
33-
* @brief Reads SIMPL json and converts it simplnx Arguments.
34-
* @param json
35-
* @return Result<Arguments>
36-
*/
37-
static Result<Arguments> FromSIMPLJson(const nlohmann::json& json);
38-
3932
/**
4033
* @brief Returns the name of the filter.
4134
* @return

src/SimplnxReview/Filters/GroupMicroTextureRegionsFilter.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,16 @@ Parameters GroupMicroTextureRegionsFilter::parameters() const
6262
params.insert(std::make_unique<NeighborListSelectionParameter>(k_ContiguousNeighborListArrayPath_Key, "Contiguous Neighbor List", "List of contiguous neighbors for each Feature.", DataPath{},
6363
NeighborListSelectionParameter::AllowedTypes{DataType::int32}));
6464

65-
params.insertSeparator(Parameters::Separator{"Non-Contiguous Neighborhood Option"});
65+
params.insertSeparator(Parameters::Separator{"Non-Contiguous Neighborhood Option"});
6666
params.insertLinkableParameter(std::make_unique<BoolParameter>(k_UseNonContiguousNeighbors_Key, "Use Non-Contiguous Neighbors", "Use non-contiguous neighborhoods", false));
6767
params.insert(std::make_unique<NeighborListSelectionParameter>(k_NonContiguousNeighborListArrayPath_Key, "Non-Contiguous Neighbor List", "List of non-contiguous neighbors for each Feature.",
6868
DataPath{}, NeighborListSelectionParameter::AllowedTypes{DataType::int32}));
6969

70+
7071
params.insertSeparator(Parameters::Separator{"Random Number Seed Parameters"});
7172
params.insertLinkableParameter(std::make_unique<BoolParameter>(k_UseSeed_Key, "Use Seed for Random Generation", "When true the user will be able to put in a seed for random generation", false));
7273
params.insert(std::make_unique<NumberParameter<uint64>>(k_SeedValue_Key, "Seed", "The seed fed into the random generator", std::mt19937::default_seed));
73-
params.insert(std::make_unique<DataObjectNameParameter>(k_SeedArrayName_Key, "Stored Seed Value Array Name", "Name of array holding the seed value", "_Group_MicroTexture_Regions_Seed_Value_"));
74+
params.insert(std::make_unique<DataObjectNameParameter>(k_SeedArrayName_Key, "Stored Seed Value Array Name", "", "_Group_MicroTexture_Regions_Seed_Value_"));
7475

7576
params.insertSeparator(Parameters::Separator{"Input Cell Data"});
7677
params.insert(std::make_unique<ArraySelectionParameter>(k_FeatureIdsArrayPath_Key, "Cell Feature Ids", "Data Array that specifies to which Feature each Element belongs", DataPath{},

src/SimplnxReview/Filters/GroupMicroTextureRegionsFilter.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ class SIMPLNXREVIEW_EXPORT GroupMicroTextureRegionsFilter : public IFilter
4242
static inline constexpr StringLiteral k_UseSeed_Key = "use_seed";
4343
static inline constexpr StringLiteral k_SeedValue_Key = "seed_value";
4444

45-
/**
46-
* @brief Reads SIMPL json and converts it simplnx Arguments.
47-
* @param json
48-
* @return Result<Arguments>
49-
*/
50-
static Result<Arguments> FromSIMPLJson(const nlohmann::json& json);
51-
5245
/**
5346
* @brief Returns the name of the filter.
5447
* @return

src/SimplnxReview/Filters/InterpolateValuesToUnstructuredGridFilter.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ class SIMPLNXREVIEW_EXPORT InterpolateValuesToUnstructuredGridFilter : public IF
2828
static inline constexpr StringLiteral k_CreatedAttrMatrixName_Key = "created_attr_matrix_name";
2929
static inline constexpr StringLiteral k_DestinationGeometryPath_Key = "destination_geometry_path";
3030

31-
/**
32-
* @brief Reads SIMPL json and converts it simplnx Arguments.
33-
* @param json
34-
* @return Result<Arguments>
35-
*/
36-
static Result<Arguments> FromSIMPLJson(const nlohmann::json& json);
37-
3831
/**
3932
* @brief
4033
* @return std::string

src/SimplnxReview/Filters/MergeColoniesFilter.hpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ class SIMPLNXREVIEW_EXPORT MergeColoniesFilter : public IFilter
4141
static inline constexpr StringLiteral k_UseSeed_Key = "use_seed";
4242
static inline constexpr StringLiteral k_SeedValue_Key = "seed_value";
4343

44-
/**
45-
* @brief Reads SIMPL json and converts it simplnx Arguments.
46-
* @param json
47-
* @return Result<Arguments>
48-
*/
49-
static Result<Arguments> FromSIMPLJson(const nlohmann::json& json);
50-
5144
/**
5245
* @brief Returns the name of the filter.
5346
* @return

0 commit comments

Comments
 (0)