Fix Python examples and pipelines.

Signed-off-by: Joey Kleingers <[email protected]>

Author: joeykleingers

src/Plugins/SimplnxCore/wrapping/python/simplnxpy.cpp

@@ -79,6 +79,7 @@
 #include <simplnx/Parameters/ReadHDF5DatasetParameter.hpp>
 #include <simplnx/Parameters/StringParameter.hpp>
 #include <simplnx/Parameters/VectorParameter.hpp>
+#include <simplnx/Parameters/util/ReadCSVData.hpp>
 #include <simplnx/Pipeline/AbstractPipelineNode.hpp>
 #include <simplnx/Pipeline/Pipeline.hpp>
 #include <simplnx/Pipeline/PipelineFilter.hpp>
@@ -497,6 +498,20 @@ PYBIND11_MODULE(simplnx, mod)
   dataType.value("float64", DataType::float64);
   dataType.value("boolean", DataType::boolean);
 
+  py::enum_<CSVType> csvType(mod, "CSVType");
+  csvType.value("int8", CSVType::int8);
+  csvType.value("uint8", CSVType::uint8);
+  csvType.value("int16", CSVType::int16);
+  csvType.value("uint16", CSVType::uint16);
+  csvType.value("int32", CSVType::int32);
+  csvType.value("uint32", CSVType::uint32);
+  csvType.value("int64", CSVType::int64);
+  csvType.value("uint64", CSVType::uint64);
+  csvType.value("float32", CSVType::float32);
+  csvType.value("float64", CSVType::float64);
+  csvType.value("boolean", CSVType::boolean);
+  csvType.value("string", CSVType::string);
+
   mod.def(
       "convert_np_dtype_to_datatype",
       [](const py::dtype& dtype) {
@@ -678,8 +693,7 @@ PYBIND11_MODULE(simplnx, mod)
   parameters.def("insert_linkable_parameter", &PyInsertLinkableParameter<ChoicesParameter>);
   parameters.def("link_parameters", [](Parameters& self, std::string groupKey, std::string childKey, BoolParameter::ValueType value) { self.linkParameters(groupKey, childKey, value); });
   parameters.def("link_parameters", [](Parameters& self, std::string groupKey, std::string childKey, ChoicesParameter::ValueType value) { self.linkParameters(groupKey, childKey, value); });
-  parameters.def(
-      "__getitem__", [](Parameters& self, std::string_view key) { return self.at(key).get(); }, py::return_value_policy::reference_internal);
+  parameters.def("__getitem__", [](Parameters& self, std::string_view key) { return self.at(key).get(); }, py::return_value_policy::reference_internal);
 
   py::class_<IArrayThreshold, std::shared_ptr<IArrayThreshold>> iArrayThreshold(mod, "IArrayThreshold");
 
@@ -1539,12 +1553,10 @@ PYBIND11_MODULE(simplnx, mod)
       "path"_a);
   pipeline.def_property("name", &Pipeline::getName, &Pipeline::setName);
   pipeline.def("execute", &ExecutePipeline);
-  pipeline.def(
-      "__getitem__", [](Pipeline& self, Pipeline::index_type index) { return self.at(index); }, py::return_value_policy::reference_internal);
+  pipeline.def("__getitem__", [](Pipeline& self, Pipeline::index_type index) { return self.at(index); }, py::return_value_policy::reference_internal);
   pipeline.def("__len__", &Pipeline::size);
   pipeline.def("size", &Pipeline::size);
-  pipeline.def(
-      "__iter__", [](Pipeline& self) { return py::make_iterator(self.begin(), self.end()); }, py::keep_alive<0, 1>());
+  pipeline.def("__iter__", [](Pipeline& self) { return py::make_iterator(self.begin(), self.end()); }, py::keep_alive<0, 1>());
   pipeline.def(
       "insert",
       [internals](Pipeline& self, Pipeline::index_type index, const IFilter& filter, const py::dict& args) {
@@ -1558,10 +1570,8 @@ PYBIND11_MODULE(simplnx, mod)
   pipeline.def("remove", &Pipeline::removeAt, "index"_a);
 
   pipelineFilter.def("get_args", [internals](PipelineFilter& self) { return ConvertArgsToDict(*internals, self.getParameters(), self.getArguments()); });
-  pipelineFilter.def(
-      "set_args", [internals](PipelineFilter& self, py::dict& args) { self.setArguments(ConvertDictToArgs(*internals, self.getParameters(), args)); }, "args"_a);
-  pipelineFilter.def(
-      "get_filter", [](PipelineFilter& self) { return self.getFilter(); }, py::return_value_policy::reference_internal);
+  pipelineFilter.def("set_args", [internals](PipelineFilter& self, py::dict& args) { self.setArguments(ConvertDictToArgs(*internals, self.getParameters(), args)); }, "args"_a);
+  pipelineFilter.def("get_filter", [](PipelineFilter& self) { return self.getFilter(); }, py::return_value_policy::reference_internal);
   pipelineFilter.def(
       "name",
       [](const PipelineFilter& self) {

wrapping/python/docs/source/Developer_API.rst

@@ -1369,7 +1369,7 @@ General Parameters
       read_csv_data.start_import_row = 2
       read_csv_data.delimiters = [',']
       read_csv_data.custom_headers = []
-      read_csv_data.column_data_types = [nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.int32]
+      read_csv_data.column_data_types = [nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.int32]
       read_csv_data.skipped_array_mask = [False,False,False,False,False,False,False]
       read_csv_data.tuple_dims = [37989]
       read_csv_data.headers_line = 1

wrapping/python/docs/source/User_API.rst

@@ -694,7 +694,7 @@ General Parameters
    read_csv_data.start_import_row = 2
    read_csv_data.delimiters = [',']
    read_csv_data.custom_headers = []
-   read_csv_data.column_data_types = [nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.int32 ]
+   read_csv_data.column_data_types = [nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.int32 ]
    read_csv_data.skipped_array_mask = [False,False,False,False,False,False,False ]
    read_csv_data.tuple_dims = [37989]
    read_csv_data.headers_line = 1

wrapping/python/examples/pipelines/Simplnx/Import_ASCII.py

@@ -47,7 +47,7 @@
 read_csv_data.start_import_row = 1
 read_csv_data.delimiters = [',']
 read_csv_data.custom_headers = ['phi1', 'Phi', 'phi2']
-read_csv_data.column_data_types = [nx.DataType.float32, nx.DataType.float32, nx.DataType.float32]
+read_csv_data.column_data_types = [nx.CSVType.float32, nx.CSVType.float32, nx.CSVType.float32]
 read_csv_data.skipped_array_mask = [False, False, False]
 read_csv_data.tuple_dims = [480_001]
 read_csv_data.headers_line = 1

wrapping/python/examples/pipelines/Simplnx/ResampleRectGridToImageGeom.py

@@ -18,7 +18,7 @@
 read_csv_data.start_import_row = 2
 read_csv_data.delimiters = [',']
 read_csv_data.custom_headers = ['x', 'y', 'z']
-read_csv_data.column_data_types = [nx.DataType.float32, nx.DataType.float32, nx.DataType.float32]
+read_csv_data.column_data_types = [nx.CSVType.float32, nx.CSVType.float32, nx.CSVType.float32]
 read_csv_data.skipped_array_mask = [False, False, False]
 read_csv_data.tuple_dims = [14]
 read_csv_data.headers_line = 1

wrapping/python/examples/scripts/read_csv_file.py

@@ -55,7 +55,7 @@
 read_csv_data.start_import_row = 2
 read_csv_data.delimiters = [',']
 read_csv_data.custom_headers = []
-read_csv_data.column_data_types = [nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.int32 ]
+read_csv_data.column_data_types = [nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.int32 ]
 read_csv_data.skipped_array_mask = [False,False,False,False,False,False,False ]
 read_csv_data.tuple_dims = [37989]
 read_csv_data.headers_line = 1

wrapping/python/plugins/ExamplePlugin/src/ExamplePlugin/ExampleFilter1.py

@@ -153,7 +153,7 @@ def parameters(self) -> nx.Parameters:
     read_csv_data.start_import_row = 2
     read_csv_data.delimiters = [',']
     read_csv_data.custom_headers = []
-    read_csv_data.column_data_types = [nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.float32,nx.DataType.int32]
+    read_csv_data.column_data_types = [nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.float32,nx.CSVType.int32]
     read_csv_data.skipped_array_mask = [False,False,False,False,False,False,False]
     read_csv_data.tuple_dims = [37989]
     read_csv_data.headers_line = 1