diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 0ea9f59d29..394d3da56c 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -32,7 +32,7 @@ jobs: timeoutInMinutes: 120 variables: - complex_source_dir: $(Build.Repository.LocalPath) + simplnx_source_dir: $(Build.Repository.LocalPath) build_type: Release dream3d_data_dir: $(Agent.WorkFolder)/DREAM3D_Data @@ -58,25 +58,25 @@ jobs: displayName: Appending to PATH - script: | - cmake -S $(complex_source_dir) -B $(Build.BinariesDirectory) -G Ninja -DCMAKE_BUILD_TYPE:STRING=$(build_type) -DDREAM3D_DATA_DIR=$(dream3d_data_dir) -C $(Agent.WorkFolder)/NX.cmake -DBUILDNAME:STRING="simplnx-$(Agent.MachineName)-$(Agent.OS)-PR$(System.PullRequest.PullRequestNumber)" + cmake -S $(simplnx_source_dir) -B $(Build.BinariesDirectory) -G Ninja -DCMAKE_BUILD_TYPE:STRING=$(build_type) -DDREAM3D_DATA_DIR=$(dream3d_data_dir) -C $(Agent.WorkFolder)/NX.cmake -DBUILDNAME:STRING="simplnx-$(Agent.MachineName)-$(Agent.OS)-PR$(System.PullRequest.PullRequestNumber)" - displayName: Configure COMPLEX + displayName: Configure SIMPLNX - script: | cmake --build $(Build.BinariesDirectory) --config $(build_type) --target all - displayName: Build COMPLEX + displayName: Build SIMPLNX - script: | cd $(Build.BinariesDirectory) cpack -C $(build_type) --verbose continueOnError: true - displayName: Packing COMPLEX + displayName: Packing SIMPLNX - script: | cd $(Build.BinariesDirectory) ctest -C $(build_type) -D Experimental --timeout 7200 -DCTEST_SITE:STRING=$(Agent.MachineName).bluequartz.net -Ddashboard_source_name:STRING=DREAM3D continueOnError: true - displayName: Testing COMPLEX + displayName: Testing SIMPLNX - task: PublishTestResults@2 inputs: diff --git a/CMakePresets.json b/CMakePresets.json index 8093d23637..c657bb03ce 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -33,7 +33,11 @@ "type": "BOOL", "value": "ON" }, - "SIMPLNX_ENABLE_PYTHON_TESTS": { + "SIMPLNX_BUILD_PYTHON_TESTS": { + "type": "BOOL", + "value": "ON" + }, + "SIMPLNX_BUILD_PYTHON_DOCS": { "type": "BOOL", "value": "ON" }, diff --git a/PortingFilters.md b/PortingFilters.md index da600be4b7..32dfca6d79 100644 --- a/PortingFilters.md +++ b/PortingFilters.md @@ -23,7 +23,7 @@ follows: This custom build has **ALL** ***SIMPL*** plugins compiled so you don't need to worry about what filters will be available -### Load up ***SIMPL*** DREAM3D and navigate to ***ComplexFilterGen*** +### Load up ***SIMPL*** DREAM3D and navigate to ***SimplnxFilterGen*** Here you will need to set the command arguments using the following syntax: @@ -120,9 +120,9 @@ The syntax for use of ***filterList*** is as follows: ## SECTION 4 : Multithreading -At the current time, the only filters that should be made parallel are those that could be considered "embarrassingly parallel". It is important to remember that the cost of creating a thread is hefty so it should only be done when there is a sizeable amount of work available for each thread. Complex has two types: ParallelTaskAlgorithm and ParallelDataAlgorithm. Task Runner is for parsing multiple objects and Data Runner is for parsing a single object. +At the current time, the only filters that should be made parallel are those that could be considered "embarrassingly parallel". It is important to remember that the cost of creating a thread is hefty so it should only be done when there is a sizeable amount of work available for each thread. Simplnx has two types: ParallelTaskAlgorithm and ParallelDataAlgorithm. Task Runner is for parsing multiple objects and Data Runner is for parsing a single object. -### Syntax for Complex +### Syntax for Simplnx This is an examplar use case and doesn't truly encompass all possible use cases for the functions, but instead serves to show how it should be structured in most cases. diff --git a/SUPPORT.md b/SUPPORT.md index 5a5cd960bd..db30702d08 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -1,4 +1,4 @@ -# Complex Support # +# Simplnx Support # ## Documentation ## diff --git a/cmake/SIMPLNXVersion.cpp.in b/cmake/SIMPLNXVersion.cpp.in index 3446b0b21e..94e1626e40 100644 --- a/cmake/SIMPLNXVersion.cpp.in +++ b/cmake/SIMPLNXVersion.cpp.in @@ -1,6 +1,6 @@ /*-------------------------------------------------------------------------- * This file is autogenerated from: - * @CMAKE_CURRENT_LIST_DIR@/ComplexVersion.cpp.in + * @CMAKE_CURRENT_LIST_DIR@/SIMPLNXVersion.cpp.in * during the cmake configuration of your project. If you need to make changes, * edit the original file NOT THIS FILE. * --------------------------------------------------------------------------*/ diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake index 4dc0ef69dc..93ec193167 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -44,7 +44,7 @@ foreach(proj ${ALL_PROJECTS}) message(STATUS "* ${proj}: ${${proj}_SOURCE_DIR} Git Hash: ${githash}") endforeach() message(STATUS "* BUILD_TYPE: ${CMAKE_BUILD_TYPE}") -message(STATUS "* COMPLEX: ${simplnx_VERSION}") +message(STATUS "* SIMPLNX: ${simplnx_VERSION}") OSInformation() message(STATUS "* -------------- Dependent Libraries -------------------------------------------") message(STATUS "* Eigen (${Eigen3_VERSION}) ${Eigen3_DIR}") @@ -60,7 +60,7 @@ message(STATUS "* boost_mp11 (${boost_mp11_VERSION}) ${boost_mp11_DIR}") message(STATUS "* nod (${nod_VERSION}) ${nod_DIR}") message(STATUS "* reproc++ (${reproc_VERSION}) ${reproc++_DIR}") -message(STATUS "* -------------- Complex Configuration Options -------------------------------------") +message(STATUS "* -------------- Simplnx Configuration Options -------------------------------------") message(STATUS "* SIMPLNX_BUILD_TESTS: ${SIMPLNX_BUILD_TESTS}") message(STATUS "* SIMPLNX_ENABLE_MULTICORE: ${SIMPLNX_ENABLE_MULTICORE}") message(STATUS "* SIMPLNX_ENABLE_COMPRESSORS: ${SIMPLNX_ENABLE_COMPRESSORS}") @@ -72,12 +72,13 @@ message(STATUS "* SIMPLNX_ENABLE_PACKAGING: ${SIMPLNX_ENABLE_PACKAGING}") message(STATUS "* SIMPLNX_BUILD_DOCS: ${SIMPLNX_BUILD_DOCS}") message(STATUS "* DREAM3D_DATA_DIR: ${DREAM3D_DATA_DIR}") -message(STATUS "* -------------- Complex Python Configuration Options -------------------------------------") +message(STATUS "* -------------- Simplnx Python Configuration Options -------------------------------------") message(STATUS "* Python3_EXECUTABLE: ${Python3_EXECUTABLE}") message(STATUS "* SIMPLNX_BUILD_PYTHON: ${SIMPLNX_BUILD_PYTHON}") -message(STATUS "* SIMPLNX_EMBED_PYTHON: ${SIMPLNX_EMBED_PYTHON}") -message(STATUS "* SIMPLNX_ENABLE_SPHINX_DOCS: ${SIMPLNX_ENABLE_SPHINX_DOCS}") +message(STATUS "* SIMPLNX_BUILD_PYTHON_DOCS: ${SIMPLNX_BUILD_PYTHON_DOCS}") +message(STATUS "* SIMPLNX_BUILD_PYTHON_TESTS: ${SIMPLNX_BUILD_PYTHON_TESTS}") message(STATUS "* SIMPLNX_CONDA_BUILD: ${SIMPLNX_CONDA_BUILD}") +message(STATUS "* SIMPLNX_EMBED_PYTHON: ${SIMPLNX_EMBED_PYTHON}") # message(STATUS "* -------------- Known Plugins ------------------------------------------------------") # foreach(plugin ${SIMPLNX_PLUGIN_LIST}) diff --git a/cmake/Utility.cmake b/cmake/Utility.cmake index 2d6d9fa78c..74294d1933 100644 --- a/cmake/Utility.cmake +++ b/cmake/Utility.cmake @@ -474,10 +474,10 @@ function(AddPythonTest) set(multiValueArgs PYTHONPATH) cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) message(STATUS "ARGS_FILE:${ARGS_FILE}") - if(COMPLEX_BUILD_PYTHON) + if(SIMPLNX_BUILD_PYTHON) if(WIN32) add_test(NAME ${ARGS_NAME} - COMMAND ${complex_SOURCE_DIR}/wrapping/python/testing/anaconda_test.bat + COMMAND ${simplnx_SOURCE_DIR}/wrapping/python/testing/anaconda_test.bat ) set_property(TEST ${ARGS_NAME} @@ -488,7 +488,7 @@ function(AddPythonTest) ) else() add_test(NAME ${ARGS_NAME} - COMMAND ${complex_SOURCE_DIR}/wrapping/python/testing/anaconda_test.sh + COMMAND ${simplnx_SOURCE_DIR}/wrapping/python/testing/anaconda_test.sh ) set_property(TEST ${ARGS_NAME} PROPERTY @@ -530,7 +530,7 @@ function(CreatePythonTests) cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) set(TESTS_PYTHONPATH - "$" + "$" ) foreach(test ${ARGS_TEST_NAMES}) diff --git a/docs/Build_From_Source.md b/docs/Build_From_Source.md index 5b256d2916..534e709639 100644 --- a/docs/Build_From_Source.md +++ b/docs/Build_From_Source.md @@ -156,7 +156,7 @@ Be default VCPKG will check for updates to the libraries that it compiles. If yo ## Defining where test data is stored ## -Complex and its plugins require test files to be able to perform the unit tests. By default these will be store inside the build directory. This means that if you have multiple build directories, a separate copy of all the test files will be downloaded for each build directory. The developer can set the `DREAM3D_DATA_DIR` variable to a path that will be used. They will need to set this for **each** build directory. You **MUST** define `DREAM3D_DATA_DIR` using an absolute path. Relative paths **will not work**. +Simplnx and its plugins require test files to be able to perform the unit tests. By default these will be store inside the build directory. This means that if you have multiple build directories, a separate copy of all the test files will be downloaded for each build directory. The developer can set the `DREAM3D_DATA_DIR` variable to a path that will be used. They will need to set this for **each** build directory. You **MUST** define `DREAM3D_DATA_DIR` using an absolute path. Relative paths **will not work**. + `-DDREAM3D_DATA_DIR=/opt/local/DREAM3D_Data` diff --git a/docs/Code_Style_Guide.md b/docs/Code_Style_Guide.md index e820f5f48e..ed238fdbf3 100644 --- a/docs/Code_Style_Guide.md +++ b/docs/Code_Style_Guide.md @@ -1,6 +1,6 @@ # Code Style Guide -This is the style guide for the COMPLEX library. When contributing sources to the simplnx repository we ask that all contributions follow this style guide. These general rules have been developed over the years in an effort to allow efficient coding practices. +This is the style guide for the SIMPLNX library. When contributing sources to the simplnx repository we ask that all contributions follow this style guide. These general rules have been developed over the years in an effort to allow efficient coding practices. ## Source Code Line Endings @@ -72,7 +72,7 @@ Note that with C++11, programmers now have the ability to inform the compiler wh ## Naming conventions -There is an include clang-tidy file that most IDE's can use to assist with some of the major areas. One area is the naming conventions that COMPLEX uses. Here are the basic rules: +There is an include clang-tidy file that most IDE's can use to assist with some of the major areas. One area is the naming conventions that SIMPLNX uses. Here are the basic rules: - Class and Structs are `UpperCamelCase` - Class private member variables are `m_UpperCamelCase` diff --git a/docs/Porting_Filters.md b/docs/Porting_Filters.md index 31546a0057..2c5ffc552b 100644 --- a/docs/Porting_Filters.md +++ b/docs/Porting_Filters.md @@ -23,7 +23,7 @@ static inline constexpr StringLiteral k_AlignmentType_Key = "alignment_type"; - `QMap<> => std::map<>` - `QByteArray => std::array or std::vector` -## Converting `setErrorCondition` from SIMPL to COMPLEX ## +## Converting `setErrorCondition` from SIMPL to SIMPLNX ## SIMPL @@ -31,7 +31,7 @@ SIMPL setErrorCondition(nx::core::StlConstants::k_ErrorOpeningFile, "Error opening STL file"); ``` -COMPLEX +SIMPLNX ```cpp Result<> result = MakeErrorResult(nx::core::StlConstants::k_ErrorOpeningFile, "Error opening STL file") diff --git a/src/Plugins/OrientationAnalysis/CMakeLists.txt b/src/Plugins/OrientationAnalysis/CMakeLists.txt index ed7cc95110..cd0829cce6 100644 --- a/src/Plugins/OrientationAnalysis/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/CMakeLists.txt @@ -126,7 +126,7 @@ endforeach() target_include_directories(simplnx PUBLIC ) # ------------------------------------------------------------------------------ -# Add a link library to simplnx because it now depends on EbsdLib. Complex will +# Add a link library to simplnx because it now depends on EbsdLib. Simplnx will # be able to find the include dirs from the CMake EbsdLib target # ------------------------------------------------------------------------------ target_link_libraries(simplnx PUBLIC EbsdLib::EbsdLib) diff --git a/src/Plugins/SimplnxCore/test/MoveDataTest.cpp b/src/Plugins/SimplnxCore/test/MoveDataTest.cpp index b61adc36f9..9096e4e2f7 100644 --- a/src/Plugins/SimplnxCore/test/MoveDataTest.cpp +++ b/src/Plugins/SimplnxCore/test/MoveDataTest.cpp @@ -41,7 +41,7 @@ DataStructure createDataStructure() } } // namespace -TEST_CASE("SimplnxCore::MoveData Successful", "[Complex::Core][MoveData]") +TEST_CASE("SimplnxCore::MoveData Successful", "[Simplnx::Core][MoveData]") { MoveData filter; Arguments args; @@ -79,7 +79,7 @@ TEST_CASE("SimplnxCore::MoveData Successful", "[Complex::Core][MoveData]") REQUIRE(dataStructure.getDataAs(newGroup4Path) != nullptr); } -TEST_CASE("SimplnxCore::MoveData Unsuccessful", "[Complex::Core][MoveData]") +TEST_CASE("SimplnxCore::MoveData Unsuccessful", "[Simplnx::Core][MoveData]") { MoveData filter; Arguments args; @@ -117,7 +117,7 @@ TEST_CASE("SimplnxCore::MoveData Unsuccessful", "[Complex::Core][MoveData]") } } -TEST_CASE("SimplnxCore::MoveData Tuple Size Mismatches Warning and Failure", "[Complex::Core][MoveData]") +TEST_CASE("SimplnxCore::MoveData Tuple Size Mismatches Warning and Failure", "[Simplnx::Core][MoveData]") { MoveData filter; Arguments args; diff --git a/src/Plugins/SimplnxCore/test/PipelineTest.cpp b/src/Plugins/SimplnxCore/test/PipelineTest.cpp index 59b9f12c97..1c4c10e420 100644 --- a/src/Plugins/SimplnxCore/test/PipelineTest.cpp +++ b/src/Plugins/SimplnxCore/test/PipelineTest.cpp @@ -154,7 +154,7 @@ TEST_CASE("PipelineTest:Execute Pipeline") REQUIRE(pipeline.push_back(tf2Handle)); } -TEST_CASE("PipelineTest:Complex Pipeline") +TEST_CASE("PipelineTest:Simplnx Pipeline") { auto app = Application::GetOrCreateInstance(); app->loadPlugins(unit_test::k_BuildDir.view()); diff --git a/src/simplnx/Core/Application.cpp b/src/simplnx/Core/Application.cpp index bb58b3968b..e93a7dcead 100644 --- a/src/simplnx/Core/Application.cpp +++ b/src/simplnx/Core/Application.cpp @@ -182,13 +182,13 @@ void Application::savePreferences() m_Preferences->saveToFile(filepath); } -std::optional Application::getComplexUuid(const Uuid& simplUuid) +std::optional Application::getSimplnxUuid(const Uuid& simplUuid) { for(usize index = 0; index < m_Simpl_Uuids.size(); index++) { if(m_Simpl_Uuids[index] == simplUuid) { - return m_Complex_Uuids[index]; + return m_Simplnx_Uuids[index]; } } @@ -198,9 +198,9 @@ std::optional Application::getComplexUuid(const Uuid& simplUuid) std::vector Application::getSimplUuid(const Uuid& simplnxUuid) { std::vector indices; - for(usize index = 0; index < m_Complex_Uuids.size(); index++) + for(usize index = 0; index < m_Simplnx_Uuids.size(); index++) { - if(m_Complex_Uuids[index] == simplnxUuid) + if(m_Simplnx_Uuids[index] == simplnxUuid) { indices.push_back(index); } @@ -294,8 +294,8 @@ void Application::loadPlugin(const std::filesystem::path& path, bool verbose) return; } - AbstractPlugin::SIMPLMapType simplToComplexUuids = plugin->getSimplToSimplnxMap(); - for(auto const& [simplUuid, simplData] : simplToComplexUuids) + AbstractPlugin::SIMPLMapType simplToSimplnxUuids = plugin->getSimplToSimplnxMap(); + for(auto const& [simplUuid, simplData] : simplToSimplnxUuids) { for(const auto& uuid : m_Simpl_Uuids) { @@ -305,12 +305,12 @@ void Application::loadPlugin(const std::filesystem::path& path, bool verbose) } } m_Simpl_Uuids.push_back(simplUuid); - m_Complex_Uuids.push_back(simplData.simplnxUuid); + m_Simplnx_Uuids.push_back(simplData.simplnxUuid); } - if(m_Simpl_Uuids.size() != m_Complex_Uuids.size()) + if(m_Simpl_Uuids.size() != m_Simplnx_Uuids.size()) { - throw std::runtime_error(fmt::format("UUID maps are not of the same size! SIMPL UUID Vector size: {} Complex UUID Vector size: {}", m_Simpl_Uuids.size(), m_Complex_Uuids.size())); + throw std::runtime_error(fmt::format("UUID maps are not of the same size! SIMPL UUID Vector size: {} Simplnx UUID Vector size: {}", m_Simpl_Uuids.size(), m_Simplnx_Uuids.size())); } for(const auto& pluginIO : plugin->getDataIOManagers()) diff --git a/src/simplnx/Core/Application.hpp b/src/simplnx/Core/Application.hpp index 25d5853476..f9cae57f7b 100644 --- a/src/simplnx/Core/Application.hpp +++ b/src/simplnx/Core/Application.hpp @@ -131,13 +131,13 @@ class SIMPLNX_EXPORT Application std::filesystem::path getCurrentDir() const; /** - * @brief Returns the Complex filter UUID [v4] from the SIMPL filter UUID [v5] + * @brief Returns the Simplnx filter UUID [v4] from the SIMPL filter UUID [v5] * @return std::optional */ - std::optional getComplexUuid(const Uuid& simplUuid); + std::optional getSimplnxUuid(const Uuid& simplUuid); /** - * @brief Returns the SIMPL filter UUID(s) [v5] from the Complex filter UUID [v4] + * @brief Returns the SIMPL filter UUID(s) [v5] from the Simplnx filter UUID [v4] * @return std::optional> */ std::vector getSimplUuid(const Uuid& simplnxUuid); @@ -184,8 +184,8 @@ class SIMPLNX_EXPORT Application // Variables std::unique_ptr m_FilterList; std::filesystem::path m_CurrentPath = ""; - std::vector m_Simpl_Uuids; // no duplicates; index must match m_Complex_Uuids - std::vector m_Complex_Uuids; // duplicate allowed conditionally; index must match m_Simpl_Uuids + std::vector m_Simpl_Uuids; // no duplicates; index must match m_Simplnx_Uuids + std::vector m_Simplnx_Uuids; // duplicate allowed conditionally; index must match m_Simpl_Uuids std::shared_ptr m_DataIOCollection; name_type_map m_NamedTypesMap; std::unique_ptr m_Preferences = nullptr; diff --git a/src/simplnx/DataStructure/IO/Generic/DataIOCollection.hpp b/src/simplnx/DataStructure/IO/Generic/DataIOCollection.hpp index e0ae9d25c0..61205652ca 100644 --- a/src/simplnx/DataStructure/IO/Generic/DataIOCollection.hpp +++ b/src/simplnx/DataStructure/IO/Generic/DataIOCollection.hpp @@ -37,7 +37,7 @@ class SIMPLNX_EXPORT DataIOCollection /** * @brief Returns the IDataIOManager for the specified format name. - * Complex comes with HDF5 IO Manager. + * Simplnx comes with HDF5 IO Manager. * Additional IDataIOManagers are added through plugins. * @param formatName * @return std::shared_ptr diff --git a/src/simplnx/DataStructure/ReadMe.md b/src/simplnx/DataStructure/ReadMe.md index ecf0ba7790..02b689dfd5 100644 --- a/src/simplnx/DataStructure/ReadMe.md +++ b/src/simplnx/DataStructure/ReadMe.md @@ -1,16 +1,19 @@ # simplnx::DataStructure ## Adding DataObject types -When adding DataObject types, additional IDataFactories need to be created for each IDataIOManager subclass. Complex provides the HDF5 version of IDataIOManager and IDataFactory, but plugins providing additional formats will need to be updated to enable reading and writing to the new types. + +When adding DataObject types, additional IDataFactories need to be created for each IDataIOManager subclass. Simplnx provides the HDF5 version of IDataIOManager and IDataFactory, but plugins providing additional formats will need to be updated to enable reading and writing to the new types. ## Adding IO formats simplnx comes with HDF5 readers and writers by default. To add additional IO formats, the plugin developer will require additional classes to tell simplnx how to read and write the DataObjects using the specified format. Required subclasses: + - IDataFactory for each concrete DataObject type - IDataIOManager for the format - * Add IDataFactory subclasses to the IO Manager + + - Add IDataFactory subclasses to the IO Manager In addition, a DataStructure reader and writer should be provided for the new format for easy IO. diff --git a/wrapping/python/CMakeLists.txt b/wrapping/python/CMakeLists.txt index fc5ea08d8b..b0a1e511a0 100644 --- a/wrapping/python/CMakeLists.txt +++ b/wrapping/python/CMakeLists.txt @@ -274,32 +274,32 @@ endforeach() #------------------------------------------------------------------------------ # Create the Sphinx based Documentation #------------------------------------------------------------------------------ -option(SIMPLNX_ENABLE_SPHINX_DOCS "Enables the Sphinx based documentation generation" OFF) -if(SIMPLNX_ENABLE_SPHINX_DOCS) +option(SIMPLNX_BUILD_PYTHON_DOCS "Enables the Sphinx based documentation generation" OFF) +if(SIMPLNX_BUILD_PYTHON_DOCS) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/docs ${simplnx_BINARY_DIR}/sphinx_docs) endif() #------------------------------------------------------------------------------ # Create the Python Unit tests #------------------------------------------------------------------------------ -option(COMPLEX_ENABLE_PYTHON_TESTS "Enables python based unit tests" OFF) -if(COMPLEX_ENABLE_PYTHON_TESTS) +option(SIMPLNX_BUILD_PYTHON_TESTS "Enables python based unit tests" OFF) +if(SIMPLNX_BUILD_PYTHON_TESTS) - file(READ ${complex_SOURCE_DIR}/wrapping/python/complex_test_dirs.in.py COMPLEX_TEST_DIRS_FILE) + file(READ ${simplnx_SOURCE_DIR}/wrapping/python/simplnx_test_dirs.in.py SIMPLNX_TEST_DIRS_FILE) - string(REPLACE "\${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" $ COMPLEX_TEST_DIRS_FILE ${COMPLEX_TEST_DIRS_FILE}) - string(REPLACE "\${complex_BINARY_DIR}" ${complex_BINARY_DIR} COMPLEX_TEST_DIRS_FILE ${COMPLEX_TEST_DIRS_FILE}) - string(REPLACE "\${DREAM3D_DATA_DIR}" ${DREAM3D_DATA_DIR} COMPLEX_TEST_DIRS_FILE ${COMPLEX_TEST_DIRS_FILE}) - string(REPLACE "\${complex_SOURCE_DIR}" ${complex_SOURCE_DIR} COMPLEX_TEST_DIRS_FILE ${COMPLEX_TEST_DIRS_FILE}) + string(REPLACE "\${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" $ SIMPLNX_TEST_DIRS_FILE ${SIMPLNX_TEST_DIRS_FILE}) + string(REPLACE "\${simplnx_BINARY_DIR}" ${simplnx_BINARY_DIR} SIMPLNX_TEST_DIRS_FILE ${SIMPLNX_TEST_DIRS_FILE}) + string(REPLACE "\${DREAM3D_DATA_DIR}" ${DREAM3D_DATA_DIR} SIMPLNX_TEST_DIRS_FILE ${SIMPLNX_TEST_DIRS_FILE}) + string(REPLACE "\${simplnx_SOURCE_DIR}" ${simplnx_SOURCE_DIR} SIMPLNX_TEST_DIRS_FILE ${SIMPLNX_TEST_DIRS_FILE}) file(GENERATE - OUTPUT "$/complex_test_dirs.py" - CONTENT ${COMPLEX_TEST_DIRS_FILE} + OUTPUT "$/simplnx_test_dirs.py" + CONTENT ${SIMPLNX_TEST_DIRS_FILE} ) - set(PYTHON_TEST_INPUT_DIR "${complex_SOURCE_DIR}/wrapping/python/examples") + set(PYTHON_TEST_INPUT_DIR "${simplnx_SOURCE_DIR}/wrapping/python/examples") - set(COMPLEX_PYTHON_TESTS + set(SIMPLNX_PYTHON_TESTS "angle_conversion" "basic_arrays" "basic_ebsd_ipf" @@ -315,9 +315,9 @@ if(COMPLEX_ENABLE_PYTHON_TESTS) # "read_esprit_data" ) - CreatePythonTests(PREFIX "PY_COMPLEX" + CreatePythonTests(PREFIX "PY_SIMPLNX" INPUT_DIR ${PYTHON_TEST_INPUT_DIR} - TEST_NAMES ${COMPLEX_PYTHON_TESTS} + TEST_NAMES ${SIMPLNX_PYTHON_TESTS} ) endif() diff --git a/wrapping/python/ReadMe.md b/wrapping/python/ReadMe.md index ef56ea66c1..9b808801bf 100644 --- a/wrapping/python/ReadMe.md +++ b/wrapping/python/ReadMe.md @@ -1,4 +1,4 @@ -# Complex Python Information +# Simplnx Python Information ## Checklist when updating Python Bindings @@ -98,6 +98,6 @@ Ensure you are building the python bindings. ```shell SIMPLNX_BUILD_PYTHON=ON SIMPLNX_EMBED_PYTHON=OFF -SIMPLNX_ENABLE_SPHINX_DOCS=ON +SIMPLNX_BUILD_PYTHON_DOCS=ON Python3_EXECUTABLE=/path/to/python ``` diff --git a/wrapping/python/docs/CMakeLists.txt b/wrapping/python/docs/CMakeLists.txt index 67a3d5e91a..a7bc651dd5 100644 --- a/wrapping/python/docs/CMakeLists.txt +++ b/wrapping/python/docs/CMakeLists.txt @@ -51,7 +51,7 @@ add_custom_target(sphinx_copy_sources ALL DEPENDS generate_sphinx_docs COMMAND ${CMAKE_COMMAND} -E remove_directory "${SIMPLNX_SPHINX_DOCS_DIR}/source" COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/source" "${SIMPLNX_SPHINX_DOCS_DIR}/source" - COMMENT "COMPLEX Python Docs: Copying static doc files to build directory at ${SIMPLNX_SPHINX_DOCS_DIR}" + COMMENT "SIMPLNX Python Docs: Copying static doc files to build directory at ${SIMPLNX_SPHINX_DOCS_DIR}" ) #------------------------------------------------------------------------------ @@ -60,7 +60,7 @@ add_custom_target(sphinx_copy_sources ALL add_custom_target(sphinx_generate_plugin_rst ALL DEPENDS sphinx_copy_sources COMMAND "$" - COMMENT "COMPLEX Python Docs: Generated Plugin .rst docs file" + COMMENT "SIMPLNX Python Docs: Generated Plugin .rst docs file" ) #------------------------------------------------------------------------------ @@ -91,7 +91,7 @@ if(WIN32) DEPENDS sphinx_generate_plugin_rst COMMAND "${SPHINX_MAKE_BAT_FILE}" clean COMMAND "${SPHINX_MAKE_BAT_FILE}" html - COMMENT "COMPLEX Python Docs: Generating Python HTML Documentation" + COMMENT "SIMPLNX Python Docs: Generating Python HTML Documentation" WORKING_DIRECTORY "${SIMPLNX_SPHINX_DOCS_DIR}" ) else() @@ -99,7 +99,7 @@ else() DEPENDS sphinx_generate_plugin_rst COMMAND "/usr/bin/make" clean COMMAND "/usr/bin/make" html - COMMENT "COMPLEX Python Docs: Generating Python HTML Documentation" + COMMENT "SIMPLNX Python Docs: Generating Python HTML Documentation" WORKING_DIRECTORY "${SIMPLNX_SPHINX_DOCS_DIR}" ) endif() diff --git a/wrapping/python/docs/source/Overview.rst b/wrapping/python/docs/source/Overview.rst index e4ec52a525..e64b35d848 100644 --- a/wrapping/python/docs/source/Overview.rst +++ b/wrapping/python/docs/source/Overview.rst @@ -183,7 +183,7 @@ then the new data will be incorporated into the existing data structure. Or, if data structure yet exists (e.g, starting from a “blank slate”), a new one will be created. -.. py:class:: complex.IFilter +.. py:class:: simplnx.IFilter This class holds an instantiation of a DREAM3D-NX filter. The filter can be preflighted, executed or just held for later execution. @@ -205,15 +205,15 @@ created. .. py:method:: execute() - :return: A complex.IFilter.Result object that contains any warnings or errors + :return: A simplnx.IFilter.Result object that contains any warnings or errors that were encountered during the execution of the filter. - :rtype: complex.IFilter.Result + :rtype: simplnx.IFilter.Result .. py:method:: preflight() - :return: A complex.IFilter.Result object that contains any warnings or errors + :return: A simplnx.IFilter.Result object that contains any warnings or errors that were encountered during the preflight of the filter. - :rtype: complex.IFilter.Result + :rtype: simplnx.IFilter.Result .. code:: python diff --git a/wrapping/python/docs/source/Python_Introduction.rst b/wrapping/python/docs/source/Python_Introduction.rst index c5ba532f77..2489594514 100644 --- a/wrapping/python/docs/source/Python_Introduction.rst +++ b/wrapping/python/docs/source/Python_Introduction.rst @@ -192,7 +192,7 @@ The filter will write the **complete** contents of the DataStructure to the HDF5 print("No errors running the filter") -Creating Geometries in Complex +Creating Geometries in Simplnx ------------------------------ Each of the supported **Geometry** objects can be created using the :ref:`simplnx.CreateGeometryFilter.Execute() ` diff --git a/wrapping/python/examples/angle_conversion.py b/wrapping/python/examples/angle_conversion.py index eaa49a59fc..f0267529f1 100644 --- a/wrapping/python/examples/angle_conversion.py +++ b/wrapping/python/examples/angle_conversion.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,25 +28,25 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # ------------------------------------------------------------------------------ @@ -62,7 +62,7 @@ tuple_dimensions=[[99]], output_data_array=array_path, initialization_value='0') -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) # Get a numpy.view into the newly created DataArray @@ -73,19 +73,19 @@ npdata = data_store.npview() # Read the CSV file into the DataArray using the numpy view -file_path = cxtest.GetComplexPythonSourceDir() + '/examples/angles.csv' +file_path = nxtest.GetSimplnxPythonSourceDir() + '/examples/angles.csv' npdata[:] = np.loadtxt(file_path, delimiter=',') # ------------------------------------------------------------------------------ # Run the ConvertOrientation Filter to convert the Eulers to Quaternions # ------------------------------------------------------------------------------ quat_path = nx.DataPath(['Quaternions']) -result = cxor.ConvertOrientations.execute(data_structure=data_structure, +result = nxor.ConvertOrientations.execute(data_structure=data_structure, input_orientation_array_path=array_path, input_type=0, output_orientation_array_name='Quaternions', output_type=2) -cxtest.check_filter_result(cxor.ConvertOrientations, result) +nxtest.check_filter_result(nxor.ConvertOrientations, result) # Get the Quaternions and print them out. diff --git a/wrapping/python/examples/basic_arrays.py b/wrapping/python/examples/basic_arrays.py index 2c4abbb6ef..54bba9096f 100644 --- a/wrapping/python/examples/basic_arrays.py +++ b/wrapping/python/examples/basic_arrays.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,25 +28,25 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # Create a Data Structure data_structure = nx.DataStructure() @@ -54,14 +54,14 @@ #------------------------------------------------------------------------------ # Create a top level group: (Not needed) #------------------------------------------------------------------------------ -result = cx.CreateDataGroup.execute(data_structure=data_structure, - data_object_path=cx.DataPath(['Group'])) -cxtest.check_filter_result(cx.CreateDataGroup, result) +result = nx.CreateDataGroup.execute(data_structure=data_structure, + data_object_path=nx.DataPath(['Group'])) +nxtest.check_filter_result(nx.CreateDataGroup, result) -result = cx.CreateDataGroup.execute(data_structure=data_structure, - data_object_path=cx.DataPath("/Some/Path/To/Group")); -cxtest.check_filter_result(cx.CreateDataGroup, result) +result = nx.CreateDataGroup.execute(data_structure=data_structure, + data_object_path=nx.DataPath("/Some/Path/To/Group")); +nxtest.check_filter_result(nx.CreateDataGroup, result) #------------------------------------------------------------------------------ @@ -79,7 +79,7 @@ numeric_type=array_type, output_data_array=output_array_path, tuple_dimensions=tuple_dims) -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) # We can check the output of the filter by simply printing the array @@ -102,7 +102,7 @@ numeric_type=array_type, output_data_array=output_array_path, tuple_dimensions=tuple_dims) -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) data_array = data_structure[output_array_path] @@ -131,7 +131,7 @@ numeric_type=array_type, output_data_array=output_array_path, tuple_dimensions=tuple_dims) -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) npdata = data_structure[output_array_path].npview() @@ -140,15 +140,15 @@ result = nx.CreateAttributeMatrixFilter.execute(data_structure=data_structure, data_object_path=nx.DataPath(["New Attribute Matrix"]), tuple_dimensions = [[100., 200., 300.]]) -cxtest.check_filter_result(cx.CreateAttributeMatrixFilter, result) +nxtest.check_filter_result(nx.CreateAttributeMatrixFilter, result) -output_file_path = cxtest.GetTestTempDirectory() + "/output_file_example.dream3d" -result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, +output_file_path = nxtest.GetTestTempDirectory() + "/output_file_example.dream3d" +result = nx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) -cxtest.check_filter_result(cx.WriteDREAM3DFilter, result) +nxtest.check_filter_result(nx.WriteDREAM3DFilter, result) diff --git a/wrapping/python/examples/basic_ebsd_ipf.py b/wrapping/python/examples/basic_ebsd_ipf.py index d711f70111..eca12cba88 100644 --- a/wrapping/python/examples/basic_ebsd_ipf.py +++ b/wrapping/python/examples/basic_ebsd_ipf.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,25 +28,25 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() #------------------------------------------------------------------------------ # Create a Data Structure @@ -54,21 +54,21 @@ data_structure = nx.DataStructure() # Import an EBSD Data file -result = cxor.ReadAngDataFilter.execute(data_structure=data_structure, +result = nxor.ReadAngDataFilter.execute(data_structure=data_structure, cell_attribute_matrix_name="Scan Data", cell_ensemble_attribute_matrix_name="Phase Data", - data_container_name=cx.DataPath(["Small IN100"]), - input_file=cxtest.GetBuildDirectory() + "/Data/Small_IN100/Slice_1.ang") + data_container_name=nx.DataPath(["Small IN100"]), + input_file=nxtest.GetBuildDirectory() + "/Data/Small_IN100/Slice_1.ang") -cxtest.check_filter_result(cxor.ReadAngDataFilter, result) +nxtest.check_filter_result(nxor.ReadAngDataFilter, result) #------------------------------------------------------------------------------ # Rotate the Euler Reference Frame #------------------------------------------------------------------------------ -result = cxor.RotateEulerRefFrameFilter.execute(data_structure=data_structure, +result = nxor.RotateEulerRefFrameFilter.execute(data_structure=data_structure, euler_angles_array_path=nx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), rotation_axis=[0,0,1,90]) -cxtest.check_filter_result(cxor.RotateEulerRefFrameFilter, result) +nxtest.check_filter_result(nxor.RotateEulerRefFrameFilter, result) #------------------------------------------------------------------------------ # Rotate the Sample Reference Frame 180@010 @@ -82,7 +82,7 @@ selected_image_geometry=nx.DataPath(["Small IN100"]), #rotation_matrix=[[1,0,0],[0,1,0],[0,0,1]] ) -cxtest.check_filter_result(cx.RotateSampleRefFrameFilter, result) +nxtest.check_filter_result(nx.RotateSampleRefFrameFilter, result) #------------------------------------------------------------------------------ @@ -105,14 +105,14 @@ result = nx.MultiThresholdObjects.execute(data_structure=data_structure, array_thresholds=threshold_set, created_data_path="Mask", - created_mask_type=cx.DataType.boolean) -cxtest.check_filter_result(cx.MultiThresholdObjects, result) + created_mask_type=nx.DataType.boolean) +nxtest.check_filter_result(nx.MultiThresholdObjects, result) #------------------------------------------------------------------------------ # Generate the IPF Colors for the <001> direction #------------------------------------------------------------------------------ -result = cxor.GenerateIPFColorsFilter.execute( data_structure=data_structure, +result = nxor.GenerateIPFColorsFilter.execute( data_structure=data_structure, cell_euler_angles_array_path=nx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), cell_ipf_colors_array_name="IPFColors", cell_phases_array_path=nx.DataPath(["Small IN100", "Scan Data", "Phases"]), @@ -121,20 +121,20 @@ reference_dir=[0,0,1], use_mask=True ) -cxtest.check_filter_result(cxor.GenerateIPFColorsFilter, result) +nxtest.check_filter_result(nxor.GenerateIPFColorsFilter, result) #------------------------------------------------------------------------------ # Write the IPF colors to a PNG file #------------------------------------------------------------------------------ -result = cxitk.ITKImageWriter.execute(data_structure=data_structure, - file_name=cxtest.GetTestTempDirectory() + "/Small_IN100_IPF_Z.png", - image_array_path=cx.DataPath(["Small IN100", "Scan Data", "IPFColors"]), - image_geom_path=cx.DataPath(["Small IN100"]), +result = nxitk.ITKImageWriter.execute(data_structure=data_structure, + file_name=nxtest.GetTestTempDirectory() + "/Small_IN100_IPF_Z.png", + image_array_path=nx.DataPath(["Small IN100", "Scan Data", "IPFColors"]), + image_geom_path=nx.DataPath(["Small IN100"]), index_offset=0, plane=0) -cxtest.check_filter_result(cxitk.ITKImageWriter, result) +nxtest.check_filter_result(nxitk.ITKImageWriter, result) # #------------------------------------------------------------------------------ # # Show the IPFColors using MatPlotLib @@ -161,14 +161,14 @@ output_rgb_array_name="CI Color", selected_data_array_path=nx.DataPath(["Small IN100", "Scan Data", "Confidence Index"]), selected_preset=color_control_points) -cxtest.check_filter_result(cx.GenerateColorTableFilter, result) +nxtest.check_filter_result(nx.GenerateColorTableFilter, result) #------------------------------------------------------------------------------ # Create a Pole Figure #------------------------------------------------------------------------------ prefix = "Small_IN100_" -result = cxor.WritePoleFigureFilter.execute(data_structure=data_structure, +result = nxor.WritePoleFigureFilter.execute(data_structure=data_structure, cell_euler_angles_array_path=nx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), cell_phases_array_path=nx.DataPath(["Small IN100", "Scan Data", "Phases"]), crystal_structures_array_path=nx.DataPath(["Small IN100", "Phase Data", "CrystalStructures"]), @@ -181,12 +181,12 @@ lambert_size=64, material_name_array_path=nx.DataPath(["Small IN100", "Phase Data", "MaterialName"]), num_colors=32, - output_path=cxtest.GetTestTempDirectory() + "/small_in100_pole_figure", + output_path=nxtest.GetTestTempDirectory() + "/small_in100_pole_figure", save_as_image_geometry=True, title="Small IN100 Slice 1", use_mask=True, write_image_to_disk=True) -cxtest.check_filter_result(cxor.WritePoleFigureFilter, result) +nxtest.check_filter_result(nxor.WritePoleFigureFilter, result) @@ -194,8 +194,8 @@ # Write the DataStructure to a .dream3d file #------------------------------------------------------------------------------ -output_file_path = cxtest.GetTestTempDirectory() + "/basic_ebsd_example.dream3d" -result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, +output_file_path = nxtest.GetTestTempDirectory() + "/basic_ebsd_example.dream3d" +result = nx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) -cxtest.check_filter_result(cx.WriteDREAM3DFilter, result) +nxtest.check_filter_result(nx.WriteDREAM3DFilter, result) diff --git a/wrapping/python/examples/basic_numpy.py b/wrapping/python/examples/basic_numpy.py index 33e0d061e6..09f8014a4a 100644 --- a/wrapping/python/examples/basic_numpy.py +++ b/wrapping/python/examples/basic_numpy.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,15 +28,15 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx -import complex_test_dirs as cxtest +import simplnx as nx +import simplnx_test_dirs as nxtest import numpy as np @@ -74,8 +74,8 @@ radians_data = np.radians(degrees_data) # Run a D3D filter to convert back to degrees -result = cx.ChangeAngleRepresentation.execute(data_structure, conversion_type=0, angles_array_path=array_path) -cxtest.check_filter_result(cx.ChangeAngleRepresentation, result) +result = nx.ChangeAngleRepresentation.execute(data_structure, conversion_type=0, angles_array_path=array_path) +nxtest.check_filter_result(nx.ChangeAngleRepresentation, result) # compare the 2 arrays assert np.array_equal(npdata, radians_data) diff --git a/wrapping/python/examples/create_ensemble_info.py b/wrapping/python/examples/create_ensemble_info.py index 52a955afb6..1bd25c1157 100644 --- a/wrapping/python/examples/create_ensemble_info.py +++ b/wrapping/python/examples/create_ensemble_info.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,25 +28,25 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # Create a Data Structure data_structure = nx.DataStructure() @@ -55,7 +55,7 @@ ensemble_info_parameter.append(["Hexagonal-High 6/mmm","Primary","Phase 1"]) ensemble_info_parameter.append(["Cubic-High m-3m","Primary","Phase 2"]) -create_ensemble_info = cxor.CreateEnsembleInfoFilter() +create_ensemble_info = nxor.CreateEnsembleInfoFilter() result = create_ensemble_info.execute(data_structure=data_structure, cell_ensemble_attribute_matrix_name=nx.DataPath(["Phase Information"]), crystal_structures_array_name="CrystalStructures", @@ -63,4 +63,4 @@ phase_types_array_name="Primary", ensemble=ensemble_info_parameter ) -cxtest.check_filter_result(cxor.CreateEnsembleInfoFilter, result) +nxtest.check_filter_result(nxor.CreateEnsembleInfoFilter, result) diff --git a/wrapping/python/examples/generated_file_list.py b/wrapping/python/examples/generated_file_list.py index ce701041e9..9bb7aad0f8 100644 --- a/wrapping/python/examples/generated_file_list.py +++ b/wrapping/python/examples/generated_file_list.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,34 +28,34 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pre-generated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # Create a Data Structure data_structure = nx.DataStructure() -generated_file_list_value = cx.GeneratedFileListParameter.ValueType() -generated_file_list_value.input_path = cxtest.GetBuildDirectory() + "/Data/Porosity_Image" -generated_file_list_value.ordering = cx.GeneratedFileListParameter.Ordering.LowToHigh +generated_file_list_value = nx.GeneratedFileListParameter.ValueType() +generated_file_list_value.input_path = nxtest.GetBuildDirectory() + "/Data/Porosity_Image" +generated_file_list_value.ordering = nx.GeneratedFileListParameter.Ordering.LowToHigh generated_file_list_value.file_prefix = "slice_" generated_file_list_value.file_suffix = "" @@ -65,7 +65,7 @@ generated_file_list_value.increment_index = 1 generated_file_list_value.padding_digits = 2 -result = cxitk.ITKImportImageStack.execute(data_structure=data_structure, +result = nxitk.ITKImportImageStack.execute(data_structure=data_structure, cell_data_name="Cell Data", image_data_array_path="Image Data", image_geometry_path=nx.DataPath(["Image Stack"]), @@ -73,4 +73,4 @@ input_file_list_info=generated_file_list_value, origin=[0., 0., 0.], spacing=[1., 1.,1.]) -cxtest.check_filter_result(cxitk.ITKImportImageStack, result) +nxtest.check_filter_result(nxitk.ITKImportImageStack, result) diff --git a/wrapping/python/examples/geometry_examples.py b/wrapping/python/examples/geometry_examples.py index 9f69e927eb..32a4b9e03e 100644 --- a/wrapping/python/examples/geometry_examples.py +++ b/wrapping/python/examples/geometry_examples.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,25 +28,25 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() """ In the code below we are using some data files that are found in the simplnx @@ -65,7 +65,7 @@ geometry_type=0, # 0 = Image Geometry origin=[0.0, 0.0, 0.0], spacing=[1.0, 1.0, 1.0]) -cxtest.check_filter_result(cx.CreateGeometryFilter, result) +nxtest.check_filter_result(nx.CreateGeometryFilter, result) data_object = data_structure["Image Geometry"] @@ -86,7 +86,7 @@ result = create_array_filter.execute(data_structure=data_structure, component_count=1, data_format="", initialization_value="10", numeric_type=array_type, output_data_array=output_array_path) -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) # ------------------------------------------------------------------------------ @@ -112,7 +112,7 @@ numeric_type=array_type, output_data_array=output_array_path, tuple_dimensions=tuple_dims) -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) x_coords = data_structure[output_array_path].npview() @@ -130,7 +130,7 @@ numeric_type=array_type, output_data_array=output_array_path, tuple_dimensions=tuple_dims) -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) y_coords = data_structure[output_array_path].npview() @@ -148,7 +148,7 @@ numeric_type=array_type, output_data_array=output_array_path, tuple_dimensions=tuple_dims) -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) z_coords = data_structure[output_array_path].npview() @@ -164,7 +164,7 @@ y_bounds=nx.DataPath("RectGridCoords/Y Coords"), z_bounds=nx.DataPath("RectGridCoords/Z Coords") ) -cxtest.check_filter_result(cx.CreateGeometryFilter, result) +nxtest.check_filter_result(nx.CreateGeometryFilter, result) rect_grid_geom = data_structure["RectGrid Geometry"] @@ -186,12 +186,12 @@ tuple_dimensions=[[144]], output_data_array=array_path, initialization_value='0') -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) # Read the CSV file into the DataArray using the numpy view vertex_coords = data_structure[array_path].npview() -file_path = cxtest.GetComplexSourceDir() + '/test/Data/VertexCoordinates.csv' +file_path = nxtest.GetSimplnxSourceDir() + '/test/Data/VertexCoordinates.csv' vertex_coords[:] = np.loadtxt(file_path, delimiter=',', skiprows=1) array_path = nx.DataPath('Triangles') @@ -201,11 +201,11 @@ tuple_dimensions=[[242]], output_data_array=array_path, initialization_value='0') -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) # Read the CSV file into the DataArray using the numpy view triangles = data_structure[array_path].npview() -file_path = cxtest.GetComplexSourceDir() + '/test/Data/TriangleConnectivity.csv' +file_path = nxtest.GetSimplnxSourceDir() + '/test/Data/TriangleConnectivity.csv' triangles[:] = np.loadtxt(file_path, delimiter=',', skiprows=1) result = nx.CreateGeometryFilter.execute(data_structure=data_structure, @@ -218,7 +218,7 @@ vertex_list_name=nx.DataPath('Vertices'), triangle_list_name=nx.DataPath('Triangles') ) -cxtest.check_filter_result(cx.CreateGeometryFilter, result) +nxtest.check_filter_result(nx.CreateGeometryFilter, result) # ------------------------------------------------------------------------------ @@ -232,12 +232,12 @@ tuple_dimensions=[[144]], output_data_array=array_path, initialization_value='0') -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) # Read the CSV file into the DataArray using the numpy view vertex_coords = data_structure[array_path].npview() -file_path = cxtest.GetComplexSourceDir() + '/test/Data/VertexCoordinates.csv' +file_path = nxtest.GetSimplnxSourceDir() + '/test/Data/VertexCoordinates.csv' vertex_coords[:] = np.loadtxt(file_path, delimiter=',', skiprows=1) array_path = nx.DataPath('Edges') @@ -247,11 +247,11 @@ tuple_dimensions=[[264]], output_data_array=array_path, initialization_value='0') -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) # Read the CSV file into the DataArray using the numpy view -file_path = cxtest.GetComplexSourceDir() + '/test/Data/EdgeConnectivity.csv' +file_path = nxtest.GetSimplnxSourceDir() + '/test/Data/EdgeConnectivity.csv' edges_view = data_structure["Edges"].npview() edges_view[:] = np.loadtxt(file_path, delimiter=',', skiprows=1) @@ -264,11 +264,11 @@ vertex_list_name=nx.DataPath('Vertices'), edge_list_name=nx.DataPath('Edges') ) -cxtest.check_filter_result(cx.CreateGeometryFilter, result) +nxtest.check_filter_result(nx.CreateGeometryFilter, result) -output_file_path = cxtest.GetTestTempDirectory() + "/geometry_examples.dream3d" -result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, +output_file_path = nxtest.GetTestTempDirectory() + "/geometry_examples.dream3d" +result = nx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) -cxtest.check_filter_result(cx.WriteDREAM3DFilter, result) +nxtest.check_filter_result(nx.WriteDREAM3DFilter, result) diff --git a/wrapping/python/examples/import_d3d.py b/wrapping/python/examples/import_d3d.py index d68f0cbc5c..b64478bebc 100644 --- a/wrapping/python/examples/import_d3d.py +++ b/wrapping/python/examples/import_d3d.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,37 +28,37 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # Create the DataStructure object data_structure = nx.DataStructure() -import_data = cx.Dream3dImportParameter.ImportData() -import_data.file_path = cxtest.GetTestTempDirectory() + "/basic_ebsd_example.dream3d" +import_data = nx.Dream3dImportParameter.ImportData() +import_data.file_path = nxtest.GetTestTempDirectory() + "/basic_ebsd_example.dream3d" import_data.data_paths = None # Use 'None' to import the entire file. print(f'{import_data.file_path}') -result = cx.ReadDREAM3DFilter.execute(data_structure=data_structure, import_file_data=import_data) -cxtest.check_filter_result(cx.ReadDREAM3DFilter, result) +result = nx.ReadDREAM3DFilter.execute(data_structure=data_structure, import_file_data=import_data) +nxtest.check_filter_result(nx.ReadDREAM3DFilter, result) #------------------------------------------------------------------------------ # Print out the children of some of the Attribute Matrix groups @@ -83,9 +83,9 @@ #------------------------------------------------------------------------------ # Write the DataStructure to a .dream3d file #------------------------------------------------------------------------------ -output_file_path = cxtest.GetTestTempDirectory() + "/import_data.dream3d" -result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, +output_file_path = nxtest.GetTestTempDirectory() + "/import_data.dream3d" +result = nx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) -cxtest.check_filter_result(cx.WriteDREAM3DFilter, result) +nxtest.check_filter_result(nx.WriteDREAM3DFilter, result) diff --git a/wrapping/python/examples/import_hdf5.py b/wrapping/python/examples/import_hdf5.py index f52c6d0d06..8c6e5f7cd3 100644 --- a/wrapping/python/examples/import_hdf5.py +++ b/wrapping/python/examples/import_hdf5.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,31 +28,31 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import simplnx as nx +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # Create the DataStructure object data_structure = nx.DataStructure() # Create the ReadH5EbsdFileParameter and assign values to it. -h5ebsdParameter = cxor.ReadH5EbsdFileParameter.ValueType() +h5ebsdParameter = nxor.ReadH5EbsdFileParameter.ValueType() h5ebsdParameter.euler_representation=0 h5ebsdParameter.end_slice=117 h5ebsdParameter.selected_array_names=["Confidence Index", "EulerAngles", "Fit", "Image Quality", "Phases", "SEM Signal", "X Position", "Y Position"] @@ -61,7 +61,7 @@ h5ebsdParameter.use_recommended_transform=True # Execute Filter with Parameters -result = cxor.ReadH5EbsdFilter.execute( +result = nxor.ReadH5EbsdFilter.execute( data_structure=data_structure, cell_attribute_matrix_name="CellData", cell_ensemble_attribute_matrix_name="CellEnsembleData", @@ -69,22 +69,22 @@ read_h5_ebsd_parameter=h5ebsdParameter ) -dataset1 = cx.ReadHDF5DatasetParameter.DatasetImportInfo() +dataset1 = nx.ReadHDF5DatasetParameter.DatasetImportInfo() dataset1.dataset_path = "/DataStructure/Small IN100/Scan Data/Confidence Index" dataset1.tuple_dims = "1,201,189" dataset1.component_dims = "1" -dataset2 = cx.ReadHDF5DatasetParameter.DatasetImportInfo() +dataset2 = nx.ReadHDF5DatasetParameter.DatasetImportInfo() dataset2.dataset_path = "/DataStructure/Small IN100/Scan Data/EulerAngles" dataset2.tuple_dims = "1,201,189" dataset2.component_dims = "3" -import_hdf5_param = cx.ReadHDF5DatasetParameter.ValueType() -import_hdf5_param.input_file = cxtest.GetTestTempDirectory() + "/basic_ebsd_example.dream3d" +import_hdf5_param = nx.ReadHDF5DatasetParameter.ValueType() +import_hdf5_param.input_file = nxtest.GetTestTempDirectory() + "/basic_ebsd_example.dream3d" import_hdf5_param.datasets = [dataset1, dataset2] # import_hdf5_param.parent = nx.DataPath(["Imported Data"]) result = nx.ReadHDF5Dataset.execute(data_structure=data_structure, import_hd_f5_file=import_hdf5_param ) -cxtest.check_filter_result(cx.ReadHDF5Dataset, result) +nxtest.check_filter_result(nx.ReadHDF5Dataset, result) diff --git a/wrapping/python/examples/output_file.py b/wrapping/python/examples/output_file.py index 834bdde81d..4d900dcb34 100644 --- a/wrapping/python/examples/output_file.py +++ b/wrapping/python/examples/output_file.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,25 +28,25 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # Let's get a data array created to have something to write. @@ -61,14 +61,14 @@ create_array_filter = nx.CreateDataArray() result = create_array_filter.execute(data_structure=data_structure, component_count=1, data_format="", initialization_value="10", numeric_type=array_type, output_data_array=output_array_path, tuple_dimensions=tuple_dims) -cxtest.check_filter_result(cx.CreateDataArray, result) +nxtest.check_filter_result(nx.CreateDataArray, result) npdata = data_structure[output_array_path].npview() print(npdata) -output_file_path = cxtest.GetTestTempDirectory() + "/output_file_example.dream3d" -result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, +output_file_path = nxtest.GetTestTempDirectory() + "/output_file_example.dream3d" +result = nx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) -cxtest.check_filter_result(cx.WriteDREAM3DFilter, result) +nxtest.check_filter_result(nx.WriteDREAM3DFilter, result) diff --git a/wrapping/python/examples/pipeline.py b/wrapping/python/examples/pipeline.py index 3a88f7fb98..b9a9305add 100644 --- a/wrapping/python/examples/pipeline.py +++ b/wrapping/python/examples/pipeline.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,31 +28,31 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() -data_structure = cx.DataStructure() +data_structure = nx.DataStructure() -pipeline = cx.Pipeline().from_file(cxtest.GetComplexSourceDir() + '/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline') +pipeline = nx.Pipeline().from_file(nxtest.GetSimplnxSourceDir() + '/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline') -pipeline.to_file( "test pipeline", cxtest.GetTestTempDirectory() + "/python_pipeline.d3dpipeline") +pipeline.to_file( "test pipeline", nxtest.GetTestTempDirectory() + "/python_pipeline.d3dpipeline") diff --git a/wrapping/python/examples/read_csv_file.py b/wrapping/python/examples/read_csv_file.py index 0587327b72..f7521fd9d5 100644 --- a/wrapping/python/examples/read_csv_file.py +++ b/wrapping/python/examples/read_csv_file.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,30 +28,30 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import simplnx as nx +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # Create the DataStructure object data_structure = nx.DataStructure() # This file has 7 columns to import -read_csv_data = cx.ReadCSVDataParameter() -read_csv_data.input_file_path = cxtest.GetComplexPythonSourceDir() + "/examples/test_csv_data.csv" +read_csv_data = nx.ReadCSVDataParameter() +read_csv_data.input_file_path = nxtest.GetSimplnxPythonSourceDir() + "/examples/test_csv_data.csv" read_csv_data.start_import_row = 2 read_csv_data.delimiters = [','] read_csv_data.custom_headers = [] @@ -72,4 +72,4 @@ # The ReadCSVData object with all member variables set. read_csv_data=read_csv_data # The ReadCSVData object with all member variables set. ) -cxtest.check_filter_result(cx.ReadCSVFileFilter, result) +nxtest.check_filter_result(nx.ReadCSVFileFilter, result) diff --git a/wrapping/python/examples/read_esprit_data.py b/wrapping/python/examples/read_esprit_data.py index e43c9bd2af..6140b3ab3e 100644 --- a/wrapping/python/examples/read_esprit_data.py +++ b/wrapping/python/examples/read_esprit_data.py @@ -13,7 +13,7 @@ .. code:: python - import complex_test_dirs as cxtest + import simplnx_test_dirs as nxtest Filter Error Detection ---------------------- @@ -28,25 +28,25 @@ .. code:: python - cxtest.check_filter_result(cxor.ReadAngDataFilter, result) + nxtest.check_filter_result(nxor.ReadAngDataFilter, result) is used by the simplnx unit testing framework and should be replaced by your own error checking code. You are welcome to look up the function definition and use that. """ -import complex as cx +import simplnx as nx -import itkimageprocessing as cxitk -import orientationanalysis as cxor -import complex_test_dirs as cxtest +import itkimageprocessing as nxitk +import orientationanalysis as nxor +import simplnx_test_dirs as nxtest import numpy as np #------------------------------------------------------------------------------ # Print the various filesystem paths that are pregenerated for this machine. #------------------------------------------------------------------------------ -cxtest.print_all_paths() +nxtest.print_all_paths() # ------------------------------------------------------------------------------ @@ -55,12 +55,12 @@ # Create a Data Structure data_structure = nx.DataStructure() -param1 = cxor.OEMEbsdScanSelectionParameter.ValueType() +param1 = nxor.OEMEbsdScanSelectionParameter.ValueType() param1.input_file_path = "LEROY_0089_Section_382.h5" param1.stacking_order = 0 param1.scan_names = ["LEROY_0089_Section_382"] -result = cxor.ReadH5EspritDataFilter.execute(data_structure = data_structure, +result = nxor.ReadH5EspritDataFilter.execute(data_structure = data_structure, cell_attribute_matrix_name = "Cell Data", cell_ensemble_attribute_matrix_name = "Cell Ensemble Data", degrees_to_radians = True, @@ -70,13 +70,13 @@ selected_scan_names = param1, z_spacing = 1.0) -cxtest.check_filter_result(cxor.ReadH5EspritDataFilter, result) +nxtest.check_filter_result(nxor.ReadH5EspritDataFilter, result) #------------------------------------------------------------------------------ # Write the DataStructure to a .dream3d file #------------------------------------------------------------------------------ -output_file_path = cxtest.GetTestTempDirectory() + "/import_esprit.dream3d" +output_file_path = nxtest.GetTestTempDirectory() + "/import_esprit.dream3d" result = nx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) -cxtest.check_filter_result(cx.WriteDREAM3DFilter, result) +nxtest.check_filter_result(nx.WriteDREAM3DFilter, result) diff --git a/wrapping/python/complex_test_dirs.in.py b/wrapping/python/simplnx_test_dirs.in.py similarity index 73% rename from wrapping/python/complex_test_dirs.in.py rename to wrapping/python/simplnx_test_dirs.in.py index e1a6881026..932c16282a 100644 --- a/wrapping/python/complex_test_dirs.in.py +++ b/wrapping/python/simplnx_test_dirs.in.py @@ -7,9 +7,9 @@ ''' -import complex as cx +import simplnx as sx -def check_filter_result(filter: cx.IFilter, result: cx.IFilter.ExecuteResult): +def check_filter_result(filter: sx.IFilter, result: sx.IFilter.ExecuteResult): if len(result.warnings) != 0: print(f'{filter.name()} :: Warnings: {result.warnings}') @@ -25,19 +25,19 @@ def GetBuildDirectory(): return '${CMAKE_LIBRARY_OUTPUT_DIRECTORY}' def GetTestDirectory(): - return '${complex_BINARY_DIR}/Testing' + return '${simplnx_BINARY_DIR}/Testing' def GetTestTempDirectory(): - return '${complex_BINARY_DIR}/Testing/Temporary' + return '${simplnx_BINARY_DIR}/Testing/Temporary' def GetDataDirectory(): return '${DREAM3D_DATA_DIR}' -def GetComplexPythonSourceDir(): - return '${complex_SOURCE_DIR}/wrapping/python' +def GetSimplnxPythonSourceDir(): + return '${simplnx_SOURCE_DIR}/wrapping/python' -def GetComplexSourceDir(): - return '${complex_SOURCE_DIR}' +def GetSimplnxSourceDir(): + return '${simplnx_SOURCE_DIR}' def print_all_paths(): print(f'#### Important Filesystem Paths ####') @@ -45,6 +45,6 @@ def print_all_paths(): print(f' GetTestDirectory: {GetTestDirectory()}') print(f' GetTestTempDirectory: {GetTestTempDirectory()}') print(f' GetDataDirectory: {GetDataDirectory()}') - print(f' GetComplexPythonSourceDir: {GetComplexPythonSourceDir()}') - print(f' GetComplexSourceDir: {GetComplexSourceDir()}') + print(f' GetSimplnxPythonSourceDir: {GetSimplnxPythonSourceDir()}') + print(f' GetSimplnxSourceDir: {GetSimplnxSourceDir()}') print('#######################################') \ No newline at end of file