From a0d6e0b5ce648b637e4b084a5ffb980f6a75ecb3 Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Mon, 23 Oct 2023 12:07:21 -0400 Subject: [PATCH 01/19] AbaqusHexahedronWriter -> WriteAbaqusHexahedron --- src/Plugins/ComplexCore/CMakeLists.txt | 4 +-- .../ComplexCoreLegacyUUIDMapping.hpp | 4 +-- ...onWriter.cpp => WriteAbaqusHexahedron.cpp} | 20 +++++------ ...onWriter.hpp => WriteAbaqusHexahedron.hpp} | 18 +++++----- ...er.cpp => WriteAbaqusHexahedronFilter.cpp} | 36 +++++++++---------- ...er.hpp => WriteAbaqusHexahedronFilter.hpp} | 18 +++++----- src/Plugins/ComplexCore/test/CMakeLists.txt | 2 +- ...Test.cpp => WriteAbaqusHexahedronTest.cpp} | 20 +++++------ 8 files changed, 60 insertions(+), 62 deletions(-) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{AbaqusHexahedronWriter.cpp => WriteAbaqusHexahedron.cpp} (93%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{AbaqusHexahedronWriter.hpp => WriteAbaqusHexahedron.hpp} (61%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{AbaqusHexahedronWriterFilter.cpp => WriteAbaqusHexahedronFilter.cpp} (78%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{AbaqusHexahedronWriterFilter.hpp => WriteAbaqusHexahedronFilter.hpp} (83%) rename src/Plugins/ComplexCore/test/{AbaqusHexahedronWriterTest.cpp => WriteAbaqusHexahedronTest.cpp} (80%) diff --git a/src/Plugins/ComplexCore/CMakeLists.txt b/src/Plugins/ComplexCore/CMakeLists.txt index 962c09532a..bd7cdc0fd9 100644 --- a/src/Plugins/ComplexCore/CMakeLists.txt +++ b/src/Plugins/ComplexCore/CMakeLists.txt @@ -7,7 +7,6 @@ set(${PLUGIN_NAME}_SOURCE_DIR ${complex_SOURCE_DIR}/src/Plugins/${PLUGIN_NAME}) # These are all the filters in the plugin. All filters should be kept in the # PLUGIN_NAME/src/PLUGIN_NAME/Filters/ directory. set(FilterList - AbaqusHexahedronWriterFilter AddBadDataFilter AlignGeometries AlignSectionsFeatureCentroidFilter @@ -122,6 +121,7 @@ set(FilterList TriangleNormalFilter UncertainRegularGridSampleSurfaceMeshFilter VtkRectilinearGridWriterFilter + WriteAbaqusHexahedronFilter WriteASCIIDataFilter WriteBinaryDataFilter WriteStlFileFilter @@ -131,7 +131,6 @@ set(ActionList ) set(AlgorithmList - AbaqusHexahedronWriter AddBadData AlignSectionsFeatureCentroid AlignSectionsList @@ -198,6 +197,7 @@ set(AlgorithmList TupleTransfer UncertainRegularGridSampleSurfaceMesh VtkRectilinearGridWriter + WriteAbaqusHexahedron WriteStlFile ) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp index 73f387c2b3..b57178c3c4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp @@ -98,7 +98,7 @@ #include "ComplexCore/Filters/AddBadDataFilter.hpp" #include "ComplexCore/Filters/AppendImageGeometryZSliceFilter.hpp" #include "ComplexCore/Filters/FindFeatureClusteringFilter.hpp" -#include "ComplexCore/Filters/AbaqusHexahedronWriterFilter.hpp" +#include "ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp" #include "ComplexCore/Filters/NearestPointFuseRegularGridsFilter.hpp" #include "ComplexCore/Filters/ResampleRectGridToImageGeomFilter.hpp" #include "ComplexCore/Filters/CombineStlFilesFilter.hpp" @@ -220,7 +220,7 @@ namespace complex {complex::Uuid::FromString("ac99b706-d1e0-5f78-9246-fbbe1efd93d2").value(), complex::FilterTraits::uuid}, // AddBadData {complex::Uuid::FromString("52b2918a-4fb5-57aa-97d4-ccc084b89572").value(), complex::FilterTraits::uuid}, // AppendImageGeometryZSlice {complex::Uuid::FromString("a1e9cf6d-2d1b-573e-98b8-0314c993d2b6").value(), complex::FilterTraits::uuid}, // FindFeatureClustering - {complex::Uuid::FromString("0559aa37-c5ad-549a-82d4-bff4bfcb6cc6").value(), complex::FilterTraits::uuid}, // AbaqusHexahedronWriter + {complex::Uuid::FromString("0559aa37-c5ad-549a-82d4-bff4bfcb6cc6").value(), complex::FilterTraits::uuid}, // WriteAbaqusHexahedron {complex::Uuid::FromString("cbaf9e68-5ded-560c-9440-509289100ea8").value(), complex::FilterTraits::uuid}, // NearestPointFuseRegularGrids {complex::Uuid::FromString("77befd69-4536-5856-9f81-02996d038f73").value(), complex::FilterTraits::uuid}, // ResampleRectGridToImageGeom {complex::Uuid::FromString("71d46128-1d2d-58fd-9924-1714695768c3").value(), complex::FilterTraits::uuid}, // CombineStlFiles diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AbaqusHexahedronWriter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AbaqusHexahedronWriter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp index e71d120743..b9eac7adc6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AbaqusHexahedronWriter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp @@ -1,4 +1,4 @@ -#include "AbaqusHexahedronWriter.hpp" +#include "WriteAbaqusHexahedron.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/DataStructure/DataGroup.hpp" @@ -59,7 +59,7 @@ std::vector getNodeIds(usize x, usize y, usize z, const usize* pDims) return nodeId; } -int32 writeNodes(AbaqusHexahedronWriter* filter, const std::string& fileName, usize* cDims, const float32* origin, const float32* spacing, const std::atomic_bool& shouldCancel) +int32 writeNodes(WriteAbaqusHexahedron* filter, const std::string& fileName, usize* cDims, const float32* origin, const float32* spacing, const std::atomic_bool& shouldCancel) { usize pDims[3] = {cDims[0] + 1, cDims[1] + 1, cDims[2] + 1}; usize nodeIndex = 1; @@ -122,7 +122,7 @@ int32 writeNodes(AbaqusHexahedronWriter* filter, const std::string& fileName, us return err; } -int32 writeElems(AbaqusHexahedronWriter* filter, const std::string& fileName, const usize* cDims, usize* pDims, const std::atomic_bool& shouldCancel) +int32 writeElems(WriteAbaqusHexahedron* filter, const std::string& fileName, const usize* cDims, usize* pDims, const std::atomic_bool& shouldCancel) { usize totalPoints = cDims[0] * cDims[1] * cDims[2]; auto increment = static_cast(totalPoints * 0.01f); @@ -184,7 +184,7 @@ int32 writeElems(AbaqusHexahedronWriter* filter, const std::string& fileName, co return err; } -int32 writeElset(AbaqusHexahedronWriter* filter, const std::string& fileName, size_t totalPoints, const Int32Array& featureIds, const std::atomic_bool& shouldCancel) +int32 writeElset(WriteAbaqusHexahedron* filter, const std::string& fileName, size_t totalPoints, const Int32Array& featureIds, const std::atomic_bool& shouldCancel) { int32 err = 0; FILE* f = fopen(fileName.c_str(), "wb"); @@ -330,8 +330,8 @@ void deleteFile(const std::vector& fileNames) } // namespace // ----------------------------------------------------------------------------- -AbaqusHexahedronWriter::AbaqusHexahedronWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - AbaqusHexahedronWriterInputValues* inputValues) +WriteAbaqusHexahedron::WriteAbaqusHexahedron(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, + WriteAbaqusHexahedronInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -340,22 +340,22 @@ AbaqusHexahedronWriter::AbaqusHexahedronWriter(DataStructure& dataStructure, con } // ----------------------------------------------------------------------------- -AbaqusHexahedronWriter::~AbaqusHexahedronWriter() noexcept = default; +WriteAbaqusHexahedron::~WriteAbaqusHexahedron() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& AbaqusHexahedronWriter::getCancel() +const std::atomic_bool& WriteAbaqusHexahedron::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -void AbaqusHexahedronWriter::sendMessage(const std::string& message) +void WriteAbaqusHexahedron::sendMessage(const std::string& message) { m_MessageHandler(IFilter::Message::Type::Info, message); } // ----------------------------------------------------------------------------- -Result<> AbaqusHexahedronWriter::operator()() +Result<> WriteAbaqusHexahedron::operator()() { auto& imageGeom = m_DataStructure.getDataRefAs(m_InputValues->ImageGeometryPath); auto& featureIds = m_DataStructure.getDataRefAs(m_InputValues->FeatureIdsArrayPath); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AbaqusHexahedronWriter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp similarity index 61% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AbaqusHexahedronWriter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp index 88d06bb9aa..13732cb1ec 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AbaqusHexahedronWriter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp @@ -13,7 +13,7 @@ namespace complex { -struct COMPLEXCORE_EXPORT AbaqusHexahedronWriterInputValues +struct COMPLEXCORE_EXPORT WriteAbaqusHexahedronInputValues { int32 HourglassStiffness; StringParameter::ValueType JobName; @@ -29,16 +29,16 @@ struct COMPLEXCORE_EXPORT AbaqusHexahedronWriterInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT AbaqusHexahedronWriter +class COMPLEXCORE_EXPORT WriteAbaqusHexahedron { public: - AbaqusHexahedronWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AbaqusHexahedronWriterInputValues* inputValues); - ~AbaqusHexahedronWriter() noexcept; + WriteAbaqusHexahedron(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteAbaqusHexahedronInputValues* inputValues); + ~WriteAbaqusHexahedron() noexcept; - AbaqusHexahedronWriter(const AbaqusHexahedronWriter&) = delete; - AbaqusHexahedronWriter(AbaqusHexahedronWriter&&) noexcept = delete; - AbaqusHexahedronWriter& operator=(const AbaqusHexahedronWriter&) = delete; - AbaqusHexahedronWriter& operator=(AbaqusHexahedronWriter&&) noexcept = delete; + WriteAbaqusHexahedron(const WriteAbaqusHexahedron&) = delete; + WriteAbaqusHexahedron(WriteAbaqusHexahedron&&) noexcept = delete; + WriteAbaqusHexahedron& operator=(const WriteAbaqusHexahedron&) = delete; + WriteAbaqusHexahedron& operator=(WriteAbaqusHexahedron&&) noexcept = delete; Result<> operator()(); @@ -48,7 +48,7 @@ class COMPLEXCORE_EXPORT AbaqusHexahedronWriter private: DataStructure& m_DataStructure; - const AbaqusHexahedronWriterInputValues* m_InputValues = nullptr; + const WriteAbaqusHexahedronInputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AbaqusHexahedronWriterFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp similarity index 78% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AbaqusHexahedronWriterFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp index 2b5448f180..07e7eacb41 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AbaqusHexahedronWriterFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp @@ -1,6 +1,6 @@ -#include "AbaqusHexahedronWriterFilter.hpp" +#include "WriteAbaqusHexahedronFilter.hpp" -#include "ComplexCore/Filters/Algorithms/AbaqusHexahedronWriter.hpp" +#include "ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.hpp" #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/EmptyAction.hpp" @@ -16,37 +16,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string AbaqusHexahedronWriterFilter::name() const +std::string WriteAbaqusHexahedronFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string AbaqusHexahedronWriterFilter::className() const +std::string WriteAbaqusHexahedronFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid AbaqusHexahedronWriterFilter::uuid() const +Uuid WriteAbaqusHexahedronFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string AbaqusHexahedronWriterFilter::humanName() const +std::string WriteAbaqusHexahedronFilter::humanName() const { - return "Abaqus Hexahedron Exporter"; + return "Write Abaqus Hexahedron"; } //------------------------------------------------------------------------------ -std::vector AbaqusHexahedronWriterFilter::defaultTags() const +std::vector WriteAbaqusHexahedronFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters AbaqusHexahedronWriterFilter::parameters() const +Parameters WriteAbaqusHexahedronFilter::parameters() const { Parameters params; @@ -66,13 +66,13 @@ Parameters AbaqusHexahedronWriterFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer AbaqusHexahedronWriterFilter::clone() const +IFilter::UniquePointer WriteAbaqusHexahedronFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult AbaqusHexahedronWriterFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteAbaqusHexahedronFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pHourglassStiffnessValue = filterArgs.value(k_HourglassStiffness_Key); @@ -104,10 +104,10 @@ IFilter::PreflightResult AbaqusHexahedronWriterFilter::preflightImpl(const DataS } //------------------------------------------------------------------------------ -Result<> AbaqusHexahedronWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteAbaqusHexahedronFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - AbaqusHexahedronWriterInputValues inputValues; + WriteAbaqusHexahedronInputValues inputValues; inputValues.HourglassStiffness = filterArgs.value(k_HourglassStiffness_Key); inputValues.JobName = filterArgs.value(k_JobName_Key); @@ -116,6 +116,6 @@ Result<> AbaqusHexahedronWriterFilter::executeImpl(DataStructure& dataStructure, inputValues.FeatureIdsArrayPath = filterArgs.value(k_FeatureIdsArrayPath_Key); inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometryPath_Key); - return AbaqusHexahedronWriter(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return WriteAbaqusHexahedron(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AbaqusHexahedronWriterFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AbaqusHexahedronWriterFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp index cc002db302..803730d9a7 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AbaqusHexahedronWriterFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class AbaqusHexahedronWriterFilter + * @class WriteAbaqusHexahedronFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT AbaqusHexahedronWriterFilter : public IFilter +class COMPLEXCORE_EXPORT WriteAbaqusHexahedronFilter : public IFilter { public: - AbaqusHexahedronWriterFilter() = default; - ~AbaqusHexahedronWriterFilter() noexcept override = default; + WriteAbaqusHexahedronFilter() = default; + ~WriteAbaqusHexahedronFilter() noexcept override = default; - AbaqusHexahedronWriterFilter(const AbaqusHexahedronWriterFilter&) = delete; - AbaqusHexahedronWriterFilter(AbaqusHexahedronWriterFilter&&) noexcept = delete; + WriteAbaqusHexahedronFilter(const WriteAbaqusHexahedronFilter&) = delete; + WriteAbaqusHexahedronFilter(WriteAbaqusHexahedronFilter&&) noexcept = delete; - AbaqusHexahedronWriterFilter& operator=(const AbaqusHexahedronWriterFilter&) = delete; - AbaqusHexahedronWriterFilter& operator=(AbaqusHexahedronWriterFilter&&) noexcept = delete; + WriteAbaqusHexahedronFilter& operator=(const WriteAbaqusHexahedronFilter&) = delete; + WriteAbaqusHexahedronFilter& operator=(WriteAbaqusHexahedronFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_ImageGeometryPath_Key = "image_geometry_path"; @@ -97,5 +97,5 @@ class COMPLEXCORE_EXPORT AbaqusHexahedronWriterFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, AbaqusHexahedronWriterFilter, "4bc81b8c-1594-409a-89eb-3ea8d8f061b0"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteAbaqusHexahedronFilter, "4bc81b8c-1594-409a-89eb-3ea8d8f061b0"); /* LEGACY UUID FOR THIS FILTER 0559aa37-c5ad-549a-82d4-bff4bfcb6cc6 */ diff --git a/src/Plugins/ComplexCore/test/CMakeLists.txt b/src/Plugins/ComplexCore/test/CMakeLists.txt index a8d333d714..2970dbe00b 100644 --- a/src/Plugins/ComplexCore/test/CMakeLists.txt +++ b/src/Plugins/ComplexCore/test/CMakeLists.txt @@ -6,7 +6,7 @@ # ------------------------------------------------------------------------------ # Define the list of unit test source files set(${PLUGIN_NAME}UnitTest_SRCS - AbaqusHexahedronWriterTest.cpp + WriteAbaqusHexahedronTest.cpp AddBadDataTest.cpp AlignGeometriesTest.cpp AlignSectionsFeatureCentroidTest.cpp diff --git a/src/Plugins/ComplexCore/test/AbaqusHexahedronWriterTest.cpp b/src/Plugins/ComplexCore/test/WriteAbaqusHexahedronTest.cpp similarity index 80% rename from src/Plugins/ComplexCore/test/AbaqusHexahedronWriterTest.cpp rename to src/Plugins/ComplexCore/test/WriteAbaqusHexahedronTest.cpp index 8f5ccf5588..11e53c50a8 100644 --- a/src/Plugins/ComplexCore/test/AbaqusHexahedronWriterTest.cpp +++ b/src/Plugins/ComplexCore/test/WriteAbaqusHexahedronTest.cpp @@ -1,15 +1,13 @@ #include #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/AbaqusHexahedronWriterFilter.hpp" +#include "ComplexCore/Filters/WriteAbaqusHexahedronFilter.hpp" #include "complex/Parameters/FileSystemPathParameter.hpp" #include "complex/Parameters/StringParameter.hpp" #include "complex/UnitTest/UnitTestCommon.hpp" -#include - namespace fs = std::filesystem; using namespace complex; @@ -70,7 +68,7 @@ void CompareResults() // compare hash of both file strings } } // namespace -TEST_CASE("ComplexCore::AbaqusHexahedronWriterFilter: Valid Filter Execution", "[ComplexCore][AbaqusHexahedronWriterFilter]") +TEST_CASE("ComplexCore::WriteAbaqusHexahedronFilter: Valid Filter Execution", "[ComplexCore][WriteAbaqusHexahedronFilter]") { const complex::UnitTest::TestFileSentinel testDataSentinel1(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "abaqus_hexahedron_writer_test.tar.gz", "abaqus_hexahedron_writer_test"); @@ -79,17 +77,17 @@ TEST_CASE("ComplexCore::AbaqusHexahedronWriterFilter: Valid Filter Execution", " "6_6_find_feature_centroids.dream3d"); // Instantiate the filter, a DataStructure object and an Arguments Object - const AbaqusHexahedronWriterFilter filter; + const WriteAbaqusHexahedronFilter filter; DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/6_6_find_feature_centroids.dream3d", unit_test::k_TestFilesDir))); Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(AbaqusHexahedronWriterFilter::k_HourglassStiffness_Key, std::make_any(250)); - args.insertOrAssign(AbaqusHexahedronWriterFilter::k_JobName_Key, std::make_any("UnitTest")); - args.insertOrAssign(AbaqusHexahedronWriterFilter::k_OutputPath_Key, std::make_any(fs::path(std::string(unit_test::k_BinaryTestOutputDir)))); - args.insertOrAssign(AbaqusHexahedronWriterFilter::k_FilePrefix_Key, std::make_any("6_6_Abaqus_Hexahedron_Writer_Test")); - args.insertOrAssign(AbaqusHexahedronWriterFilter::k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); - args.insertOrAssign(AbaqusHexahedronWriterFilter::k_FeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); + args.insertOrAssign(WriteAbaqusHexahedronFilter::k_HourglassStiffness_Key, std::make_any(250)); + args.insertOrAssign(WriteAbaqusHexahedronFilter::k_JobName_Key, std::make_any("UnitTest")); + args.insertOrAssign(WriteAbaqusHexahedronFilter::k_OutputPath_Key, std::make_any(fs::path(std::string(unit_test::k_BinaryTestOutputDir)))); + args.insertOrAssign(WriteAbaqusHexahedronFilter::k_FilePrefix_Key, std::make_any("6_6_Abaqus_Hexahedron_Writer_Test")); + args.insertOrAssign(WriteAbaqusHexahedronFilter::k_ImageGeometryPath_Key, std::make_any(Constants::k_DataContainerPath)); + args.insertOrAssign(WriteAbaqusHexahedronFilter::k_FeatureIdsArrayPath_Key, std::make_any(k_FeatureIdsPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); From 4ced8c614f497608175462a59bc4577c63df10e4 Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Mon, 23 Oct 2023 12:49:32 -0400 Subject: [PATCH 02/19] AvizoRectilinearCoordinateWriter -> WriteAvizoRectilinearCoordinate --- src/Plugins/ComplexCore/CMakeLists.txt | 4 +-- ...lter.md => WriteAbaqusHexahedronFilter.md} | 0 ... WriteAvizoRectilinearCoordinateFilter.md} | 0 .../pipelines/AvizoWriters.d3dpipeline | 2 +- .../ComplexCoreLegacyUUIDMapping.hpp | 4 +-- .../AvizoRectilinearCoordinateWriter.hpp | 31 ------------------ ...pp => WriteAvizoRectilinearCoordinate.cpp} | 12 +++---- .../WriteAvizoRectilinearCoordinate.hpp | 31 ++++++++++++++++++ ...WriteAvizoRectilinearCoordinateFilter.cpp} | 32 +++++++++---------- ...WriteAvizoRectilinearCoordinateFilter.hpp} | 18 +++++------ src/Plugins/ComplexCore/test/CMakeLists.txt | 2 +- ...> WriteAvizoRectilinearCoordinateTest.cpp} | 20 ++++++------ 12 files changed, 78 insertions(+), 78 deletions(-) rename src/Plugins/ComplexCore/docs/{AbaqusHexahedronWriterFilter.md => WriteAbaqusHexahedronFilter.md} (100%) rename src/Plugins/ComplexCore/docs/{AvizoRectilinearCoordinateWriterFilter.md => WriteAvizoRectilinearCoordinateFilter.md} (100%) delete mode 100644 src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoRectilinearCoordinateWriter.hpp rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{AvizoRectilinearCoordinateWriter.cpp => WriteAvizoRectilinearCoordinate.cpp} (89%) create mode 100644 src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{AvizoRectilinearCoordinateWriterFilter.cpp => WriteAvizoRectilinearCoordinateFilter.cpp} (74%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{AvizoRectilinearCoordinateWriterFilter.hpp => WriteAvizoRectilinearCoordinateFilter.hpp} (80%) rename src/Plugins/ComplexCore/test/{AvizoRectilinearCoordinateWriterTest.cpp => WriteAvizoRectilinearCoordinateTest.cpp} (68%) diff --git a/src/Plugins/ComplexCore/CMakeLists.txt b/src/Plugins/ComplexCore/CMakeLists.txt index bd7cdc0fd9..c1c7c0c629 100644 --- a/src/Plugins/ComplexCore/CMakeLists.txt +++ b/src/Plugins/ComplexCore/CMakeLists.txt @@ -15,7 +15,6 @@ set(FilterList ApplyTransformationToGeometryFilter ApproximatePointCloudHull ArrayCalculatorFilter - AvizoRectilinearCoordinateWriterFilter AvizoUniformCoordinateWriterFilter CalculateArrayHistogramFilter CalculateFeatureSizesFilter @@ -123,6 +122,7 @@ set(FilterList VtkRectilinearGridWriterFilter WriteAbaqusHexahedronFilter WriteASCIIDataFilter + WriteAvizoRectilinearCoordinateFilter WriteBinaryDataFilter WriteStlFileFilter ) @@ -137,7 +137,6 @@ set(AlgorithmList AppendImageGeometryZSlice ApplyTransformationToGeometry ArrayCalculator - AvizoRectilinearCoordinateWriter AvizoUniformCoordinateWriter CalculateArrayHistogram CalculateTriangleGroupCurvatures @@ -198,6 +197,7 @@ set(AlgorithmList UncertainRegularGridSampleSurfaceMesh VtkRectilinearGridWriter WriteAbaqusHexahedron + WriteAvizoRectilinearCoordinate WriteStlFile ) diff --git a/src/Plugins/ComplexCore/docs/AbaqusHexahedronWriterFilter.md b/src/Plugins/ComplexCore/docs/WriteAbaqusHexahedronFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/AbaqusHexahedronWriterFilter.md rename to src/Plugins/ComplexCore/docs/WriteAbaqusHexahedronFilter.md diff --git a/src/Plugins/ComplexCore/docs/AvizoRectilinearCoordinateWriterFilter.md b/src/Plugins/ComplexCore/docs/WriteAvizoRectilinearCoordinateFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/AvizoRectilinearCoordinateWriterFilter.md rename to src/Plugins/ComplexCore/docs/WriteAvizoRectilinearCoordinateFilter.md diff --git a/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline b/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline index 47023bc2a0..b58be039e6 100644 --- a/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline @@ -74,7 +74,7 @@ }, "comments": "", "filter": { - "name": "complex::AvizoRectilinearCoordinateWriterFilter", + "name": "complex::WriteAvizoRectilinearCoordinateFilter", "uuid": "58661ea8-0322-44af-a48e-1dc80e999376" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp index b57178c3c4..549dc7ccdb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp @@ -103,7 +103,7 @@ #include "ComplexCore/Filters/ResampleRectGridToImageGeomFilter.hpp" #include "ComplexCore/Filters/CombineStlFilesFilter.hpp" #include "ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.hpp" -#include "ComplexCore/Filters/AvizoRectilinearCoordinateWriterFilter.hpp" +#include "ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp" #include "ComplexCore/Filters/VtkRectilinearGridWriterFilter.hpp" #include "ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp" #include "ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp" @@ -225,7 +225,7 @@ namespace complex {complex::Uuid::FromString("77befd69-4536-5856-9f81-02996d038f73").value(), complex::FilterTraits::uuid}, // ResampleRectGridToImageGeom {complex::Uuid::FromString("71d46128-1d2d-58fd-9924-1714695768c3").value(), complex::FilterTraits::uuid}, // CombineStlFiles {complex::Uuid::FromString("339f1349-9236-5023-9a56-c82fb8eafd12").value(), complex::FilterTraits::uuid}, // AvizoUniformCoordinateWriter - {complex::Uuid::FromString("2861f4b4-8d50-5e69-9575-68c9d35f1256").value(), complex::FilterTraits::uuid}, // AvizoRectilinearCoordinateWriter + {complex::Uuid::FromString("2861f4b4-8d50-5e69-9575-68c9d35f1256").value(), complex::FilterTraits::uuid}, // WriteAvizoRectilinearCoordinate {complex::Uuid::FromString("a043bd66-2681-5126-82e1-5fdc46694bf4").value(), complex::FilterTraits::uuid}, // VtkRectilinearGridWriter {complex::Uuid::FromString("0df3da89-9106-538e-b1a9-6bbf1cf0aa92").value(), complex::FilterTraits::uuid}, // RegularGridSampleSurfaceMesh {complex::Uuid::FromString("75cfeb9b-cd4b-5a20-a344-4170b39bbfaf").value(), complex::FilterTraits::uuid}, // UncertainRegularGridSampleSurfaceMesh diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoRectilinearCoordinateWriter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoRectilinearCoordinateWriter.hpp deleted file mode 100644 index f74ca122df..0000000000 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoRectilinearCoordinateWriter.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/AvizoWriter.hpp" - -namespace complex -{ -/** - * @class AvizoRectilinearCoordinateWriter - * @brief This filter writes out a native Avizo Rectilinear Coordinate data file. - */ - -class COMPLEXCORE_EXPORT AvizoRectilinearCoordinateWriter : public AvizoWriter -{ -public: - AvizoRectilinearCoordinateWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues); - ~AvizoRectilinearCoordinateWriter() noexcept override; - - AvizoRectilinearCoordinateWriter(const AvizoRectilinearCoordinateWriter&) = delete; - AvizoRectilinearCoordinateWriter(AvizoRectilinearCoordinateWriter&&) noexcept = delete; - AvizoRectilinearCoordinateWriter& operator=(const AvizoRectilinearCoordinateWriter&) = delete; - AvizoRectilinearCoordinateWriter& operator=(AvizoRectilinearCoordinateWriter&&) noexcept = delete; - - Result<> operator()(); - -protected: - Result<> generateHeader(FILE* outputFile) const override; - Result<> writeData(FILE* outputFile) const override; -}; - -} // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoRectilinearCoordinateWriter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoRectilinearCoordinateWriter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp index 2eb3a2f8d8..9f191feeb5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoRectilinearCoordinateWriter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp @@ -1,4 +1,4 @@ -#include "AvizoRectilinearCoordinateWriter.hpp" +#include "WriteAvizoRectilinearCoordinate.hpp" #include "complex/Common/Bit.hpp" #include "complex/DataStructure/DataArray.hpp" @@ -8,23 +8,23 @@ using namespace complex; // ----------------------------------------------------------------------------- -AvizoRectilinearCoordinateWriter::AvizoRectilinearCoordinateWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, +WriteAvizoRectilinearCoordinate::WriteAvizoRectilinearCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues) : AvizoWriter(dataStructure, mesgHandler, shouldCancel, inputValues) { } // ----------------------------------------------------------------------------- -AvizoRectilinearCoordinateWriter::~AvizoRectilinearCoordinateWriter() noexcept = default; +WriteAvizoRectilinearCoordinate::~WriteAvizoRectilinearCoordinate() noexcept = default; // ----------------------------------------------------------------------------- -Result<> AvizoRectilinearCoordinateWriter::operator()() +Result<> WriteAvizoRectilinearCoordinate::operator()() { return AvizoWriter::execute(); } // ----------------------------------------------------------------------------- -Result<> AvizoRectilinearCoordinateWriter::generateHeader(FILE* outputFile) const +Result<> WriteAvizoRectilinearCoordinate::generateHeader(FILE* outputFile) const { const auto& geom = m_DataStructure.getDataRefAs(m_InputValues->GeometryPath); @@ -75,7 +75,7 @@ Result<> AvizoRectilinearCoordinateWriter::generateHeader(FILE* outputFile) cons } // ----------------------------------------------------------------------------- -Result<> AvizoRectilinearCoordinateWriter::writeData(FILE* outputFile) const +Result<> WriteAvizoRectilinearCoordinate::writeData(FILE* outputFile) const { const auto& geom = m_DataStructure.getDataRefAs(m_InputValues->GeometryPath); SizeVec3 dims = geom.getDimensions(); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp new file mode 100644 index 0000000000..69e1616767 --- /dev/null +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp @@ -0,0 +1,31 @@ +#pragma once + +#include "ComplexCore/ComplexCore_export.hpp" +#include "ComplexCore/utils/AvizoWriter.hpp" + +namespace complex +{ +/** + * @class WriteAvizoRectilinearCoordinate + * @brief This filter writes out a native Avizo Rectilinear Coordinate data file. + */ + +class COMPLEXCORE_EXPORT WriteAvizoRectilinearCoordinate : public AvizoWriter +{ +public: + WriteAvizoRectilinearCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues); + ~WriteAvizoRectilinearCoordinate() noexcept override; + + WriteAvizoRectilinearCoordinate(const WriteAvizoRectilinearCoordinate&) = delete; + WriteAvizoRectilinearCoordinate(WriteAvizoRectilinearCoordinate&&) noexcept = delete; + WriteAvizoRectilinearCoordinate& operator=(const WriteAvizoRectilinearCoordinate&) = delete; + WriteAvizoRectilinearCoordinate& operator=(WriteAvizoRectilinearCoordinate&&) noexcept = delete; + + Result<> operator()(); + +protected: + Result<> generateHeader(FILE* outputFile) const override; + Result<> writeData(FILE* outputFile) const override; +}; + +} // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoRectilinearCoordinateWriterFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp similarity index 74% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoRectilinearCoordinateWriterFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp index 5faabd552c..199c02b412 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoRectilinearCoordinateWriterFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp @@ -1,6 +1,6 @@ -#include "AvizoRectilinearCoordinateWriterFilter.hpp" +#include "WriteAvizoRectilinearCoordinateFilter.hpp" -#include "ComplexCore/Filters/Algorithms/AvizoRectilinearCoordinateWriter.hpp" +#include "ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.hpp" #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/EmptyAction.hpp" @@ -18,37 +18,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string AvizoRectilinearCoordinateWriterFilter::name() const +std::string WriteAvizoRectilinearCoordinateFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string AvizoRectilinearCoordinateWriterFilter::className() const +std::string WriteAvizoRectilinearCoordinateFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid AvizoRectilinearCoordinateWriterFilter::uuid() const +Uuid WriteAvizoRectilinearCoordinateFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string AvizoRectilinearCoordinateWriterFilter::humanName() const +std::string WriteAvizoRectilinearCoordinateFilter::humanName() const { return "Avizo Rectilinear Coordinate Exporter"; } //------------------------------------------------------------------------------ -std::vector AvizoRectilinearCoordinateWriterFilter::defaultTags() const +std::vector WriteAvizoRectilinearCoordinateFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters AvizoRectilinearCoordinateWriterFilter::parameters() const +Parameters WriteAvizoRectilinearCoordinateFilter::parameters() const { Parameters params; @@ -67,13 +67,13 @@ Parameters AvizoRectilinearCoordinateWriterFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer AvizoRectilinearCoordinateWriterFilter::clone() const +IFilter::UniquePointer WriteAvizoRectilinearCoordinateFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult AvizoRectilinearCoordinateWriterFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteAvizoRectilinearCoordinateFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); @@ -89,7 +89,7 @@ IFilter::PreflightResult AvizoRectilinearCoordinateWriterFilter::preflightImpl(c } //------------------------------------------------------------------------------ -Result<> AvizoRectilinearCoordinateWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteAvizoRectilinearCoordinateFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { AvizoWriterInputValues inputValues; @@ -100,6 +100,6 @@ Result<> AvizoRectilinearCoordinateWriterFilter::executeImpl(DataStructure& data inputValues.FeatureIdsArrayPath = filterArgs.value(k_FeatureIdsArrayPath_Key); inputValues.Units = filterArgs.value(k_Units_Key); - return AvizoRectilinearCoordinateWriter(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return WriteAvizoRectilinearCoordinate(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoRectilinearCoordinateWriterFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp similarity index 80% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoRectilinearCoordinateWriterFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp index aef1b05d65..875e7f1d71 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoRectilinearCoordinateWriterFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class AvizoRectilinearCoordinateWriterFilter + * @class WriteAvizoRectilinearCoordinateFilter * @brief This filter writes out a native Avizo Rectilinear Coordinate data file */ -class COMPLEXCORE_EXPORT AvizoRectilinearCoordinateWriterFilter : public IFilter +class COMPLEXCORE_EXPORT WriteAvizoRectilinearCoordinateFilter : public IFilter { public: - AvizoRectilinearCoordinateWriterFilter() = default; - ~AvizoRectilinearCoordinateWriterFilter() noexcept override = default; + WriteAvizoRectilinearCoordinateFilter() = default; + ~WriteAvizoRectilinearCoordinateFilter() noexcept override = default; - AvizoRectilinearCoordinateWriterFilter(const AvizoRectilinearCoordinateWriterFilter&) = delete; - AvizoRectilinearCoordinateWriterFilter(AvizoRectilinearCoordinateWriterFilter&&) noexcept = delete; + WriteAvizoRectilinearCoordinateFilter(const WriteAvizoRectilinearCoordinateFilter&) = delete; + WriteAvizoRectilinearCoordinateFilter(WriteAvizoRectilinearCoordinateFilter&&) noexcept = delete; - AvizoRectilinearCoordinateWriterFilter& operator=(const AvizoRectilinearCoordinateWriterFilter&) = delete; - AvizoRectilinearCoordinateWriterFilter& operator=(AvizoRectilinearCoordinateWriterFilter&&) noexcept = delete; + WriteAvizoRectilinearCoordinateFilter& operator=(const WriteAvizoRectilinearCoordinateFilter&) = delete; + WriteAvizoRectilinearCoordinateFilter& operator=(WriteAvizoRectilinearCoordinateFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; @@ -96,5 +96,5 @@ class COMPLEXCORE_EXPORT AvizoRectilinearCoordinateWriterFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, AvizoRectilinearCoordinateWriterFilter, "58661ea8-0322-44af-a48e-1dc80e999376"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteAvizoRectilinearCoordinateFilter, "58661ea8-0322-44af-a48e-1dc80e999376"); /* LEGACY UUID FOR THIS FILTER 2861f4b4-8d50-5e69-9575-68c9d35f1256 */ diff --git a/src/Plugins/ComplexCore/test/CMakeLists.txt b/src/Plugins/ComplexCore/test/CMakeLists.txt index 2970dbe00b..f173a72d9e 100644 --- a/src/Plugins/ComplexCore/test/CMakeLists.txt +++ b/src/Plugins/ComplexCore/test/CMakeLists.txt @@ -15,7 +15,7 @@ set(${PLUGIN_NAME}UnitTest_SRCS ApplyTransformationToGeometryTest.cpp ApproximatePointCloudHullTest.cpp ArrayCalculatorTest.cpp - AvizoRectilinearCoordinateWriterTest.cpp + WriteAvizoRectilinearCoordinateTest.cpp AvizoUniformCoordinateWriterTest.cpp CalculateArrayHistogramTest.cpp CalculateFeatureSizesTest.cpp diff --git a/src/Plugins/ComplexCore/test/AvizoRectilinearCoordinateWriterTest.cpp b/src/Plugins/ComplexCore/test/WriteAvizoRectilinearCoordinateTest.cpp similarity index 68% rename from src/Plugins/ComplexCore/test/AvizoRectilinearCoordinateWriterTest.cpp rename to src/Plugins/ComplexCore/test/WriteAvizoRectilinearCoordinateTest.cpp index a1faf502e9..69ae7fac2f 100644 --- a/src/Plugins/ComplexCore/test/AvizoRectilinearCoordinateWriterTest.cpp +++ b/src/Plugins/ComplexCore/test/WriteAvizoRectilinearCoordinateTest.cpp @@ -7,7 +7,7 @@ #include "complex/UnitTest/UnitTestCommon.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/AvizoRectilinearCoordinateWriterFilter.hpp" +#include "ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp" #include namespace fs = std::filesystem; @@ -15,7 +15,7 @@ namespace fs = std::filesystem; using namespace complex; using namespace complex::Constants; -TEST_CASE("ComplexCore::AvizoRectilinearCoordinateWriterFilter: Valid Filter Execution", "[ComplexCore][AvizoRectilinearCoordinateWriterFilter][.][UNIMPLEMENTED][!mayfail]") +TEST_CASE("ComplexCore::WriteAvizoRectilinearCoordinateFilter: Valid Filter Execution", "[ComplexCore][WriteAvizoRectilinearCoordinateFilter][.][UNIMPLEMENTED][!mayfail]") { const std::string kDataInputArchive = "6_6_avizo_writers.tar.gz"; const std::string kExpectedOutputTopLevel = "6_6_avizo_writers"; @@ -26,7 +26,7 @@ TEST_CASE("ComplexCore::AvizoRectilinearCoordinateWriterFilter: Valid Filter Exe DataStructure dataStructure = UnitTest::LoadDataStructure(exemplarFilePath); // Instantiate the filter, a DataStructure object and an Arguments Object - AvizoRectilinearCoordinateWriterFilter filter; + WriteAvizoRectilinearCoordinateFilter filter; DataStructure ds; Arguments args; @@ -36,11 +36,11 @@ TEST_CASE("ComplexCore::AvizoRectilinearCoordinateWriterFilter: Valid Filter Exe fs::path computedBinaryOutputPath(fmt::format("{}/NX_AvisoRectilinearOutput_binary.am", unit_test::k_BinaryTestOutputDir)); // Create default Parameters for the filter. - args.insertOrAssign(AvizoRectilinearCoordinateWriterFilter::k_OutputFile_Key, std::make_any(computedOutputPath)); - args.insertOrAssign(AvizoRectilinearCoordinateWriterFilter::k_WriteBinaryFile_Key, std::make_any(false)); - args.insertOrAssign(AvizoRectilinearCoordinateWriterFilter::k_GeometryPath_Key, std::make_any(DataPath({k_SmallIN100}))); - args.insertOrAssign(AvizoRectilinearCoordinateWriterFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({k_SmallIN100, k_EbsdScanData, k_FeatureIds}))); - args.insertOrAssign(AvizoRectilinearCoordinateWriterFilter::k_Units_Key, std::make_any("microns")); + args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_OutputFile_Key, std::make_any(computedOutputPath)); + args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_WriteBinaryFile_Key, std::make_any(false)); + args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_GeometryPath_Key, std::make_any(DataPath({k_SmallIN100}))); + args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({k_SmallIN100, k_EbsdScanData, k_FeatureIds}))); + args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_Units_Key, std::make_any("microns")); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -50,8 +50,8 @@ TEST_CASE("ComplexCore::AvizoRectilinearCoordinateWriterFilter: Valid Filter Exe auto executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) - args.insertOrAssign(AvizoRectilinearCoordinateWriterFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); - args.insertOrAssign(AvizoRectilinearCoordinateWriterFilter::k_WriteBinaryFile_Key, std::make_any(true)); + args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); + args.insertOrAssign(WriteAvizoRectilinearCoordinateFilter::k_WriteBinaryFile_Key, std::make_any(true)); preflightResult = filter.preflight(dataStructure, args); COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) From fbe0f7c7083533ee59704097167ddb473f2d30c8 Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Mon, 23 Oct 2023 13:24:18 -0400 Subject: [PATCH 03/19] AvizoUniformCoordinateWriter -> WriteAvizoUniformCoordinate --- src/Plugins/ComplexCore/CMakeLists.txt | 4 +-- ...d => WriteAvizoUniformCoordinateFilter.md} | 0 .../pipelines/AvizoWriters.d3dpipeline | 2 +- .../ComplexCoreLegacyUUIDMapping.hpp | 4 +-- .../AvizoUniformCoordinateWriter.hpp | 31 ------------------ ...er.cpp => WriteAvizoUniformCoordinate.cpp} | 12 +++---- .../WriteAvizoUniformCoordinate.hpp | 31 ++++++++++++++++++ ... => WriteAvizoUniformCoordinateFilter.cpp} | 32 +++++++++---------- ... => WriteAvizoUniformCoordinateFilter.hpp} | 18 +++++------ src/Plugins/ComplexCore/test/CMakeLists.txt | 2 +- ...pp => WriteAvizoUniformCoordinateTest.cpp} | 20 ++++++------ 11 files changed, 78 insertions(+), 78 deletions(-) rename src/Plugins/ComplexCore/docs/{AvizoUniformCoordinateWriterFilter.md => WriteAvizoUniformCoordinateFilter.md} (100%) delete mode 100644 src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoUniformCoordinateWriter.hpp rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{AvizoUniformCoordinateWriter.cpp => WriteAvizoUniformCoordinate.cpp} (88%) create mode 100644 src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{AvizoUniformCoordinateWriterFilter.cpp => WriteAvizoUniformCoordinateFilter.cpp} (75%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{AvizoUniformCoordinateWriterFilter.hpp => WriteAvizoUniformCoordinateFilter.hpp} (81%) rename src/Plugins/ComplexCore/test/{AvizoUniformCoordinateWriterTest.cpp => WriteAvizoUniformCoordinateTest.cpp} (69%) diff --git a/src/Plugins/ComplexCore/CMakeLists.txt b/src/Plugins/ComplexCore/CMakeLists.txt index c1c7c0c629..aa67941310 100644 --- a/src/Plugins/ComplexCore/CMakeLists.txt +++ b/src/Plugins/ComplexCore/CMakeLists.txt @@ -15,7 +15,6 @@ set(FilterList ApplyTransformationToGeometryFilter ApproximatePointCloudHull ArrayCalculatorFilter - AvizoUniformCoordinateWriterFilter CalculateArrayHistogramFilter CalculateFeatureSizesFilter CalculateTriangleAreasFilter @@ -123,6 +122,7 @@ set(FilterList WriteAbaqusHexahedronFilter WriteASCIIDataFilter WriteAvizoRectilinearCoordinateFilter + WriteAvizoUniformCoordinateFilter WriteBinaryDataFilter WriteStlFileFilter ) @@ -137,7 +137,6 @@ set(AlgorithmList AppendImageGeometryZSlice ApplyTransformationToGeometry ArrayCalculator - AvizoUniformCoordinateWriter CalculateArrayHistogram CalculateTriangleGroupCurvatures CombineAttributeArrays @@ -198,6 +197,7 @@ set(AlgorithmList VtkRectilinearGridWriter WriteAbaqusHexahedron WriteAvizoRectilinearCoordinate + WriteAvizoUniformCoordinate WriteStlFile ) diff --git a/src/Plugins/ComplexCore/docs/AvizoUniformCoordinateWriterFilter.md b/src/Plugins/ComplexCore/docs/WriteAvizoUniformCoordinateFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/AvizoUniformCoordinateWriterFilter.md rename to src/Plugins/ComplexCore/docs/WriteAvizoUniformCoordinateFilter.md diff --git a/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline b/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline index b58be039e6..61372e0362 100644 --- a/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline @@ -59,7 +59,7 @@ }, "comments": "", "filter": { - "name": "complex::AvizoUniformCoordinateWriterFilter", + "name": "complex::WriteAvizoUniformCoordinateFilter", "uuid": "0ed4ae48-3295-4a5d-8505-d5d2a6f2a212" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp index 549dc7ccdb..607e0fab39 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp @@ -102,7 +102,7 @@ #include "ComplexCore/Filters/NearestPointFuseRegularGridsFilter.hpp" #include "ComplexCore/Filters/ResampleRectGridToImageGeomFilter.hpp" #include "ComplexCore/Filters/CombineStlFilesFilter.hpp" -#include "ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.hpp" +#include "ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp" #include "ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp" #include "ComplexCore/Filters/VtkRectilinearGridWriterFilter.hpp" #include "ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp" @@ -224,7 +224,7 @@ namespace complex {complex::Uuid::FromString("cbaf9e68-5ded-560c-9440-509289100ea8").value(), complex::FilterTraits::uuid}, // NearestPointFuseRegularGrids {complex::Uuid::FromString("77befd69-4536-5856-9f81-02996d038f73").value(), complex::FilterTraits::uuid}, // ResampleRectGridToImageGeom {complex::Uuid::FromString("71d46128-1d2d-58fd-9924-1714695768c3").value(), complex::FilterTraits::uuid}, // CombineStlFiles - {complex::Uuid::FromString("339f1349-9236-5023-9a56-c82fb8eafd12").value(), complex::FilterTraits::uuid}, // AvizoUniformCoordinateWriter + {complex::Uuid::FromString("339f1349-9236-5023-9a56-c82fb8eafd12").value(), complex::FilterTraits::uuid}, // WriteAvizoUniformCoordinate {complex::Uuid::FromString("2861f4b4-8d50-5e69-9575-68c9d35f1256").value(), complex::FilterTraits::uuid}, // WriteAvizoRectilinearCoordinate {complex::Uuid::FromString("a043bd66-2681-5126-82e1-5fdc46694bf4").value(), complex::FilterTraits::uuid}, // VtkRectilinearGridWriter {complex::Uuid::FromString("0df3da89-9106-538e-b1a9-6bbf1cf0aa92").value(), complex::FilterTraits::uuid}, // RegularGridSampleSurfaceMesh diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoUniformCoordinateWriter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoUniformCoordinateWriter.hpp deleted file mode 100644 index d5c321a858..0000000000 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoUniformCoordinateWriter.hpp +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "ComplexCore/ComplexCore_export.hpp" -#include "ComplexCore/utils/AvizoWriter.hpp" - -namespace complex -{ -/** - * @class AvizoUniformCoordinateWriter - * @brief This filter writes out a native Avizo Uniform Coordinate data file. - */ - -class COMPLEXCORE_EXPORT AvizoUniformCoordinateWriter : public AvizoWriter -{ -public: - AvizoUniformCoordinateWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues); - ~AvizoUniformCoordinateWriter() noexcept override; - - AvizoUniformCoordinateWriter(const AvizoUniformCoordinateWriter&) = delete; - AvizoUniformCoordinateWriter(AvizoUniformCoordinateWriter&&) noexcept = delete; - AvizoUniformCoordinateWriter& operator=(const AvizoUniformCoordinateWriter&) = delete; - AvizoUniformCoordinateWriter& operator=(AvizoUniformCoordinateWriter&&) noexcept = delete; - - Result<> operator()(); - -protected: - Result<> generateHeader(FILE* outputFile) const override; - Result<> writeData(FILE* outputFile) const override; -}; - -} // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoUniformCoordinateWriter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoUniformCoordinateWriter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp index a5cad4c6f7..cfe1987459 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/AvizoUniformCoordinateWriter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp @@ -1,4 +1,4 @@ -#include "AvizoUniformCoordinateWriter.hpp" +#include "WriteAvizoUniformCoordinate.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/DataStructure/Geometry/ImageGeom.hpp" @@ -9,23 +9,23 @@ using namespace complex; // ----------------------------------------------------------------------------- -AvizoUniformCoordinateWriter::AvizoUniformCoordinateWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, +WriteAvizoUniformCoordinate::WriteAvizoUniformCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues) : AvizoWriter(dataStructure, mesgHandler, shouldCancel, inputValues) { } // ----------------------------------------------------------------------------- -AvizoUniformCoordinateWriter::~AvizoUniformCoordinateWriter() noexcept = default; +WriteAvizoUniformCoordinate::~WriteAvizoUniformCoordinate() noexcept = default; // ----------------------------------------------------------------------------- -Result<> AvizoUniformCoordinateWriter::operator()() +Result<> WriteAvizoUniformCoordinate::operator()() { return AvizoWriter::execute(); } // ----------------------------------------------------------------------------- -Result<> AvizoUniformCoordinateWriter::generateHeader(FILE* outputFile) const +Result<> WriteAvizoUniformCoordinate::generateHeader(FILE* outputFile) const { const auto& geom = m_DataStructure.getDataRefAs(m_InputValues->GeometryPath); @@ -83,7 +83,7 @@ Result<> AvizoUniformCoordinateWriter::generateHeader(FILE* outputFile) const } // ----------------------------------------------------------------------------- -Result<> AvizoUniformCoordinateWriter::writeData(FILE* outputFile) const +Result<> WriteAvizoUniformCoordinate::writeData(FILE* outputFile) const { fprintf(outputFile, "@1\n"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp new file mode 100644 index 0000000000..e2f214f26f --- /dev/null +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp @@ -0,0 +1,31 @@ +#pragma once + +#include "ComplexCore/ComplexCore_export.hpp" +#include "ComplexCore/utils/AvizoWriter.hpp" + +namespace complex +{ +/** + * @class WriteAvizoUniformCoordinate + * @brief This filter writes out a native Avizo Uniform Coordinate data file. + */ + +class COMPLEXCORE_EXPORT WriteAvizoUniformCoordinate : public AvizoWriter +{ +public: + WriteAvizoUniformCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, AvizoWriterInputValues* inputValues); + ~WriteAvizoUniformCoordinate() noexcept override; + + WriteAvizoUniformCoordinate(const WriteAvizoUniformCoordinate&) = delete; + WriteAvizoUniformCoordinate(WriteAvizoUniformCoordinate&&) noexcept = delete; + WriteAvizoUniformCoordinate& operator=(const WriteAvizoUniformCoordinate&) = delete; + WriteAvizoUniformCoordinate& operator=(WriteAvizoUniformCoordinate&&) noexcept = delete; + + Result<> operator()(); + +protected: + Result<> generateHeader(FILE* outputFile) const override; + Result<> writeData(FILE* outputFile) const override; +}; + +} // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp similarity index 75% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp index ecda63d7f3..3a117c9b95 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp @@ -1,6 +1,6 @@ -#include "AvizoUniformCoordinateWriterFilter.hpp" +#include "WriteAvizoUniformCoordinateFilter.hpp" -#include "ComplexCore/Filters/Algorithms/AvizoUniformCoordinateWriter.hpp" +#include "ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.hpp" #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/EmptyAction.hpp" @@ -18,37 +18,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string AvizoUniformCoordinateWriterFilter::name() const +std::string WriteAvizoUniformCoordinateFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string AvizoUniformCoordinateWriterFilter::className() const +std::string WriteAvizoUniformCoordinateFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid AvizoUniformCoordinateWriterFilter::uuid() const +Uuid WriteAvizoUniformCoordinateFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string AvizoUniformCoordinateWriterFilter::humanName() const +std::string WriteAvizoUniformCoordinateFilter::humanName() const { return "Avizo Uniform Coordinate Exporter"; } //------------------------------------------------------------------------------ -std::vector AvizoUniformCoordinateWriterFilter::defaultTags() const +std::vector WriteAvizoUniformCoordinateFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters AvizoUniformCoordinateWriterFilter::parameters() const +Parameters WriteAvizoUniformCoordinateFilter::parameters() const { Parameters params; @@ -67,13 +67,13 @@ Parameters AvizoUniformCoordinateWriterFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer AvizoUniformCoordinateWriterFilter::clone() const +IFilter::UniquePointer WriteAvizoUniformCoordinateFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult AvizoUniformCoordinateWriterFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteAvizoUniformCoordinateFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); @@ -89,7 +89,7 @@ IFilter::PreflightResult AvizoUniformCoordinateWriterFilter::preflightImpl(const } //------------------------------------------------------------------------------ -Result<> AvizoUniformCoordinateWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteAvizoUniformCoordinateFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { AvizoWriterInputValues inputValues; @@ -100,6 +100,6 @@ Result<> AvizoUniformCoordinateWriterFilter::executeImpl(DataStructure& dataStru inputValues.FeatureIdsArrayPath = filterArgs.value(k_FeatureIdsArrayPath_Key); inputValues.Units = filterArgs.value(k_Units_Key); - return AvizoUniformCoordinateWriter(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return WriteAvizoUniformCoordinate(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp index 05949c55e8..ba088b9828 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class AvizoUniformCoordinateWriterFilter + * @class WriteAvizoUniformCoordinateFilter * @brief This filter writes out a native Avizo Uniform Coordinate data file */ -class COMPLEXCORE_EXPORT AvizoUniformCoordinateWriterFilter : public IFilter +class COMPLEXCORE_EXPORT WriteAvizoUniformCoordinateFilter : public IFilter { public: - AvizoUniformCoordinateWriterFilter() = default; - ~AvizoUniformCoordinateWriterFilter() noexcept override = default; + WriteAvizoUniformCoordinateFilter() = default; + ~WriteAvizoUniformCoordinateFilter() noexcept override = default; - AvizoUniformCoordinateWriterFilter(const AvizoUniformCoordinateWriterFilter&) = delete; - AvizoUniformCoordinateWriterFilter(AvizoUniformCoordinateWriterFilter&&) noexcept = delete; + WriteAvizoUniformCoordinateFilter(const WriteAvizoUniformCoordinateFilter&) = delete; + WriteAvizoUniformCoordinateFilter(WriteAvizoUniformCoordinateFilter&&) noexcept = delete; - AvizoUniformCoordinateWriterFilter& operator=(const AvizoUniformCoordinateWriterFilter&) = delete; - AvizoUniformCoordinateWriterFilter& operator=(AvizoUniformCoordinateWriterFilter&&) noexcept = delete; + WriteAvizoUniformCoordinateFilter& operator=(const WriteAvizoUniformCoordinateFilter&) = delete; + WriteAvizoUniformCoordinateFilter& operator=(WriteAvizoUniformCoordinateFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; @@ -96,5 +96,5 @@ class COMPLEXCORE_EXPORT AvizoUniformCoordinateWriterFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, AvizoUniformCoordinateWriterFilter, "0ed4ae48-3295-4a5d-8505-d5d2a6f2a212"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteAvizoUniformCoordinateFilter, "0ed4ae48-3295-4a5d-8505-d5d2a6f2a212"); /* LEGACY UUID FOR THIS FILTER 339f1349-9236-5023-9a56-c82fb8eafd12 */ diff --git a/src/Plugins/ComplexCore/test/CMakeLists.txt b/src/Plugins/ComplexCore/test/CMakeLists.txt index f173a72d9e..6724838683 100644 --- a/src/Plugins/ComplexCore/test/CMakeLists.txt +++ b/src/Plugins/ComplexCore/test/CMakeLists.txt @@ -16,7 +16,7 @@ set(${PLUGIN_NAME}UnitTest_SRCS ApproximatePointCloudHullTest.cpp ArrayCalculatorTest.cpp WriteAvizoRectilinearCoordinateTest.cpp - AvizoUniformCoordinateWriterTest.cpp + WriteAvizoUniformCoordinateTest.cpp CalculateArrayHistogramTest.cpp CalculateFeatureSizesTest.cpp CalculateTriangleAreasFilterTest.cpp diff --git a/src/Plugins/ComplexCore/test/AvizoUniformCoordinateWriterTest.cpp b/src/Plugins/ComplexCore/test/WriteAvizoUniformCoordinateTest.cpp similarity index 69% rename from src/Plugins/ComplexCore/test/AvizoUniformCoordinateWriterTest.cpp rename to src/Plugins/ComplexCore/test/WriteAvizoUniformCoordinateTest.cpp index a55220bd17..308b893c89 100644 --- a/src/Plugins/ComplexCore/test/AvizoUniformCoordinateWriterTest.cpp +++ b/src/Plugins/ComplexCore/test/WriteAvizoUniformCoordinateTest.cpp @@ -7,7 +7,7 @@ #include "complex/UnitTest/UnitTestCommon.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/AvizoUniformCoordinateWriterFilter.hpp" +#include "ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp" #include namespace fs = std::filesystem; @@ -15,7 +15,7 @@ namespace fs = std::filesystem; using namespace complex; using namespace complex::Constants; -TEST_CASE("ComplexCore::AvizoUniformCoordinateWriterFilter: Valid Filter Execution", "[ComplexCore][AvizoUniformCoordinateWriterFilter]") +TEST_CASE("ComplexCore::WriteAvizoUniformCoordinateFilter: Valid Filter Execution", "[ComplexCore][WriteAvizoUniformCoordinateFilter]") { const std::string kDataInputArchive = "6_6_avizo_writers.tar.gz"; const std::string kExpectedOutputTopLevel = "6_6_avizo_writers"; @@ -26,7 +26,7 @@ TEST_CASE("ComplexCore::AvizoUniformCoordinateWriterFilter: Valid Filter Executi DataStructure dataStructure = UnitTest::LoadDataStructure(exemplarFilePath); // Instantiate the filter, a DataStructure object and an Arguments Object - AvizoUniformCoordinateWriterFilter filter; + WriteAvizoUniformCoordinateFilter filter; Arguments args; fs::path exemplarOutputPath = fs::path(fmt::format("{}/6_6_avizo_writers/6_6_avizo_uniform_coordinate_writer.am", unit_test::k_TestFilesDir)); @@ -35,11 +35,11 @@ TEST_CASE("ComplexCore::AvizoUniformCoordinateWriterFilter: Valid Filter Executi fs::path computedBinaryOutputPath(fmt::format("{}/NX_AvisoUniformOutput_binary.am", unit_test::k_BinaryTestOutputDir)); // Create default Parameters for the filter. - args.insertOrAssign(AvizoUniformCoordinateWriterFilter::k_OutputFile_Key, std::make_any(computedOutputPath)); - args.insertOrAssign(AvizoUniformCoordinateWriterFilter::k_WriteBinaryFile_Key, std::make_any(false)); - args.insertOrAssign(AvizoUniformCoordinateWriterFilter::k_GeometryPath_Key, std::make_any(DataPath({k_SmallIN100}))); - args.insertOrAssign(AvizoUniformCoordinateWriterFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({k_SmallIN100, k_EbsdScanData, k_FeatureIds}))); - args.insertOrAssign(AvizoUniformCoordinateWriterFilter::k_Units_Key, std::make_any("microns")); + args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_OutputFile_Key, std::make_any(computedOutputPath)); + args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_WriteBinaryFile_Key, std::make_any(false)); + args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_GeometryPath_Key, std::make_any(DataPath({k_SmallIN100}))); + args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({k_SmallIN100, k_EbsdScanData, k_FeatureIds}))); + args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_Units_Key, std::make_any("microns")); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -49,8 +49,8 @@ TEST_CASE("ComplexCore::AvizoUniformCoordinateWriterFilter: Valid Filter Executi auto executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) - args.insertOrAssign(AvizoUniformCoordinateWriterFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); - args.insertOrAssign(AvizoUniformCoordinateWriterFilter::k_WriteBinaryFile_Key, std::make_any(true)); + args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); + args.insertOrAssign(WriteAvizoUniformCoordinateFilter::k_WriteBinaryFile_Key, std::make_any(true)); preflightResult = filter.preflight(dataStructure, args); COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) From 0481d8a6a92d8bb7b3f6c1b2f1a1836f112e3a9f Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Mon, 23 Oct 2023 14:43:08 -0400 Subject: [PATCH 04/19] ComplexCore Algorithm renaming --- src/Plugins/ComplexCore/CMakeLists.txt | 14 +++--- .../ComplexCoreLegacyUUIDMapping.hpp | 4 +- .../Algorithms/ImportVolumeGraphicsFile.hpp | 46 ------------------- ...orthstar.cpp => ReadBinaryCTNorthstar.cpp} | 14 +++--- ...orthstar.hpp => ReadBinaryCTNorthstar.hpp} | 18 ++++---- ...eyFileV12.cpp => ReadDeformKeyFileV12.cpp} | 20 ++++---- ...eyFileV12.hpp => ReadDeformKeyFileV12.hpp} | 18 ++++---- ...{RawBinaryReader.cpp => ReadRawBinary.cpp} | 10 ++-- ...{RawBinaryReader.hpp => ReadRawBinary.hpp} | 18 ++++---- .../{StlFileReader.cpp => ReadStlFile.cpp} | 10 ++-- .../{StlFileReader.hpp => ReadStlFile.hpp} | 14 +++--- ...icsFile.cpp => ReadVolumeGraphicsFile.cpp} | 12 ++--- .../Algorithms/ReadVolumeGraphicsFile.hpp | 46 +++++++++++++++++++ ...mosFFTWriter.cpp => WriteLosAlamosFFT.cpp} | 10 ++-- ...mosFFTWriter.hpp => WriteLosAlamosFFT.hpp} | 18 ++++---- ...Writer.cpp => WriteVtkRectilinearGrid.cpp} | 16 +++---- ...Writer.hpp => WriteVtkRectilinearGrid.hpp} | 18 ++++---- .../Filters/ImportBinaryCTNorthstarFilter.cpp | 6 +-- .../Filters/ImportDeformKeyFileV12Filter.cpp | 10 ++-- .../ImportVolumeGraphicsFileFilter.cpp | 6 +-- .../Filters/LosAlamosFFTWriterFilter.cpp | 6 +-- .../Filters/RawBinaryReaderFilter.cpp | 6 +-- .../Filters/StlFileReaderFilter.cpp | 6 +-- .../Filters/StlFileReaderFilter.hpp | 2 +- .../VtkRectilinearGridWriterFilter.cpp | 6 +-- 25 files changed, 177 insertions(+), 177 deletions(-) delete mode 100644 src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportVolumeGraphicsFile.hpp rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{ImportBinaryCTNorthstar.cpp => ReadBinaryCTNorthstar.cpp} (90%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{ImportBinaryCTNorthstar.hpp => ReadBinaryCTNorthstar.hpp} (61%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{ImportDeformKeyFileV12.cpp => ReadDeformKeyFileV12.cpp} (97%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{ImportDeformKeyFileV12.hpp => ReadDeformKeyFileV12.hpp} (64%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{RawBinaryReader.cpp => ReadRawBinary.cpp} (94%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{RawBinaryReader.hpp => ReadRawBinary.hpp} (56%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{StlFileReader.cpp => ReadStlFile.cpp} (97%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{StlFileReader.hpp => ReadStlFile.hpp} (76%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{ImportVolumeGraphicsFile.cpp => ReadVolumeGraphicsFile.cpp} (76%) create mode 100644 src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{LosAlamosFFTWriter.cpp => WriteLosAlamosFFT.cpp} (87%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{LosAlamosFFTWriter.hpp => WriteLosAlamosFFT.hpp} (59%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{VtkRectilinearGridWriter.cpp => WriteVtkRectilinearGrid.cpp} (93%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/{VtkRectilinearGridWriter.hpp => WriteVtkRectilinearGrid.hpp} (70%) diff --git a/src/Plugins/ComplexCore/CMakeLists.txt b/src/Plugins/ComplexCore/CMakeLists.txt index aa67941310..907dfb693b 100644 --- a/src/Plugins/ComplexCore/CMakeLists.txt +++ b/src/Plugins/ComplexCore/CMakeLists.txt @@ -168,18 +168,18 @@ set(AlgorithmList GenerateColorTable GenerateVectorColors ImageContouring - ImportDeformKeyFileV12 - ImportVolumeGraphicsFile - ImportBinaryCTNorthstar + ReadDeformKeyFileV12 + ReadVolumeGraphicsFile + ReadBinaryCTNorthstar KMeans KMedoids LaplacianSmoothing - LosAlamosFFTWriter + WriteLosAlamosFFT NearestPointFuseRegularGrids PartitionGeometry PointSampleTriangleGeometry QuickSurfaceMesh - RawBinaryReader + ReadRawBinary RegularGridSampleSurfaceMesh RemoveFlaggedFeatures ReplaceElementAttributesWithNeighborValues @@ -189,12 +189,12 @@ set(AlgorithmList SharedFeatureFace Silhouette SplitAttributeArray - StlFileReader + ReadStlFile SurfaceNets TriangleCentroid TupleTransfer UncertainRegularGridSampleSurfaceMesh - VtkRectilinearGridWriter + WriteVtkRectilinearGrid WriteAbaqusHexahedron WriteAvizoRectilinearCoordinate WriteAvizoUniformCoordinate diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp index 607e0fab39..7c9640101d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp @@ -182,7 +182,7 @@ namespace complex {complex::Uuid::FromString("686d5393-2b02-5c86-b887-dd81a8ae80f2").value(), complex::FilterTraits::uuid}, // MultiThresholdObjects2 {complex::Uuid::FromString("119861c5-e303-537e-b210-2e62936222e9").value(), complex::FilterTraits::uuid}, // PointSampleTriangleGeometry {complex::Uuid::FromString("07b49e30-3900-5c34-862a-f1fb48bad568").value(), complex::FilterTraits::uuid}, // QuickSurfaceMesh - {complex::Uuid::FromString("0791f556-3d73-5b1e-b275-db3f7bb6850d").value(), complex::FilterTraits::uuid}, // RawBinaryReader + {complex::Uuid::FromString("0791f556-3d73-5b1e-b275-db3f7bb6850d").value(), complex::FilterTraits::uuid}, // ReadRawBinary {complex::Uuid::FromString("379ccc67-16dd-530a-984f-177db2314bac").value(), complex::FilterTraits::uuid}, // RemoveFlaggedVertices {complex::Uuid::FromString("53ac1638-8934-57b8-b8e5-4b91cdda23ec").value(), complex::FilterTraits::uuid}, // MinSize {complex::Uuid::FromString("53a5f731-2858-5e3e-bd43-8f2cf45d90ec").value(), complex::FilterTraits::uuid}, // RenameAttributeArray @@ -231,7 +231,7 @@ namespace complex {complex::Uuid::FromString("75cfeb9b-cd4b-5a20-a344-4170b39bbfaf").value(), complex::FilterTraits::uuid}, // UncertainRegularGridSampleSurfaceMesh {complex::Uuid::FromString("6357243e-41a6-52c4-be2d-2f6894c39fcc").value(), complex::FilterTraits::uuid}, // FindBoundaryElementFractions {complex::Uuid::FromString("9b9fb9e1-074d-54b6-a6ce-0be21ab4496d").value(), complex::FilterTraits::uuid}, // ReverseTriangleWinding - {complex::Uuid::FromString("158ebe9e-f772-57e2-ac1b-71ff213cf890").value(), complex::FilterTraits::uuid}, // LosAlamosFFTWriter + {complex::Uuid::FromString("158ebe9e-f772-57e2-ac1b-71ff213cf890").value(), complex::FilterTraits::uuid}, // WriteLosAlamosFFT {complex::Uuid::FromString("ef28de7e-5bdd-57c2-9318-60ba0dfaf7bc").value(), complex::FilterTraits::uuid}, // GenerateVectorColors {complex::Uuid::FromString("3c6337da-e232-4420-a5ca-451496748d88").value(), complex::FilterTraits::uuid}, // ImportDeformKeyFileV12Filter {complex::Uuid::FromString("f7486aa6-3049-5be7-8511-ae772b70c90b").value(), complex::FilterTraits::uuid}, // KMedoids diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportVolumeGraphicsFile.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportVolumeGraphicsFile.hpp deleted file mode 100644 index 9694f3d795..0000000000 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportVolumeGraphicsFile.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -#include "ComplexCore/ComplexCore_export.hpp" - -#include "complex/DataStructure/DataPath.hpp" -#include "complex/Filter/IFilter.hpp" -#include "complex/Parameters/FileSystemPathParameter.hpp" - -#include - -namespace fs = std::filesystem; - -namespace complex -{ - -struct COMPLEXCORE_EXPORT ImportVolumeGraphicsFileInputValues -{ - DataPath ImageGeometryPath; - std::string CellAttributeMatrixName; - std::string DensityArrayName; - fs::path VGDataFile; -}; - -class COMPLEXCORE_EXPORT ImportVolumeGraphicsFile -{ -public: - ImportVolumeGraphicsFile(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, ImportVolumeGraphicsFileInputValues* inputValues); - ~ImportVolumeGraphicsFile() noexcept; - - ImportVolumeGraphicsFile(const ImportVolumeGraphicsFile&) = delete; - ImportVolumeGraphicsFile(ImportVolumeGraphicsFile&&) noexcept = delete; - ImportVolumeGraphicsFile& operator=(const ImportVolumeGraphicsFile&) = delete; - ImportVolumeGraphicsFile& operator=(ImportVolumeGraphicsFile&&) noexcept = delete; - - Result<> operator()(); - - const std::atomic_bool& getCancel(); - -private: - DataStructure& m_DataStructure; - const ImportVolumeGraphicsFileInputValues* m_InputValues = nullptr; - const std::atomic_bool& m_ShouldCancel; - const IFilter::MessageHandler& m_MessageHandler; -}; - -} // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportBinaryCTNorthstar.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportBinaryCTNorthstar.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp index 0abdded6e1..859e014604 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportBinaryCTNorthstar.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.cpp @@ -1,4 +1,4 @@ -#include "ImportBinaryCTNorthstar.hpp" +#include "ReadBinaryCTNorthstar.hpp" #include "complex/Common/ScopeGuard.hpp" #include "complex/DataStructure/DataArray.hpp" @@ -27,7 +27,7 @@ Result<> SanityCheckFileSizeVersusAllocatedSize(size_t allocatedBytes, size_t fi } // ----------------------------------------------------------------------------- -Result<> ReadBinaryCTFiles(DataStructure& dataStructure, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel, const ImportBinaryCTNorthstarInputValues* inputValues) +Result<> ReadBinaryCTFiles(DataStructure& dataStructure, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel, const ReadBinaryCTNorthstarInputValues* inputValues) { auto& geom = dataStructure.getDataRefAs(inputValues->ImageGeometryPath); geom.setUnits(static_cast(inputValues->LengthUnit)); @@ -117,8 +117,8 @@ Result<> ReadBinaryCTFiles(DataStructure& dataStructure, const IFilter::MessageH } // namespace // ----------------------------------------------------------------------------- -ImportBinaryCTNorthstar::ImportBinaryCTNorthstar(DataStructure& dataStructure, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel, - ImportBinaryCTNorthstarInputValues* inputValues) +ReadBinaryCTNorthstar::ReadBinaryCTNorthstar(DataStructure& dataStructure, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel, + ReadBinaryCTNorthstarInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -127,16 +127,16 @@ ImportBinaryCTNorthstar::ImportBinaryCTNorthstar(DataStructure& dataStructure, c } // ----------------------------------------------------------------------------- -ImportBinaryCTNorthstar::~ImportBinaryCTNorthstar() noexcept = default; +ReadBinaryCTNorthstar::~ReadBinaryCTNorthstar() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& ImportBinaryCTNorthstar::getCancel() +const std::atomic_bool& ReadBinaryCTNorthstar::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -Result<> ImportBinaryCTNorthstar::operator()() +Result<> ReadBinaryCTNorthstar::operator()() { Result<> result = ReadBinaryCTFiles(m_DataStructure, m_MessageHandler, m_ShouldCancel, m_InputValues); if(result.invalid()) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportBinaryCTNorthstar.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp similarity index 61% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportBinaryCTNorthstar.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp index b27a127c96..b53454d00b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportBinaryCTNorthstar.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp @@ -13,7 +13,7 @@ namespace fs = std::filesystem; namespace complex { -struct COMPLEXCORE_EXPORT ImportBinaryCTNorthstarInputValues +struct COMPLEXCORE_EXPORT ReadBinaryCTNorthstarInputValues { FileSystemPathParameter::ValueType InputHeaderFile; DataPath ImageGeometryPath; @@ -33,16 +33,16 @@ struct COMPLEXCORE_EXPORT ImportBinaryCTNorthstarInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ImportBinaryCTNorthstar +class COMPLEXCORE_EXPORT ReadBinaryCTNorthstar { public: - ImportBinaryCTNorthstar(DataStructure& dataStructure, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel, ImportBinaryCTNorthstarInputValues* inputValues); - ~ImportBinaryCTNorthstar() noexcept; + ReadBinaryCTNorthstar(DataStructure& dataStructure, const IFilter::MessageHandler& messageHandler, const std::atomic_bool& shouldCancel, ReadBinaryCTNorthstarInputValues* inputValues); + ~ReadBinaryCTNorthstar() noexcept; - ImportBinaryCTNorthstar(const ImportBinaryCTNorthstar&) = delete; - ImportBinaryCTNorthstar(ImportBinaryCTNorthstar&&) noexcept = delete; - ImportBinaryCTNorthstar& operator=(const ImportBinaryCTNorthstar&) = delete; - ImportBinaryCTNorthstar& operator=(ImportBinaryCTNorthstar&&) noexcept = delete; + ReadBinaryCTNorthstar(const ReadBinaryCTNorthstar&) = delete; + ReadBinaryCTNorthstar(ReadBinaryCTNorthstar&&) noexcept = delete; + ReadBinaryCTNorthstar& operator=(const ReadBinaryCTNorthstar&) = delete; + ReadBinaryCTNorthstar& operator=(ReadBinaryCTNorthstar&&) noexcept = delete; Result<> operator()(); @@ -50,7 +50,7 @@ class COMPLEXCORE_EXPORT ImportBinaryCTNorthstar private: DataStructure& m_DataStructure; - const ImportBinaryCTNorthstarInputValues* m_InputValues = nullptr; + const ReadBinaryCTNorthstarInputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportDeformKeyFileV12.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportDeformKeyFileV12.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp index 6743a97559..d3bf112bc1 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportDeformKeyFileV12.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp @@ -1,4 +1,4 @@ -#include "ImportDeformKeyFileV12.hpp" +#include "ReadDeformKeyFileV12.hpp" #include "complex/DataStructure/AttributeMatrix.hpp" #include "complex/DataStructure/Geometry/IGeometry.hpp" @@ -29,7 +29,7 @@ const std::vector k_DataForObject = {"Data", "for", "Object", "#"}; class IOHandler { public: - IOHandler(ImportDeformKeyFileV12* filter, DataStructure& dataStructure, std::ifstream& inStream, const DataPath& quadGeomPath, const DataPath& vertexAMPath, const DataPath& cellAMPath, + IOHandler(ReadDeformKeyFileV12* filter, DataStructure& dataStructure, std::ifstream& inStream, const DataPath& quadGeomPath, const DataPath& vertexAMPath, const DataPath& cellAMPath, const bool allocate) : m_Filter(filter) , m_DataStructure(dataStructure) @@ -184,7 +184,7 @@ class IOHandler private: // member variables - ImportDeformKeyFileV12* m_Filter; + ReadDeformKeyFileV12* m_Filter; DataStructure& m_DataStructure; std::ifstream& m_InStream; const DataPath& m_QuadGeomPath; @@ -784,8 +784,8 @@ class IOHandler } // namespace // ----------------------------------------------------------------------------- -ImportDeformKeyFileV12::ImportDeformKeyFileV12(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - ImportDeformKeyFileV12InputValues* inputValues) +ReadDeformKeyFileV12::ReadDeformKeyFileV12(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, + ReadDeformKeyFileV12InputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -795,28 +795,28 @@ ImportDeformKeyFileV12::ImportDeformKeyFileV12(DataStructure& dataStructure, con } // ----------------------------------------------------------------------------- -ImportDeformKeyFileV12::~ImportDeformKeyFileV12() noexcept = default; +ReadDeformKeyFileV12::~ReadDeformKeyFileV12() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& ImportDeformKeyFileV12::getCancel() +const std::atomic_bool& ReadDeformKeyFileV12::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -void ImportDeformKeyFileV12::updateProgress(const std::string& progressMessage) +void ReadDeformKeyFileV12::updateProgress(const std::string& progressMessage) { m_MessageHandler({IFilter::Message::Type::Info, progressMessage}); } // ----------------------------------------------------------------------------- -FileCache& ImportDeformKeyFileV12::getCache() +FileCache& ReadDeformKeyFileV12::getCache() { return m_Cache; } // ----------------------------------------------------------------------------- -Result<> ImportDeformKeyFileV12::operator()(bool allocate) +Result<> ReadDeformKeyFileV12::operator()(bool allocate) { /* * IF allocate is false DO NOT TOUCH DATA STRUCTURE IN ANY WAY diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportDeformKeyFileV12.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp similarity index 64% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportDeformKeyFileV12.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp index 867c9a98c0..2c3ad0ec4a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportDeformKeyFileV12.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.hpp @@ -34,7 +34,7 @@ struct COMPLEXCORE_EXPORT FileCache } }; -struct COMPLEXCORE_EXPORT ImportDeformKeyFileV12InputValues +struct COMPLEXCORE_EXPORT ReadDeformKeyFileV12InputValues { fs::path InputFilePath; DataPath QuadGeomPath; @@ -48,16 +48,16 @@ struct COMPLEXCORE_EXPORT ImportDeformKeyFileV12InputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT ImportDeformKeyFileV12 +class COMPLEXCORE_EXPORT ReadDeformKeyFileV12 { public: - ImportDeformKeyFileV12(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ImportDeformKeyFileV12InputValues* inputValues); - ~ImportDeformKeyFileV12() noexcept; + ReadDeformKeyFileV12(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadDeformKeyFileV12InputValues* inputValues); + ~ReadDeformKeyFileV12() noexcept; - ImportDeformKeyFileV12(const ImportDeformKeyFileV12&) = delete; - ImportDeformKeyFileV12(ImportDeformKeyFileV12&&) noexcept = delete; - ImportDeformKeyFileV12& operator=(const ImportDeformKeyFileV12&) = delete; - ImportDeformKeyFileV12& operator=(ImportDeformKeyFileV12&&) noexcept = delete; + ReadDeformKeyFileV12(const ReadDeformKeyFileV12&) = delete; + ReadDeformKeyFileV12(ReadDeformKeyFileV12&&) noexcept = delete; + ReadDeformKeyFileV12& operator=(const ReadDeformKeyFileV12&) = delete; + ReadDeformKeyFileV12& operator=(ReadDeformKeyFileV12&&) noexcept = delete; Result<> operator()(bool allocate); @@ -67,7 +67,7 @@ class COMPLEXCORE_EXPORT ImportDeformKeyFileV12 private: DataStructure& m_DataStructure; - const ImportDeformKeyFileV12InputValues* m_InputValues = nullptr; + const ReadDeformKeyFileV12InputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; FileCache m_Cache = {}; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RawBinaryReader.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RawBinaryReader.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.cpp index d83054a848..615e67d630 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RawBinaryReader.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.cpp @@ -34,7 +34,7 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include "RawBinaryReader.hpp" +#include "ReadRawBinary.hpp" #include "complex/Common/Bit.hpp" #include "complex/Common/ComplexConstants.hpp" @@ -100,7 +100,7 @@ Result<> ReadBinaryFile(IDataArray& dataArrayPtr, const std::string& filename, u namespace complex { -RawBinaryReader::RawBinaryReader(DataStructure& dataStructure, const RawBinaryReaderInputValues& inputValues, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler) +ReadRawBinary::ReadRawBinary(DataStructure& dataStructure, const ReadRawBinaryInputValues& inputValues, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -108,15 +108,15 @@ RawBinaryReader::RawBinaryReader(DataStructure& dataStructure, const RawBinaryRe { } -RawBinaryReader::~RawBinaryReader() noexcept = default; +ReadRawBinary::~ReadRawBinary() noexcept = default; -Result<> RawBinaryReader::operator()() +Result<> ReadRawBinary::operator()() { return execute(); } // ----------------------------------------------------------------------------- -Result<> RawBinaryReader::execute() +Result<> ReadRawBinary::execute() { IDataArray& binaryIDataArray = m_DataStructure.getDataRefAs(m_InputValues.createdAttributeArrayPathValue); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RawBinaryReader.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.hpp similarity index 56% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RawBinaryReader.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.hpp index 02065b9df2..9854a60413 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/RawBinaryReader.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadRawBinary.hpp @@ -9,7 +9,7 @@ namespace complex { inline constexpr int32 k_UnsupportedScalarType = -1070; -struct COMPLEXCORE_EXPORT RawBinaryReaderInputValues +struct COMPLEXCORE_EXPORT ReadRawBinaryInputValues { FileSystemPathParameter::ValueType inputFileValue; NumericType scalarTypeValue; @@ -19,22 +19,22 @@ struct COMPLEXCORE_EXPORT RawBinaryReaderInputValues DataPath createdAttributeArrayPathValue; }; -class COMPLEXCORE_EXPORT RawBinaryReader +class COMPLEXCORE_EXPORT ReadRawBinary { public: - RawBinaryReader(DataStructure& data, const RawBinaryReaderInputValues& inputValues, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler); - ~RawBinaryReader() noexcept; + ReadRawBinary(DataStructure& data, const ReadRawBinaryInputValues& inputValues, const std::atomic_bool& shouldCancel, const IFilter::MessageHandler& mesgHandler); + ~ReadRawBinary() noexcept; - RawBinaryReader(const RawBinaryReader&) = delete; - RawBinaryReader(RawBinaryReader&&) noexcept = delete; - RawBinaryReader& operator=(const RawBinaryReader&) = delete; - RawBinaryReader& operator=(RawBinaryReader&&) noexcept = delete; + ReadRawBinary(const ReadRawBinary&) = delete; + ReadRawBinary(ReadRawBinary&&) noexcept = delete; + ReadRawBinary& operator=(const ReadRawBinary&) = delete; + ReadRawBinary& operator=(ReadRawBinary&&) noexcept = delete; Result<> operator()(); private: DataStructure& m_DataStructure; - const RawBinaryReaderInputValues& m_InputValues; + const ReadRawBinaryInputValues& m_InputValues; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/StlFileReader.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp similarity index 97% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/StlFileReader.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp index 3a373093b0..1bd4271b1a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/StlFileReader.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp @@ -1,4 +1,4 @@ -#include "StlFileReader.hpp" +#include "ReadStlFile.hpp" #include "ComplexCore/utils/StlUtilities.hpp" @@ -94,7 +94,7 @@ std::array CreateMinMaxCoords() } // End anonymous namespace -StlFileReader::StlFileReader(DataStructure& data, fs::path stlFilePath, const DataPath& geometryPath, const DataPath& faceGroupPath, const DataPath& faceNormalsDataPath, bool scaleOutput, +ReadStlFile::ReadStlFile(DataStructure& data, fs::path stlFilePath, const DataPath& geometryPath, const DataPath& faceGroupPath, const DataPath& faceNormalsDataPath, bool scaleOutput, float32 scaleFactor, const std::atomic_bool& shouldCancel) : m_DataStructure(data) , m_FilePath(std::move(stlFilePath)) @@ -107,9 +107,9 @@ StlFileReader::StlFileReader(DataStructure& data, fs::path stlFilePath, const Da { } -StlFileReader::~StlFileReader() noexcept = default; +ReadStlFile::~ReadStlFile() noexcept = default; -Result<> StlFileReader::operator()() +Result<> ReadStlFile::operator()() { m_MinMaxCoords = ::CreateMinMaxCoords(); @@ -285,7 +285,7 @@ Result<> StlFileReader::operator()() // The fileSentinel will ensure the FILE* is closed. } -Result<> StlFileReader::eliminate_duplicate_nodes() +Result<> ReadStlFile::eliminate_duplicate_nodes() { TriangleGeom& triangleGeom = m_DataStructure.getDataRefAs(m_GeometryDataPath); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/StlFileReader.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp similarity index 76% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/StlFileReader.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp index 3d6450538a..53aa615002 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/StlFileReader.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp @@ -19,17 +19,17 @@ namespace complex * @brief This filter replaces values in the target array with a user specified value * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT StlFileReader +class COMPLEXCORE_EXPORT ReadStlFile { public: - StlFileReader(DataStructure& data, fs::path stlFilePath, const DataPath& geometryPath, const DataPath& faceGroupPath, const DataPath& faceNormalsDataPath, bool scaleOutput, float32 scaleFactor, + ReadStlFile(DataStructure& data, fs::path stlFilePath, const DataPath& geometryPath, const DataPath& faceGroupPath, const DataPath& faceNormalsDataPath, bool scaleOutput, float32 scaleFactor, const std::atomic_bool& shouldCancel); - ~StlFileReader() noexcept; + ~ReadStlFile() noexcept; - StlFileReader(const StlFileReader&) = delete; - StlFileReader(StlFileReader&&) noexcept = delete; - StlFileReader& operator=(const StlFileReader&) = delete; - StlFileReader& operator=(StlFileReader&&) noexcept = delete; + ReadStlFile(const ReadStlFile&) = delete; + ReadStlFile(ReadStlFile&&) noexcept = delete; + ReadStlFile& operator=(const ReadStlFile&) = delete; + ReadStlFile& operator=(ReadStlFile&&) noexcept = delete; Result<> operator()(); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportVolumeGraphicsFile.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp similarity index 76% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportVolumeGraphicsFile.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp index 1be8043694..689ffb410c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ImportVolumeGraphicsFile.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp @@ -1,4 +1,4 @@ -#include "ImportVolumeGraphicsFile.hpp" +#include "ReadVolumeGraphicsFile.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/DataStructure/DataGroup.hpp" @@ -13,8 +13,8 @@ inline const int32 k_VolBinaryAllocateMismatch = -91504; } // namespace // ----------------------------------------------------------------------------- -ImportVolumeGraphicsFile::ImportVolumeGraphicsFile(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, - ImportVolumeGraphicsFileInputValues* inputValues) +ReadVolumeGraphicsFile::ReadVolumeGraphicsFile(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, + ReadVolumeGraphicsFileInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -23,16 +23,16 @@ ImportVolumeGraphicsFile::ImportVolumeGraphicsFile(DataStructure& dataStructure, } // ----------------------------------------------------------------------------- -ImportVolumeGraphicsFile::~ImportVolumeGraphicsFile() noexcept = default; +ReadVolumeGraphicsFile::~ReadVolumeGraphicsFile() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& ImportVolumeGraphicsFile::getCancel() +const std::atomic_bool& ReadVolumeGraphicsFile::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -Result<> ImportVolumeGraphicsFile::operator()() +Result<> ReadVolumeGraphicsFile::operator()() { const DataPath densityArrayPath = m_InputValues->ImageGeometryPath.createChildPath(m_InputValues->CellAttributeMatrixName).createChildPath(m_InputValues->DensityArrayName); auto& density = m_DataStructure.getDataRefAs(densityArrayPath); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp new file mode 100644 index 0000000000..ffa7352955 --- /dev/null +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp @@ -0,0 +1,46 @@ +#pragma once + +#include "ComplexCore/ComplexCore_export.hpp" + +#include "complex/DataStructure/DataPath.hpp" +#include "complex/Filter/IFilter.hpp" +#include "complex/Parameters/FileSystemPathParameter.hpp" + +#include + +namespace fs = std::filesystem; + +namespace complex +{ + +struct COMPLEXCORE_EXPORT ReadVolumeGraphicsFileInputValues +{ + DataPath ImageGeometryPath; + std::string CellAttributeMatrixName; + std::string DensityArrayName; + fs::path VGDataFile; +}; + +class COMPLEXCORE_EXPORT ReadVolumeGraphicsFile +{ +public: + ReadVolumeGraphicsFile(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, ReadVolumeGraphicsFileInputValues* inputValues); + ~ReadVolumeGraphicsFile() noexcept; + + ReadVolumeGraphicsFile(const ReadVolumeGraphicsFile&) = delete; + ReadVolumeGraphicsFile(ReadVolumeGraphicsFile&&) noexcept = delete; + ReadVolumeGraphicsFile& operator=(const ReadVolumeGraphicsFile&) = delete; + ReadVolumeGraphicsFile& operator=(ReadVolumeGraphicsFile&&) noexcept = delete; + + Result<> operator()(); + + const std::atomic_bool& getCancel(); + +private: + DataStructure& m_DataStructure; + const ReadVolumeGraphicsFileInputValues* m_InputValues = nullptr; + const std::atomic_bool& m_ShouldCancel; + const IFilter::MessageHandler& m_MessageHandler; +}; + +} // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LosAlamosFFTWriter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.cpp similarity index 87% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LosAlamosFFTWriter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.cpp index b6b530fea6..3f67f5933c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LosAlamosFFTWriter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.cpp @@ -1,4 +1,4 @@ -#include "LosAlamosFFTWriter.hpp" +#include "WriteLosAlamosFFT.hpp" #include "complex/Common/Constants.hpp" #include "complex/DataStructure/DataArray.hpp" @@ -16,7 +16,7 @@ using ull = unsigned long long int; } // ----------------------------------------------------------------------------- -LosAlamosFFTWriter::LosAlamosFFTWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, LosAlamosFFTWriterInputValues* inputValues) +WriteLosAlamosFFT::WriteLosAlamosFFT(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteLosAlamosFFTInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -25,16 +25,16 @@ LosAlamosFFTWriter::LosAlamosFFTWriter(DataStructure& dataStructure, const IFilt } // ----------------------------------------------------------------------------- -LosAlamosFFTWriter::~LosAlamosFFTWriter() noexcept = default; +WriteLosAlamosFFT::~WriteLosAlamosFFT() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& LosAlamosFFTWriter::getCancel() +const std::atomic_bool& WriteLosAlamosFFT::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -Result<> LosAlamosFFTWriter::operator()() +Result<> WriteLosAlamosFFT::operator()() { /** * Header print function was unimplemented in original filter so it was omitted here and condensed to just the writeFile() function diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LosAlamosFFTWriter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp similarity index 59% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LosAlamosFFTWriter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp index 334bac646a..3787108998 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/LosAlamosFFTWriter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp @@ -11,7 +11,7 @@ namespace complex { -struct COMPLEXCORE_EXPORT LosAlamosFFTWriterInputValues +struct COMPLEXCORE_EXPORT WriteLosAlamosFFTInputValues { FileSystemPathParameter::ValueType OutputFile; DataPath FeatureIdsArrayPath; @@ -26,16 +26,16 @@ struct COMPLEXCORE_EXPORT LosAlamosFFTWriterInputValues * where a bool mask array specifies. */ -class COMPLEXCORE_EXPORT LosAlamosFFTWriter +class COMPLEXCORE_EXPORT WriteLosAlamosFFT { public: - LosAlamosFFTWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, LosAlamosFFTWriterInputValues* inputValues); - ~LosAlamosFFTWriter() noexcept; + WriteLosAlamosFFT(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteLosAlamosFFTInputValues* inputValues); + ~WriteLosAlamosFFT() noexcept; - LosAlamosFFTWriter(const LosAlamosFFTWriter&) = delete; - LosAlamosFFTWriter(LosAlamosFFTWriter&&) noexcept = delete; - LosAlamosFFTWriter& operator=(const LosAlamosFFTWriter&) = delete; - LosAlamosFFTWriter& operator=(LosAlamosFFTWriter&&) noexcept = delete; + WriteLosAlamosFFT(const WriteLosAlamosFFT&) = delete; + WriteLosAlamosFFT(WriteLosAlamosFFT&&) noexcept = delete; + WriteLosAlamosFFT& operator=(const WriteLosAlamosFFT&) = delete; + WriteLosAlamosFFT& operator=(WriteLosAlamosFFT&&) noexcept = delete; Result<> operator()(); @@ -43,7 +43,7 @@ class COMPLEXCORE_EXPORT LosAlamosFFTWriter private: DataStructure& m_DataStructure; - const LosAlamosFFTWriterInputValues* m_InputValues = nullptr; + const WriteLosAlamosFFTInputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/VtkRectilinearGridWriter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp similarity index 93% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/VtkRectilinearGridWriter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp index b065646142..23951eace6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/VtkRectilinearGridWriter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp @@ -1,4 +1,4 @@ -#include "VtkRectilinearGridWriter.hpp" +#include "WriteVtkRectilinearGrid.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/DataStructure/Geometry/ImageGeom.hpp" @@ -220,8 +220,8 @@ struct WriteVtkDataArrayFunctor } // namespace // ----------------------------------------------------------------------------- -VtkRectilinearGridWriter::VtkRectilinearGridWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - VtkRectilinearGridWriterInputValues* inputValues) +WriteVtkRectilinearGrid::WriteVtkRectilinearGrid(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, + WriteVtkRectilinearGridInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -230,16 +230,16 @@ VtkRectilinearGridWriter::VtkRectilinearGridWriter(DataStructure& dataStructure, } // ----------------------------------------------------------------------------- -VtkRectilinearGridWriter::~VtkRectilinearGridWriter() noexcept = default; +WriteVtkRectilinearGrid::~WriteVtkRectilinearGrid() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& VtkRectilinearGridWriter::getCancel() +const std::atomic_bool& WriteVtkRectilinearGrid::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -Result<> VtkRectilinearGridWriter::operator()() +Result<> WriteVtkRectilinearGrid::operator()() { // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path @@ -298,7 +298,7 @@ Result<> VtkRectilinearGridWriter::operator()() } // ----------------------------------------------------------------------------- -void VtkRectilinearGridWriter::writeVtkHeader(FILE* outputFile) const +void WriteVtkRectilinearGrid::writeVtkHeader(FILE* outputFile) const { const auto& geom = m_DataStructure.getDataRefAs(m_InputValues->ImageGeometryPath); const usize xPoints = geom.getNumXCells() + 1; @@ -322,7 +322,7 @@ void VtkRectilinearGridWriter::writeVtkHeader(FILE* outputFile) const // ----------------------------------------------------------------------------- template -Result<> VtkRectilinearGridWriter::writeCoords(FILE* outputFile, const std::string& axis, const std::string& type, int64 nPoints, T min, T max, T step) +Result<> WriteVtkRectilinearGrid::writeCoords(FILE* outputFile, const std::string& axis, const std::string& type, int64 nPoints, T min, T max, T step) { fprintf(outputFile, "%s %lld %s\n", axis.c_str(), static_cast(nPoints), type.c_str()); if(m_InputValues->WriteBinaryFile) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/VtkRectilinearGridWriter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp similarity index 70% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/VtkRectilinearGridWriter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp index 685b3dc22f..8afb8ec936 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/VtkRectilinearGridWriter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp @@ -13,7 +13,7 @@ namespace complex class ImageGeom; class IDataArray; -struct COMPLEXCORE_EXPORT VtkRectilinearGridWriterInputValues +struct COMPLEXCORE_EXPORT WriteVtkRectilinearGridInputValues { FileSystemPathParameter::ValueType OutputFile; bool WriteBinaryFile; @@ -26,16 +26,16 @@ struct COMPLEXCORE_EXPORT VtkRectilinearGridWriterInputValues * @brief This filter ... */ -class COMPLEXCORE_EXPORT VtkRectilinearGridWriter +class COMPLEXCORE_EXPORT WriteVtkRectilinearGrid { public: - VtkRectilinearGridWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, VtkRectilinearGridWriterInputValues* inputValues); - ~VtkRectilinearGridWriter() noexcept; + WriteVtkRectilinearGrid(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteVtkRectilinearGridInputValues* inputValues); + ~WriteVtkRectilinearGrid() noexcept; - VtkRectilinearGridWriter(const VtkRectilinearGridWriter&) = delete; - VtkRectilinearGridWriter(VtkRectilinearGridWriter&&) noexcept = delete; - VtkRectilinearGridWriter& operator=(const VtkRectilinearGridWriter&) = delete; - VtkRectilinearGridWriter& operator=(VtkRectilinearGridWriter&&) noexcept = delete; + WriteVtkRectilinearGrid(const WriteVtkRectilinearGrid&) = delete; + WriteVtkRectilinearGrid(WriteVtkRectilinearGrid&&) noexcept = delete; + WriteVtkRectilinearGrid& operator=(const WriteVtkRectilinearGrid&) = delete; + WriteVtkRectilinearGrid& operator=(WriteVtkRectilinearGrid&&) noexcept = delete; Result<> operator()(); @@ -60,7 +60,7 @@ class COMPLEXCORE_EXPORT VtkRectilinearGridWriter private: DataStructure& m_DataStructure; - const VtkRectilinearGridWriterInputValues* m_InputValues = nullptr; + const WriteVtkRectilinearGridInputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.cpp index feb616543b..d457e92c85 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.cpp @@ -1,6 +1,6 @@ #include "ImportBinaryCTNorthstarFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ImportBinaryCTNorthstar.hpp" +#include "ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp" #include "complex/DataStructure/Geometry/IGeometry.hpp" #include "complex/Filter/Actions/CreateArrayAction.hpp" @@ -526,7 +526,7 @@ IFilter::PreflightResult ImportBinaryCTNorthstarFilter::preflightImpl(const Data Result<> ImportBinaryCTNorthstarFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - ImportBinaryCTNorthstarInputValues inputValues; + ReadBinaryCTNorthstarInputValues inputValues; inputValues.InputHeaderFile = filterArgs.value(k_InputHeaderFile_Key); inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometryPath_Key); @@ -544,6 +544,6 @@ Result<> ImportBinaryCTNorthstarFilter::executeImpl(DataStructure& dataStructure inputValues.EndVoxelCoord = s_HeaderCache[m_InstanceId].EndVoxelCoord; inputValues.LengthUnit = filterArgs.value(k_LengthUnit_Key); - return ImportBinaryCTNorthstar(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return ReadBinaryCTNorthstar(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.cpp index 52b8feb7d8..d70d0ee4d8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.cpp @@ -1,6 +1,6 @@ #include "ImportDeformKeyFileV12Filter.hpp" -#include "Algorithms/ImportDeformKeyFileV12.hpp" +#include "Algorithms/ReadDeformKeyFileV12.hpp" #include "complex/Filter/Actions/CreateArrayAction.hpp" #include "complex/Filter/Actions/CreateGeometry2DAction.hpp" @@ -109,7 +109,7 @@ IFilter::PreflightResult ImportDeformKeyFileV12Filter::preflightImpl(const DataS // Read from the file if the input file has changed or the input file's time stamp is out of date. if(pInputFilePathValue != s_HeaderCache[m_InstanceId].inputFile || s_HeaderCache[m_InstanceId].timeStamp < fs::last_write_time(pInputFilePathValue)) { - ImportDeformKeyFileV12InputValues inputValues; + ReadDeformKeyFileV12InputValues inputValues; inputValues.InputFilePath = pInputFilePathValue; inputValues.QuadGeomPath = pQuadGeomPathValue; @@ -118,7 +118,7 @@ IFilter::PreflightResult ImportDeformKeyFileV12Filter::preflightImpl(const DataS // Read from the file DataStructure throwaway = DataStructure(); - ImportDeformKeyFileV12 algorithm(throwaway, messageHandler, shouldCancel, &inputValues); + ReadDeformKeyFileV12 algorithm(throwaway, messageHandler, shouldCancel, &inputValues); algorithm.operator()(false); // Cache the results from algorithm run s_HeaderCache[m_InstanceId] = algorithm.getCache(); @@ -172,13 +172,13 @@ IFilter::PreflightResult ImportDeformKeyFileV12Filter::preflightImpl(const DataS Result<> ImportDeformKeyFileV12Filter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - ImportDeformKeyFileV12InputValues inputValues; + ReadDeformKeyFileV12InputValues inputValues; inputValues.InputFilePath = s_HeaderCache[m_InstanceId].inputFile; inputValues.QuadGeomPath = filterArgs.value(k_QuadGeomPath_Key); inputValues.CellAMPath = filterArgs.value(k_QuadGeomPath_Key).createChildPath(filterArgs.value(k_CellAMName_Key)); inputValues.VertexAMPath = filterArgs.value(k_QuadGeomPath_Key).createChildPath(filterArgs.value(k_VertexAMName_Key)); - return ImportDeformKeyFileV12(dataStructure, messageHandler, shouldCancel, &inputValues)(true); + return ReadDeformKeyFileV12(dataStructure, messageHandler, shouldCancel, &inputValues)(true); } } // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.cpp index 92b0d5762d..6f4661fee0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.cpp @@ -1,6 +1,6 @@ #include "ImportVolumeGraphicsFileFilter.hpp" -#include "ComplexCore/Filters/Algorithms/ImportVolumeGraphicsFile.hpp" +#include "ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp" #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/CreateArrayAction.hpp" @@ -449,13 +449,13 @@ Result<> ImportVolumeGraphicsFileFilter::executeImpl(DataStructure& dataStructur const std::atomic_bool& shouldCancel) const { - ImportVolumeGraphicsFileInputValues inputValues; + ReadVolumeGraphicsFileInputValues inputValues; inputValues.ImageGeometryPath = filterArgs.value(k_NewImageGeometry_Key); inputValues.CellAttributeMatrixName = filterArgs.value(k_CellAttributeMatrixName_Key); inputValues.DensityArrayName = filterArgs.value(k_DensityArrayName_Key); inputValues.VGDataFile = s_HeaderCache[m_InstanceId].VgiDataFilePath; - return ImportVolumeGraphicsFile(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return ReadVolumeGraphicsFile(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.cpp index 46fc0d0b5f..307ea26707 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.cpp @@ -1,6 +1,6 @@ #include "LosAlamosFFTWriterFilter.hpp" -#include "ComplexCore/Filters/Algorithms/LosAlamosFFTWriter.hpp" +#include "ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp" #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/EmptyAction.hpp" @@ -105,7 +105,7 @@ IFilter::PreflightResult LosAlamosFFTWriterFilter::preflightImpl(const DataStruc Result<> LosAlamosFFTWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - LosAlamosFFTWriterInputValues inputValues; + WriteLosAlamosFFTInputValues inputValues; inputValues.OutputFile = filterArgs.value(k_OutputFile_Key); inputValues.FeatureIdsArrayPath = filterArgs.value(k_FeatureIdsArrayPath_Key); @@ -113,6 +113,6 @@ Result<> LosAlamosFFTWriterFilter::executeImpl(DataStructure& dataStructure, con inputValues.CellPhasesArrayPath = filterArgs.value(k_CellPhasesArrayPath_Key); inputValues.ImageGeomPath = filterArgs.value(k_ImageGeomPath); - return LosAlamosFFTWriter(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return WriteLosAlamosFFT(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.cpp index 6c6e00c692..1c51d13d33 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.cpp @@ -1,6 +1,6 @@ #include "RawBinaryReaderFilter.hpp" -#include "ComplexCore/Filters/Algorithms/RawBinaryReader.hpp" +#include "ComplexCore/Filters/Algorithms/ReadRawBinary.hpp" #include "complex/Common/TypesUtility.hpp" #include "complex/DataStructure/DataPath.hpp" @@ -169,7 +169,7 @@ IFilter::PreflightResult RawBinaryReaderFilter::preflightImpl(const DataStructur Result<> RawBinaryReaderFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - RawBinaryReaderInputValues inputValues; + ReadRawBinaryInputValues inputValues; inputValues.inputFileValue = filterArgs.value(k_InputFile_Key); inputValues.scalarTypeValue = filterArgs.value(k_ScalarType_Key); @@ -179,6 +179,6 @@ Result<> RawBinaryReaderFilter::executeImpl(DataStructure& dataStructure, const inputValues.createdAttributeArrayPathValue = filterArgs.value(k_CreatedAttributeArrayPath_Key); // Let the Algorithm instance do the work - return RawBinaryReader(dataStructure, inputValues, shouldCancel, messageHandler)(); + return ReadRawBinary(dataStructure, inputValues, shouldCancel, messageHandler)(); } } // namespace complex diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.cpp index d0d08a664d..ea3d3bdab5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.cpp @@ -1,6 +1,6 @@ #include "StlFileReaderFilter.hpp" -#include "ComplexCore/Filters/Algorithms/StlFileReader.hpp" +#include "ComplexCore/Filters/Algorithms/ReadStlFile.hpp" #include "ComplexCore/utils/StlUtilities.hpp" #include "complex/DataStructure/DataPath.hpp" @@ -187,8 +187,8 @@ Result<> StlFileReaderFilter::executeImpl(DataStructure& data, const Arguments& auto scaleOutput = filterArgs.value(k_ScaleOutput); auto scaleFactor = filterArgs.value(k_ScaleFactor); - // The actual STL File Reading is placed in a separate class `StlFileReader` - Result<> result = StlFileReader(data, pStlFilePathValue, pTriangleGeometryPath, pFaceDataGroupPath, pFaceNormalsPath, scaleOutput, scaleFactor, shouldCancel)(); + // The actual STL File Reading is placed in a separate class `ReadStlFile` + Result<> result = ReadStlFile(data, pStlFilePathValue, pTriangleGeometryPath, pFaceDataGroupPath, pFaceNormalsPath, scaleOutput, scaleFactor, shouldCancel)(); return result; } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.hpp index de9a9cd096..71e4a16cbf 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.hpp @@ -10,7 +10,7 @@ namespace complex /** * @brief StlFileReaderFilter This filter will read a Binary STL file into a Triangle * Geometry including the Normal Vector for each face. The actual algorithm is - * contained in the ComplexCore/Filters/Algorithms/StlFileReader + * contained in the ComplexCore/Filters/Algorithms/ReadStlFile * */ class COMPLEXCORE_EXPORT StlFileReaderFilter : public IFilter diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.cpp index d290d07c8c..fba287b850 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.cpp @@ -1,6 +1,6 @@ #include "VtkRectilinearGridWriterFilter.hpp" -#include "ComplexCore/Filters/Algorithms/VtkRectilinearGridWriter.hpp" +#include "ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp" #include "complex/DataStructure/DataPath.hpp" #include "complex/DataStructure/Geometry/ImageGeom.hpp" @@ -110,13 +110,13 @@ IFilter::PreflightResult VtkRectilinearGridWriterFilter::preflightImpl(const Dat Result<> VtkRectilinearGridWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - VtkRectilinearGridWriterInputValues inputValues; + WriteVtkRectilinearGridInputValues inputValues; inputValues.OutputFile = filterArgs.value(k_OutputFile_Key); inputValues.WriteBinaryFile = filterArgs.value(k_WriteBinaryFile_Key); inputValues.ImageGeometryPath = filterArgs.value(k_ImageGeometryPath_Key); inputValues.SelectedDataArrayPaths = filterArgs.value(k_SelectedDataArrayPaths_Key); - return VtkRectilinearGridWriter(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return WriteVtkRectilinearGrid(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex From c9183244e6e9c6d26b2aea540245bdb382402c3b Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Mon, 23 Oct 2023 16:32:44 -0400 Subject: [PATCH 05/19] Complete complexcore io rename update --- pipelines/Combo-EBSD-osc_r0c0.d3dpipeline | 2 +- pipelines/PorosityAnalysis.d3dpipeline | 2 +- src/Plugins/ComplexCore/CMakeLists.txt | 46 ++++---- ...lter.md => ReadBinaryCTNorthstarFilter.md} | 0 ...tDREAM3DFilter.md => ReadDREAM3DFilter.md} | 2 +- ...ilter.md => ReadDeformKeyFileV12Filter.md} | 0 ...mportHDF5Dataset.md => ReadHDF5Dataset.md} | 0 ...ReaderFilter.md => ReadRawBinaryFilter.md} | 0 ...leReaderFilter.md => ReadStlFileFilter.md} | 0 ...ter.md => ReadVolumeGraphicsFileFilter.md} | 0 ...DREAM3DFilter.md => WriteDREAM3DFilter.md} | 2 +- ...Filter.md => WriteFeatureDataCSVFilter.md} | 0 ...erFilter.md => WriteLosAlamosFFTFilter.md} | 0 ...er.md => WriteVtkRectilinearGridFilter.md} | 0 .../AppendImageGeometryZSlice.d3dpipeline | 2 +- .../ApplyTransformation_Image.d3dpipeline | 2 +- .../ApplyTransformation_Node.d3dpipeline | 10 +- .../ArrayCalculatorExample.d3dpipeline | 2 +- .../pipelines/AvizoWriters.d3dpipeline | 2 +- .../pipelines/CombineStlFiles.d3dpipeline | 2 +- .../pipelines/FindBiasedFeatures.d3dpipeline | 4 +- .../pipelines/FindBoundaryCells.d3dpipeline | 4 +- .../FindLargestCrossSections.d3dpipeline | 2 +- .../pipelines/Import_ASCII.d3dpipeline | 2 +- .../pipelines/Import_STL_Model.d3dpipeline | 2 +- ...eElementAttributesWithNeighbor.d3dpipeline | 2 +- .../ResamplePorosityImage.d3dpipeline | 2 +- .../ResampleRectGridToImageGeom.d3dpipeline | 2 +- .../pipelines/SurfaceNets_Demo.d3dpipeline | 2 +- .../Triangle_Face_Data_Demo.d3dpipeline | 2 +- .../VtkRectilinearGridWriter.d3dpipeline | 6 +- .../ComplexCoreLegacyUUIDMapping.hpp | 44 ++++---- .../Filters/Algorithms/CombineStlFiles.cpp | 8 +- ...er.cpp => ReadBinaryCTNorthstarFilter.cpp} | 50 ++++----- ...er.hpp => ReadBinaryCTNorthstarFilter.hpp} | 18 ++-- ...REAM3DFilter.cpp => ReadDREAM3DFilter.cpp} | 30 +++--- ...REAM3DFilter.hpp => ReadDREAM3DFilter.hpp} | 22 ++-- ...ter.cpp => ReadDeformKeyFileV12Filter.cpp} | 34 +++--- ...ter.hpp => ReadDeformKeyFileV12Filter.hpp} | 18 ++-- ...ortHDF5Dataset.cpp => ReadHDF5Dataset.cpp} | 30 +++--- ...ortHDF5Dataset.hpp => ReadHDF5Dataset.hpp} | 18 ++-- ...aderFilter.cpp => ReadRawBinaryFilter.cpp} | 30 +++--- ...aderFilter.hpp => ReadRawBinaryFilter.hpp} | 18 ++-- ...ReaderFilter.cpp => ReadStlFileFilter.cpp} | 30 +++--- ...ReaderFilter.hpp => ReadStlFileFilter.hpp} | 18 ++-- ...r.cpp => ReadVolumeGraphicsFileFilter.cpp} | 42 ++++---- ...r.hpp => ReadVolumeGraphicsFileFilter.hpp} | 18 ++-- .../Filters/WriteASCIIDataFilter.cpp | 2 +- .../WriteAvizoRectilinearCoordinateFilter.cpp | 2 +- .../WriteAvizoUniformCoordinateFilter.cpp | 2 +- .../Filters/WriteBinaryDataFilter.cpp | 2 +- ...EAM3DFilter.cpp => WriteDREAM3DFilter.cpp} | 28 ++--- ...EAM3DFilter.hpp => WriteDREAM3DFilter.hpp} | 22 ++-- ...lter.cpp => WriteFeatureDataCSVFilter.cpp} | 30 +++--- ...lter.hpp => WriteFeatureDataCSVFilter.hpp} | 18 ++-- ...Filter.cpp => WriteLosAlamosFFTFilter.cpp} | 30 +++--- ...Filter.hpp => WriteLosAlamosFFTFilter.hpp} | 18 ++-- .../Filters/WriteStlFileFilter.cpp | 2 +- ....cpp => WriteVtkRectilinearGridFilter.cpp} | 30 +++--- ....hpp => WriteVtkRectilinearGridFilter.hpp} | 18 ++-- .../test/ApproximatePointCloudHullTest.cpp | 8 +- src/Plugins/ComplexCore/test/CMakeLists.txt | 35 +++--- .../test/CalculateFeatureSizesTest.cpp | 2 +- .../test/CalculateTriangleAreasFilterTest.cpp | 8 +- .../test/FindSurfaceFeaturesTest.cpp | 22 ++-- .../test/LaplacianSmoothingFilterTest.cpp | 8 +- .../test/PartitionGeometryTest.cpp | 40 +++---- .../PointSampleTriangleGeometryFilterTest.cpp | 8 +- ...Test.cpp => ReadBinaryCTNorthstarTest.cpp} | 102 +++++++++--------- ...2Test.cpp => ReadDeformKeyFileV12Test.cpp} | 26 ++--- ...atasetTest.cpp => ReadHDF5DatasetTest.cpp} | 38 +++---- ...ryReaderTest.cpp => ReadRawBinaryTest.cpp} | 36 +++---- ...FileReaderTest.cpp => ReadStlFileTest.cpp} | 10 +- ...est.cpp => ReadVolumeGraphicsFileTest.cpp} | 8 +- .../test/TriangleNormalFilterTest.cpp | 8 +- ...erTest.cpp => WriteFeatureDataCSVTest.cpp} | 16 +-- ...iterTest.cpp => WriteLosAlamosFFTTest.cpp} | 16 +-- ...st.cpp => WriteVtkRectilinearGridTest.cpp} | 34 +++--- .../(02) Image Segmentation.d3dpipeline | 2 +- .../(03) Porosity Mesh Export.d3dpipeline | 2 +- ...AlignSectionsMutualInformation.d3dpipeline | 2 +- ...mall IN100 Full Reconstruction.d3dpipeline | 2 +- ...IN100 Morphological Statistics.d3dpipeline | 4 +- ...00 Crystallographic Statistics.d3dpipeline | 10 +- .../(01) Small IN100 Quick Mesh.d3dpipeline | 4 +- .../(02) Small IN100 Smooth Mesh.d3dpipeline | 4 +- ...3) Small IN100 Mesh Statistics.d3dpipeline | 4 +- .../(04) Small IN100 GBCD.d3dpipeline | 4 +- .../(05) Small IN100 GBCD Metric.d3dpipeline | 4 +- .../pipelines/EnsembleInfoReader.d3dpipeline | 4 +- .../FindGBCD-GBPDMetricBased.d3dpipeline | 24 ++--- .../ImportBrukerNanoEspritData.d3dpipeline | 2 +- .../pipelines/ImportEdaxOIMData.d3dpipeline | 2 +- .../pipelines/aptr12_Analysis.d3dpipeline | 4 +- .../pipelines/avtr12_Analysis.d3dpipeline | 4 +- wrapping/python/docs/source/API.rst | 6 +- .../docs/source/Python_Introduction.rst | 8 +- wrapping/python/examples/basic_ebsd_ipf.ipynb | 4 +- .../python/examples/create_image_geom.ipynb | 4 +- wrapping/python/examples/import_d3d.ipynb | 8 +- wrapping/python/examples/output_file.ipynb | 4 +- 101 files changed, 638 insertions(+), 639 deletions(-) rename src/Plugins/ComplexCore/docs/{ImportBinaryCTNorthstarFilter.md => ReadBinaryCTNorthstarFilter.md} (100%) rename src/Plugins/ComplexCore/docs/{ImportDREAM3DFilter.md => ReadDREAM3DFilter.md} (92%) rename src/Plugins/ComplexCore/docs/{ImportDeformKeyFileV12Filter.md => ReadDeformKeyFileV12Filter.md} (100%) rename src/Plugins/ComplexCore/docs/{ImportHDF5Dataset.md => ReadHDF5Dataset.md} (100%) rename src/Plugins/ComplexCore/docs/{RawBinaryReaderFilter.md => ReadRawBinaryFilter.md} (100%) rename src/Plugins/ComplexCore/docs/{StlFileReaderFilter.md => ReadStlFileFilter.md} (100%) rename src/Plugins/ComplexCore/docs/{ImportVolumeGraphicsFileFilter.md => ReadVolumeGraphicsFileFilter.md} (100%) rename src/Plugins/ComplexCore/docs/{ExportDREAM3DFilter.md => WriteDREAM3DFilter.md} (96%) rename src/Plugins/ComplexCore/docs/{FeatureDataCSVWriterFilter.md => WriteFeatureDataCSVFilter.md} (100%) rename src/Plugins/ComplexCore/docs/{LosAlamosFFTWriterFilter.md => WriteLosAlamosFFTFilter.md} (100%) rename src/Plugins/ComplexCore/docs/{VtkRectilinearGridWriterFilter.md => WriteVtkRectilinearGridFilter.md} (100%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportBinaryCTNorthstarFilter.cpp => ReadBinaryCTNorthstarFilter.cpp} (91%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportBinaryCTNorthstarFilter.hpp => ReadBinaryCTNorthstarFilter.hpp} (86%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportDREAM3DFilter.cpp => ReadDREAM3DFilter.cpp} (73%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportDREAM3DFilter.hpp => ReadDREAM3DFilter.hpp} (78%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportDeformKeyFileV12Filter.cpp => ReadDeformKeyFileV12Filter.cpp} (85%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportDeformKeyFileV12Filter.hpp => ReadDeformKeyFileV12Filter.hpp} (83%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportHDF5Dataset.cpp => ReadHDF5Dataset.cpp} (94%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportHDF5Dataset.hpp => ReadHDF5Dataset.hpp} (84%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{RawBinaryReaderFilter.cpp => ReadRawBinaryFilter.cpp} (88%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{RawBinaryReaderFilter.hpp => ReadRawBinaryFilter.hpp} (86%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{StlFileReaderFilter.cpp => ReadStlFileFilter.cpp} (90%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{StlFileReaderFilter.hpp => ReadStlFileFilter.hpp} (85%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportVolumeGraphicsFileFilter.cpp => ReadVolumeGraphicsFileFilter.cpp} (89%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ImportVolumeGraphicsFileFilter.hpp => ReadVolumeGraphicsFileFilter.hpp} (85%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ExportDREAM3DFilter.cpp => WriteDREAM3DFilter.cpp} (74%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{ExportDREAM3DFilter.hpp => WriteDREAM3DFilter.hpp} (77%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{FeatureDataCSVWriterFilter.cpp => WriteFeatureDataCSVFilter.cpp} (84%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{FeatureDataCSVWriterFilter.hpp => WriteFeatureDataCSVFilter.hpp} (84%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{LosAlamosFFTWriterFilter.cpp => WriteLosAlamosFFTFilter.cpp} (83%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{LosAlamosFFTWriterFilter.hpp => WriteLosAlamosFFTFilter.hpp} (84%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{VtkRectilinearGridWriterFilter.cpp => WriteVtkRectilinearGridFilter.cpp} (81%) rename src/Plugins/ComplexCore/src/ComplexCore/Filters/{VtkRectilinearGridWriterFilter.hpp => WriteVtkRectilinearGridFilter.hpp} (81%) rename src/Plugins/ComplexCore/test/{ImportBinaryCTNorthstarTest.cpp => ReadBinaryCTNorthstarTest.cpp} (66%) rename src/Plugins/ComplexCore/test/{ImportDeformKeyFileV12Test.cpp => ReadDeformKeyFileV12Test.cpp} (87%) rename src/Plugins/ComplexCore/test/{ImportHDF5DatasetTest.cpp => ReadHDF5DatasetTest.cpp} (91%) rename src/Plugins/ComplexCore/test/{RawBinaryReaderTest.cpp => ReadRawBinaryTest.cpp} (90%) rename src/Plugins/ComplexCore/test/{StlFileReaderTest.cpp => ReadStlFileTest.cpp} (79%) rename src/Plugins/ComplexCore/test/{ImportVolumeGraphicsFileTest.cpp => ReadVolumeGraphicsFileTest.cpp} (87%) rename src/Plugins/ComplexCore/test/{FeatureDataCSVWriterTest.cpp => WriteFeatureDataCSVTest.cpp} (81%) rename src/Plugins/ComplexCore/test/{LosAlamosFFTWriterTest.cpp => WriteLosAlamosFFTTest.cpp} (72%) rename src/Plugins/ComplexCore/test/{VtkRectilinearGridWriterTest.cpp => WriteVtkRectilinearGridTest.cpp} (71%) diff --git a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline index e2557ea2bb..9a28522e9f 100644 --- a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline +++ b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline @@ -405,7 +405,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/pipelines/PorosityAnalysis.d3dpipeline b/pipelines/PorosityAnalysis.d3dpipeline index 2fd3e2dd32..23291fe1a6 100644 --- a/pipelines/PorosityAnalysis.d3dpipeline +++ b/pipelines/PorosityAnalysis.d3dpipeline @@ -248,7 +248,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/CMakeLists.txt b/src/Plugins/ComplexCore/CMakeLists.txt index 907dfb693b..4e3a004382 100644 --- a/src/Plugins/ComplexCore/CMakeLists.txt +++ b/src/Plugins/ComplexCore/CMakeLists.txt @@ -21,8 +21,8 @@ set(FilterList ChangeAngleRepresentation CombineAttributeArraysFilter CombineStlFilesFilter - ComputeMomentInvariants2DFilter ComputeFeatureRectFilter + ComputeMomentInvariants2DFilter ConditionalSetValue ConvertColorToGrayScaleFilter ConvertDataFilter @@ -41,11 +41,9 @@ set(FilterList ErodeDilateCoordinationNumberFilter ErodeDilateMaskFilter ExecuteProcessFilter - ExportDREAM3DFilter ExtractComponentAsArrayFilter ExtractInternalSurfacesFromTriangleGeometry ExtractVertexGeometryFilter - FeatureDataCSVWriterFilter FeatureFaceCurvatureFilter FillBadDataFilter FindArrayStatisticsFilter @@ -56,8 +54,8 @@ set(FilterList FindEuclideanDistMapFilter FindFeatureCentroidsFilter FindFeatureClusteringFilter - FindFeaturePhasesFilter FindFeaturePhasesBinaryFilter + FindFeaturePhasesFilter FindLargestCrossSectionsFilter FindNeighborhoodsFilter FindNeighborListStatistics @@ -71,22 +69,14 @@ set(FilterList FindVolFractionsFilter GenerateColorTableFilter GenerateVectorColorsFilter - ImageContouringFilter IdentifySample - ImportBinaryCTNorthstarFilter - ReadCSVFileFilter - ImportDeformKeyFileV12Filter - ImportDREAM3DFilter - ImportHDF5Dataset - ReadTextDataArrayFilter - ImportVolumeGraphicsFileFilter + ImageContouringFilter InitializeData InterpolatePointCloudToRegularGridFilter IterativeClosestPointFilter KMeansFilter KMedoidsFilter LaplacianSmoothingFilter - LosAlamosFFTWriterFilter MapPointCloudToRegularGridFilter MinNeighbors MoveData @@ -95,7 +85,15 @@ set(FilterList PartitionGeometryFilter PointSampleTriangleGeometryFilter QuickSurfaceMeshFilter - RawBinaryReaderFilter + ReadBinaryCTNorthstarFilter + ReadCSVFileFilter + ReadDeformKeyFileV12Filter + ReadDREAM3DFilter + ReadHDF5Dataset + ReadRawBinaryFilter + ReadStlFileFilter + ReadTextDataArrayFilter + ReadVolumeGraphicsFileFilter RegularGridSampleSurfaceMeshFilter RemoveFlaggedFeaturesFilter RemoveFlaggedVertices @@ -112,19 +110,21 @@ set(FilterList SharedFeatureFaceFilter SilhouetteFilter SplitAttributeArrayFilter - StlFileReaderFilter SurfaceNetsFilter TriangleCentroidFilter TriangleDihedralAngleFilter TriangleNormalFilter UncertainRegularGridSampleSurfaceMeshFilter - VtkRectilinearGridWriterFilter WriteAbaqusHexahedronFilter WriteASCIIDataFilter WriteAvizoRectilinearCoordinateFilter WriteAvizoUniformCoordinateFilter WriteBinaryDataFilter + WriteDREAM3DFilter + WriteFeatureDataCSVFilter + WriteLosAlamosFFTFilter WriteStlFileFilter + WriteVtkRectilinearGridFilter ) set(ActionList @@ -141,8 +141,8 @@ set(AlgorithmList CalculateTriangleGroupCurvatures CombineAttributeArrays CombineStlFiles - ComputeMomentInvariants2D ComputeFeatureRect + ComputeMomentInvariants2D ConvertColorToGrayScale ConvertData ErodeDilateBadData @@ -168,18 +168,18 @@ set(AlgorithmList GenerateColorTable GenerateVectorColors ImageContouring - ReadDeformKeyFileV12 - ReadVolumeGraphicsFile - ReadBinaryCTNorthstar KMeans KMedoids LaplacianSmoothing - WriteLosAlamosFFT NearestPointFuseRegularGrids PartitionGeometry PointSampleTriangleGeometry QuickSurfaceMesh + ReadBinaryCTNorthstar + ReadDeformKeyFileV12 ReadRawBinary + ReadStlFile + ReadVolumeGraphicsFile RegularGridSampleSurfaceMesh RemoveFlaggedFeatures ReplaceElementAttributesWithNeighborValues @@ -189,16 +189,16 @@ set(AlgorithmList SharedFeatureFace Silhouette SplitAttributeArray - ReadStlFile SurfaceNets TriangleCentroid TupleTransfer UncertainRegularGridSampleSurfaceMesh - WriteVtkRectilinearGrid WriteAbaqusHexahedron WriteAvizoRectilinearCoordinate WriteAvizoUniformCoordinate + WriteLosAlamosFFT WriteStlFile + WriteVtkRectilinearGrid ) create_complex_plugin(NAME ${PLUGIN_NAME} diff --git a/src/Plugins/ComplexCore/docs/ImportBinaryCTNorthstarFilter.md b/src/Plugins/ComplexCore/docs/ReadBinaryCTNorthstarFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ImportBinaryCTNorthstarFilter.md rename to src/Plugins/ComplexCore/docs/ReadBinaryCTNorthstarFilter.md diff --git a/src/Plugins/ComplexCore/docs/ImportDREAM3DFilter.md b/src/Plugins/ComplexCore/docs/ReadDREAM3DFilter.md similarity index 92% rename from src/Plugins/ComplexCore/docs/ImportDREAM3DFilter.md rename to src/Plugins/ComplexCore/docs/ReadDREAM3DFilter.md index 4f5d29f9e6..8bef874400 100644 --- a/src/Plugins/ComplexCore/docs/ImportDREAM3DFilter.md +++ b/src/Plugins/ComplexCore/docs/ReadDREAM3DFilter.md @@ -1,4 +1,4 @@ -# ImportDREAM3DFilter +# ReadDREAM3DFilter ## Description diff --git a/src/Plugins/ComplexCore/docs/ImportDeformKeyFileV12Filter.md b/src/Plugins/ComplexCore/docs/ReadDeformKeyFileV12Filter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ImportDeformKeyFileV12Filter.md rename to src/Plugins/ComplexCore/docs/ReadDeformKeyFileV12Filter.md diff --git a/src/Plugins/ComplexCore/docs/ImportHDF5Dataset.md b/src/Plugins/ComplexCore/docs/ReadHDF5Dataset.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ImportHDF5Dataset.md rename to src/Plugins/ComplexCore/docs/ReadHDF5Dataset.md diff --git a/src/Plugins/ComplexCore/docs/RawBinaryReaderFilter.md b/src/Plugins/ComplexCore/docs/ReadRawBinaryFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/RawBinaryReaderFilter.md rename to src/Plugins/ComplexCore/docs/ReadRawBinaryFilter.md diff --git a/src/Plugins/ComplexCore/docs/StlFileReaderFilter.md b/src/Plugins/ComplexCore/docs/ReadStlFileFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/StlFileReaderFilter.md rename to src/Plugins/ComplexCore/docs/ReadStlFileFilter.md diff --git a/src/Plugins/ComplexCore/docs/ImportVolumeGraphicsFileFilter.md b/src/Plugins/ComplexCore/docs/ReadVolumeGraphicsFileFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/ImportVolumeGraphicsFileFilter.md rename to src/Plugins/ComplexCore/docs/ReadVolumeGraphicsFileFilter.md diff --git a/src/Plugins/ComplexCore/docs/ExportDREAM3DFilter.md b/src/Plugins/ComplexCore/docs/WriteDREAM3DFilter.md similarity index 96% rename from src/Plugins/ComplexCore/docs/ExportDREAM3DFilter.md rename to src/Plugins/ComplexCore/docs/WriteDREAM3DFilter.md index 7df7886ab3..07382b03fb 100644 --- a/src/Plugins/ComplexCore/docs/ExportDREAM3DFilter.md +++ b/src/Plugins/ComplexCore/docs/WriteDREAM3DFilter.md @@ -1,4 +1,4 @@ -# ExportDREAM3DFilter +# WriteDREAM3DFilter ## Description diff --git a/src/Plugins/ComplexCore/docs/FeatureDataCSVWriterFilter.md b/src/Plugins/ComplexCore/docs/WriteFeatureDataCSVFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/FeatureDataCSVWriterFilter.md rename to src/Plugins/ComplexCore/docs/WriteFeatureDataCSVFilter.md diff --git a/src/Plugins/ComplexCore/docs/LosAlamosFFTWriterFilter.md b/src/Plugins/ComplexCore/docs/WriteLosAlamosFFTFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/LosAlamosFFTWriterFilter.md rename to src/Plugins/ComplexCore/docs/WriteLosAlamosFFTFilter.md diff --git a/src/Plugins/ComplexCore/docs/VtkRectilinearGridWriterFilter.md b/src/Plugins/ComplexCore/docs/WriteVtkRectilinearGridFilter.md similarity index 100% rename from src/Plugins/ComplexCore/docs/VtkRectilinearGridWriterFilter.md rename to src/Plugins/ComplexCore/docs/WriteVtkRectilinearGridFilter.md diff --git a/src/Plugins/ComplexCore/pipelines/AppendImageGeometryZSlice.d3dpipeline b/src/Plugins/ComplexCore/pipelines/AppendImageGeometryZSlice.d3dpipeline index ffe592743f..e1838d52ab 100644 --- a/src/Plugins/ComplexCore/pipelines/AppendImageGeometryZSlice.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/AppendImageGeometryZSlice.d3dpipeline @@ -190,7 +190,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Image.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Image.d3dpipeline index 2f5e69f227..bc0e0ddcb7 100644 --- a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Image.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Image.d3dpipeline @@ -379,7 +379,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Node.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Node.d3dpipeline index a9f106f564..55248b59dd 100644 --- a/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Node.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/ApplyTransformation_Node.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::StlFileReaderFilter", + "name": "complex::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -26,7 +26,7 @@ }, "comments": "", "filter": { - "name": "complex::StlFileReaderFilter", + "name": "complex::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -97,7 +97,7 @@ }, "comments": "", "filter": { - "name": "complex::StlFileReaderFilter", + "name": "complex::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -168,7 +168,7 @@ }, "comments": "", "filter": { - "name": "complex::StlFileReaderFilter", + "name": "complex::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false @@ -237,7 +237,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ArrayCalculatorExample.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ArrayCalculatorExample.d3dpipeline index 5799b937a8..1039a0dfe4 100644 --- a/src/Plugins/ComplexCore/pipelines/ArrayCalculatorExample.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/ArrayCalculatorExample.d3dpipeline @@ -168,7 +168,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline b/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline index 61372e0362..8b3fcb08bb 100644 --- a/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/AvizoWriters.d3dpipeline @@ -44,7 +44,7 @@ }, "comments": "This pipeline requires the output from the (08) Small IN100 Full Reconstruction pipeline as input", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/CombineStlFiles.d3dpipeline b/src/Plugins/ComplexCore/pipelines/CombineStlFiles.d3dpipeline index e817c2a590..e2ac41cf96 100644 --- a/src/Plugins/ComplexCore/pipelines/CombineStlFiles.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/CombineStlFiles.d3dpipeline @@ -25,7 +25,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/FindBiasedFeatures.d3dpipeline b/src/Plugins/ComplexCore/pipelines/FindBiasedFeatures.d3dpipeline index c613c18a4e..b9251d8721 100644 --- a/src/Plugins/ComplexCore/pipelines/FindBiasedFeatures.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/FindBiasedFeatures.d3dpipeline @@ -50,7 +50,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -127,7 +127,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/FindBoundaryCells.d3dpipeline b/src/Plugins/ComplexCore/pipelines/FindBoundaryCells.d3dpipeline index 162655a434..d671b3dca2 100644 --- a/src/Plugins/ComplexCore/pipelines/FindBoundaryCells.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/FindBoundaryCells.d3dpipeline @@ -49,7 +49,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -76,7 +76,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline b/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline index 5b1b3a7d0b..ddc92eb372 100644 --- a/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline @@ -124,7 +124,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline b/src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline index 88b3737991..94785d2ce2 100644 --- a/src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/Import_ASCII.d3dpipeline @@ -186,7 +186,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": true diff --git a/src/Plugins/ComplexCore/pipelines/Import_STL_Model.d3dpipeline b/src/Plugins/ComplexCore/pipelines/Import_STL_Model.d3dpipeline index 839fa18be7..97cb3d8c73 100644 --- a/src/Plugins/ComplexCore/pipelines/Import_STL_Model.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/Import_STL_Model.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::StlFileReaderFilter", + "name": "complex::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline index 91211431b9..9389b5bfbd 100644 --- a/src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/ReplaceElementAttributesWithNeighbor.d3dpipeline @@ -212,7 +212,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ResamplePorosityImage.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ResamplePorosityImage.d3dpipeline index 70c041b6b9..57d42842db 100644 --- a/src/Plugins/ComplexCore/pipelines/ResamplePorosityImage.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/ResamplePorosityImage.d3dpipeline @@ -141,7 +141,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline b/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline index 0566560cba..0231a09463 100644 --- a/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/ResampleRectGridToImageGeom.d3dpipeline @@ -260,7 +260,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/SurfaceNets_Demo.d3dpipeline b/src/Plugins/ComplexCore/pipelines/SurfaceNets_Demo.d3dpipeline index 841a3eb6c9..28f39be4de 100644 --- a/src/Plugins/ComplexCore/pipelines/SurfaceNets_Demo.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/SurfaceNets_Demo.d3dpipeline @@ -118,7 +118,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline b/src/Plugins/ComplexCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline index 6d25bad0ac..81259ae3d9 100644 --- a/src/Plugins/ComplexCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/Triangle_Face_Data_Demo.d3dpipeline @@ -12,7 +12,7 @@ }, "comments": "", "filter": { - "name": "complex::StlFileReaderFilter", + "name": "complex::ReadStlFileFilter", "uuid": "2f64bd45-9d28-4254-9e07-6aa7c6d3d015" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline index cdee76e5a7..c871126e3e 100644 --- a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline @@ -456,7 +456,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -466,7 +466,7 @@ }, "comments": "The input for this pipeline requires the output from the (08) Small IN100 Full Reconstruction bookmarked pipeline.", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -494,7 +494,7 @@ }, "comments": "", "filter": { - "name": "complex::VtkRectilinearGridWriterFilter", + "name": "complex::WriteVtkRectilinearGridFilter", "uuid": "58a4d758-c5ff-43d3-a394-1508ad00a0d2" }, "isDisabled": false diff --git a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp index 7c9640101d..47d705d3fc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/ComplexCoreLegacyUUIDMapping.hpp @@ -32,10 +32,10 @@ #include "ComplexCore/Filters/ErodeDilateMaskFilter.hpp" #include "ComplexCore/Filters/ErodeDilateBadDataFilter.hpp" #include "ComplexCore/Filters/ExecuteProcessFilter.hpp" -#include "ComplexCore/Filters/ExportDREAM3DFilter.hpp" +#include "ComplexCore/Filters/WriteDREAM3DFilter.hpp" #include "ComplexCore/Filters/ExtractComponentAsArrayFilter.hpp" #include "ComplexCore/Filters/ExtractInternalSurfacesFromTriangleGeometry.hpp" -#include "ComplexCore/Filters/FeatureDataCSVWriterFilter.hpp" +#include "ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp" #include "ComplexCore/Filters/FillBadDataFilter.hpp" #include "ComplexCore/Filters/FindArrayStatisticsFilter.hpp" #include "ComplexCore/Filters/FindBoundaryCellsFilter.hpp" @@ -54,13 +54,13 @@ #include "ComplexCore/Filters/FindVolFractionsFilter.hpp" #include "ComplexCore/Filters/GenerateColorTableFilter.hpp" #include "ComplexCore/Filters/IdentifySample.hpp" -#include "ComplexCore/Filters/ImportBinaryCTNorthstarFilter.hpp" +#include "ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp" #include "ComplexCore/Filters/ReadCSVFileFilter.hpp" -#include "ComplexCore/Filters/ImportDeformKeyFileV12Filter.hpp" -#include "ComplexCore/Filters/ImportDREAM3DFilter.hpp" -#include "ComplexCore/Filters/ImportHDF5Dataset.hpp" +#include "ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp" +#include "ComplexCore/Filters/ReadDREAM3DFilter.hpp" +#include "ComplexCore/Filters/ReadHDF5Dataset.hpp" #include "ComplexCore/Filters/ReadTextDataArrayFilter.hpp" -#include "ComplexCore/Filters/ImportVolumeGraphicsFileFilter.hpp" +#include "ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp" #include "ComplexCore/Filters/InitializeData.hpp" #include "ComplexCore/Filters/InterpolatePointCloudToRegularGridFilter.hpp" #include "ComplexCore/Filters/IterativeClosestPointFilter.hpp" @@ -71,7 +71,7 @@ #include "ComplexCore/Filters/MultiThresholdObjects.hpp" #include "ComplexCore/Filters/PointSampleTriangleGeometryFilter.hpp" #include "ComplexCore/Filters/QuickSurfaceMeshFilter.hpp" -#include "ComplexCore/Filters/RawBinaryReaderFilter.hpp" +#include "ComplexCore/Filters/ReadRawBinaryFilter.hpp" #include "ComplexCore/Filters/RemoveFlaggedVertices.hpp" #include "ComplexCore/Filters/RemoveMinimumSizeFeaturesFilter.hpp" #include "ComplexCore/Filters/RenameDataObject.hpp" @@ -82,7 +82,7 @@ #include "ComplexCore/Filters/ScalarSegmentFeaturesFilter.hpp" #include "ComplexCore/Filters/SetImageGeomOriginScalingFilter.hpp" #include "ComplexCore/Filters/SplitAttributeArrayFilter.hpp" -#include "ComplexCore/Filters/StlFileReaderFilter.hpp" +#include "ComplexCore/Filters/ReadStlFileFilter.hpp" #include "ComplexCore/Filters/TriangleCentroidFilter.hpp" #include "ComplexCore/Filters/TriangleDihedralAngleFilter.hpp" #include "ComplexCore/Filters/TriangleNormalFilter.hpp" @@ -104,12 +104,12 @@ #include "ComplexCore/Filters/CombineStlFilesFilter.hpp" #include "ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.hpp" #include "ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.hpp" -#include "ComplexCore/Filters/VtkRectilinearGridWriterFilter.hpp" +#include "ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp" #include "ComplexCore/Filters/RegularGridSampleSurfaceMeshFilter.hpp" #include "ComplexCore/Filters/UncertainRegularGridSampleSurfaceMeshFilter.hpp" #include "ComplexCore/Filters/FindBoundaryElementFractionsFilter.hpp" #include "ComplexCore/Filters/ReverseTriangleWindingFilter.hpp" -#include "ComplexCore/Filters/LosAlamosFFTWriterFilter.hpp" +#include "ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp" #include "ComplexCore/Filters/GenerateVectorColorsFilter.hpp" #include "ComplexCore/Filters/KMedoidsFilter.hpp" #include "ComplexCore/Filters/KMeansFilter.hpp" @@ -145,9 +145,9 @@ namespace complex {complex::Uuid::FromString("baa4b7fe-31e5-5e63-a2cb-0bb9d844cfaf").value(), complex::FilterTraits::uuid}, // CropImageGeometry {complex::Uuid::FromString("f28cbf07-f15a-53ca-8c7f-b41a11dae6cc").value(), complex::FilterTraits::uuid}, // CropVertexGeometry {complex::Uuid::FromString("7b1c8f46-90dd-584a-b3ba-34e16958a7d0").value(), complex::FilterTraits::uuid}, // RemoveArrays - {complex::Uuid::FromString("3fcd4c43-9d75-5b86-aad4-4441bc914f37").value(), complex::FilterTraits::uuid}, // DataContainerWriter + {complex::Uuid::FromString("3fcd4c43-9d75-5b86-aad4-4441bc914f37").value(), complex::FilterTraits::uuid}, // DataContainerWriter {complex::Uuid::FromString("52a069b4-6a46-5810-b0ec-e0693c636034").value(), complex::FilterTraits::uuid}, // ExtractInternalSurfacesFromTriangleGeometry - {complex::Uuid::FromString("737b8d5a-8622-50f9-9a8a-bfdb57608891").value(), complex::FilterTraits::uuid}, // FeatureDataCSVWriter + {complex::Uuid::FromString("737b8d5a-8622-50f9-9a8a-bfdb57608891").value(), complex::FilterTraits::uuid}, // FeatureDataCSVWriter {complex::Uuid::FromString("bf35f515-294b-55ed-8c69-211b7e69cb56").value(), complex::FilterTraits::uuid}, // FindArrayStatistics {complex::Uuid::FromString("8a1106d4-c67f-5e09-a02a-b2e9b99d031e").value(), complex::FilterTraits::uuid}, // FindBoundaryCellsFilter {complex::Uuid::FromString("450c2f00-9ddf-56e1-b4c1-0e74e7ad2349").value(), complex::FilterTraits::uuid}, // FindBiasedFeaturesFilter @@ -165,12 +165,12 @@ namespace complex {complex::Uuid::FromString("68246a67-7f32-5c80-815a-bec82008d7bc").value(), complex::FilterTraits::uuid}, // FindVolFractions {complex::Uuid::FromString("0d0a6535-6565-51c5-a3fc-fbc00008606d").value(), complex::FilterTraits::uuid}, // GenerateColorTable {complex::Uuid::FromString("0e8c0818-a3fb-57d4-a5c8-7cb8ae54a40a").value(), complex::FilterTraits::uuid}, // IdentifySample - {complex::Uuid::FromString("f2259481-5011-5f22-9fcb-c92fb6f8be10").value(), complex::FilterTraits::uuid}, // ImportBinaryCTNorthstarFilter + {complex::Uuid::FromString("f2259481-5011-5f22-9fcb-c92fb6f8be10").value(), complex::FilterTraits::uuid}, // ReadBinaryCTNorthstarFilter {complex::Uuid::FromString("bdb978bc-96bf-5498-972c-b509c38b8d50").value(), complex::FilterTraits::uuid}, // ReadASCIIData - {complex::Uuid::FromString("043cbde5-3878-5718-958f-ae75714df0df").value(), complex::FilterTraits::uuid}, // DataContainerReader - {complex::Uuid::FromString("9e98c3b0-5707-5a3b-b8b5-23ef83b02896").value(), complex::FilterTraits::uuid}, // ImportHDF5Dataset + {complex::Uuid::FromString("043cbde5-3878-5718-958f-ae75714df0df").value(), complex::FilterTraits::uuid}, // DataContainerReader + {complex::Uuid::FromString("9e98c3b0-5707-5a3b-b8b5-23ef83b02896").value(), complex::FilterTraits::uuid}, // ReadHDF5Dataset {complex::Uuid::FromString("a7007472-29e5-5d0a-89a6-1aed11b603f8").value(), complex::FilterTraits::uuid}, // ImportAsciDataArray - {complex::Uuid::FromString("5fa10d81-94b4-582b-833f-8eabe659069e").value(), complex::FilterTraits::uuid}, // ImportVolumeGraphicsFileFilter + {complex::Uuid::FromString("5fa10d81-94b4-582b-833f-8eabe659069e").value(), complex::FilterTraits::uuid}, // ReadVolumeGraphicsFileFilter {complex::Uuid::FromString("dfab9921-fea3-521c-99ba-48db98e43ff8").value(), complex::FilterTraits::uuid}, // InitializeData {complex::Uuid::FromString("4b551c15-418d-5081-be3f-d3aeb62408e5").value(), complex::FilterTraits::uuid}, // InterpolatePointCloudToRegularGrid {complex::Uuid::FromString("6c8fb24b-5b12-551c-ba6d-ae2fa7724764").value(), complex::FilterTraits::uuid}, // IterativeClosestPoint @@ -182,7 +182,7 @@ namespace complex {complex::Uuid::FromString("686d5393-2b02-5c86-b887-dd81a8ae80f2").value(), complex::FilterTraits::uuid}, // MultiThresholdObjects2 {complex::Uuid::FromString("119861c5-e303-537e-b210-2e62936222e9").value(), complex::FilterTraits::uuid}, // PointSampleTriangleGeometry {complex::Uuid::FromString("07b49e30-3900-5c34-862a-f1fb48bad568").value(), complex::FilterTraits::uuid}, // QuickSurfaceMesh - {complex::Uuid::FromString("0791f556-3d73-5b1e-b275-db3f7bb6850d").value(), complex::FilterTraits::uuid}, // ReadRawBinary + {complex::Uuid::FromString("0791f556-3d73-5b1e-b275-db3f7bb6850d").value(), complex::FilterTraits::uuid}, // ReadRawBinary {complex::Uuid::FromString("379ccc67-16dd-530a-984f-177db2314bac").value(), complex::FilterTraits::uuid}, // RemoveFlaggedVertices {complex::Uuid::FromString("53ac1638-8934-57b8-b8e5-4b91cdda23ec").value(), complex::FilterTraits::uuid}, // MinSize {complex::Uuid::FromString("53a5f731-2858-5e3e-bd43-8f2cf45d90ec").value(), complex::FilterTraits::uuid}, // RenameAttributeArray @@ -192,7 +192,7 @@ namespace complex {complex::Uuid::FromString("2c5edebf-95d8-511f-b787-90ee2adf485c").value(), complex::FilterTraits::uuid}, // ScalarSegmentFeatures {complex::Uuid::FromString("6d3a3852-6251-5d2e-b749-6257fd0d8951").value(), complex::FilterTraits::uuid}, // SetOriginResolutionImageGeom {complex::Uuid::FromString("5ecf77f4-a38a-52ab-b4f6-0fb8a9c5cb9c").value(), complex::FilterTraits::uuid}, // SplitAttributeArray - {complex::Uuid::FromString("980c7bfd-20b2-5711-bc3b-0190b9096c34").value(), complex::FilterTraits::uuid}, // ReadStlFile + {complex::Uuid::FromString("980c7bfd-20b2-5711-bc3b-0190b9096c34").value(), complex::FilterTraits::uuid}, // ReadStlFile {complex::Uuid::FromString("5fbf9204-2c6c-597b-856a-f4612adbac38").value(), complex::FilterTraits::uuid}, // WriteASCIIData {complex::Uuid::FromString("0541c5eb-1976-5797-9468-be50a93d44e2").value(), complex::FilterTraits::uuid}, // TriangleDihedralAngleFilter {complex::Uuid::FromString("8133d419-1919-4dbf-a5bf-1c97282ba63f").value(), complex::FilterTraits::uuid}, // TriangleNormalFilter @@ -226,14 +226,14 @@ namespace complex {complex::Uuid::FromString("71d46128-1d2d-58fd-9924-1714695768c3").value(), complex::FilterTraits::uuid}, // CombineStlFiles {complex::Uuid::FromString("339f1349-9236-5023-9a56-c82fb8eafd12").value(), complex::FilterTraits::uuid}, // WriteAvizoUniformCoordinate {complex::Uuid::FromString("2861f4b4-8d50-5e69-9575-68c9d35f1256").value(), complex::FilterTraits::uuid}, // WriteAvizoRectilinearCoordinate - {complex::Uuid::FromString("a043bd66-2681-5126-82e1-5fdc46694bf4").value(), complex::FilterTraits::uuid}, // VtkRectilinearGridWriter + {complex::Uuid::FromString("a043bd66-2681-5126-82e1-5fdc46694bf4").value(), complex::FilterTraits::uuid}, // VtkRectilinearGridWriter {complex::Uuid::FromString("0df3da89-9106-538e-b1a9-6bbf1cf0aa92").value(), complex::FilterTraits::uuid}, // RegularGridSampleSurfaceMesh {complex::Uuid::FromString("75cfeb9b-cd4b-5a20-a344-4170b39bbfaf").value(), complex::FilterTraits::uuid}, // UncertainRegularGridSampleSurfaceMesh {complex::Uuid::FromString("6357243e-41a6-52c4-be2d-2f6894c39fcc").value(), complex::FilterTraits::uuid}, // FindBoundaryElementFractions {complex::Uuid::FromString("9b9fb9e1-074d-54b6-a6ce-0be21ab4496d").value(), complex::FilterTraits::uuid}, // ReverseTriangleWinding - {complex::Uuid::FromString("158ebe9e-f772-57e2-ac1b-71ff213cf890").value(), complex::FilterTraits::uuid}, // WriteLosAlamosFFT + {complex::Uuid::FromString("158ebe9e-f772-57e2-ac1b-71ff213cf890").value(), complex::FilterTraits::uuid}, // WriteLosAlamosFFT {complex::Uuid::FromString("ef28de7e-5bdd-57c2-9318-60ba0dfaf7bc").value(), complex::FilterTraits::uuid}, // GenerateVectorColors - {complex::Uuid::FromString("3c6337da-e232-4420-a5ca-451496748d88").value(), complex::FilterTraits::uuid}, // ImportDeformKeyFileV12Filter + {complex::Uuid::FromString("3c6337da-e232-4420-a5ca-451496748d88").value(), complex::FilterTraits::uuid}, // ReadDeformKeyFileV12Filter {complex::Uuid::FromString("f7486aa6-3049-5be7-8511-ae772b70c90b").value(), complex::FilterTraits::uuid}, // KMedoids {complex::Uuid::FromString("b56a04de-0ca0-509d-809f-52219fca9c98").value(), complex::FilterTraits::uuid}, // KMeans {complex::Uuid::FromString("f84d4d69-9ea5-54b6-a71c-df76d76d50cf").value(), complex::FilterTraits::uuid}, // Silhouette diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.cpp index c94c4b6d44..39fc6cc080 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/CombineStlFiles.cpp @@ -1,6 +1,6 @@ #include "CombineStlFiles.hpp" -#include "ComplexCore/Filters/StlFileReaderFilter.hpp" +#include "ComplexCore/Filters/ReadStlFileFilter.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/DataStructure/Geometry/TriangleGeom.hpp" @@ -91,10 +91,10 @@ Result<> CombineStlFiles::operator()() const fs::path& stlFilePath = dirEntry.path(); if(fs::is_regular_file(stlFilePath) && StringUtilities::toLower(stlFilePath.extension().string()) == ".stl") { - StlFileReaderFilter stlFileReader; + ReadStlFileFilter stlFileReader; Arguments args; - args.insertOrAssign(StlFileReaderFilter::k_StlFilePath_Key, std::make_any(stlFilePath)); - args.insertOrAssign(StlFileReaderFilter::k_TriangleGeometryName_Key, std::make_any(DataPath({stlFilePath.stem().string()}))); + args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(stlFilePath)); + args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(DataPath({stlFilePath.stem().string()}))); auto executeResult = stlFileReader.execute(tempDataStructure, args); if(executeResult.result.invalid()) { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp similarity index 91% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp index d457e92c85..ee10a76f7d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp @@ -1,4 +1,4 @@ -#include "ImportBinaryCTNorthstarFilter.hpp" +#include "ReadBinaryCTNorthstarFilter.hpp" #include "ComplexCore/Filters/Algorithms/ReadBinaryCTNorthstar.hpp" @@ -20,7 +20,7 @@ using namespace complex; namespace { -struct ImportBinaryCTNorthstarFilterCache +struct ReadBinaryCTNorthstarFilterCache { std::vector> DataFilePaths; SizeVec3 OriginalGeometryDims; @@ -30,7 +30,7 @@ struct ImportBinaryCTNorthstarFilterCache }; std::atomic_int32_t s_InstanceId = 0; -std::map s_HeaderCache; +std::map s_HeaderCache; // ----------------------------------------------------------------------------- std::string GetNextLine(std::ifstream& inStream, usize& lineCount) @@ -50,7 +50,7 @@ std::vector ParseNextLine(std::ifstream& inStream, char delimiter, } // ----------------------------------------------------------------------------- -std::string GenerateGeometryInfoString(const ImportBinaryCTNorthstarFilter::ImageGeometryInfo& info, const IGeometry::LengthUnit& lengthUnit) +std::string GenerateGeometryInfoString(const ReadBinaryCTNorthstarFilter::ImageGeometryInfo& info, const IGeometry::LengthUnit& lengthUnit) { SizeVec3 dims = info.Dimensions; FloatVec3 origin = info.Origin; @@ -248,9 +248,9 @@ Result> ReadVoxels(const std::vector& tokens, co } // ----------------------------------------------------------------------------- -Result>, ImportBinaryCTNorthstarFilter::ImageGeometryInfo>> ReadHeaderMetaData(const fs::path& headerFilePath) +Result>, ReadBinaryCTNorthstarFilter::ImageGeometryInfo>> ReadHeaderMetaData(const fs::path& headerFilePath) { - ImportBinaryCTNorthstarFilter::ImageGeometryInfo imageGeomInfo; + ReadBinaryCTNorthstarFilter::ImageGeometryInfo imageGeomInfo; std::string buffer; std::string trimmedBuffer; @@ -275,7 +275,7 @@ Result>, ImportBinaryCTNorthsta Result> result = ReadVoxels(tokens, headerFilePath, lineCount); if(result.invalid()) { - return ConvertResultTo>, ImportBinaryCTNorthstarFilter::ImageGeometryInfo>>(std::move(ConvertResult(std::move(result))), {}); + return ConvertResultTo>, ReadBinaryCTNorthstarFilter::ImageGeometryInfo>>(std::move(ConvertResult(std::move(result))), {}); } voxels = result.value(); } @@ -284,7 +284,7 @@ Result>, ImportBinaryCTNorthsta auto result = ReadLocation(inHeaderStream, headerFilePath, lineCount); if(result.invalid()) { - return ConvertResultTo>, ImportBinaryCTNorthstarFilter::ImageGeometryInfo>>(std::move(ConvertResult(std::move(result))), {}); + return ConvertResultTo>, ReadBinaryCTNorthstarFilter::ImageGeometryInfo>>(std::move(ConvertResult(std::move(result))), {}); } minLocation = result.value().first; maxLocation = result.value().second; @@ -294,7 +294,7 @@ Result>, ImportBinaryCTNorthsta auto result = ReadFileList(inHeaderStream, headerFilePath, lineCount); if(result.invalid()) { - return ConvertResultTo>, ImportBinaryCTNorthstarFilter::ImageGeometryInfo>>(std::move(ConvertResult(std::move(result))), {}); + return ConvertResultTo>, ReadBinaryCTNorthstarFilter::ImageGeometryInfo>>(std::move(ConvertResult(std::move(result))), {}); } dataFiles = result.value(); } @@ -317,50 +317,50 @@ Result>, ImportBinaryCTNorthsta namespace complex { //------------------------------------------------------------------------------ -ImportBinaryCTNorthstarFilter::ImportBinaryCTNorthstarFilter() +ReadBinaryCTNorthstarFilter::ReadBinaryCTNorthstarFilter() : m_InstanceId(s_InstanceId.fetch_add(1)) { s_HeaderCache[m_InstanceId] = {}; } //------------------------------------------------------------------------------ -ImportBinaryCTNorthstarFilter::~ImportBinaryCTNorthstarFilter() noexcept +ReadBinaryCTNorthstarFilter::~ReadBinaryCTNorthstarFilter() noexcept { s_HeaderCache.erase(m_InstanceId); } //------------------------------------------------------------------------------ -std::string ImportBinaryCTNorthstarFilter::name() const +std::string ReadBinaryCTNorthstarFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string ImportBinaryCTNorthstarFilter::className() const +std::string ReadBinaryCTNorthstarFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ImportBinaryCTNorthstarFilter::uuid() const +Uuid ReadBinaryCTNorthstarFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ImportBinaryCTNorthstarFilter::humanName() const +std::string ReadBinaryCTNorthstarFilter::humanName() const { - return "Import North Star Imaging CT (.nsihdr/.nsidat)"; + return "Read North Star Imaging CT (.nsihdr/.nsidat)"; } //------------------------------------------------------------------------------ -std::vector ImportBinaryCTNorthstarFilter::defaultTags() const +std::vector ReadBinaryCTNorthstarFilter::defaultTags() const { return {className(), "#IO", "#Input", "#Read", "#Import", "#Northstar", "#CT", "#Binary"}; } //------------------------------------------------------------------------------ -Parameters ImportBinaryCTNorthstarFilter::parameters() const +Parameters ReadBinaryCTNorthstarFilter::parameters() const { Parameters params; @@ -390,13 +390,13 @@ Parameters ImportBinaryCTNorthstarFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ImportBinaryCTNorthstarFilter::clone() const +IFilter::UniquePointer ReadBinaryCTNorthstarFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ImportBinaryCTNorthstarFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadBinaryCTNorthstarFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pInputHeaderFileValue = filterArgs.value(k_InputHeaderFile_Key); @@ -523,7 +523,7 @@ IFilter::PreflightResult ImportBinaryCTNorthstarFilter::preflightImpl(const Data } //------------------------------------------------------------------------------ -Result<> ImportBinaryCTNorthstarFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadBinaryCTNorthstarFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { ReadBinaryCTNorthstarInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp index c3164992ae..618c6de75d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportBinaryCTNorthstarFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp @@ -11,7 +11,7 @@ namespace fs = std::filesystem; namespace complex { /** - * @class ImportBinaryCTNorthstarFilter + * @class ReadBinaryCTNorthstarFilter * @brief This filter will import a NorthStar Imaging data set consisting of a single .nsihdr and one * or more .nsidat files. The data is read into an Image Geometry. The user can import a subvolume * instead of reading the entire data set into memory. The user should note that when using the @@ -20,17 +20,17 @@ namespace complex * files are in the same directory as the .nsihdr files. */ -class COMPLEXCORE_EXPORT ImportBinaryCTNorthstarFilter : public IFilter +class COMPLEXCORE_EXPORT ReadBinaryCTNorthstarFilter : public IFilter { public: - ImportBinaryCTNorthstarFilter(); - ~ImportBinaryCTNorthstarFilter() noexcept override; + ReadBinaryCTNorthstarFilter(); + ~ReadBinaryCTNorthstarFilter() noexcept override; - ImportBinaryCTNorthstarFilter(const ImportBinaryCTNorthstarFilter&) = delete; - ImportBinaryCTNorthstarFilter(ImportBinaryCTNorthstarFilter&&) noexcept = delete; + ReadBinaryCTNorthstarFilter(const ReadBinaryCTNorthstarFilter&) = delete; + ReadBinaryCTNorthstarFilter(ReadBinaryCTNorthstarFilter&&) noexcept = delete; - ImportBinaryCTNorthstarFilter& operator=(const ImportBinaryCTNorthstarFilter&) = delete; - ImportBinaryCTNorthstarFilter& operator=(ImportBinaryCTNorthstarFilter&&) noexcept = delete; + ReadBinaryCTNorthstarFilter& operator=(const ReadBinaryCTNorthstarFilter&) = delete; + ReadBinaryCTNorthstarFilter& operator=(ReadBinaryCTNorthstarFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_InputHeaderFile_Key = "input_header_file"; @@ -118,5 +118,5 @@ class COMPLEXCORE_EXPORT ImportBinaryCTNorthstarFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ImportBinaryCTNorthstarFilter, "5469af5c-368a-465b-87b7-7c0dfdf73666"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadBinaryCTNorthstarFilter, "5469af5c-368a-465b-87b7-7c0dfdf73666"); /* LEGACY UUID FOR THIS FILTER f2259481-5011-5f22-9fcb-c92fb6f8be10 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDREAM3DFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp similarity index 73% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDREAM3DFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp index 4b76436ee7..44b4bc79fb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDREAM3DFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp @@ -1,4 +1,4 @@ -#include "ImportDREAM3DFilter.hpp" +#include "ReadDREAM3DFilter.hpp" #include "complex/Common/StringLiteral.hpp" #include "complex/DataStructure/DataGroup.hpp" @@ -21,37 +21,37 @@ constexpr complex::int32 k_FailedOpenFileReaderError = -25; namespace complex { //------------------------------------------------------------------------------ -std::string ImportDREAM3DFilter::name() const +std::string ReadDREAM3DFilter::name() const { - return FilterTraits::name; + return FilterTraits::name; } //------------------------------------------------------------------------------ -std::string ImportDREAM3DFilter::className() const +std::string ReadDREAM3DFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ImportDREAM3DFilter::uuid() const +Uuid ReadDREAM3DFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ImportDREAM3DFilter::humanName() const +std::string ReadDREAM3DFilter::humanName() const { return "Read DREAM.3D File"; } //------------------------------------------------------------------------------ -std::vector ImportDREAM3DFilter::defaultTags() const +std::vector ReadDREAM3DFilter::defaultTags() const { return {className(), "IO", "Input", "Read", "Import"}; } //------------------------------------------------------------------------------ -Parameters ImportDREAM3DFilter::parameters() const +Parameters ReadDREAM3DFilter::parameters() const { Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); @@ -60,12 +60,12 @@ Parameters ImportDREAM3DFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ImportDREAM3DFilter::clone() const +IFilter::UniquePointer ReadDREAM3DFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } -IFilter::PreflightResult ImportDREAM3DFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const +IFilter::PreflightResult ReadDREAM3DFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto importData = args.value(k_ImportFileData); if(importData.FilePath.empty()) @@ -84,13 +84,13 @@ IFilter::PreflightResult ImportDREAM3DFilter::preflightImpl(const DataStructure& return {std::move(actions)}; } -Result<> ImportDREAM3DFilter::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadDREAM3DFilter::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { return {}; } -nlohmann::json ImportDREAM3DFilter::toJson(const Arguments& args) const +nlohmann::json ReadDREAM3DFilter::toJson(const Arguments& args) const { auto json = IFilter::toJson(args); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDREAM3DFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.hpp similarity index 78% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDREAM3DFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.hpp index 79d932bf40..5ebcf80f90 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDREAM3DFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.hpp @@ -10,21 +10,21 @@ namespace complex { /** - * @class ImportDREAM3DFilter - * @brief The ImportDREAM3DFilter is an IFilter class designed to import data + * @class ReadDREAM3DFilter + * @brief The ReadDREAM3DFilter is an IFilter class designed to import data * from a target DREAM.3D file. */ -class COMPLEXCORE_EXPORT ImportDREAM3DFilter : public IFilter +class COMPLEXCORE_EXPORT ReadDREAM3DFilter : public IFilter { public: - ImportDREAM3DFilter() = default; - ~ImportDREAM3DFilter() noexcept override = default; + ReadDREAM3DFilter() = default; + ~ReadDREAM3DFilter() noexcept override = default; - ImportDREAM3DFilter(const ImportDREAM3DFilter&) = delete; - ImportDREAM3DFilter(ImportDREAM3DFilter&&) noexcept = delete; + ReadDREAM3DFilter(const ReadDREAM3DFilter&) = delete; + ReadDREAM3DFilter(ReadDREAM3DFilter&&) noexcept = delete; - ImportDREAM3DFilter& operator=(const ImportDREAM3DFilter&) = delete; - ImportDREAM3DFilter& operator=(ImportDREAM3DFilter&&) noexcept = delete; + ReadDREAM3DFilter& operator=(const ReadDREAM3DFilter&) = delete; + ReadDREAM3DFilter& operator=(ReadDREAM3DFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_ImportFileData = "import_file_data"; @@ -42,7 +42,7 @@ class COMPLEXCORE_EXPORT ImportDREAM3DFilter : public IFilter std::string className() const override; /** - * @brief Returns the ImportDREAM3DFilter class's UUID. + * @brief Returns the ReadDREAM3DFilter class's UUID. * @return Uuid */ Uuid uuid() const override; @@ -103,4 +103,4 @@ class COMPLEXCORE_EXPORT ImportDREAM3DFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ImportDREAM3DFilter, "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadDREAM3DFilter, "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp index d70d0ee4d8..5af6d5bf73 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp @@ -1,4 +1,4 @@ -#include "ImportDeformKeyFileV12Filter.hpp" +#include "ReadDeformKeyFileV12Filter.hpp" #include "Algorithms/ReadDeformKeyFileV12.hpp" @@ -22,50 +22,50 @@ std::map s_HeaderCache; namespace complex { //------------------------------------------------------------------------------ -ImportDeformKeyFileV12Filter::ImportDeformKeyFileV12Filter() +ReadDeformKeyFileV12Filter::ReadDeformKeyFileV12Filter() : m_InstanceId(s_InstanceId.fetch_add(1)) { s_HeaderCache[m_InstanceId] = {}; } //------------------------------------------------------------------------------ -ImportDeformKeyFileV12Filter::~ImportDeformKeyFileV12Filter() noexcept +ReadDeformKeyFileV12Filter::~ReadDeformKeyFileV12Filter() noexcept { s_HeaderCache.erase(m_InstanceId); } //------------------------------------------------------------------------------ -std::string ImportDeformKeyFileV12Filter::name() const +std::string ReadDeformKeyFileV12Filter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string ImportDeformKeyFileV12Filter::className() const +std::string ReadDeformKeyFileV12Filter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ImportDeformKeyFileV12Filter::uuid() const +Uuid ReadDeformKeyFileV12Filter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ImportDeformKeyFileV12Filter::humanName() const +std::string ReadDeformKeyFileV12Filter::humanName() const { - return "Import Deform Key File (v12)"; + return "Read Deform Key File (v12)"; } //------------------------------------------------------------------------------ -std::vector ImportDeformKeyFileV12Filter::defaultTags() const +std::vector ReadDeformKeyFileV12Filter::defaultTags() const { return {className(), "IO", "Input", "Read", "Import"}; } //------------------------------------------------------------------------------ -Parameters ImportDeformKeyFileV12Filter::parameters() const +Parameters ReadDeformKeyFileV12Filter::parameters() const { Parameters params; @@ -83,13 +83,13 @@ Parameters ImportDeformKeyFileV12Filter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ImportDeformKeyFileV12Filter::clone() const +IFilter::UniquePointer ReadDeformKeyFileV12Filter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ImportDeformKeyFileV12Filter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadDeformKeyFileV12Filter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pInputFilePathValue = filterArgs.value(k_InputFilePath_Key); @@ -169,7 +169,7 @@ IFilter::PreflightResult ImportDeformKeyFileV12Filter::preflightImpl(const DataS } //------------------------------------------------------------------------------ -Result<> ImportDeformKeyFileV12Filter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadDeformKeyFileV12Filter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { ReadDeformKeyFileV12InputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp index 741b6016e5..7fcfff387b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportDeformKeyFileV12Filter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp @@ -12,20 +12,20 @@ namespace fs = std::filesystem; namespace complex { /** - * @class ImportDeformKeyFileV12Filter + * @class ReadDeformKeyFileV12Filter * @brief This filter will... */ -class COMPLEXCORE_EXPORT ImportDeformKeyFileV12Filter : public IFilter +class COMPLEXCORE_EXPORT ReadDeformKeyFileV12Filter : public IFilter { public: - ImportDeformKeyFileV12Filter(); - ~ImportDeformKeyFileV12Filter() noexcept override; + ReadDeformKeyFileV12Filter(); + ~ReadDeformKeyFileV12Filter() noexcept override; - ImportDeformKeyFileV12Filter(const ImportDeformKeyFileV12Filter&) = delete; - ImportDeformKeyFileV12Filter(ImportDeformKeyFileV12Filter&&) noexcept = delete; + ReadDeformKeyFileV12Filter(const ReadDeformKeyFileV12Filter&) = delete; + ReadDeformKeyFileV12Filter(ReadDeformKeyFileV12Filter&&) noexcept = delete; - ImportDeformKeyFileV12Filter& operator=(const ImportDeformKeyFileV12Filter&) = delete; - ImportDeformKeyFileV12Filter& operator=(ImportDeformKeyFileV12Filter&&) noexcept = delete; + ReadDeformKeyFileV12Filter& operator=(const ReadDeformKeyFileV12Filter&) = delete; + ReadDeformKeyFileV12Filter& operator=(ReadDeformKeyFileV12Filter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_InputFilePath_Key = "input_file_path"; @@ -103,4 +103,4 @@ class COMPLEXCORE_EXPORT ImportDeformKeyFileV12Filter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ImportDeformKeyFileV12Filter, "22c421c3-573c-4125-883c-4d95bd6e3bcb"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadDeformKeyFileV12Filter, "22c421c3-573c-4125-883c-4d95bd6e3bcb"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportHDF5Dataset.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp similarity index 94% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportHDF5Dataset.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp index f735832017..dbe4a0cde4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportHDF5Dataset.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp @@ -1,4 +1,4 @@ -#include "ImportHDF5Dataset.hpp" +#include "ReadHDF5Dataset.hpp" #include "complex/DataStructure/DataGroup.hpp" #include "complex/DataStructure/DataPath.hpp" @@ -97,37 +97,37 @@ Result<> fillDataArray(DataStructure& dataStructure, const DataPath& dataArrayPa namespace complex { //------------------------------------------------------------------------------ -std::string ImportHDF5Dataset::name() const +std::string ReadHDF5Dataset::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string ImportHDF5Dataset::className() const +std::string ReadHDF5Dataset::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ImportHDF5Dataset::uuid() const +Uuid ReadHDF5Dataset::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ImportHDF5Dataset::humanName() const +std::string ReadHDF5Dataset::humanName() const { - return "Import HDF5 Dataset"; + return "Read HDF5 Dataset"; } //------------------------------------------------------------------------------ -std::vector ImportHDF5Dataset::defaultTags() const +std::vector ReadHDF5Dataset::defaultTags() const { return {className(), "IO", "Input", "Read", "Import"}; } //------------------------------------------------------------------------------ -Parameters ImportHDF5Dataset::parameters() const +Parameters ReadHDF5Dataset::parameters() const { Parameters params; @@ -138,13 +138,13 @@ Parameters ImportHDF5Dataset::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ImportHDF5Dataset::clone() const +IFilter::UniquePointer ReadHDF5Dataset::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ImportHDF5Dataset::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pImportHDF5FileValue = filterArgs.value(k_ImportHDF5File_Key); @@ -348,7 +348,7 @@ IFilter::PreflightResult ImportHDF5Dataset::preflightImpl(const DataStructure& d } //------------------------------------------------------------------------------ -Result<> ImportHDF5Dataset::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadHDF5Dataset::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pImportHDF5FileValue = filterArgs.value(k_ImportHDF5File_Key); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportHDF5Dataset.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportHDF5Dataset.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.hpp index 6c7992fbfc..e2be66fc59 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportHDF5Dataset.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.hpp @@ -10,20 +10,20 @@ namespace complex { /** - * @class ImportHDF5Dataset + * @class ReadHDF5Dataset * @brief This filter will .... */ -class COMPLEXCORE_EXPORT ImportHDF5Dataset : public IFilter +class COMPLEXCORE_EXPORT ReadHDF5Dataset : public IFilter { public: - ImportHDF5Dataset() = default; - ~ImportHDF5Dataset() noexcept override = default; + ReadHDF5Dataset() = default; + ~ReadHDF5Dataset() noexcept override = default; - ImportHDF5Dataset(const ImportHDF5Dataset&) = delete; - ImportHDF5Dataset(ImportHDF5Dataset&&) noexcept = delete; + ReadHDF5Dataset(const ReadHDF5Dataset&) = delete; + ReadHDF5Dataset(ReadHDF5Dataset&&) noexcept = delete; - ImportHDF5Dataset& operator=(const ImportHDF5Dataset&) = delete; - ImportHDF5Dataset& operator=(ImportHDF5Dataset&&) noexcept = delete; + ReadHDF5Dataset& operator=(const ReadHDF5Dataset&) = delete; + ReadHDF5Dataset& operator=(ReadHDF5Dataset&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_ImportHDF5File_Key = "import_hd_f5_file"; @@ -94,4 +94,4 @@ class COMPLEXCORE_EXPORT ImportHDF5Dataset : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ImportHDF5Dataset, "8027f145-c7d5-4589-900e-b909fb3a059c"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadHDF5Dataset, "8027f145-c7d5-4589-900e-b909fb3a059c"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp similarity index 88% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp index 1c51d13d33..0aa0330d0d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp @@ -1,4 +1,4 @@ -#include "RawBinaryReaderFilter.hpp" +#include "ReadRawBinaryFilter.hpp" #include "ComplexCore/Filters/Algorithms/ReadRawBinary.hpp" @@ -27,37 +27,37 @@ constexpr int32 k_RbrSkippedTooMuch = -395; constexpr int32 k_RbrTupleDimsInconsistent = -397; //------------------------------------------------------------------------------ -std::string RawBinaryReaderFilter::name() const +std::string ReadRawBinaryFilter::name() const { - return FilterTraits::name; + return FilterTraits::name; } //------------------------------------------------------------------------------ -std::string RawBinaryReaderFilter::className() const +std::string ReadRawBinaryFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid RawBinaryReaderFilter::uuid() const +Uuid ReadRawBinaryFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string RawBinaryReaderFilter::humanName() const +std::string ReadRawBinaryFilter::humanName() const { - return "Raw Binary Importer"; + return "Read Raw Binary"; } //------------------------------------------------------------------------------ -std::vector RawBinaryReaderFilter::defaultTags() const +std::vector ReadRawBinaryFilter::defaultTags() const { return {className(), "IO", "Input", "Read", "Import"}; } //------------------------------------------------------------------------------ -Parameters RawBinaryReaderFilter::parameters() const +Parameters ReadRawBinaryFilter::parameters() const { Parameters params; @@ -81,13 +81,13 @@ Parameters RawBinaryReaderFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer RawBinaryReaderFilter::clone() const +IFilter::UniquePointer ReadRawBinaryFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult RawBinaryReaderFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadRawBinaryFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pInputFileValue = filterArgs.value(k_InputFile_Key); @@ -166,7 +166,7 @@ IFilter::PreflightResult RawBinaryReaderFilter::preflightImpl(const DataStructur } //------------------------------------------------------------------------------ -Result<> RawBinaryReaderFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadRawBinaryFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { ReadRawBinaryInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.hpp similarity index 86% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.hpp index 914596d568..a5234419b4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/RawBinaryReaderFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.hpp @@ -8,7 +8,7 @@ namespace complex { /** - * @class RawBinaryReaderFilter + * @class ReadRawBinaryFilter * @brief This filter reads data stored in files on the user's system * in binary form. The user should know exactly how the data is stored * in the file and properly define this in the user interface. Not @@ -16,17 +16,17 @@ namespace complex * this filter is simply reading the data into a pre-allocated array * interpreted as the user defines. */ -class COMPLEXCORE_EXPORT RawBinaryReaderFilter : public IFilter +class COMPLEXCORE_EXPORT ReadRawBinaryFilter : public IFilter { public: - RawBinaryReaderFilter() = default; - ~RawBinaryReaderFilter() noexcept override = default; + ReadRawBinaryFilter() = default; + ~ReadRawBinaryFilter() noexcept override = default; - RawBinaryReaderFilter(const RawBinaryReaderFilter&) = delete; - RawBinaryReaderFilter(RawBinaryReaderFilter&&) noexcept = delete; + ReadRawBinaryFilter(const ReadRawBinaryFilter&) = delete; + ReadRawBinaryFilter(ReadRawBinaryFilter&&) noexcept = delete; - RawBinaryReaderFilter& operator=(const RawBinaryReaderFilter&) = delete; - RawBinaryReaderFilter& operator=(RawBinaryReaderFilter&&) noexcept = delete; + ReadRawBinaryFilter& operator=(const ReadRawBinaryFilter&) = delete; + ReadRawBinaryFilter& operator=(ReadRawBinaryFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; @@ -103,4 +103,4 @@ class COMPLEXCORE_EXPORT RawBinaryReaderFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, RawBinaryReaderFilter, "dd159366-5f12-42db-af6d-a33592ae8a89"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadRawBinaryFilter, "dd159366-5f12-42db-af6d-a33592ae8a89"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp similarity index 90% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp index ea3d3bdab5..7d5495bee5 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp @@ -1,4 +1,4 @@ -#include "StlFileReaderFilter.hpp" +#include "ReadStlFileFilter.hpp" #include "ComplexCore/Filters/Algorithms/ReadStlFile.hpp" #include "ComplexCore/utils/StlUtilities.hpp" @@ -23,37 +23,37 @@ namespace complex { //------------------------------------------------------------------------------ -std::string StlFileReaderFilter::name() const +std::string ReadStlFileFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string StlFileReaderFilter::className() const +std::string ReadStlFileFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid StlFileReaderFilter::uuid() const +Uuid ReadStlFileFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string StlFileReaderFilter::humanName() const +std::string ReadStlFileFilter::humanName() const { - return "Import STL File"; + return "Read STL File"; } //------------------------------------------------------------------------------ -std::vector StlFileReaderFilter::defaultTags() const +std::vector ReadStlFileFilter::defaultTags() const { return {className(), "IO", "Input", "Read", "Import"}; } //------------------------------------------------------------------------------ -Parameters StlFileReaderFilter::parameters() const +Parameters ReadStlFileFilter::parameters() const { Parameters params; @@ -88,13 +88,13 @@ Parameters StlFileReaderFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer StlFileReaderFilter::clone() const +IFilter::UniquePointer ReadStlFileFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult StlFileReaderFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadStlFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pStlFilePathValue = filterArgs.value(k_StlFilePath_Key); @@ -171,7 +171,7 @@ IFilter::PreflightResult StlFileReaderFilter::preflightImpl(const DataStructure& } //------------------------------------------------------------------------------ -Result<> StlFileReaderFilter::executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadStlFileFilter::executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pStlFilePathValue = filterArgs.value(k_StlFilePath_Key); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.hpp index 71e4a16cbf..06085cb567 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/StlFileReaderFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.hpp @@ -8,22 +8,22 @@ namespace complex { /** - * @brief StlFileReaderFilter This filter will read a Binary STL file into a Triangle + * @brief ReadStlFileFilter This filter will read a Binary STL file into a Triangle * Geometry including the Normal Vector for each face. The actual algorithm is * contained in the ComplexCore/Filters/Algorithms/ReadStlFile * */ -class COMPLEXCORE_EXPORT StlFileReaderFilter : public IFilter +class COMPLEXCORE_EXPORT ReadStlFileFilter : public IFilter { public: - StlFileReaderFilter() = default; - ~StlFileReaderFilter() noexcept override = default; + ReadStlFileFilter() = default; + ~ReadStlFileFilter() noexcept override = default; - StlFileReaderFilter(const StlFileReaderFilter&) = delete; - StlFileReaderFilter(StlFileReaderFilter&&) noexcept = delete; + ReadStlFileFilter(const ReadStlFileFilter&) = delete; + ReadStlFileFilter(ReadStlFileFilter&&) noexcept = delete; - StlFileReaderFilter& operator=(const StlFileReaderFilter&) = delete; - StlFileReaderFilter& operator=(StlFileReaderFilter&&) noexcept = delete; + ReadStlFileFilter& operator=(const ReadStlFileFilter&) = delete; + ReadStlFileFilter& operator=(ReadStlFileFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_ScaleOutput = "scale_output"; @@ -103,4 +103,4 @@ class COMPLEXCORE_EXPORT StlFileReaderFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, StlFileReaderFilter, "2f64bd45-9d28-4254-9e07-6aa7c6d3d015"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadStlFileFilter, "2f64bd45-9d28-4254-9e07-6aa7c6d3d015"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp similarity index 89% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp index 6f4661fee0..50aa0de7ba 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp @@ -1,4 +1,4 @@ -#include "ImportVolumeGraphicsFileFilter.hpp" +#include "ReadVolumeGraphicsFileFilter.hpp" #include "ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.hpp" @@ -276,7 +276,7 @@ Result ParseGeometryBlock(std::ifstream& inputFile, usize& lineCo } // ----------------------------------------------------------------------------- -Result ReadHeaderMetaData(const std::string& vgHeaderFilePath) +Result ReadHeaderMetaData(const std::string& vgHeaderFilePath) { std::ifstream vgHeaderFile(vgHeaderFilePath); usize lineCount = 0; @@ -295,7 +295,7 @@ Result ReadHeaderMetaData(const auto result = ParseFileBlock(vgHeaderFile, lineCount); if(result.invalid()) { - return ConvertResultTo(std::move(ConvertResult(std::move(result))), {}); + return ConvertResultTo(std::move(ConvertResult(std::move(result))), {}); } fileBlock = result.value(); } @@ -305,7 +305,7 @@ Result ReadHeaderMetaData(const auto result = ParseGeometryBlock(vgHeaderFile, lineCount); if(result.invalid()) { - return ConvertResultTo(std::move(ConvertResult(std::move(result))), {}); + return ConvertResultTo(std::move(ConvertResult(std::move(result))), {}); } geomBlock = result.value(); } @@ -314,7 +314,7 @@ Result ReadHeaderMetaData(const vgHeaderFile.clear(); vgHeaderFile.seekg(0); - ImportVolumeGraphicsFileFilter::HeaderMetadata metadata; + ReadVolumeGraphicsFileFilter::HeaderMetadata metadata; metadata.Dimensions = fileBlock.Size; metadata.Spacing = geomBlock.Resolution; if(geomBlock.Unit == k_Millimeter) @@ -340,50 +340,50 @@ std::map s_HeaderCache; namespace complex { //------------------------------------------------------------------------------ -ImportVolumeGraphicsFileFilter::ImportVolumeGraphicsFileFilter() +ReadVolumeGraphicsFileFilter::ReadVolumeGraphicsFileFilter() : m_InstanceId(s_InstanceId.fetch_add(1)) { s_HeaderCache[m_InstanceId] = {}; } //------------------------------------------------------------------------------ -ImportVolumeGraphicsFileFilter::~ImportVolumeGraphicsFileFilter() noexcept +ReadVolumeGraphicsFileFilter::~ReadVolumeGraphicsFileFilter() noexcept { s_HeaderCache.erase(m_InstanceId); } //------------------------------------------------------------------------------ -std::string ImportVolumeGraphicsFileFilter::name() const +std::string ReadVolumeGraphicsFileFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string ImportVolumeGraphicsFileFilter::className() const +std::string ReadVolumeGraphicsFileFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ImportVolumeGraphicsFileFilter::uuid() const +Uuid ReadVolumeGraphicsFileFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ImportVolumeGraphicsFileFilter::humanName() const +std::string ReadVolumeGraphicsFileFilter::humanName() const { - return "Import Volume Graphics File (.vgi/.vol)"; + return "Read Volume Graphics File (.vgi/.vol)"; } //------------------------------------------------------------------------------ -std::vector ImportVolumeGraphicsFileFilter::defaultTags() const +std::vector ReadVolumeGraphicsFileFilter::defaultTags() const { return {className(), "#IO", "#Input", "#Read", "#Import", "#CT", "#VolumeGraphics", "#vgi"}; } //------------------------------------------------------------------------------ -Parameters ImportVolumeGraphicsFileFilter::parameters() const +Parameters ReadVolumeGraphicsFileFilter::parameters() const { Parameters params; @@ -399,13 +399,13 @@ Parameters ImportVolumeGraphicsFileFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ImportVolumeGraphicsFileFilter::clone() const +IFilter::UniquePointer ReadVolumeGraphicsFileFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ImportVolumeGraphicsFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadVolumeGraphicsFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pVGHeaderFileValue = filterArgs.value(k_VGHeaderFile_Key); @@ -445,7 +445,7 @@ IFilter::PreflightResult ImportVolumeGraphicsFileFilter::preflightImpl(const Dat } //------------------------------------------------------------------------------ -Result<> ImportVolumeGraphicsFileFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadVolumeGraphicsFileFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp similarity index 85% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp index e73af885b2..00d412bb85 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ImportVolumeGraphicsFileFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp @@ -10,23 +10,23 @@ namespace complex { /** - * @class ImportVolumeGraphicsFileFilter + * @class ReadVolumeGraphicsFileFilter * @brief This filter will import Volume Graphics data files in the form of .vgi/.vol pairs. * Both files must exist and be in the same directory for the filter to work. The .vgi file * is read to find out the dimensions, spacing and units of the data. The name of the .vol * file is also contained in the .vgi file. */ -class COMPLEXCORE_EXPORT ImportVolumeGraphicsFileFilter : public IFilter +class COMPLEXCORE_EXPORT ReadVolumeGraphicsFileFilter : public IFilter { public: - ImportVolumeGraphicsFileFilter(); - ~ImportVolumeGraphicsFileFilter() noexcept override; + ReadVolumeGraphicsFileFilter(); + ~ReadVolumeGraphicsFileFilter() noexcept override; - ImportVolumeGraphicsFileFilter(const ImportVolumeGraphicsFileFilter&) = delete; - ImportVolumeGraphicsFileFilter(ImportVolumeGraphicsFileFilter&&) noexcept = delete; + ReadVolumeGraphicsFileFilter(const ReadVolumeGraphicsFileFilter&) = delete; + ReadVolumeGraphicsFileFilter(ReadVolumeGraphicsFileFilter&&) noexcept = delete; - ImportVolumeGraphicsFileFilter& operator=(const ImportVolumeGraphicsFileFilter&) = delete; - ImportVolumeGraphicsFileFilter& operator=(ImportVolumeGraphicsFileFilter&&) noexcept = delete; + ReadVolumeGraphicsFileFilter& operator=(const ReadVolumeGraphicsFileFilter&) = delete; + ReadVolumeGraphicsFileFilter& operator=(ReadVolumeGraphicsFileFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_VGHeaderFile_Key = "vg_header_file"; @@ -115,4 +115,4 @@ class COMPLEXCORE_EXPORT ImportVolumeGraphicsFileFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ImportVolumeGraphicsFileFilter, "dfd93665-b455-499a-abed-36ae7dbcdf57"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadVolumeGraphicsFileFilter, "dfd93665-b455-499a-abed-36ae7dbcdf57"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.cpp index 6fc02c7a8c..0090622036 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteASCIIDataFilter.cpp @@ -45,7 +45,7 @@ Uuid WriteASCIIDataFilter::uuid() const //------------------------------------------------------------------------------ std::string WriteASCIIDataFilter::humanName() const { - return "Export ASCII Data"; + return "Write ASCII Data"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp index 199c02b412..7cebfee342 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp @@ -38,7 +38,7 @@ Uuid WriteAvizoRectilinearCoordinateFilter::uuid() const //------------------------------------------------------------------------------ std::string WriteAvizoRectilinearCoordinateFilter::humanName() const { - return "Avizo Rectilinear Coordinate Exporter"; + return "Write Avizo Rectilinear Coordinate"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp index 3a117c9b95..d03858e106 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp @@ -38,7 +38,7 @@ Uuid WriteAvizoUniformCoordinateFilter::uuid() const //------------------------------------------------------------------------------ std::string WriteAvizoUniformCoordinateFilter::humanName() const { - return "Avizo Uniform Coordinate Exporter"; + return "Write Avizo Uniform Coordinate"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.cpp index 95bad07f7c..6134f5fcb8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteBinaryDataFilter.cpp @@ -57,7 +57,7 @@ Uuid WriteBinaryDataFilter::uuid() const //------------------------------------------------------------------------------ std::string WriteBinaryDataFilter::humanName() const { - return "Export Binary Data"; + return "Write Binary Data"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExportDREAM3DFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp similarity index 74% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExportDREAM3DFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp index d334044c93..8535ff3800 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExportDREAM3DFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp @@ -1,4 +1,4 @@ -#include "ExportDREAM3DFilter.hpp" +#include "WriteDREAM3DFilter.hpp" #include "complex/DataStructure/DataGroup.hpp" #include "complex/Parameters/BoolParameter.hpp" @@ -17,37 +17,37 @@ constexpr complex::int32 k_FailedFindPipelineError = -15; namespace complex { //------------------------------------------------------------------------------ -std::string ExportDREAM3DFilter::name() const +std::string WriteDREAM3DFilter::name() const { - return FilterTraits::name; + return FilterTraits::name; } //------------------------------------------------------------------------------ -std::string ExportDREAM3DFilter::className() const +std::string WriteDREAM3DFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ExportDREAM3DFilter::uuid() const +Uuid WriteDREAM3DFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ExportDREAM3DFilter::humanName() const +std::string WriteDREAM3DFilter::humanName() const { return "Write DREAM3D NX File"; } //------------------------------------------------------------------------------ -std::vector ExportDREAM3DFilter::defaultTags() const +std::vector WriteDREAM3DFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export", "Binary"}; } //------------------------------------------------------------------------------ -Parameters ExportDREAM3DFilter::parameters() const +Parameters WriteDREAM3DFilter::parameters() const { Parameters params; @@ -59,13 +59,13 @@ Parameters ExportDREAM3DFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ExportDREAM3DFilter::clone() const +IFilter::UniquePointer WriteDREAM3DFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ExportDREAM3DFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const +IFilter::PreflightResult WriteDREAM3DFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& args, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto exportFilePath = args.value(k_ExportFilePath); if(exportFilePath.empty()) @@ -76,7 +76,7 @@ IFilter::PreflightResult ExportDREAM3DFilter::preflightImpl(const DataStructure& } //------------------------------------------------------------------------------ -Result<> ExportDREAM3DFilter::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteDREAM3DFilter::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto exportFilePath = args.value(k_ExportFilePath); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExportDREAM3DFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.hpp similarity index 77% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/ExportDREAM3DFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.hpp index cbefd9c928..e1da9967ab 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ExportDREAM3DFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.hpp @@ -10,21 +10,21 @@ namespace complex { /** - * @class ExportDREAM3DFilter - * @brief The ExportDREAM3DFilter is an IFilter class designed to export the + * @class WriteDREAM3DFilter + * @brief The WriteDREAM3DFilter is an IFilter class designed to export the * DataStructure to a target HDF5 file. */ -class COMPLEXCORE_EXPORT ExportDREAM3DFilter : public IFilter +class COMPLEXCORE_EXPORT WriteDREAM3DFilter : public IFilter { public: - ExportDREAM3DFilter() = default; - ~ExportDREAM3DFilter() noexcept override = default; + WriteDREAM3DFilter() = default; + ~WriteDREAM3DFilter() noexcept override = default; - ExportDREAM3DFilter(const ExportDREAM3DFilter&) = delete; - ExportDREAM3DFilter(ExportDREAM3DFilter&&) noexcept = delete; + WriteDREAM3DFilter(const WriteDREAM3DFilter&) = delete; + WriteDREAM3DFilter(WriteDREAM3DFilter&&) noexcept = delete; - ExportDREAM3DFilter& operator=(const ExportDREAM3DFilter&) = delete; - ExportDREAM3DFilter& operator=(ExportDREAM3DFilter&&) noexcept = delete; + WriteDREAM3DFilter& operator=(const WriteDREAM3DFilter&) = delete; + WriteDREAM3DFilter& operator=(WriteDREAM3DFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_ExportFilePath = "export_file_path"; @@ -43,7 +43,7 @@ class COMPLEXCORE_EXPORT ExportDREAM3DFilter : public IFilter std::string className() const override; /** - * @brief Returns the ExportDREAM3DFilter class's UUID. + * @brief Returns the WriteDREAM3DFilter class's UUID. * @return Uuid */ Uuid uuid() const override; @@ -97,4 +97,4 @@ class COMPLEXCORE_EXPORT ExportDREAM3DFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ExportDREAM3DFilter, "b3a95784-2ced-41ec-8d3d-0242ac130003"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteDREAM3DFilter, "b3a95784-2ced-41ec-8d3d-0242ac130003"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureDataCSVWriterFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureDataCSVWriterFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp index c19f594da3..4804e0ebe0 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureDataCSVWriterFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp @@ -1,4 +1,4 @@ -#include "FeatureDataCSVWriterFilter.hpp" +#include "WriteFeatureDataCSVFilter.hpp" #include "complex/Common/TypeTraits.hpp" #include "complex/DataStructure/AttributeMatrix.hpp" @@ -20,37 +20,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string FeatureDataCSVWriterFilter::name() const +std::string WriteFeatureDataCSVFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string FeatureDataCSVWriterFilter::className() const +std::string WriteFeatureDataCSVFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid FeatureDataCSVWriterFilter::uuid() const +Uuid WriteFeatureDataCSVFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string FeatureDataCSVWriterFilter::humanName() const +std::string WriteFeatureDataCSVFilter::humanName() const { - return "Export Feature Data as CSV File"; + return "Write Feature Data as CSV File"; } //------------------------------------------------------------------------------ -std::vector FeatureDataCSVWriterFilter::defaultTags() const +std::vector WriteFeatureDataCSVFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters FeatureDataCSVWriterFilter::parameters() const +Parameters WriteFeatureDataCSVFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter @@ -69,13 +69,13 @@ Parameters FeatureDataCSVWriterFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer FeatureDataCSVWriterFilter::clone() const +IFilter::UniquePointer WriteFeatureDataCSVFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult FeatureDataCSVWriterFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteFeatureDataCSVFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { PreflightResult preflightResult; @@ -88,7 +88,7 @@ IFilter::PreflightResult FeatureDataCSVWriterFilter::preflightImpl(const DataStr } //------------------------------------------------------------------------------ -Result<> FeatureDataCSVWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteFeatureDataCSVFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pOutputFilePath = filterArgs.value(k_FeatureDataFile_Key); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureDataCSVWriterFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureDataCSVWriterFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp index a9a567c218..92421be15a 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FeatureDataCSVWriterFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class FeatureDataCSVWriterFilter + * @class WriteFeatureDataCSVFilter * @brief This filter will export feature data as ASCII to a single file using choice delimiter */ -class COMPLEXCORE_EXPORT FeatureDataCSVWriterFilter : public IFilter +class COMPLEXCORE_EXPORT WriteFeatureDataCSVFilter : public IFilter { public: - FeatureDataCSVWriterFilter() = default; - ~FeatureDataCSVWriterFilter() noexcept override = default; + WriteFeatureDataCSVFilter() = default; + ~WriteFeatureDataCSVFilter() noexcept override = default; - FeatureDataCSVWriterFilter(const FeatureDataCSVWriterFilter&) = delete; - FeatureDataCSVWriterFilter(FeatureDataCSVWriterFilter&&) noexcept = delete; + WriteFeatureDataCSVFilter(const WriteFeatureDataCSVFilter&) = delete; + WriteFeatureDataCSVFilter(WriteFeatureDataCSVFilter&&) noexcept = delete; - FeatureDataCSVWriterFilter& operator=(const FeatureDataCSVWriterFilter&) = delete; - FeatureDataCSVWriterFilter& operator=(FeatureDataCSVWriterFilter&&) noexcept = delete; + WriteFeatureDataCSVFilter& operator=(const WriteFeatureDataCSVFilter&) = delete; + WriteFeatureDataCSVFilter& operator=(WriteFeatureDataCSVFilter&&) noexcept = delete; enum class Delimiter : uint64 { @@ -105,4 +105,4 @@ class COMPLEXCORE_EXPORT FeatureDataCSVWriterFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, FeatureDataCSVWriterFilter, "d734293f-3017-4699-b458-c05aca078b96"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteFeatureDataCSVFilter, "d734293f-3017-4699-b458-c05aca078b96"); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp similarity index 83% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp index 307ea26707..9bc89c1bbb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp @@ -1,4 +1,4 @@ -#include "LosAlamosFFTWriterFilter.hpp" +#include "WriteLosAlamosFFTFilter.hpp" #include "ComplexCore/Filters/Algorithms/WriteLosAlamosFFT.hpp" @@ -16,37 +16,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string LosAlamosFFTWriterFilter::name() const +std::string WriteLosAlamosFFTFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string LosAlamosFFTWriterFilter::className() const +std::string WriteLosAlamosFFTFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid LosAlamosFFTWriterFilter::uuid() const +Uuid WriteLosAlamosFFTFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string LosAlamosFFTWriterFilter::humanName() const +std::string WriteLosAlamosFFTFilter::humanName() const { - return "Export Los Alamos FFT File"; + return "Write Los Alamos FFT File"; } //------------------------------------------------------------------------------ -std::vector LosAlamosFFTWriterFilter::defaultTags() const +std::vector WriteLosAlamosFFTFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters LosAlamosFFTWriterFilter::parameters() const +Parameters WriteLosAlamosFFTFilter::parameters() const { Parameters params; @@ -70,13 +70,13 @@ Parameters LosAlamosFFTWriterFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer LosAlamosFFTWriterFilter::clone() const +IFilter::UniquePointer WriteLosAlamosFFTFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult LosAlamosFFTWriterFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteLosAlamosFFTFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); @@ -102,7 +102,7 @@ IFilter::PreflightResult LosAlamosFFTWriterFilter::preflightImpl(const DataStruc } //------------------------------------------------------------------------------ -Result<> LosAlamosFFTWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteLosAlamosFFTFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { WriteLosAlamosFFTInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp similarity index 84% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp index ad744a298e..11a6f72ffe 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/LosAlamosFFTWriterFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class LosAlamosFFTWriterFilter + * @class WriteLosAlamosFFTFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT LosAlamosFFTWriterFilter : public IFilter +class COMPLEXCORE_EXPORT WriteLosAlamosFFTFilter : public IFilter { public: - LosAlamosFFTWriterFilter() = default; - ~LosAlamosFFTWriterFilter() noexcept override = default; + WriteLosAlamosFFTFilter() = default; + ~WriteLosAlamosFFTFilter() noexcept override = default; - LosAlamosFFTWriterFilter(const LosAlamosFFTWriterFilter&) = delete; - LosAlamosFFTWriterFilter(LosAlamosFFTWriterFilter&&) noexcept = delete; + WriteLosAlamosFFTFilter(const WriteLosAlamosFFTFilter&) = delete; + WriteLosAlamosFFTFilter(WriteLosAlamosFFTFilter&&) noexcept = delete; - LosAlamosFFTWriterFilter& operator=(const LosAlamosFFTWriterFilter&) = delete; - LosAlamosFFTWriterFilter& operator=(LosAlamosFFTWriterFilter&&) noexcept = delete; + WriteLosAlamosFFTFilter& operator=(const WriteLosAlamosFFTFilter&) = delete; + WriteLosAlamosFFTFilter& operator=(WriteLosAlamosFFTFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; @@ -96,5 +96,5 @@ class COMPLEXCORE_EXPORT LosAlamosFFTWriterFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, LosAlamosFFTWriterFilter, "9d5ffeba-4339-49d2-a519-5743fbd5e7a9"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteLosAlamosFFTFilter, "9d5ffeba-4339-49d2-a519-5743fbd5e7a9"); /* LEGACY UUID FOR THIS FILTER 158ebe9e-f772-57e2-ac1b-71ff213cf890 */ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.cpp index 66ec38fbc8..358c1bc597 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteStlFileFilter.cpp @@ -39,7 +39,7 @@ Uuid WriteStlFileFilter::uuid() const //------------------------------------------------------------------------------ std::string WriteStlFileFilter::humanName() const { - return "Export STL Files from Triangle Geometry"; + return "Write STL Files from Triangle Geometry"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.cpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp index fba287b850..6de4164f2f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp @@ -1,4 +1,4 @@ -#include "VtkRectilinearGridWriterFilter.hpp" +#include "WriteVtkRectilinearGridFilter.hpp" #include "ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.hpp" @@ -17,37 +17,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string VtkRectilinearGridWriterFilter::name() const +std::string WriteVtkRectilinearGridFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string VtkRectilinearGridWriterFilter::className() const +std::string WriteVtkRectilinearGridFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid VtkRectilinearGridWriterFilter::uuid() const +Uuid WriteVtkRectilinearGridFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string VtkRectilinearGridWriterFilter::humanName() const +std::string WriteVtkRectilinearGridFilter::humanName() const { - return "Vtk Rectilinear Grid Exporter"; + return "Write Vtk Rectilinear Grid"; } //------------------------------------------------------------------------------ -std::vector VtkRectilinearGridWriterFilter::defaultTags() const +std::vector WriteVtkRectilinearGridFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters VtkRectilinearGridWriterFilter::parameters() const +Parameters WriteVtkRectilinearGridFilter::parameters() const { Parameters params; @@ -64,13 +64,13 @@ Parameters VtkRectilinearGridWriterFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer VtkRectilinearGridWriterFilter::clone() const +IFilter::UniquePointer WriteVtkRectilinearGridFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult VtkRectilinearGridWriterFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteVtkRectilinearGridFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); @@ -107,7 +107,7 @@ IFilter::PreflightResult VtkRectilinearGridWriterFilter::preflightImpl(const Dat } //------------------------------------------------------------------------------ -Result<> VtkRectilinearGridWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteVtkRectilinearGridFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { WriteVtkRectilinearGridInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp similarity index 81% rename from src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.hpp rename to src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp index a2d2fa898d..1aafe90ec9 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/VtkRectilinearGridWriterFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class VtkRectilinearGridWriterFilter + * @class WriteVtkRectilinearGridFilter * @brief This filter will .... */ -class COMPLEXCORE_EXPORT VtkRectilinearGridWriterFilter : public IFilter +class COMPLEXCORE_EXPORT WriteVtkRectilinearGridFilter : public IFilter { public: - VtkRectilinearGridWriterFilter() = default; - ~VtkRectilinearGridWriterFilter() noexcept override = default; + WriteVtkRectilinearGridFilter() = default; + ~WriteVtkRectilinearGridFilter() noexcept override = default; - VtkRectilinearGridWriterFilter(const VtkRectilinearGridWriterFilter&) = delete; - VtkRectilinearGridWriterFilter(VtkRectilinearGridWriterFilter&&) noexcept = delete; + WriteVtkRectilinearGridFilter(const WriteVtkRectilinearGridFilter&) = delete; + WriteVtkRectilinearGridFilter(WriteVtkRectilinearGridFilter&&) noexcept = delete; - VtkRectilinearGridWriterFilter& operator=(const VtkRectilinearGridWriterFilter&) = delete; - VtkRectilinearGridWriterFilter& operator=(VtkRectilinearGridWriterFilter&&) noexcept = delete; + WriteVtkRectilinearGridFilter& operator=(const WriteVtkRectilinearGridFilter&) = delete; + WriteVtkRectilinearGridFilter& operator=(WriteVtkRectilinearGridFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; @@ -95,5 +95,5 @@ class COMPLEXCORE_EXPORT VtkRectilinearGridWriterFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, VtkRectilinearGridWriterFilter, "58a4d758-c5ff-43d3-a394-1508ad00a0d2"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteVtkRectilinearGridFilter, "58a4d758-c5ff-43d3-a394-1508ad00a0d2"); /* LEGACY UUID FOR THIS FILTER a043bd66-2681-5126-82e1-5fdc46694bf4 */ diff --git a/src/Plugins/ComplexCore/test/ApproximatePointCloudHullTest.cpp b/src/Plugins/ComplexCore/test/ApproximatePointCloudHullTest.cpp index 20befcb6df..2edc15843b 100644 --- a/src/Plugins/ComplexCore/test/ApproximatePointCloudHullTest.cpp +++ b/src/Plugins/ComplexCore/test/ApproximatePointCloudHullTest.cpp @@ -1,6 +1,6 @@ #include "ComplexCore/Filters/ApproximatePointCloudHull.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/StlFileReaderFilter.hpp" +#include "ComplexCore/Filters/ReadStlFileFilter.hpp" #include "complex/DataStructure/Geometry/TriangleGeom.hpp" #include "complex/DataStructure/Geometry/VertexGeom.hpp" @@ -49,12 +49,12 @@ TEST_CASE("ComplexCore::ApproximatePointCloudHull: Instantiate Filter", "[Approx { Arguments args; - StlFileReaderFilter filter; + ReadStlFileFilter filter; std::string inputFile = fmt::format("{}/ASTMD638_specimen.stl", unit_test::k_ComplexTestDataSourceDir.view()); // Create default Parameters for the filter. - args.insertOrAssign(StlFileReaderFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(StlFileReaderFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); + args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/CMakeLists.txt b/src/Plugins/ComplexCore/test/CMakeLists.txt index 6724838683..9bb9f85b40 100644 --- a/src/Plugins/ComplexCore/test/CMakeLists.txt +++ b/src/Plugins/ComplexCore/test/CMakeLists.txt @@ -6,7 +6,6 @@ # ------------------------------------------------------------------------------ # Define the list of unit test source files set(${PLUGIN_NAME}UnitTest_SRCS - WriteAbaqusHexahedronTest.cpp AddBadDataTest.cpp AlignGeometriesTest.cpp AlignSectionsFeatureCentroidTest.cpp @@ -15,16 +14,14 @@ set(${PLUGIN_NAME}UnitTest_SRCS ApplyTransformationToGeometryTest.cpp ApproximatePointCloudHullTest.cpp ArrayCalculatorTest.cpp - WriteAvizoRectilinearCoordinateTest.cpp - WriteAvizoUniformCoordinateTest.cpp CalculateArrayHistogramTest.cpp CalculateFeatureSizesTest.cpp CalculateTriangleAreasFilterTest.cpp ChangeAngleRepresentationTest.cpp CombineAttributeArraysTest.cpp CombineStlFilesTest.cpp - ComputeMomentInvariants2DTest.cpp ComputeFeatureRectTest.cpp + ComputeMomentInvariants2DTest.cpp ConditionalSetValueTest.cpp ConvertColorToGrayScaleTest.cpp ConvertDataTest.cpp @@ -47,7 +44,6 @@ set(${PLUGIN_NAME}UnitTest_SRCS ExtractComponentAsArrayTest.cpp ExtractInternalSurfacesFromTriangleGeometryTest.cpp ExtractVertexGeometryTest.cpp - FeatureDataCSVWriterTest.cpp FeatureFaceCurvatureTest.cpp FillBadDataTest.cpp FindArrayStatisticsTest.cpp @@ -58,8 +54,8 @@ set(${PLUGIN_NAME}UnitTest_SRCS FindEuclideanDistMapTest.cpp FindFeatureCentroidsFilterTest.cpp FindFeatureClusteringTest.cpp - FindFeaturePhasesFilterTest.cpp FindFeaturePhasesBinaryTest.cpp + FindFeaturePhasesFilterTest.cpp FindLargestCrossSectionsTest.cpp FindNeighborhoodsTest.cpp FindNeighborListStatisticsTest.cpp @@ -76,30 +72,29 @@ set(${PLUGIN_NAME}UnitTest_SRCS IdentifySampleTest.cpp ImageContouringTest.cpp ImageGeomTest.cpp - ImportBinaryCTNorthstarTest.cpp - ReadCSVFileTest.cpp - - # ImportDeformKeyFileV12Test.cpp - ImportHDF5DatasetTest.cpp - ReadTextDataArrayTest.cpp - ImportVolumeGraphicsFileTest.cpp InitializeDataTest.cpp InterpolatePointCloudToRegularGridTest.cpp IterativeClosestPointTest.cpp KMeansTest.cpp KMedoidsTest.cpp LaplacianSmoothingFilterTest.cpp - LosAlamosFFTWriterTest.cpp - MultiThresholdObjectsTest.cpp MapPointCloudToRegularGridTest.cpp MinNeighborsTest.cpp MoveDataTest.cpp + MultiThresholdObjectsTest.cpp NearestPointFuseRegularGridsTest.cpp PartitionGeometryTest.cpp PipelineTest.cpp PointSampleTriangleGeometryFilterTest.cpp QuickSurfaceMeshFilterTest.cpp - RawBinaryReaderTest.cpp + ReadBinaryCTNorthstarTest.cpp + ReadCSVFileTest.cpp + ReadDeformKeyFileV12Test.cpp + ReadHDF5DatasetTest.cpp + ReadRawBinaryTest.cpp + ReadStlFileTest.cpp + ReadTextDataArrayTest.cpp + ReadVolumeGraphicsFileTest.cpp RegularGridSampleSurfaceMeshTest.cpp RemoveFlaggedFeaturesTest.cpp RemoveFlaggedVerticesTest.cpp @@ -116,16 +111,20 @@ set(${PLUGIN_NAME}UnitTest_SRCS SharedFeatureFaceTest.cpp SilhouetteTest.cpp SplitAttributeArrayTest.cpp - StlFileReaderTest.cpp SurfaceNetsTest.cpp TriangleCentroidTest.cpp TriangleDihedralAngleFilterTest.cpp TriangleNormalFilterTest.cpp UncertainRegularGridSampleSurfaceMeshTest.cpp - VtkRectilinearGridWriterTest.cpp + WriteAbaqusHexahedronTest.cpp WriteASCIIDataTest.cpp + WriteAvizoRectilinearCoordinateTest.cpp + WriteAvizoUniformCoordinateTest.cpp WriteBinaryDataTest.cpp + WriteFeatureDataCSVTest.cpp + WriteLosAlamosFFTTest.cpp WriteStlFileTest.cpp + WriteVtkRectilinearGridTest.cpp ) create_complex_plugin_unit_test(PLUGIN_NAME ${PLUGIN_NAME} diff --git a/src/Plugins/ComplexCore/test/CalculateFeatureSizesTest.cpp b/src/Plugins/ComplexCore/test/CalculateFeatureSizesTest.cpp index 55acffc526..4d2a6320c6 100644 --- a/src/Plugins/ComplexCore/test/CalculateFeatureSizesTest.cpp +++ b/src/Plugins/ComplexCore/test/CalculateFeatureSizesTest.cpp @@ -1,6 +1,6 @@ #include "ComplexCore/ComplexCore_test_dirs.hpp" #include "ComplexCore/Filters/CalculateFeatureSizesFilter.hpp" -#include "ComplexCore/Filters/RawBinaryReaderFilter.hpp" +#include "ComplexCore/Filters/ReadRawBinaryFilter.hpp" #include "complex/UnitTest/UnitTestCommon.hpp" diff --git a/src/Plugins/ComplexCore/test/CalculateTriangleAreasFilterTest.cpp b/src/Plugins/ComplexCore/test/CalculateTriangleAreasFilterTest.cpp index 50658c54c9..348e05bcec 100644 --- a/src/Plugins/ComplexCore/test/CalculateTriangleAreasFilterTest.cpp +++ b/src/Plugins/ComplexCore/test/CalculateTriangleAreasFilterTest.cpp @@ -1,6 +1,6 @@ #include "ComplexCore/Filters/CalculateTriangleAreasFilter.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/StlFileReaderFilter.hpp" +#include "ComplexCore/Filters/ReadStlFileFilter.hpp" #include "complex/DataStructure/Geometry/TriangleGeom.hpp" #include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" @@ -28,15 +28,15 @@ TEST_CASE("ComplexCore::CalculateTriangleAreasFilter", "[ComplexCore][CalculateT { Arguments args; - StlFileReaderFilter filter; + ReadStlFileFilter filter; DataPath triangleGeomDataPath({triangleGeometryName}); std::string inputFile = fmt::format("{}/ASTMD638_specimen.stl", unit_test::k_ComplexTestDataSourceDir.view()); // Create default Parameters for the filter. - args.insertOrAssign(StlFileReaderFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(StlFileReaderFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); + args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp b/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp index 353e7fe250..6f177d2e36 100644 --- a/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp +++ b/src/Plugins/ComplexCore/test/FindSurfaceFeaturesTest.cpp @@ -1,7 +1,7 @@ #include "ComplexCore/Filters/FindSurfaceFeatures.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" #include "ComplexCore/Filters/CreateImageGeometry.hpp" -#include "ComplexCore/Filters/RawBinaryReaderFilter.hpp" +#include "ComplexCore/Filters/ReadRawBinaryFilter.hpp" #include "complex/Parameters/DynamicTableParameter.hpp" #include "complex/UnitTest/UnitTestCommon.hpp" @@ -39,13 +39,13 @@ void test_impl(const std::vector& geometryDims, const std::string& featu auto result = cigFilter.execute(dataStructure, cigArgs); COMPLEX_RESULT_REQUIRE_VALID(result.result) - RawBinaryReaderFilter rbrFilter; + ReadRawBinaryFilter rbrFilter; Arguments rbrArgs; - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_InputFile_Key, fs::path(unit_test::k_TestFilesDir.str()).append(featureIdsFileName)); - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_NumberOfComponents_Key, std::make_any(1)); - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_ScalarType_Key, NumericType::int32); - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_TupleDims_Key, DynamicTableParameter::ValueType({{static_cast(featureIdsSize)}})); - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_CreatedAttributeArrayPath_Key, std::make_any(k_FeatureIDsPath)); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_InputFile_Key, fs::path(unit_test::k_TestFilesDir.str()).append(featureIdsFileName)); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_NumberOfComponents_Key, std::make_any(1)); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_ScalarType_Key, NumericType::int32); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_TupleDims_Key, DynamicTableParameter::ValueType({{static_cast(featureIdsSize)}})); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_CreatedAttributeArrayPath_Key, std::make_any(k_FeatureIDsPath)); result = rbrFilter.execute(dataStructure, rbrArgs); COMPLEX_RESULT_REQUIRE_VALID(result.result); @@ -62,10 +62,10 @@ void test_impl(const std::vector& geometryDims, const std::string& featu REQUIRE(imageGeomId.has_value()); AttributeMatrix::Create(dataStructure, Constants::k_CellFeatureData, std::vector{maxValue + 1}, imageGeomId.value()); - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_InputFile_Key, fs::path(unit_test::k_TestFilesDir.str()).append(exemplaryFileName)); - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_ScalarType_Key, NumericType::int8); - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_TupleDims_Key, DynamicTableParameter::ValueType({{796}})); - rbrArgs.insertOrAssign(RawBinaryReaderFilter::k_CreatedAttributeArrayPath_Key, std::make_any(k_SurfaceFeaturesExemplaryPath)); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_InputFile_Key, fs::path(unit_test::k_TestFilesDir.str()).append(exemplaryFileName)); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_ScalarType_Key, NumericType::int8); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_TupleDims_Key, DynamicTableParameter::ValueType({{796}})); + rbrArgs.insertOrAssign(ReadRawBinaryFilter::k_CreatedAttributeArrayPath_Key, std::make_any(k_SurfaceFeaturesExemplaryPath)); result = rbrFilter.execute(dataStructure, rbrArgs); COMPLEX_RESULT_REQUIRE_VALID(result.result) diff --git a/src/Plugins/ComplexCore/test/LaplacianSmoothingFilterTest.cpp b/src/Plugins/ComplexCore/test/LaplacianSmoothingFilterTest.cpp index eda30403bc..1148897baf 100644 --- a/src/Plugins/ComplexCore/test/LaplacianSmoothingFilterTest.cpp +++ b/src/Plugins/ComplexCore/test/LaplacianSmoothingFilterTest.cpp @@ -1,6 +1,6 @@ #include "ComplexCore/Filters/LaplacianSmoothingFilter.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/StlFileReaderFilter.hpp" +#include "ComplexCore/Filters/ReadStlFileFilter.hpp" #include "complex/DataStructure/Geometry/TriangleGeom.hpp" #include "complex/Parameters/ArrayCreationParameter.hpp" @@ -30,7 +30,7 @@ TEST_CASE("ComplexCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSm { Arguments args; - StlFileReaderFilter filter; + ReadStlFileFilter filter; DataPath triangleGeomDataPath({triangleGeometryName}); DataPath triangleFaceDataGroupDataPath({triangleGeometryName, triangleFaceDataGroupName}); @@ -39,8 +39,8 @@ TEST_CASE("ComplexCore::LaplacianSmoothingFilter", "[SurfaceMeshing][LaplacianSm std::string inputFile = fmt::format("{}/ASTMD638_specimen.stl", unit_test::k_ComplexTestDataSourceDir.view()); // Create default Parameters for the filter. - args.insertOrAssign(StlFileReaderFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(StlFileReaderFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); + args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/PartitionGeometryTest.cpp b/src/Plugins/ComplexCore/test/PartitionGeometryTest.cpp index fb5bc466b7..da259451da 100644 --- a/src/Plugins/ComplexCore/test/PartitionGeometryTest.cpp +++ b/src/Plugins/ComplexCore/test/PartitionGeometryTest.cpp @@ -30,8 +30,8 @@ #include "complex/UnitTest/UnitTestCommon.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ImportDREAM3DFilter.hpp" #include "ComplexCore/Filters/PartitionGeometryFilter.hpp" +#include "ComplexCore/Filters/ReadDREAM3DFilter.hpp" using namespace complex; namespace fs = std::filesystem; @@ -162,9 +162,9 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Basic", "[Plugins][PartitionGeo DataStructure dataStructure; { - const ImportDREAM3DFilter importD3DFilter; + const ReadDREAM3DFilter importD3DFilter; Arguments importD3DArgs; - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); // Preflight the filter and check result auto executeResult = importD3DFilter.execute(dataStructure, importD3DArgs); COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) @@ -265,9 +265,9 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Advanced", "[Plugins][Partition DataStructure dataStructure; { - const ImportDREAM3DFilter importD3DFilter; + const ReadDREAM3DFilter importD3DFilter; Arguments importD3DArgs; - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); // Execute the filter and check result auto executeResult = importD3DFilter.execute(dataStructure, importD3DArgs); COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) @@ -360,9 +360,9 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Bounding Box", "[Plugins][Parti DataStructure dataStructure; { - const ImportDREAM3DFilter importD3DFilter; + const ReadDREAM3DFilter importD3DFilter; Arguments importD3DArgs; - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{filePaths[index]}); // Execute the filter and check result auto executeResult = importD3DFilter.execute(dataStructure, importD3DArgs); COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) @@ -420,7 +420,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug exemplaryArrayName = "ExemplaryPartitioningSchemeIds"; partitionGeometryArgs = createExistingPartitioningSchemeGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, existingPSGeometryPath); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_ImageGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_ImageGeomTestFilePath}); } SECTION("Test Existing Partitioning Scheme Rect Grid Geometry") @@ -430,7 +430,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug exemplaryArrayName = "ExemplaryPartitioningSchemeIds"; partitionGeometryArgs = createExistingPartitioningSchemeGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, existingPSGeometryPath); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_RectGridGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_RectGridGeomTestFilePath}); } SECTION("Test Existing Partitioning Scheme Triangle Geometry") @@ -440,7 +440,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug exemplaryArrayName = "ExemplaryPartitioningSchemeIds"; partitionGeometryArgs = createExistingPartitioningSchemeGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, existingPSGeometryPath); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_TriangleGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_TriangleGeomTestFilePath}); } SECTION("Test Existing Partitioning Scheme Edge Geometry") @@ -450,7 +450,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug exemplaryArrayName = "ExemplaryPartitioningSchemeIds"; partitionGeometryArgs = createExistingPartitioningSchemeGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, existingPSGeometryPath); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_EdgeGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_EdgeGeomTestFilePath}); } SECTION("Test Existing Partitioning Scheme Vertex Geometry") @@ -460,7 +460,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug exemplaryArrayName = "ExemplaryPartitioningSchemeIds"; partitionGeometryArgs = createExistingPartitioningSchemeGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, existingPSGeometryPath); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_VertexGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_VertexGeomTestFilePath}); } SECTION("Test Existing Partitioning Scheme Quad Geometry") @@ -470,7 +470,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug exemplaryArrayName = "ExemplaryPartitioningSchemeIds"; partitionGeometryArgs = createExistingPartitioningSchemeGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, existingPSGeometryPath); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_QuadGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_QuadGeomTestFilePath}); } SECTION("Test Existing Partitioning Scheme Tetrahedral Geometry") @@ -480,7 +480,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug exemplaryArrayName = "ExemplaryPartitioningSchemeIds"; partitionGeometryArgs = createExistingPartitioningSchemeGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, existingPSGeometryPath); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_TetrahedralGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_TetrahedralGeomTestFilePath}); } SECTION("Test Existing Partitioning Scheme Hexahedral Geometry") @@ -490,10 +490,10 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Valid filter execution", "[Plug exemplaryArrayName = "ExemplaryPartitioningSchemeIds"; partitionGeometryArgs = createExistingPartitioningSchemeGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, existingPSGeometryPath); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_HexahedralGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_HexahedralGeomTestFilePath}); } - const ImportDREAM3DFilter importD3DFilter; + const ReadDREAM3DFilter importD3DFilter; DataStructure dataStructure; const PartitionGeometryFilter filter; @@ -541,7 +541,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Invalid filter execution") expectedErrorCode = -3042; partitionGeometryArgs = createBasicPartitionGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, numOfPartitionsPerAxis, {}); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_PlanalXYNodeGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_PlanalXYNodeGeomTestFilePath}); } SECTION("Test Planal XZ Node Geometry") { @@ -551,7 +551,7 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Invalid filter execution") expectedErrorCode = -3041; partitionGeometryArgs = createBasicPartitionGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, numOfPartitionsPerAxis, {}); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_PlanalXZNodeGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_PlanalXZNodeGeomTestFilePath}); } SECTION("Test Planal YZ Node Geometry") { @@ -561,10 +561,10 @@ TEST_CASE("ComplexCore::PartitionGeometryFilter: Invalid filter execution") expectedErrorCode = -3040; partitionGeometryArgs = createBasicPartitionGeometryArguments(inputGeometryPath, attrMatrixPath, partitionIdsArrayName, numOfPartitionsPerAxis, {}); - importD3DArgs.insert(ImportDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_PlanalYZNodeGeomTestFilePath}); + importD3DArgs.insert(ReadDREAM3DFilter::k_ImportFileData, Dream3dImportParameter::ImportData{k_PlanalYZNodeGeomTestFilePath}); } - const ImportDREAM3DFilter importD3DFilter; + const ReadDREAM3DFilter importD3DFilter; DataStructure dataStructure; const PartitionGeometryFilter filter; diff --git a/src/Plugins/ComplexCore/test/PointSampleTriangleGeometryFilterTest.cpp b/src/Plugins/ComplexCore/test/PointSampleTriangleGeometryFilterTest.cpp index cf9e3ae2c8..fa74642aec 100644 --- a/src/Plugins/ComplexCore/test/PointSampleTriangleGeometryFilterTest.cpp +++ b/src/Plugins/ComplexCore/test/PointSampleTriangleGeometryFilterTest.cpp @@ -1,7 +1,7 @@ #include "ComplexCore/Filters/PointSampleTriangleGeometryFilter.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" #include "ComplexCore/Filters/CalculateTriangleAreasFilter.hpp" -#include "ComplexCore/Filters/StlFileReaderFilter.hpp" +#include "ComplexCore/Filters/ReadStlFileFilter.hpp" #include "complex/DataStructure/DataGroup.hpp" #include "complex/DataStructure/Geometry/TriangleGeom.hpp" @@ -81,7 +81,7 @@ TEST_CASE("ComplexCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][Poi // Read in the STL File to load a Triangle Geometry to sample { Arguments args; - StlFileReaderFilter filter; + ReadStlFileFilter filter; DataPath triangleGeomDataPath({triangleGeometryName}); DataPath triangleFaceDataGroupDataPath({triangleGeometryName, triangleFaceDataGroupName}); @@ -90,8 +90,8 @@ TEST_CASE("ComplexCore::PointSampleTriangleGeometryFilter", "[DREAM3DReview][Poi std::string inputFile = fmt::format("{}/ASTMD638_specimen.stl", unit_test::k_ComplexTestDataSourceDir.view()); // Create default Parameters for the filter. - args.insertOrAssign(StlFileReaderFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(StlFileReaderFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); + args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/ImportBinaryCTNorthstarTest.cpp b/src/Plugins/ComplexCore/test/ReadBinaryCTNorthstarTest.cpp similarity index 66% rename from src/Plugins/ComplexCore/test/ImportBinaryCTNorthstarTest.cpp rename to src/Plugins/ComplexCore/test/ReadBinaryCTNorthstarTest.cpp index 4be39e8089..add0f55a1e 100644 --- a/src/Plugins/ComplexCore/test/ImportBinaryCTNorthstarTest.cpp +++ b/src/Plugins/ComplexCore/test/ReadBinaryCTNorthstarTest.cpp @@ -5,7 +5,7 @@ #include "complex/UnitTest/UnitTestCommon.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ImportBinaryCTNorthstarFilter.hpp" +#include "ComplexCore/Filters/ReadBinaryCTNorthstarFilter.hpp" #include #include @@ -88,12 +88,12 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution") WriteNsiBinaryDataFiles(k_TestDirPath / k_NsiDataFileName1, k_TestDirPath / k_NsiDataFileName2); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportBinaryCTNorthstarFilter filter; + ReadBinaryCTNorthstarFilter filter; DataStructure dataStructure; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -119,15 +119,15 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution with WriteNsiBinaryDataFiles(k_TestDirPath / k_NsiDataFileName1, k_TestDirPath / k_NsiDataFileName2); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportBinaryCTNorthstarFilter filter; + ReadBinaryCTNorthstarFilter filter; DataStructure dataStructure; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{1, 2, 4})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{1, 2, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -139,8 +139,8 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Valid filter execution with REQUIRE_NOTHROW(dataStructure.getDataRefAs(densityArrayPath)); const Float32Array& densityResult = dataStructure.getDataRefAs(densityArrayPath); - auto startVoxelCoord = args.value(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key); - auto endVoxelCoord = args.value(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key); + auto startVoxelCoord = args.value(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key); + auto endVoxelCoord = args.value(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key); usize subvolumeXDim = endVoxelCoord[0] - startVoxelCoord[0] + 1; usize subvolumeYDim = endVoxelCoord[1] - startVoxelCoord[1] + 1; usize subvolumeZDim = endVoxelCoord[2] - startVoxelCoord[2] + 1; @@ -168,12 +168,12 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - WriteNsiBinaryDataFiles(k_TestDirPath / k_NsiDataFileName1, k_TestDirPath / k_NsiDataFileName2); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportBinaryCTNorthstarFilter filter; + ReadBinaryCTNorthstarFilter filter; DataStructure dataStructure; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); @@ -191,12 +191,12 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - WriteNsiBinaryDataFiles(k_TestDirPath / k_NsiDataFileName1, k_TestDirPath / k_NsiDataFileName2); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportBinaryCTNorthstarFilter filter; + ReadBinaryCTNorthstarFilter filter; DataStructure dataStructure; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); // Execute the filter and check the result auto executeResult = filter.execute(dataStructure, args); @@ -212,94 +212,94 @@ TEST_CASE("ComplexCore::ReadBinaryCTNorthStarFilter: Invalid filter execution - WriteNsiBinaryDataFiles(k_TestDirPath / k_NsiDataFileName1, k_TestDirPath / k_NsiDataFileName2); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportBinaryCTNorthstarFilter filter; + ReadBinaryCTNorthstarFilter filter; DataStructure dataStructure; Arguments args; - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{4, 2, 4})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{3, 3, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{4, 2, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{3, 3, 6})); auto executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38712); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 3, 4})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 2, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 3, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 2, 6})); executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38713); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, 6})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 4})); executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38714); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{-1, 2, 4})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{-1, 2, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38715); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, -1, 4})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, -1, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38715); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, -1})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, -1})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 6})); executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38715); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, 4})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{9, 3, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{9, 3, 6})); executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38716); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, 4})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 9, 6})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 9, 6})); executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); REQUIRE(executeResult.result.errors().size() == 1); REQUIRE(executeResult.result.errors()[0].code == -38717); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, 4})); - args.insertOrAssign(ImportBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 9})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_InputHeaderFile_Key, std::make_any(k_NsiHeaderPath)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_ImportSubvolume_Key, std::make_any(true)); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_StartVoxelCoord_Key, std::make_any(std::vector{3, 2, 4})); + args.insertOrAssign(ReadBinaryCTNorthstarFilter::k_EndVoxelCoord_Key, std::make_any(std::vector{4, 3, 9})); executeResult = filter.execute(dataStructure, args); COMPLEX_RESULT_REQUIRE_INVALID(executeResult.result); diff --git a/src/Plugins/ComplexCore/test/ImportDeformKeyFileV12Test.cpp b/src/Plugins/ComplexCore/test/ReadDeformKeyFileV12Test.cpp similarity index 87% rename from src/Plugins/ComplexCore/test/ImportDeformKeyFileV12Test.cpp rename to src/Plugins/ComplexCore/test/ReadDeformKeyFileV12Test.cpp index b1c3f3b2e3..57f6f7e97c 100644 --- a/src/Plugins/ComplexCore/test/ImportDeformKeyFileV12Test.cpp +++ b/src/Plugins/ComplexCore/test/ReadDeformKeyFileV12Test.cpp @@ -5,7 +5,7 @@ #include "complex/Utilities/StringUtilities.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ImportDeformKeyFileV12Filter.hpp" +#include "ComplexCore/Filters/ReadDeformKeyFileV12Filter.hpp" #include namespace fs = std::filesystem; @@ -155,7 +155,7 @@ const DataPath k_VertexPath = k_QuadGeomPath.createChildPath(k_VertexData); // } // } -TEST_CASE("ComplexCore::ImportDeformKeyFileV12: Case 0", "[Core][ImportDeformKeyFileV12]") +TEST_CASE("ComplexCore::ReadDeformKeyFileV12: Case 0", "[Core][ReadDeformKeyFileV12]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_import_deform_12.tar.gz", "6_6_import_deform_12"); // Read Exemplar DREAM3D File Filter @@ -165,16 +165,16 @@ TEST_CASE("ComplexCore::ImportDeformKeyFileV12: Case 0", "[Core][ImportDeformKey DataStructure dataStructure; { // Instantiate the filter and an Arguments Object - ImportDeformKeyFileV12Filter filter; + ReadDeformKeyFileV12Filter filter; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(ImportDeformKeyFileV12Filter::k_InputFilePath_Key, + args.insertOrAssign(ReadDeformKeyFileV12Filter::k_InputFilePath_Key, std::make_any(fs::path(fmt::format("{}/6_6_import_deform_12/deform_v12_0.key", unit_test::k_TestFilesDir)))); - args.insertOrAssign(ImportDeformKeyFileV12Filter::k_QuadGeomPath_Key, std::make_any(k_QuadGeomPath)); - args.insertOrAssign(ImportDeformKeyFileV12Filter::k_VertexAMName_Key, std::make_any(k_VertexPath.getTargetName())); - args.insertOrAssign(ImportDeformKeyFileV12Filter::k_CellAMName_Key, std::make_any(k_CellPath.getTargetName())); + args.insertOrAssign(ReadDeformKeyFileV12Filter::k_QuadGeomPath_Key, std::make_any(k_QuadGeomPath)); + args.insertOrAssign(ReadDeformKeyFileV12Filter::k_VertexAMName_Key, std::make_any(k_VertexPath.getTargetName())); + args.insertOrAssign(ReadDeformKeyFileV12Filter::k_CellAMName_Key, std::make_any(k_CellPath.getTargetName())); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -194,7 +194,7 @@ TEST_CASE("ComplexCore::ImportDeformKeyFileV12: Case 0", "[Core][ImportDeformKey #endif } -TEST_CASE("ComplexCore::ImportDeformKeyFileV12: Case 1", "[Core][ImportDeformKeyFileV12]") +TEST_CASE("ComplexCore::ReadDeformKeyFileV12Filter: Case 1", "[Core][ReadDeformKeyFileV12Filter]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_import_deform_12.tar.gz", "6_6_import_deform_12"); // Read Exemplar DREAM3D File Filter @@ -204,16 +204,16 @@ TEST_CASE("ComplexCore::ImportDeformKeyFileV12: Case 1", "[Core][ImportDeformKey DataStructure dataStructure; { // Instantiate the filter and an Arguments Object - ImportDeformKeyFileV12Filter filter; + ReadDeformKeyFileV12Filter filter; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(ImportDeformKeyFileV12Filter::k_InputFilePath_Key, + args.insertOrAssign(ReadDeformKeyFileV12Filter::k_InputFilePath_Key, std::make_any(fs::path(fmt::format("{}/6_6_import_deform_12/deform_v12_1.key", unit_test::k_TestFilesDir)))); - args.insertOrAssign(ImportDeformKeyFileV12Filter::k_QuadGeomPath_Key, std::make_any(k_QuadGeomPath)); - args.insertOrAssign(ImportDeformKeyFileV12Filter::k_VertexAMName_Key, std::make_any(k_VertexPath.getTargetName())); - args.insertOrAssign(ImportDeformKeyFileV12Filter::k_CellAMName_Key, std::make_any(k_CellPath.getTargetName())); + args.insertOrAssign(ReadDeformKeyFileV12Filter::k_QuadGeomPath_Key, std::make_any(k_QuadGeomPath)); + args.insertOrAssign(ReadDeformKeyFileV12Filter::k_VertexAMName_Key, std::make_any(k_VertexPath.getTargetName())); + args.insertOrAssign(ReadDeformKeyFileV12Filter::k_CellAMName_Key, std::make_any(k_CellPath.getTargetName())); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/ImportHDF5DatasetTest.cpp b/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp similarity index 91% rename from src/Plugins/ComplexCore/test/ImportHDF5DatasetTest.cpp rename to src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp index 1344c2556a..c8e8ed0a2f 100644 --- a/src/Plugins/ComplexCore/test/ImportHDF5DatasetTest.cpp +++ b/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp @@ -1,5 +1,5 @@ -#include "ComplexCore/Filters/ImportHDF5Dataset.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" +#include "ComplexCore/Filters/ReadHDF5Dataset.hpp" #include "complex/Common/TypesUtility.hpp" #include "complex/DataStructure/DataArray.hpp" @@ -143,7 +143,7 @@ void writeHDF5File() } // ----------------------------------------------------------------------------- -void testFilterPreflight(ImportHDF5Dataset& filter) +void testFilterPreflight(ReadHDF5Dataset& filter) { Arguments args; DataStructure dataStructure; @@ -153,7 +153,7 @@ void testFilterPreflight(ImportHDF5Dataset& filter) std::optional levelZeroPath = {DataPath::FromString(Constants::k_LevelZero.view()).value()}; ImportHDF5DatasetParameter::ValueType val = {levelZeroPath, "", {}}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); // Check empty file path error auto results = filter.preflight(dataStructure, args); @@ -161,21 +161,21 @@ void testFilterPreflight(ImportHDF5Dataset& filter) // Check incorrect extension error val = {levelZeroPath, "foo.txt", {}}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); // Check non-existent file error val = {levelZeroPath, "foo.h5", {}}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); // Put in the correct file path val = {levelZeroPath, m_FilePath, {}}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); // Check no datasets checked error results = filter.preflight(dataStructure, args); @@ -189,7 +189,7 @@ void testFilterPreflight(ImportHDF5Dataset& filter) importInfo.dataSetPath = ""; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -199,7 +199,7 @@ void testFilterPreflight(ImportHDF5Dataset& filter) importInfo.dataSetPath = "/Foo"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -210,7 +210,7 @@ void testFilterPreflight(ImportHDF5Dataset& filter) importInfo.dataSetPath = "Pointer/Pointer1DArrayDataset<" + typeStr + ">"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); // Check empty component dimensions results = filter.preflight(dataStructure, args); @@ -221,7 +221,7 @@ void testFilterPreflight(ImportHDF5Dataset& filter) importInfo.componentDimensions = "(abcdg 635w"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -231,7 +231,7 @@ void testFilterPreflight(ImportHDF5Dataset& filter) importInfo.componentDimensions = "12, 6"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -240,14 +240,14 @@ void testFilterPreflight(ImportHDF5Dataset& filter) importInfo.tupleDimensions = "(abcdg 635w"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); // Check empty parent attribute matrix/data group val = {std::optional{}, m_FilePath, importInfoList}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -256,7 +256,7 @@ void testFilterPreflight(ImportHDF5Dataset& filter) importInfo.componentDimensions = "1"; importInfoList.push_back(importInfo); val = {DataPath::FromString(levelZeroAMName), m_FilePath, importInfoList}; - args.insertOrAssign(ImportHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(results.outputActions.valid()); } @@ -280,7 +280,7 @@ std::string createVectorString(std::vector vec) // ----------------------------------------------------------------------------- template -void DatasetTest(ImportHDF5Dataset& filter, const std::list& importInfoList, bool useParentGroup, bool resultsValid) +void DatasetTest(ReadHDF5Dataset& filter, const std::list& importInfoList, bool useParentGroup, bool resultsValid) { if(importInfoList.empty()) { @@ -305,7 +305,7 @@ void DatasetTest(ImportHDF5Dataset& filter, const std::list(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); // Execute Dataset Test if(dsetInfoList.size() > 1) @@ -384,7 +384,7 @@ void DatasetTest(ImportHDF5Dataset& filter, const std::list(k_TestOutput)); - args.insertOrAssign(RawBinaryReaderFilter::k_ScalarType_Key, std::make_any(scalarType)); + args.insertOrAssign(ReadRawBinaryFilter::k_InputFile_Key, std::make_any(k_TestOutput)); + args.insertOrAssign(ReadRawBinaryFilter::k_ScalarType_Key, std::make_any(scalarType)); - args.insertOrAssign(RawBinaryReaderFilter::k_TupleDims_Key, std::make_any(DynamicTableParameter::ValueType{{static_cast(file_size)}})); + args.insertOrAssign(ReadRawBinaryFilter::k_TupleDims_Key, std::make_any(DynamicTableParameter::ValueType{{static_cast(file_size)}})); - args.insertOrAssign(RawBinaryReaderFilter::k_NumberOfComponents_Key, std::make_any(N)); - args.insertOrAssign(RawBinaryReaderFilter::k_Endian_Key, std::make_any(static_cast(endian::little))); - args.insertOrAssign(RawBinaryReaderFilter::k_SkipHeaderBytes_Key, std::make_any(skipBytes)); - args.insertOrAssign(RawBinaryReaderFilter::k_CreatedAttributeArrayPath_Key, k_CreatedArrayPath); + args.insertOrAssign(ReadRawBinaryFilter::k_NumberOfComponents_Key, std::make_any(N)); + args.insertOrAssign(ReadRawBinaryFilter::k_Endian_Key, std::make_any(static_cast(endian::little))); + args.insertOrAssign(ReadRawBinaryFilter::k_SkipHeaderBytes_Key, std::make_any(skipBytes)); + args.insertOrAssign(ReadRawBinaryFilter::k_CreatedAttributeArrayPath_Key, k_CreatedArrayPath); return args; } @@ -100,7 +100,7 @@ void TestCase1_Execute(NumericType scalarType) REQUIRE(result); // Create the filter, passing in the skipHeaderBytes - RawBinaryReaderFilter filter; + ReadRawBinaryFilter filter; Arguments args = CreateFilterArguments(scalarType, N, tupleCount, skipHeaderBytes); DataStructure dataStructure; @@ -158,7 +158,7 @@ void TestCase2_Execute() REQUIRE(result); // Create the filter, passing in the skipHeaderBytes - RawBinaryReaderFilter filter; + ReadRawBinaryFilter filter; Arguments args = CreateFilterArguments(scalarType, N, dataArraySize, skipHeaderBytes); DataStructure dataStructure; @@ -194,7 +194,7 @@ void TestCase3_Execute() REQUIRE(result); // Create the filter, passing in the skipHeaderBytes - RawBinaryReaderFilter filter; + ReadRawBinaryFilter filter; Arguments args = CreateFilterArguments(scalarType, N, dataArraySize, skipHeaderBytes); DataStructure dataStructure; @@ -231,7 +231,7 @@ void TestCase4_Execute(NumericType scalarType) REQUIRE(result); // Create the filter, passing in the skipHeaderBytes - RawBinaryReaderFilter filter; + ReadRawBinaryFilter filter; Arguments args = CreateFilterArguments(scalarType, N, tupleCount - skipHeaderTuples, skipHeaderBytes); DataStructure dataStructure; @@ -283,7 +283,7 @@ void TestCase5_Execute(NumericType scalarType) REQUIRE(result); // Create the filter, passing in the skipHeaderBytes - RawBinaryReaderFilter filter; + ReadRawBinaryFilter filter; Arguments args = CreateFilterArguments(scalarType, N, dataArraySize, skipHeaderBytes); DataStructure dataStructure; @@ -317,7 +317,7 @@ void TestCase4_TestPrimitives(NumericType scalarType) } // namespace // Case1: This tests when skipHeaderBytes equals 0, and checks to see if the data read is the same as the data written. -TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case1)", "[ComplexCore][RawBinaryReaderFilter]") +TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case1)", "[ComplexCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); @@ -335,7 +335,7 @@ TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case1)", "[ComplexCore][RawBinaryR } // Case2: This tests when the wrong scalar type is selected. (The total number of bytes in the file does not evenly divide by the scalar type size). -TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case2)", "[ComplexCore][RawBinaryReaderFilter]") +TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case2)", "[ComplexCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); @@ -344,7 +344,7 @@ TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case2)", "[ComplexCore][RawBinaryR } // Case3: This tests when the wrong component size is chosen. (The total number of scalar elements in the file does not evenly divide by the chosen component size). -TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case3)", "[ComplexCore][RawBinaryReaderFilter]") +TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case3)", "[ComplexCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); @@ -353,7 +353,7 @@ TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case3)", "[ComplexCore][RawBinaryR } // Case4: This tests when skipHeaderBytes is non-zero, and checks to see if the data read is the same as the data written. -TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case4)", "[ComplexCore][RawBinaryReaderFilter]") +TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case4)", "[ComplexCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); @@ -371,7 +371,7 @@ TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case4)", "[ComplexCore][RawBinaryR } // Case5: This tests when skipHeaderBytes equals the file size -TEST_CASE("ComplexCore::RawBinaryReaderFilter(Case5)", "[ComplexCore][RawBinaryReaderFilter]") +TEST_CASE("ComplexCore::ReadRawBinaryFilter(Case5)", "[ComplexCore][ReadRawBinaryFilter]") { // Create the parent directory path fs::create_directories(k_TestOutput.parent_path()); diff --git a/src/Plugins/ComplexCore/test/StlFileReaderTest.cpp b/src/Plugins/ComplexCore/test/ReadStlFileTest.cpp similarity index 79% rename from src/Plugins/ComplexCore/test/StlFileReaderTest.cpp rename to src/Plugins/ComplexCore/test/ReadStlFileTest.cpp index c51fe89d86..b24a7849d2 100644 --- a/src/Plugins/ComplexCore/test/StlFileReaderTest.cpp +++ b/src/Plugins/ComplexCore/test/ReadStlFileTest.cpp @@ -1,5 +1,5 @@ #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/StlFileReaderFilter.hpp" +#include "ComplexCore/Filters/ReadStlFileFilter.hpp" #include "complex/DataStructure/Geometry/TriangleGeom.hpp" #include "complex/Parameters/ArrayCreationParameter.hpp" @@ -16,20 +16,20 @@ namespace fs = std::filesystem; using namespace complex; using namespace complex::Constants; -TEST_CASE("ComplexCore::StlFileReaderFilter", "[ComplexCore][StlFileReaderFilter]") +TEST_CASE("ComplexCore::ReadStlFileFilter", "[ComplexCore][ReadStlFileFilter]") { // Instantiate the filter, a DataStructure object and an Arguments Object DataStructure dataStructure; Arguments args; - StlFileReaderFilter filter; + ReadStlFileFilter filter; DataPath triangleGeomDataPath({"[Triangle Geometry]"}); std::string inputFile = fmt::format("{}/ASTMD638_specimen.stl", unit_test::k_ComplexTestDataSourceDir.view()); // Create default Parameters for the filter. - args.insertOrAssign(StlFileReaderFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(StlFileReaderFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); + args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/ImportVolumeGraphicsFileTest.cpp b/src/Plugins/ComplexCore/test/ReadVolumeGraphicsFileTest.cpp similarity index 87% rename from src/Plugins/ComplexCore/test/ImportVolumeGraphicsFileTest.cpp rename to src/Plugins/ComplexCore/test/ReadVolumeGraphicsFileTest.cpp index 18ccecc994..f944696462 100644 --- a/src/Plugins/ComplexCore/test/ImportVolumeGraphicsFileTest.cpp +++ b/src/Plugins/ComplexCore/test/ReadVolumeGraphicsFileTest.cpp @@ -1,7 +1,7 @@ #include #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/ImportVolumeGraphicsFileFilter.hpp" +#include "ComplexCore/Filters/ReadVolumeGraphicsFileFilter.hpp" #include "complex/DataStructure/Geometry/ImageGeom.hpp" #include "complex/Parameters/ArrayCreationParameter.hpp" @@ -36,12 +36,12 @@ void writeVolTestFile() REQUIRE_NOTHROW(fs::copy(k_VgiSrcFile, k_VgiDestFile, copyOptions)); // copy vgi file } -TEST_CASE("ComplexCore::ImportVolumeGraphicsFileFilter - Valid filter execution", "[Plugins][ImportVolumeGraphicsFileFilter]") +TEST_CASE("ComplexCore::ReadVolumeGraphicsFileFilter - Valid filter execution", "[Plugins][ReadVolumeGraphicsFileFilter]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "volume_graphics_test.tar.gz", "volume_graphics_test.vgi"); // Instantiate the filter, a DataStructure object and an Arguments Object - const ImportVolumeGraphicsFileFilter filter; + const ReadVolumeGraphicsFileFilter filter; DataStructure dataStructure; Arguments args; @@ -49,7 +49,7 @@ TEST_CASE("ComplexCore::ImportVolumeGraphicsFileFilter - Valid filter execution" writeVolTestFile(); { - args.insertOrAssign(ImportVolumeGraphicsFileFilter::k_VGHeaderFile_Key, std::make_any(k_VgiDestFile)); + args.insertOrAssign(ReadVolumeGraphicsFileFilter::k_VGHeaderFile_Key, std::make_any(k_VgiDestFile)); auto preflightResult = filter.preflight(dataStructure, args); REQUIRE(preflightResult.outputActions.valid()); diff --git a/src/Plugins/ComplexCore/test/TriangleNormalFilterTest.cpp b/src/Plugins/ComplexCore/test/TriangleNormalFilterTest.cpp index 5cd3e0bc41..d1f8e17d50 100644 --- a/src/Plugins/ComplexCore/test/TriangleNormalFilterTest.cpp +++ b/src/Plugins/ComplexCore/test/TriangleNormalFilterTest.cpp @@ -1,6 +1,6 @@ #include "ComplexCore/Filters/TriangleNormalFilter.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/StlFileReaderFilter.hpp" +#include "ComplexCore/Filters/ReadStlFileFilter.hpp" #include "complex/DataStructure/Geometry/TriangleGeom.hpp" #include "complex/DataStructure/IO/HDF5/DataStructureWriter.hpp" @@ -34,7 +34,7 @@ TEST_CASE("ComplexCore::TriangleNormalFilter", "[ComplexCore][TriangleNormalFilt { Arguments args; - StlFileReaderFilter filter; + ReadStlFileFilter filter; DataPath triangleGeomDataPath({triangleGeometryName}); DataPath triangleFaceDataGroupDataPath({triangleGeometryName, triangleFaceDataGroupName}); @@ -43,8 +43,8 @@ TEST_CASE("ComplexCore::TriangleNormalFilter", "[ComplexCore][TriangleNormalFilt std::string inputFile = fmt::format("{}/ASTMD638_specimen.stl", unit_test::k_ComplexTestDataSourceDir.view()); // Create default Parameters for the filter. - args.insertOrAssign(StlFileReaderFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); - args.insertOrAssign(StlFileReaderFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); + args.insertOrAssign(ReadStlFileFilter::k_StlFilePath_Key, std::make_any(fs::path(inputFile))); + args.insertOrAssign(ReadStlFileFilter::k_TriangleGeometryName_Key, std::make_any(triangleGeomDataPath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/FeatureDataCSVWriterTest.cpp b/src/Plugins/ComplexCore/test/WriteFeatureDataCSVTest.cpp similarity index 81% rename from src/Plugins/ComplexCore/test/FeatureDataCSVWriterTest.cpp rename to src/Plugins/ComplexCore/test/WriteFeatureDataCSVTest.cpp index 11207a0b58..bd6de89222 100644 --- a/src/Plugins/ComplexCore/test/FeatureDataCSVWriterTest.cpp +++ b/src/Plugins/ComplexCore/test/WriteFeatureDataCSVTest.cpp @@ -1,5 +1,5 @@ #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/FeatureDataCSVWriterFilter.hpp" +#include "ComplexCore/Filters/WriteFeatureDataCSVFilter.hpp" #include "complex/DataStructure/AttributeMatrix.hpp" #include "complex/Parameters/BoolParameter.hpp" @@ -48,9 +48,9 @@ std::vector readIn(fs::path filePath) return {}; } -TEST_CASE("ComplexCore::FeatureDataCSVWriterFilter: Test Algorithm", "[FeatureDataCSVWriterFilter]") +TEST_CASE("ComplexCore::WriteFeatureDataCSVFilter: Test Algorithm", "[WriteFeatureDataCSVFilter]") { - FeatureDataCSVWriterFilter filter; + WriteFeatureDataCSVFilter filter; DataStructure dataStructure; AttributeMatrix& topLevelGroup = *AttributeMatrix::Create(dataStructure, "TestData", k_VertexTupleDims); auto path = dataStructure.getAllDataPaths()[0]; @@ -74,11 +74,11 @@ TEST_CASE("ComplexCore::FeatureDataCSVWriterFilter: Test Algorithm", "[FeatureDa auto file = std::filesystem::path(fmt::format("{}/{}.csv", k_TestOutput, "CSV_Test")); Arguments args; - args.insertOrAssign(FeatureDataCSVWriterFilter::k_FeatureDataFile_Key, std::make_any(file)); - args.insertOrAssign(FeatureDataCSVWriterFilter::k_WriteNeighborListData_Key, std::make_any(true)); - args.insertOrAssign(FeatureDataCSVWriterFilter::k_WriteNumFeaturesLine_Key, std::make_any(true)); - args.insertOrAssign(FeatureDataCSVWriterFilter::k_DelimiterChoiceInt_Key, std::make_any(2ULL)); - args.insertOrAssign(FeatureDataCSVWriterFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(path)); + args.insertOrAssign(WriteFeatureDataCSVFilter::k_FeatureDataFile_Key, std::make_any(file)); + args.insertOrAssign(WriteFeatureDataCSVFilter::k_WriteNeighborListData_Key, std::make_any(true)); + args.insertOrAssign(WriteFeatureDataCSVFilter::k_WriteNumFeaturesLine_Key, std::make_any(true)); + args.insertOrAssign(WriteFeatureDataCSVFilter::k_DelimiterChoiceInt_Key, std::make_any(2ULL)); + args.insertOrAssign(WriteFeatureDataCSVFilter::k_CellFeatureAttributeMatrixPath_Key, std::make_any(path)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/LosAlamosFFTWriterTest.cpp b/src/Plugins/ComplexCore/test/WriteLosAlamosFFTTest.cpp similarity index 72% rename from src/Plugins/ComplexCore/test/LosAlamosFFTWriterTest.cpp rename to src/Plugins/ComplexCore/test/WriteLosAlamosFFTTest.cpp index 89d2cf642b..ad98af1177 100644 --- a/src/Plugins/ComplexCore/test/LosAlamosFFTWriterTest.cpp +++ b/src/Plugins/ComplexCore/test/WriteLosAlamosFFTTest.cpp @@ -5,7 +5,7 @@ #include "complex/UnitTest/UnitTestCommon.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/LosAlamosFFTWriterFilter.hpp" +#include "ComplexCore/Filters/WriteLosAlamosFFTFilter.hpp" #include @@ -57,7 +57,7 @@ void CompareResults() // compare hash of both file strings } } // namespace -TEST_CASE("ComplexCore::LosAlamosFFTWriterFilter: Valid Filter Execution", "[ComplexCore][LosAlamosFFTWriterFilter]") +TEST_CASE("ComplexCore::WriteLosAlamosFFTFilter: Valid Filter Execution", "[ComplexCore][WriteLosAlamosFFTFilter]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "bin_feature_phases.tar.gz", "bin_feature_phases"); @@ -68,16 +68,16 @@ TEST_CASE("ComplexCore::LosAlamosFFTWriterFilter: Valid Filter Execution", "[Com { // Instantiate the filter and an Arguments Object - LosAlamosFFTWriterFilter filter; + WriteLosAlamosFFTFilter filter; Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(LosAlamosFFTWriterFilter::k_OutputFile_Key, std::make_any(writtenFilePath)); + args.insertOrAssign(WriteLosAlamosFFTFilter::k_OutputFile_Key, std::make_any(writtenFilePath)); - args.insertOrAssign(LosAlamosFFTWriterFilter::k_ImageGeomPath, std::make_any(DataPath({Constants::k_SmallIN100}))); - args.insertOrAssign(LosAlamosFFTWriterFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_FeatureIds}))); - args.insertOrAssign(LosAlamosFFTWriterFilter::k_CellEulerAnglesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_EulerAngles}))); - args.insertOrAssign(LosAlamosFFTWriterFilter::k_CellPhasesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, "BinaryPhases"}))); + args.insertOrAssign(WriteLosAlamosFFTFilter::k_ImageGeomPath, std::make_any(DataPath({Constants::k_SmallIN100}))); + args.insertOrAssign(WriteLosAlamosFFTFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_FeatureIds}))); + args.insertOrAssign(WriteLosAlamosFFTFilter::k_CellEulerAnglesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_EulerAngles}))); + args.insertOrAssign(WriteLosAlamosFFTFilter::k_CellPhasesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, "BinaryPhases"}))); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/ComplexCore/test/VtkRectilinearGridWriterTest.cpp b/src/Plugins/ComplexCore/test/WriteVtkRectilinearGridTest.cpp similarity index 71% rename from src/Plugins/ComplexCore/test/VtkRectilinearGridWriterTest.cpp rename to src/Plugins/ComplexCore/test/WriteVtkRectilinearGridTest.cpp index 9761a726db..3537ef45fe 100644 --- a/src/Plugins/ComplexCore/test/VtkRectilinearGridWriterTest.cpp +++ b/src/Plugins/ComplexCore/test/WriteVtkRectilinearGridTest.cpp @@ -5,7 +5,7 @@ #include "complex/UnitTest/UnitTestCommon.hpp" #include "ComplexCore/ComplexCore_test_dirs.hpp" -#include "ComplexCore/Filters/VtkRectilinearGridWriterFilter.hpp" +#include "ComplexCore/Filters/WriteVtkRectilinearGridFilter.hpp" #include namespace fs = std::filesystem; @@ -13,7 +13,7 @@ namespace fs = std::filesystem; using namespace complex; using namespace complex::Constants; -TEST_CASE("ComplexCore::VtkRectilinearGridWriterFilter: Valid Filter Execution", "[ComplexCore][VtkRectilinearGridWriterFilter]") +TEST_CASE("ComplexCore::WriteVtkRectilinearGridFilter: Valid Filter Execution", "[ComplexCore][WriteVtkRectilinearGridFilter]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); @@ -24,7 +24,7 @@ TEST_CASE("ComplexCore::VtkRectilinearGridWriterFilter: Valid Filter Execution", DataStructure dataStructure = UnitTest::LoadDataStructure(exemplarFilePath); // Instantiate the filter, and an Arguments Object - VtkRectilinearGridWriterFilter filter; + WriteVtkRectilinearGridFilter filter; Arguments args; fs::path exemplarOutputPath = fs::path(fmt::format("{}/vtk_rectilinear_grid_writer/vtk_rectilinear_grid.vtk", unit_test::k_TestFilesDir)); @@ -35,10 +35,10 @@ TEST_CASE("ComplexCore::VtkRectilinearGridWriterFilter: Valid Filter Execution", MultiArraySelectionParameter::ValueType selectedArrayPaths = {k_ConfidenceIndexArrayPath, k_EulersArrayPath, k_FitArrayPath, k_ImageQualityArrayPath, k_PhasesArrayPath, k_SEMSignalArrayPath}; // write out ascii vtk file - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_OutputFile_Key, std::make_any(computedOutputPath)); - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_WriteBinaryFile_Key, std::make_any(false)); - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_ImageGeometryPath_Key, std::make_any(k_DataContainerPath)); - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_SelectedDataArrayPaths_Key, std::make_any(selectedArrayPaths)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_OutputFile_Key, std::make_any(computedOutputPath)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_WriteBinaryFile_Key, std::make_any(false)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_ImageGeometryPath_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_SelectedDataArrayPaths_Key, std::make_any(selectedArrayPaths)); auto preflightResult = filter.preflight(dataStructure, args); COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -47,8 +47,8 @@ TEST_CASE("ComplexCore::VtkRectilinearGridWriterFilter: Valid Filter Execution", COMPLEX_RESULT_REQUIRE_VALID(executeResult.result) // write out binary vtk file - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_WriteBinaryFile_Key, std::make_any(true)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_OutputFile_Key, std::make_any(computedBinaryOutputPath)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_WriteBinaryFile_Key, std::make_any(true)); preflightResult = filter.preflight(dataStructure, args); COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions) @@ -69,7 +69,7 @@ TEST_CASE("ComplexCore::VtkRectilinearGridWriterFilter: Valid Filter Execution", std::filesystem::remove_all(fmt::format("{}/vtk_rectilinear_grid_writer", unit_test::k_BinaryTestOutputDir), errorCode); } -TEST_CASE("ComplexCore::VtkRectilinearGridWriterFilter: InValid Filter Execution", "[ComplexCore][VtkRectilinearGridWriterFilter]") +TEST_CASE("ComplexCore::WriteVtkRectilinearGridFilter: InValid Filter Execution", "[ComplexCore][WriteVtkRectilinearGridFilter]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "Small_IN100_dream3d.tar.gz", "Small_IN100.dream3d"); @@ -81,28 +81,28 @@ TEST_CASE("ComplexCore::VtkRectilinearGridWriterFilter: InValid Filter Execution DataStructure dataStructure = UnitTest::LoadDataStructure(exemplarFilePath); // Instantiate the filter, and an Arguments Object - VtkRectilinearGridWriterFilter filter; + WriteVtkRectilinearGridFilter filter; Arguments args; fs::path computedOutputPath(fmt::format("{}/NX_vtk_rectilinear_grid.vtk", unit_test::k_BinaryTestOutputDir)); - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_OutputFile_Key, std::make_any(computedOutputPath)); - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_WriteBinaryFile_Key, std::make_any(false)); - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_ImageGeometryPath_Key, std::make_any(k_DataContainerPath)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_OutputFile_Key, std::make_any(computedOutputPath)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_WriteBinaryFile_Key, std::make_any(false)); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_ImageGeometryPath_Key, std::make_any(k_DataContainerPath)); SECTION("No Selected Arrays") { - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_SelectedDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{})); + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_SelectedDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{})); } SECTION("Mismatching Tuples in Selected Arrays") { - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_SelectedDataArrayPaths_Key, + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_SelectedDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{ k_CrystalStructuresArrayPath, k_ConfidenceIndexArrayPath, k_EulersArrayPath, k_FitArrayPath, k_ImageQualityArrayPath, k_PhasesArrayPath, k_SEMSignalArrayPath})); } SECTION("Selected Arrays are not Cell Level Arrays") { - args.insertOrAssign(VtkRectilinearGridWriterFilter::k_SelectedDataArrayPaths_Key, + args.insertOrAssign(WriteVtkRectilinearGridFilter::k_SelectedDataArrayPaths_Key, std::make_any(MultiArraySelectionParameter::ValueType{k_CrystalStructuresArrayPath})); } diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline index 6615ce2d13..65a129f486 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline @@ -202,7 +202,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline index 70152ce8d5..58ba09fcb1 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(03) Porosity Mesh Export.d3dpipeline @@ -250,7 +250,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline index 338e5c8b4c..5f627ead7c 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline @@ -107,7 +107,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline index 00555e0600..bc01d038cb 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline @@ -417,7 +417,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline index 5bdb2d3111..697818eae3 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(01) Small IN100 Morphological Statistics.d3dpipeline @@ -42,7 +42,7 @@ } }, "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -169,7 +169,7 @@ "write_xdmf_file": true }, "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline index 81fe2cdfca..eaf165ace4 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline @@ -501,7 +501,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -511,7 +511,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -646,7 +646,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -656,7 +656,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -789,7 +789,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline index cdb878676b..46012c3a5d 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(01) Small IN100 Quick Mesh.d3dpipeline @@ -67,7 +67,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -139,7 +139,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline index 1d5a42d64a..09df05cd79 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(02) Small IN100 Smooth Mesh.d3dpipeline @@ -69,7 +69,7 @@ } }, "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -100,7 +100,7 @@ "write_xdmf_file": true }, "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline index 9c73dab008..5361608b7b 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(03) Small IN100 Mesh Statistics.d3dpipeline @@ -71,7 +71,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -167,7 +167,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline index c51b36f0b3..64c3d9ad38 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline @@ -74,7 +74,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -210,7 +210,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline index e9a468e914..0531558936 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(05) Small IN100 GBCD Metric.d3dpipeline @@ -74,7 +74,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -134,7 +134,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline index 52a4e0fdbf..928bc20001 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline @@ -48,7 +48,7 @@ }, "comments": "", "filter": { - "name": "complex::RawBinaryReaderFilter", + "name": "complex::ReadRawBinaryFilter", "uuid": "dd159366-5f12-42db-af6d-a33592ae8a89" }, "isDisabled": false @@ -131,7 +131,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline index 858ecf9f69..0a5a9b299d 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline @@ -757,7 +757,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -767,7 +767,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -902,7 +902,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -912,7 +912,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -1045,7 +1045,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -1055,7 +1055,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -1127,7 +1127,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -1137,7 +1137,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -1170,7 +1170,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -1180,7 +1180,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false @@ -1259,7 +1259,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false @@ -1269,7 +1269,7 @@ }, "comments": "The input for this pipeline requires the output dream3d file from the (03) Small IN100 Mesh Statistics bookmarked pipeline.", "filter": { - "name": "complex::ImportDREAM3DFilter", + "name": "complex::ReadDREAM3DFilter", "uuid": "0dbd31c7-19e0-4077-83ef-f4a6459a0e2d" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline index 553fc186e2..af1f68833c 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline @@ -38,7 +38,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline index 28da332c68..24a73944ee 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline @@ -108,7 +108,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline index 6ef83799b0..0aac2c81e5 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/aptr12_Analysis.d3dpipeline @@ -403,7 +403,7 @@ }, "comments": "", "filter": { - "name": "complex::FeatureDataCSVWriterFilter", + "name": "complex::WriteFeatureDataCSVFilter", "uuid": "d734293f-3017-4699-b458-c05aca078b96" }, "isDisabled": false @@ -456,7 +456,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline index 1c0ec2c5ef..026afc4961 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/avtr12_Analysis.d3dpipeline @@ -403,7 +403,7 @@ }, "comments": "", "filter": { - "name": "complex::FeatureDataCSVWriterFilter", + "name": "complex::WriteFeatureDataCSVFilter", "uuid": "d734293f-3017-4699-b458-c05aca078b96" }, "isDisabled": false @@ -456,7 +456,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportDREAM3DFilter", + "name": "complex::WriteDREAM3DFilter", "uuid": "b3a95784-2ced-41ec-8d3d-0242ac130003" }, "isDisabled": false diff --git a/wrapping/python/docs/source/API.rst b/wrapping/python/docs/source/API.rst index 71c3e49af9..21f20e5cbd 100644 --- a/wrapping/python/docs/source/API.rst +++ b/wrapping/python/docs/source/API.rst @@ -224,7 +224,7 @@ General Parameters import_data = cx.Dream3dImportParameter.ImportData() import_data.file_path = "/private/tmp/basic_ebsd.dream3d" import_data.data_paths = None - result = cx.ImportDREAM3DFilter.execute(data_structure=data_structure, import_file_data=import_data) + result = cx.ReadDREAM3DFilter.execute(data_structure=data_structure, import_file_data=import_data) .. _DynamicTableParameter: .. py:class:: DynamicTableParameter @@ -447,7 +447,7 @@ General Parameters .. _ImportHDF5DatasetParameter: .. py:class:: ImportHDF5DatasetParameter - This parameter is used for the :ref:`complex.ImportHDF5Dataset` and holds the information + This parameter is used for the :ref:`complex.ReadHDF5Dataset` and holds the information to import specific data sets from within the HDF5 file into DREAM3D/complex .. py:class:: ImportHDF5DatasetParameter.ValueType @@ -483,7 +483,7 @@ General Parameters import_hdf5_param.input_file = "SmallIN100_Final.dream3d" import_hdf5_param.datasets = [dataset1, dataset2] # import_hdf5_param.parent = cx.DataPath(["Imported Data"]) - result = cx.ImportHDF5Dataset.execute(data_structure=data_structure, + result = cx.ReadHDF5Dataset.execute(data_structure=data_structure, import_hd_f5_file=import_hdf5_param ) diff --git a/wrapping/python/docs/source/Python_Introduction.rst b/wrapping/python/docs/source/Python_Introduction.rst index 6bfd7bb83c..c9516ea12a 100644 --- a/wrapping/python/docs/source/Python_Introduction.rst +++ b/wrapping/python/docs/source/Python_Introduction.rst @@ -155,13 +155,13 @@ In order to import a .dream3d file, we need to tell **complex** which data to im # import EVERY piece of data from the file. import_data.data_paths = None # Instantiate and execte the filter immediately. - result = cx.ImportDREAM3DFilter.execute(data_structure=data_structure, import_file_data=import_data) + result = cx.ReadDREAM3DFilter.execute(data_structure=data_structure, import_file_data=import_data) # Check for any execution warnings or errors if len(result.errors) != 0: print('Errors: {}', result.errors) print('Warnings: {}', result.warnings) else: - print("No errors running the ImportDREAM3DFilter filter") + print("No errors running the ReadDREAM3DFilter filter") If you want to only import specific data sets from the file you can set the **import_data.data_paths** to a *List[DataPath]* objects. Once the filter executes, you can fetch data from the DataStructure using the usual methods shown in the `Creating a DataArray`_ section. @@ -176,13 +176,13 @@ Exporting a .dream3d File ------------------------- After processing the data if you would like to store your data in the native HDF5 file format, then the -:ref:`complex.ExportDREAM3DFilter.Execute() ` can be used to accomplish this goal. +:ref:`complex.WriteDREAM3DFilter.Execute() ` can be used to accomplish this goal. The filter will write the **complete** contents of the DataStructure to the HDF5 file. .. code:: python output_file_path = "output_file_example.dream3d" - result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure, + result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) if len(result.errors) != 0: diff --git a/wrapping/python/examples/basic_ebsd_ipf.ipynb b/wrapping/python/examples/basic_ebsd_ipf.ipynb index 80ad84f542..533687a8cd 100644 --- a/wrapping/python/examples/basic_ebsd_ipf.ipynb +++ b/wrapping/python/examples/basic_ebsd_ipf.ipynb @@ -288,7 +288,7 @@ "outputs": [], "source": [ "output_file_path = 'basic_ebsd_example.dream3d'\n", - "result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure,\n", + "result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure,\n", " export_file_path=output_file_path,\n", " write_xdmf_file=True,\n", ")\n", @@ -296,7 +296,7 @@ "if not result:\n", " print(f'Errors: {result.errors}')\n", "else:\n", - " print('No errors running the ExportDREAM3DFilter filter')" + " print('No errors running the WriteDREAM3DFilter filter')" ] }, { diff --git a/wrapping/python/examples/create_image_geom.ipynb b/wrapping/python/examples/create_image_geom.ipynb index 60532cebc6..1039195451 100644 --- a/wrapping/python/examples/create_image_geom.ipynb +++ b/wrapping/python/examples/create_image_geom.ipynb @@ -67,7 +67,7 @@ "outputs": [], "source": [ "output_file_path = 'image_geom.dream3d'\n", - "result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure,\n", + "result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure,\n", " export_file_path=output_file_path,\n", " write_xdmf_file=True,\n", ")\n", @@ -75,7 +75,7 @@ "if not result:\n", " print(f'Errors: {result.errors}')\n", "else:\n", - " print('No errors running the ExportDREAM3DFilter filter')" + " print('No errors running the WriteDREAM3DFilter filter')" ] } ], diff --git a/wrapping/python/examples/import_d3d.ipynb b/wrapping/python/examples/import_d3d.ipynb index cb3d61c097..a535a6ffca 100644 --- a/wrapping/python/examples/import_d3d.ipynb +++ b/wrapping/python/examples/import_d3d.ipynb @@ -37,14 +37,14 @@ "import_data.file_path = '/private/tmp/basic_ebsd.dream3d'\n", "import_data.data_paths = None\n", "\n", - "result = cx.ImportDREAM3DFilter.execute(data_structure=data_structure,\n", + "result = cx.ReadDREAM3DFilter.execute(data_structure=data_structure,\n", " import_file_data=import_data,\n", ")\n", "print(f'Warnings: {result.warnings}')\n", "if not result:\n", " print(f'Errors: {result.errors}')\n", "else:\n", - " print('No errors running the ImportDREAM3DFilter filter')" + " print('No errors running the ReadDREAM3DFilter filter')" ] }, { @@ -84,7 +84,7 @@ "outputs": [], "source": [ "output_file_path = '/tmp/import_data.dream3d'\n", - "result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure,\n", + "result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure,\n", " export_file_path=output_file_path,\n", " write_xdmf_file=True,\n", ")\n", @@ -92,7 +92,7 @@ "if not result:\n", " print(f'Errors: {result.errors}')\n", "else:\n", - " print('No errors running the ExportDREAM3DFilter filter')" + " print('No errors running the WriteDREAM3DFilter filter')" ] }, { diff --git a/wrapping/python/examples/output_file.ipynb b/wrapping/python/examples/output_file.ipynb index 811a155975..1902b22a45 100644 --- a/wrapping/python/examples/output_file.ipynb +++ b/wrapping/python/examples/output_file.ipynb @@ -72,7 +72,7 @@ "outputs": [], "source": [ "output_file_path = 'output_file_example.dream3d'\n", - "result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure,\n", + "result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure,\n", " export_file_path=output_file_path,\n", " write_xdmf_file=True,\n", ")\n", @@ -80,7 +80,7 @@ "if not result:\n", " print(f'Errors: {result.errors}')\n", "else:\n", - " print('No errors running the ExportDREAM3DFilter filter')" + " print('No errors running the WriteDREAM3DFilter filter')" ] } ], From a6d60058576f82b1d89c74f2936048c5d7c21993 Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Tue, 24 Oct 2023 11:16:06 -0400 Subject: [PATCH 06/19] Rename OrientationAnalysis i/o --- ...lementAttributesWithNeighborValuesTest.cpp | 2 +- .../OrientationAnalysis/CMakeLists.txt | 30 ++++----- ...rtGBCDGMTFile.png => WriteGBCDGMTFile.png} | Bin ...derFilter.md => ReadEnsembleInfoFilter.md} | 0 ...ataFilter.md => ReadH5EspritDataFilter.md} | 0 ...imDataFilter.md => ReadH5OimDataFilter.md} | 0 ...ileFilter.md => WriteGBCDGMTFileFilter.md} | 2 +- ...lter.md => WriteGBCDTriangleDataFilter.md} | 0 ...LWriterFilter.md => WriteINLFileFilter.md} | 0 .../(04) Small IN100 GBCD.d3dpipeline | 4 +- .../pipelines/EnsembleInfoReader.d3dpipeline | 4 +- .../ImportBrukerNanoEspritData.d3dpipeline | 2 +- .../pipelines/ImportEdaxOIMData.d3dpipeline | 2 +- .../Filters/Algorithms/ImportH5EspritData.hpp | 42 ------------ .../Filters/Algorithms/ImportH5OimData.hpp | 30 --------- ...bleInfoReader.cpp => ReadEnsembleInfo.cpp} | 12 ++-- ...bleInfoReader.hpp => ReadEnsembleInfo.hpp} | 20 +++--- ...tH5EspritData.cpp => ReadH5EspritData.cpp} | 14 ++-- .../Filters/Algorithms/ReadH5EspritData.hpp | 42 ++++++++++++ ...{ImportH5OimData.cpp => ReadH5OimData.cpp} | 12 ++-- .../Filters/Algorithms/ReadH5OimData.hpp | 30 +++++++++ ...rtGBCDGMTFile.cpp => WriteGBCDGMTFile.cpp} | 10 +-- ...rtGBCDGMTFile.hpp => WriteGBCDGMTFile.hpp} | 18 +++--- ...ngleData.cpp => WriteGBCDTriangleData.cpp} | 12 ++-- ...ngleData.hpp => WriteGBCDTriangleData.hpp} | 18 +++--- .../{INLWriter.cpp => WriteINLFile.cpp} | 10 +-- .../{INLWriter.hpp => WriteINLFile.hpp} | 18 +++--- .../Filters/ReadAngDataFilter.cpp | 2 +- .../Filters/ReadCtfDataFilter.cpp | 2 +- ...rFilter.cpp => ReadEnsembleInfoFilter.cpp} | 48 +++++++------- ...rFilter.hpp => ReadEnsembleInfoFilter.hpp} | 18 +++--- .../Filters/ReadH5EbsdFilter.cpp | 2 +- ...aFilter.cpp => ReadH5EspritDataFilter.cpp} | 38 +++++------ ...aFilter.hpp => ReadH5EspritDataFilter.hpp} | 18 +++--- ...DataFilter.cpp => ReadH5OimDataFilter.cpp} | 36 +++++------ ...DataFilter.hpp => ReadH5OimDataFilter.hpp} | 18 +++--- ...eFilter.cpp => WriteGBCDGMTFileFilter.cpp} | 36 +++++------ ...eFilter.hpp => WriteGBCDGMTFileFilter.hpp} | 18 +++--- ...er.cpp => WriteGBCDTriangleDataFilter.cpp} | 36 +++++------ ...er.hpp => WriteGBCDTriangleDataFilter.hpp} | 18 +++--- ...riterFilter.cpp => WriteINLFileFilter.cpp} | 36 +++++------ ...riterFilter.hpp => WriteINLFileFilter.hpp} | 18 +++--- .../Filters/WritePoleFigureFilter.cpp | 2 +- .../WriteStatsGenOdfAngleFileFilter.cpp | 2 +- .../OrientationAnalysisLegacyUUIDMapping.hpp | 36 +++++------ .../OrientationAnalysisPlugin.cpp | 8 +-- .../{ImportH5Data.hpp => ReadH5Data.hpp} | 20 +++--- .../OrientationAnalysis/test/CMakeLists.txt | 14 ++-- ...eaderTest.cpp => ReadEnsembleInfoTest.cpp} | 48 +++++++------- ...tDataTest.cpp => ReadH5EspritDataTest.cpp} | 60 +++++++++--------- ...5OimDataTest.cpp => ReadH5OimDataTest.cpp} | 50 +++++++-------- ...TFileTest.cpp => WriteGBCDGMTFileTest.cpp} | 40 ++++++------ ...Test.cpp => WriteGBCDTriangleDataTest.cpp} | 42 ++++++------ ...INLWriterTest.cpp => WriteINLFileTest.cpp} | 24 +++---- 54 files changed, 510 insertions(+), 514 deletions(-) rename src/Plugins/OrientationAnalysis/docs/Images/{ExportGBCDGMTFile.png => WriteGBCDGMTFile.png} (100%) rename src/Plugins/OrientationAnalysis/docs/{EnsembleInfoReaderFilter.md => ReadEnsembleInfoFilter.md} (100%) rename src/Plugins/OrientationAnalysis/docs/{ImportH5EspritDataFilter.md => ReadH5EspritDataFilter.md} (100%) rename src/Plugins/OrientationAnalysis/docs/{ImportH5OimDataFilter.md => ReadH5OimDataFilter.md} (100%) rename src/Plugins/OrientationAnalysis/docs/{ExportGBCDGMTFileFilter.md => WriteGBCDGMTFileFilter.md} (91%) rename src/Plugins/OrientationAnalysis/docs/{ExportGBCDTriangleDataFilter.md => WriteGBCDTriangleDataFilter.md} (100%) rename src/Plugins/OrientationAnalysis/docs/{INLWriterFilter.md => WriteINLFileFilter.md} (100%) delete mode 100644 src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5EspritData.hpp delete mode 100644 src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5OimData.hpp rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{EnsembleInfoReader.cpp => ReadEnsembleInfo.cpp} (94%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{EnsembleInfoReader.hpp => ReadEnsembleInfo.hpp} (60%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{ImportH5EspritData.cpp => ReadH5EspritData.cpp} (89%) create mode 100644 src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{ImportH5OimData.cpp => ReadH5OimData.cpp} (89%) create mode 100644 src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{ExportGBCDGMTFile.cpp => WriteGBCDGMTFile.cpp} (97%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{ExportGBCDGMTFile.hpp => WriteGBCDGMTFile.hpp} (59%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{ExportGBCDTriangleData.cpp => WriteGBCDTriangleData.cpp} (86%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{ExportGBCDTriangleData.hpp => WriteGBCDTriangleData.hpp} (57%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{INLWriter.cpp => WriteINLFile.cpp} (95%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/{INLWriter.hpp => WriteINLFile.hpp} (64%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{EnsembleInfoReaderFilter.cpp => ReadEnsembleInfoFilter.cpp} (76%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{EnsembleInfoReaderFilter.hpp => ReadEnsembleInfoFilter.hpp} (84%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{ImportH5EspritDataFilter.cpp => ReadH5EspritDataFilter.cpp} (89%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{ImportH5EspritDataFilter.hpp => ReadH5EspritDataFilter.hpp} (85%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{ImportH5OimDataFilter.cpp => ReadH5OimDataFilter.cpp} (89%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{ImportH5OimDataFilter.hpp => ReadH5OimDataFilter.hpp} (86%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{ExportGBCDGMTFileFilter.cpp => WriteGBCDGMTFileFilter.cpp} (81%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{ExportGBCDGMTFileFilter.hpp => WriteGBCDGMTFileFilter.hpp} (84%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{ExportGBCDTriangleDataFilter.cpp => WriteGBCDTriangleDataFilter.cpp} (80%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{ExportGBCDTriangleDataFilter.hpp => WriteGBCDTriangleDataFilter.hpp} (83%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{INLWriterFilter.cpp => WriteINLFileFilter.cpp} (83%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/{INLWriterFilter.hpp => WriteINLFileFilter.hpp} (86%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/{ImportH5Data.hpp => ReadH5Data.hpp} (87%) rename src/Plugins/OrientationAnalysis/test/{EnsembleInfoReaderTest.cpp => ReadEnsembleInfoTest.cpp} (69%) rename src/Plugins/OrientationAnalysis/test/{ImportH5EspritDataTest.cpp => ReadH5EspritDataTest.cpp} (62%) rename src/Plugins/OrientationAnalysis/test/{ImportH5OimDataTest.cpp => ReadH5OimDataTest.cpp} (66%) rename src/Plugins/OrientationAnalysis/test/{ExportGBCDGMTFileTest.cpp => WriteGBCDGMTFileTest.cpp} (86%) rename src/Plugins/OrientationAnalysis/test/{ExportGBCDTriangleDataTest.cpp => WriteGBCDTriangleDataTest.cpp} (84%) rename src/Plugins/OrientationAnalysis/test/{INLWriterTest.cpp => WriteINLFileTest.cpp} (62%) diff --git a/src/Plugins/ComplexCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp b/src/Plugins/ComplexCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp index aa083764c9..ddbdf35307 100644 --- a/src/Plugins/ComplexCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp +++ b/src/Plugins/ComplexCore/test/ReplaceElementAttributesWithNeighborValuesTest.cpp @@ -19,7 +19,7 @@ const DataPath k_ConfidenceIndexPath = k_CellAttributeMatrix.createChildPath(Con const std::string k_ExemplarDataContainer2("DataContainer"); } // namespace -TEST_CASE("OrientationAnalysis::ReplaceElementAttributesWithNeighborValuesFilter", "[OrientationAnalysis][ReplaceElementAttributesWithNeighborValuesFilter]") +TEST_CASE("ComplexCore::ReplaceElementAttributesWithNeighborValuesFilter", "[ComplexCore][ReplaceElementAttributesWithNeighborValuesFilter]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_replace_element_attributes_with_neighbor.tar.gz", diff --git a/src/Plugins/OrientationAnalysis/CMakeLists.txt b/src/Plugins/OrientationAnalysis/CMakeLists.txt index 2fd722e2f0..db648328bb 100644 --- a/src/Plugins/OrientationAnalysis/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/CMakeLists.txt @@ -37,9 +37,9 @@ set(FilterList CreateEnsembleInfoFilter EBSDSegmentFeaturesFilter EbsdToH5EbsdFilter - EnsembleInfoReaderFilter - ExportGBCDGMTFileFilter - ExportGBCDTriangleDataFilter + ReadEnsembleInfoFilter + WriteGBCDGMTFileFilter + WriteGBCDTriangleDataFilter FindAvgCAxesFilter FindAvgOrientationsFilter FindBoundaryStrengthsFilter @@ -62,9 +62,9 @@ set(FilterList GenerateGBCDPoleFigureFilter GenerateIPFColorsFilter GenerateQuaternionConjugateFilter - ImportH5EspritDataFilter - ImportH5OimDataFilter - INLWriterFilter + ReadH5EspritDataFilter + ReadH5OimDataFilter + WriteINLFileFilter MergeTwinsFilter NeighborOrientationCorrelationFilter ReadAngDataFilter @@ -77,14 +77,10 @@ set(FilterList ) set(STUB_FILTERS - - # ConvertHexGridToSquareGrid # MISSING 1 or more Parameter Implementations CreateLambertSphere EMsoftSO3Sampler - FindBoundaryStrengths FindDistsToCharactGBs - FindKernelAvgMisorientations FindMisorientations FindSchmids @@ -171,9 +167,9 @@ set(filter_algorithms CreateEnsembleInfo EBSDSegmentFeatures EbsdToH5Ebsd - EnsembleInfoReader - ExportGBCDGMTFile - ExportGBCDTriangleData + ReadEnsembleInfo + WriteGBCDGMTFile + WriteGBCDTriangleData FindAvgCAxes FindAvgOrientations FindBoundaryStrengths @@ -196,9 +192,9 @@ set(filter_algorithms GenerateIPFColors GenerateQuaternionConjugate GroupFeatures - ImportH5EspritData - ImportH5OimData - INLWriter + ReadH5EspritData + ReadH5OimData + WriteINLFile MergeTwins NeighborOrientationCorrelation ReadAngData @@ -238,7 +234,7 @@ set(PLUGIN_EXTRA_SOURCES "${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/inicpp.h" "${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/PhaseType.hpp" "${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/PhaseType.cpp" -"${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/ImportH5Data.hpp" +"${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/ReadH5Data.hpp" "${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/OrientationUtilities.hpp" "${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/OrientationUtilities.cpp" "${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/Fonts.hpp" diff --git a/src/Plugins/OrientationAnalysis/docs/Images/ExportGBCDGMTFile.png b/src/Plugins/OrientationAnalysis/docs/Images/WriteGBCDGMTFile.png similarity index 100% rename from src/Plugins/OrientationAnalysis/docs/Images/ExportGBCDGMTFile.png rename to src/Plugins/OrientationAnalysis/docs/Images/WriteGBCDGMTFile.png diff --git a/src/Plugins/OrientationAnalysis/docs/EnsembleInfoReaderFilter.md b/src/Plugins/OrientationAnalysis/docs/ReadEnsembleInfoFilter.md similarity index 100% rename from src/Plugins/OrientationAnalysis/docs/EnsembleInfoReaderFilter.md rename to src/Plugins/OrientationAnalysis/docs/ReadEnsembleInfoFilter.md diff --git a/src/Plugins/OrientationAnalysis/docs/ImportH5EspritDataFilter.md b/src/Plugins/OrientationAnalysis/docs/ReadH5EspritDataFilter.md similarity index 100% rename from src/Plugins/OrientationAnalysis/docs/ImportH5EspritDataFilter.md rename to src/Plugins/OrientationAnalysis/docs/ReadH5EspritDataFilter.md diff --git a/src/Plugins/OrientationAnalysis/docs/ImportH5OimDataFilter.md b/src/Plugins/OrientationAnalysis/docs/ReadH5OimDataFilter.md similarity index 100% rename from src/Plugins/OrientationAnalysis/docs/ImportH5OimDataFilter.md rename to src/Plugins/OrientationAnalysis/docs/ReadH5OimDataFilter.md diff --git a/src/Plugins/OrientationAnalysis/docs/ExportGBCDGMTFileFilter.md b/src/Plugins/OrientationAnalysis/docs/WriteGBCDGMTFileFilter.md similarity index 91% rename from src/Plugins/OrientationAnalysis/docs/ExportGBCDGMTFileFilter.md rename to src/Plugins/OrientationAnalysis/docs/WriteGBCDGMTFileFilter.md index f285d2d8ae..f1ef3af30f 100644 --- a/src/Plugins/OrientationAnalysis/docs/ExportGBCDGMTFileFilter.md +++ b/src/Plugins/OrientationAnalysis/docs/WriteGBCDGMTFileFilter.md @@ -8,7 +8,7 @@ IO (Output) This **Filter** creates a .dat file that can be used in conjunction with [GMT](http://gmt.soest.hawaii.edu/) to generate a grain boundary character distribution (GBCD) pole figure. The user must select the relevant phase for which to write the pole figure by entering the *phase index*. -![GMT Visualization of the Small IN100 GBCD Results](Images/ExportGBCDGMTFile.png) +![GMT Visualization of the Small IN100 GBCD Results](Images/WriteGBCDGMTFile.png) % Auto generated parameter table will be inserted here diff --git a/src/Plugins/OrientationAnalysis/docs/ExportGBCDTriangleDataFilter.md b/src/Plugins/OrientationAnalysis/docs/WriteGBCDTriangleDataFilter.md similarity index 100% rename from src/Plugins/OrientationAnalysis/docs/ExportGBCDTriangleDataFilter.md rename to src/Plugins/OrientationAnalysis/docs/WriteGBCDTriangleDataFilter.md diff --git a/src/Plugins/OrientationAnalysis/docs/INLWriterFilter.md b/src/Plugins/OrientationAnalysis/docs/WriteINLFileFilter.md similarity index 100% rename from src/Plugins/OrientationAnalysis/docs/INLWriterFilter.md rename to src/Plugins/OrientationAnalysis/docs/WriteINLFileFilter.md diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline index 64c3d9ad38..782eb50b4a 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD SurfaceMeshing/(04) Small IN100 GBCD.d3dpipeline @@ -183,7 +183,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportGBCDGMTFileFilter", + "name": "complex::WriteGBCDGMTFileFilter", "uuid": "31710abf-b8a6-423f-a03f-4b8885bd3633" }, "isDisabled": false @@ -198,7 +198,7 @@ }, "comments": "", "filter": { - "name": "complex::ExportGBCDTriangleDataFilter", + "name": "complex::WriteGBCDTriangleDataFilter", "uuid": "6e0da3a1-dc42-4b01-80aa-3af9e8209ee3" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline index 928bc20001..a70c5f1b3b 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EnsembleInfoReader.d3dpipeline @@ -1,6 +1,6 @@ { "isDisabled": false, - "name": "EnsembleInfoReader.d3dpipeline", + "name": "ReadEnsembleInfo.d3dpipeline", "pinnedParams": [], "pipeline": [ { @@ -98,7 +98,7 @@ }, "comments": "", "filter": { - "name": "complex::EnsembleInfoReaderFilter", + "name": "complex::ReadEnsembleInfoFilter", "uuid": "ecf1ec45-bc27-4ddb-b2c0-3d465b8c182a" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline index af1f68833c..175d608775 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportBrukerNanoEspritData.d3dpipeline @@ -26,7 +26,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportH5EspritDataFilter", + "name": "complex::ReadH5EspritDataFilter", "uuid": "694a0d54-b492-41bc-993b-ce0f5006e927" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline index 24a73944ee..eb927d7718 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/ImportEdaxOIMData.d3dpipeline @@ -32,7 +32,7 @@ }, "comments": "", "filter": { - "name": "complex::ImportH5OimDataFilter", + "name": "complex::ReadH5OimDataFilter", "uuid": "4ad3d47c-b1e1-4429-bc65-5e021be62ba0" }, "isDisabled": false diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5EspritData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5EspritData.hpp deleted file mode 100644 index 9421c1036b..0000000000 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5EspritData.hpp +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "OrientationAnalysis/utilities/ImportH5Data.hpp" - -#include "complex/DataStructure/DataStructure.hpp" -#include "complex/Filter/IFilter.hpp" - -namespace complex -{ - -struct ORIENTATIONANALYSIS_EXPORT ImportH5EspritDataInputValues -{ - bool DegreesToRadians; -}; - -/** - * @class ImportH5EspritData - * @brief This filter will read a single .h5 file into a new Image Geometry, allowing the immediate use of Filters on the data instead of having to generate the intermediate .h5ebsd file. - */ - -class ORIENTATIONANALYSIS_EXPORT ImportH5EspritData : public ImportH5Data -{ -public: - ImportH5EspritData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ImportH5DataInputValues* inputValues, - ImportH5EspritDataInputValues* espritInputValues); - ~ImportH5EspritData() noexcept override; - - ImportH5EspritData(const ImportH5EspritData&) = delete; - ImportH5EspritData(ImportH5EspritData&&) noexcept = delete; - ImportH5EspritData& operator=(const ImportH5EspritData&) = delete; - ImportH5EspritData& operator=(ImportH5EspritData&&) noexcept = delete; - - Result<> operator()(); - - Result<> copyRawEbsdData(int index) override; - -private: - const ImportH5EspritDataInputValues* m_EspritInputValues = nullptr; -}; - -} // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5OimData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5OimData.hpp deleted file mode 100644 index 2853b0fcce..0000000000 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5OimData.hpp +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "OrientationAnalysis/utilities/ImportH5Data.hpp" - -namespace complex -{ -/** - * @class ImportH5OimData - * @brief This filter will read a single .h5 file into a new Image Geometry, allowing the immediate use of Filters on the data instead of having to generate the - * intermediate .h5ebsd file. - */ - -class ORIENTATIONANALYSIS_EXPORT ImportH5OimData : public ImportH5Data -{ -public: - ImportH5OimData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ImportH5DataInputValues* inputValues); - ~ImportH5OimData() noexcept override; - - ImportH5OimData(const ImportH5OimData&) = delete; - ImportH5OimData(ImportH5OimData&&) noexcept = delete; - ImportH5OimData& operator=(const ImportH5OimData&) = delete; - ImportH5OimData& operator=(ImportH5OimData&&) noexcept = delete; - - Result<> operator()(); - - Result<> copyRawEbsdData(int index) override; -}; - -} // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EnsembleInfoReader.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.cpp similarity index 94% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EnsembleInfoReader.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.cpp index a69b8256a0..211a9a8bd5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EnsembleInfoReader.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.cpp @@ -1,4 +1,4 @@ -#include "EnsembleInfoReader.hpp" +#include "ReadEnsembleInfo.hpp" #include "OrientationAnalysis/utilities/PhaseType.hpp" #include "OrientationAnalysis/utilities/inicpp.h" @@ -50,7 +50,7 @@ std::map k_EnsemblePhaseTypeInfoLookup = {{k_PrimaryPhase, } // namespace // ----------------------------------------------------------------------------- -EnsembleInfoReader::EnsembleInfoReader(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, EnsembleInfoReaderInputValues* inputValues) +ReadEnsembleInfo::ReadEnsembleInfo(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadEnsembleInfoInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -59,22 +59,22 @@ EnsembleInfoReader::EnsembleInfoReader(DataStructure& dataStructure, const IFilt } // ----------------------------------------------------------------------------- -EnsembleInfoReader::~EnsembleInfoReader() noexcept = default; +ReadEnsembleInfo::~ReadEnsembleInfo() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& EnsembleInfoReader::getCancel() +const std::atomic_bool& ReadEnsembleInfo::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -Result<> EnsembleInfoReader::operator()() +Result<> ReadEnsembleInfo::operator()() { return readFile(); } // ----------------------------------------------------------------------------- -Result<> EnsembleInfoReader::readFile() +Result<> ReadEnsembleInfo::readFile() { auto& cellEnsembleAttributeMatrix = m_DataStructure.getDataRefAs(m_InputValues->CellEnsembleAttributeMatrixName); auto& crystalStructures = m_DataStructure.getDataRefAs(m_InputValues->CrystalStructuresArrayName); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EnsembleInfoReader.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp similarity index 60% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EnsembleInfoReader.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp index 52fcf0a323..1798ffacc8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/EnsembleInfoReader.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp @@ -10,7 +10,7 @@ namespace complex { -struct ORIENTATIONANALYSIS_EXPORT EnsembleInfoReaderInputValues +struct ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfoInputValues { std::string InputFile; DataPath DataContainerName; @@ -20,20 +20,20 @@ struct ORIENTATIONANALYSIS_EXPORT EnsembleInfoReaderInputValues }; /** - * @class EnsembleInfoReader + * @class ReadEnsembleInfo * @brief This filter reads in information about the crystal structure and phase types of all the Features that are contained in a Cell based volume. */ -class ORIENTATIONANALYSIS_EXPORT EnsembleInfoReader +class ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfo { public: - EnsembleInfoReader(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, EnsembleInfoReaderInputValues* inputValues); - ~EnsembleInfoReader() noexcept; + ReadEnsembleInfo(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadEnsembleInfoInputValues* inputValues); + ~ReadEnsembleInfo() noexcept; - EnsembleInfoReader(const EnsembleInfoReader&) = delete; - EnsembleInfoReader(EnsembleInfoReader&&) noexcept = delete; - EnsembleInfoReader& operator=(const EnsembleInfoReader&) = delete; - EnsembleInfoReader& operator=(EnsembleInfoReader&&) noexcept = delete; + ReadEnsembleInfo(const ReadEnsembleInfo&) = delete; + ReadEnsembleInfo(ReadEnsembleInfo&&) noexcept = delete; + ReadEnsembleInfo& operator=(const ReadEnsembleInfo&) = delete; + ReadEnsembleInfo& operator=(ReadEnsembleInfo&&) noexcept = delete; Result<> operator()(); @@ -47,7 +47,7 @@ class ORIENTATIONANALYSIS_EXPORT EnsembleInfoReader private: DataStructure& m_DataStructure; - const EnsembleInfoReaderInputValues* m_InputValues = nullptr; + const ReadEnsembleInfoInputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5EspritData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp similarity index 89% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5EspritData.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp index d1ce3c0dee..beddd35a90 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5EspritData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp @@ -1,4 +1,4 @@ -#include "ImportH5EspritData.hpp" +#include "ReadH5EspritData.hpp" #include "complex/Common/Constants.hpp" #include "complex/DataStructure/DataArray.hpp" @@ -7,24 +7,24 @@ using namespace complex; // ----------------------------------------------------------------------------- -ImportH5EspritData::ImportH5EspritData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ImportH5DataInputValues* inputValues, - ImportH5EspritDataInputValues* espritInputValues) -: ImportH5Data(dataStructure, mesgHandler, shouldCancel, inputValues) +ReadH5EspritData::ReadH5EspritData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues, + ReadH5EspritDataInputValues* espritInputValues) +: ReadH5Data(dataStructure, mesgHandler, shouldCancel, inputValues) , m_EspritInputValues(espritInputValues) { } // ----------------------------------------------------------------------------- -ImportH5EspritData::~ImportH5EspritData() noexcept = default; +ReadH5EspritData::~ReadH5EspritData() noexcept = default; // ----------------------------------------------------------------------------- -Result<> ImportH5EspritData::operator()() +Result<> ReadH5EspritData::operator()() { return execute(); } // ----------------------------------------------------------------------------- -Result<> ImportH5EspritData::copyRawEbsdData(int index) +Result<> ReadH5EspritData::copyRawEbsdData(int index) { const auto& imageGeom = m_DataStructure.getDataRefAs(m_InputValues->ImageGeometryPath); const usize totalPoints = imageGeom.getNumXCells() * imageGeom.getNumYCells(); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp new file mode 100644 index 0000000000..6d22fde27f --- /dev/null +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp @@ -0,0 +1,42 @@ +#pragma once + +#include "OrientationAnalysis/OrientationAnalysis_export.hpp" +#include "OrientationAnalysis/utilities/ReadH5Data.hpp" + +#include "complex/DataStructure/DataStructure.hpp" +#include "complex/Filter/IFilter.hpp" + +namespace complex +{ + +struct ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataInputValues +{ + bool DegreesToRadians; +}; + +/** + * @class ReadH5EspritData + * @brief This filter will read a single .h5 file into a new Image Geometry, allowing the immediate use of Filters on the data instead of having to generate the intermediate .h5ebsd file. + */ + +class ORIENTATIONANALYSIS_EXPORT ReadH5EspritData : public ReadH5Data +{ +public: + ReadH5EspritData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues, + ReadH5EspritDataInputValues* espritInputValues); + ~ReadH5EspritData() noexcept override; + + ReadH5EspritData(const ReadH5EspritData&) = delete; + ReadH5EspritData(ReadH5EspritData&&) noexcept = delete; + ReadH5EspritData& operator=(const ReadH5EspritData&) = delete; + ReadH5EspritData& operator=(ReadH5EspritData&&) noexcept = delete; + + Result<> operator()(); + + Result<> copyRawEbsdData(int index) override; + +private: + const ReadH5EspritDataInputValues* m_EspritInputValues = nullptr; +}; + +} // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5OimData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.cpp similarity index 89% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5OimData.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.cpp index 1ccd77b989..a4d1b9a133 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ImportH5OimData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.cpp @@ -1,4 +1,4 @@ -#include "ImportH5OimData.hpp" +#include "ReadH5OimData.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/DataStructure/Geometry/ImageGeom.hpp" @@ -6,22 +6,22 @@ using namespace complex; // ----------------------------------------------------------------------------- -ImportH5OimData::ImportH5OimData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ImportH5DataInputValues* inputValues) -: ImportH5Data(dataStructure, mesgHandler, shouldCancel, inputValues) +ReadH5OimData::ReadH5OimData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadH5DataInputValues* inputValues) +: ReadH5Data(dataStructure, mesgHandler, shouldCancel, inputValues) { } // ----------------------------------------------------------------------------- -ImportH5OimData::~ImportH5OimData() noexcept = default; +ReadH5OimData::~ReadH5OimData() noexcept = default; // ----------------------------------------------------------------------------- -Result<> ImportH5OimData::operator()() +Result<> ReadH5OimData::operator()() { return execute(); } // ----------------------------------------------------------------------------- -Result<> ImportH5OimData::copyRawEbsdData(int index) +Result<> ReadH5OimData::copyRawEbsdData(int index) { const auto& imageGeom = m_DataStructure.getDataRefAs(m_InputValues->ImageGeometryPath); const usize totalPoints = imageGeom.getNumXCells() * imageGeom.getNumYCells(); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp new file mode 100644 index 0000000000..5376aec87c --- /dev/null +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp @@ -0,0 +1,30 @@ +#pragma once + +#include "OrientationAnalysis/OrientationAnalysis_export.hpp" +#include "OrientationAnalysis/utilities/ReadH5Data.hpp" + +namespace complex +{ +/** + * @class ReadH5OimData + * @brief This filter will read a single .h5 file into a new Image Geometry, allowing the immediate use of Filters on the data instead of having to generate the + * intermediate .h5ebsd file. + */ + +class ORIENTATIONANALYSIS_EXPORT ReadH5OimData : public ReadH5Data +{ +public: + ReadH5OimData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadH5DataInputValues* inputValues); + ~ReadH5OimData() noexcept override; + + ReadH5OimData(const ReadH5OimData&) = delete; + ReadH5OimData(ReadH5OimData&&) noexcept = delete; + ReadH5OimData& operator=(const ReadH5OimData&) = delete; + ReadH5OimData& operator=(ReadH5OimData&&) noexcept = delete; + + Result<> operator()(); + + Result<> copyRawEbsdData(int index) override; +}; + +} // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDGMTFile.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.cpp similarity index 97% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDGMTFile.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.cpp index abd6a8ee95..4fc3cd97bb 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDGMTFile.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.cpp @@ -1,4 +1,4 @@ -#include "ExportGBCDGMTFile.hpp" +#include "WriteGBCDGMTFile.hpp" #include "OrientationAnalysis/Math/Matrix3X1.hpp" #include "OrientationAnalysis/Math/Matrix3X3.hpp" @@ -48,7 +48,7 @@ bool GetSquareCoord(std::array crystalNormal, std::array& sqCoord) } // namespace // ----------------------------------------------------------------------------- -ExportGBCDGMTFile::ExportGBCDGMTFile(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ExportGBCDGMTFileInputValues* inputValues) +WriteGBCDGMTFile::WriteGBCDGMTFile(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteGBCDGMTFileInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -57,16 +57,16 @@ ExportGBCDGMTFile::ExportGBCDGMTFile(DataStructure& dataStructure, const IFilter } // ----------------------------------------------------------------------------- -ExportGBCDGMTFile::~ExportGBCDGMTFile() noexcept = default; +WriteGBCDGMTFile::~WriteGBCDGMTFile() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& ExportGBCDGMTFile::getCancel() +const std::atomic_bool& WriteGBCDGMTFile::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -Result<> ExportGBCDGMTFile::operator()() +Result<> WriteGBCDGMTFile::operator()() { auto gbcd = m_DataStructure.getDataRefAs(m_InputValues->GBCDArrayPath); auto crystalStructures = m_DataStructure.getDataRefAs(m_InputValues->CrystalStructuresArrayPath); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDGMTFile.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp similarity index 59% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDGMTFile.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp index fedc751616..ec8deb838f 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDGMTFile.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp @@ -11,7 +11,7 @@ namespace complex { -struct ORIENTATIONANALYSIS_EXPORT ExportGBCDGMTFileInputValues +struct ORIENTATIONANALYSIS_EXPORT WriteGBCDGMTFileInputValues { int32 PhaseOfInterest; VectorFloat32Parameter::ValueType MisorientationRotation; @@ -26,16 +26,16 @@ struct ORIENTATIONANALYSIS_EXPORT ExportGBCDGMTFileInputValues * where a bool mask array specifies. */ -class ORIENTATIONANALYSIS_EXPORT ExportGBCDGMTFile +class ORIENTATIONANALYSIS_EXPORT WriteGBCDGMTFile { public: - ExportGBCDGMTFile(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ExportGBCDGMTFileInputValues* inputValues); - ~ExportGBCDGMTFile() noexcept; + WriteGBCDGMTFile(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteGBCDGMTFileInputValues* inputValues); + ~WriteGBCDGMTFile() noexcept; - ExportGBCDGMTFile(const ExportGBCDGMTFile&) = delete; - ExportGBCDGMTFile(ExportGBCDGMTFile&&) noexcept = delete; - ExportGBCDGMTFile& operator=(const ExportGBCDGMTFile&) = delete; - ExportGBCDGMTFile& operator=(ExportGBCDGMTFile&&) noexcept = delete; + WriteGBCDGMTFile(const WriteGBCDGMTFile&) = delete; + WriteGBCDGMTFile(WriteGBCDGMTFile&&) noexcept = delete; + WriteGBCDGMTFile& operator=(const WriteGBCDGMTFile&) = delete; + WriteGBCDGMTFile& operator=(WriteGBCDGMTFile&&) noexcept = delete; Result<> operator()(); @@ -43,7 +43,7 @@ class ORIENTATIONANALYSIS_EXPORT ExportGBCDGMTFile private: DataStructure& m_DataStructure; - const ExportGBCDGMTFileInputValues* m_InputValues = nullptr; + const WriteGBCDGMTFileInputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDTriangleData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp similarity index 86% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDTriangleData.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp index 0a85a1c334..c91f010d06 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDTriangleData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp @@ -1,4 +1,4 @@ -#include "ExportGBCDTriangleData.hpp" +#include "WriteGBCDTriangleData.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/DataStructure/DataGroup.hpp" @@ -6,8 +6,8 @@ using namespace complex; // ----------------------------------------------------------------------------- -ExportGBCDTriangleData::ExportGBCDTriangleData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - ExportGBCDTriangleDataInputValues* inputValues) +WriteGBCDTriangleData::WriteGBCDTriangleData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, + WriteGBCDTriangleDataInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -16,16 +16,16 @@ ExportGBCDTriangleData::ExportGBCDTriangleData(DataStructure& dataStructure, con } // ----------------------------------------------------------------------------- -ExportGBCDTriangleData::~ExportGBCDTriangleData() noexcept = default; +WriteGBCDTriangleData::~WriteGBCDTriangleData() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& ExportGBCDTriangleData::getCancel() +const std::atomic_bool& WriteGBCDTriangleData::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -Result<> ExportGBCDTriangleData::operator()() +Result<> WriteGBCDTriangleData::operator()() { auto& faceLabels = m_DataStructure.getDataRefAs(m_InputValues->SurfaceMeshFaceLabelsArrayPath); auto& faceNormals = m_DataStructure.getDataRefAs(m_InputValues->SurfaceMeshFaceNormalsArrayPath); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDTriangleData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp similarity index 57% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDTriangleData.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp index 0eebf8abc8..9d42e57798 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ExportGBCDTriangleData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp @@ -11,7 +11,7 @@ namespace complex { -struct ORIENTATIONANALYSIS_EXPORT ExportGBCDTriangleDataInputValues +struct ORIENTATIONANALYSIS_EXPORT WriteGBCDTriangleDataInputValues { FileSystemPathParameter::ValueType OutputFile; DataPath SurfaceMeshFaceLabelsArrayPath; @@ -26,16 +26,16 @@ struct ORIENTATIONANALYSIS_EXPORT ExportGBCDTriangleDataInputValues * where a bool mask array specifies. */ -class ORIENTATIONANALYSIS_EXPORT ExportGBCDTriangleData +class ORIENTATIONANALYSIS_EXPORT WriteGBCDTriangleData { public: - ExportGBCDTriangleData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ExportGBCDTriangleDataInputValues* inputValues); - ~ExportGBCDTriangleData() noexcept; + WriteGBCDTriangleData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteGBCDTriangleDataInputValues* inputValues); + ~WriteGBCDTriangleData() noexcept; - ExportGBCDTriangleData(const ExportGBCDTriangleData&) = delete; - ExportGBCDTriangleData(ExportGBCDTriangleData&&) noexcept = delete; - ExportGBCDTriangleData& operator=(const ExportGBCDTriangleData&) = delete; - ExportGBCDTriangleData& operator=(ExportGBCDTriangleData&&) noexcept = delete; + WriteGBCDTriangleData(const WriteGBCDTriangleData&) = delete; + WriteGBCDTriangleData(WriteGBCDTriangleData&&) noexcept = delete; + WriteGBCDTriangleData& operator=(const WriteGBCDTriangleData&) = delete; + WriteGBCDTriangleData& operator=(WriteGBCDTriangleData&&) noexcept = delete; Result<> operator()(); @@ -43,7 +43,7 @@ class ORIENTATIONANALYSIS_EXPORT ExportGBCDTriangleData private: DataStructure& m_DataStructure; - const ExportGBCDTriangleDataInputValues* m_InputValues = nullptr; + const WriteGBCDTriangleDataInputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/INLWriter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.cpp similarity index 95% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/INLWriter.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.cpp index 28e754240b..84d3fc3def 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/INLWriter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.cpp @@ -1,4 +1,4 @@ -#include "INLWriter.hpp" +#include "WriteINLFile.hpp" #include "complex/ComplexVersion.hpp" #include "complex/DataStructure/DataArray.hpp" @@ -53,7 +53,7 @@ uint32 mapCrystalSymmetryToTslSymmetry(uint32 symmetry) } // namespace // ----------------------------------------------------------------------------- -INLWriter::INLWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, INLWriterInputValues* inputValues) +WriteINLFile::WriteINLFile(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteINLFileInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) @@ -62,16 +62,16 @@ INLWriter::INLWriter(DataStructure& dataStructure, const IFilter::MessageHandler } // ----------------------------------------------------------------------------- -INLWriter::~INLWriter() noexcept = default; +WriteINLFile::~WriteINLFile() noexcept = default; // ----------------------------------------------------------------------------- -const std::atomic_bool& INLWriter::getCancel() +const std::atomic_bool& WriteINLFile::getCancel() { return m_ShouldCancel; } // ----------------------------------------------------------------------------- -Result<> INLWriter::operator()() +Result<> WriteINLFile::operator()() { // Make sure any directory path is also available as the user may have just typed // in a path without actually creating the full path diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/INLWriter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp similarity index 64% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/INLWriter.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp index 569b1fb8d2..eed3079f9c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/INLWriter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp @@ -11,7 +11,7 @@ namespace complex { -struct ORIENTATIONANALYSIS_EXPORT INLWriterInputValues +struct ORIENTATIONANALYSIS_EXPORT WriteINLFileInputValues { FileSystemPathParameter::ValueType OutputFile; DataPath ImageGeomPath; @@ -29,16 +29,16 @@ struct ORIENTATIONANALYSIS_EXPORT INLWriterInputValues * where a bool mask array specifies. */ -class ORIENTATIONANALYSIS_EXPORT INLWriter +class ORIENTATIONANALYSIS_EXPORT WriteINLFile { public: - INLWriter(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, INLWriterInputValues* inputValues); - ~INLWriter() noexcept; + WriteINLFile(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, WriteINLFileInputValues* inputValues); + ~WriteINLFile() noexcept; - INLWriter(const INLWriter&) = delete; - INLWriter(INLWriter&&) noexcept = delete; - INLWriter& operator=(const INLWriter&) = delete; - INLWriter& operator=(INLWriter&&) noexcept = delete; + WriteINLFile(const WriteINLFile&) = delete; + WriteINLFile(WriteINLFile&&) noexcept = delete; + WriteINLFile& operator=(const WriteINLFile&) = delete; + WriteINLFile& operator=(WriteINLFile&&) noexcept = delete; Result<> operator()(); @@ -46,7 +46,7 @@ class ORIENTATIONANALYSIS_EXPORT INLWriter private: DataStructure& m_DataStructure; - const INLWriterInputValues* m_InputValues = nullptr; + const WriteINLFileInputValues* m_InputValues = nullptr; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; }; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp index 9752b95c76..f5de746ebc 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadAngDataFilter.cpp @@ -43,7 +43,7 @@ Uuid ReadAngDataFilter::uuid() const //------------------------------------------------------------------------------ std::string ReadAngDataFilter::humanName() const { - return "Import EDAX EBSD Data (.ang)"; + return "Read EDAX EBSD Data (.ang)"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp index 0c8b0a602b..fe8f983651 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadCtfDataFilter.cpp @@ -46,7 +46,7 @@ Uuid ReadCtfDataFilter::uuid() const //------------------------------------------------------------------------------ std::string ReadCtfDataFilter::humanName() const { - return "Import Oxford Instr. EBSD Data (.ctf)"; + return "Read Oxford Instr. EBSD Data (.ctf)"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EnsembleInfoReaderFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp similarity index 76% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EnsembleInfoReaderFilter.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp index 8b9a714c5a..2301c22c02 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EnsembleInfoReaderFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp @@ -1,6 +1,6 @@ -#include "EnsembleInfoReaderFilter.hpp" +#include "ReadEnsembleInfoFilter.hpp" -#include "OrientationAnalysis/Filters/Algorithms/EnsembleInfoReader.hpp" +#include "OrientationAnalysis/Filters/Algorithms/ReadEnsembleInfo.hpp" #include "OrientationAnalysis/utilities/inicpp.h" #include "complex/DataStructure/DataPath.hpp" @@ -18,37 +18,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string EnsembleInfoReaderFilter::name() const +std::string ReadEnsembleInfoFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string EnsembleInfoReaderFilter::className() const +std::string ReadEnsembleInfoFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid EnsembleInfoReaderFilter::uuid() const +Uuid ReadEnsembleInfoFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string EnsembleInfoReaderFilter::humanName() const +std::string ReadEnsembleInfoFilter::humanName() const { - return "Import Ensemble Info File"; + return "Read Ensemble Info File"; } //------------------------------------------------------------------------------ -std::vector EnsembleInfoReaderFilter::defaultTags() const +std::vector ReadEnsembleInfoFilter::defaultTags() const { return {className(), "IO", "Input", "Read", "Import"}; } //------------------------------------------------------------------------------ -Parameters EnsembleInfoReaderFilter::parameters() const +Parameters ReadEnsembleInfoFilter::parameters() const { Parameters params; @@ -71,13 +71,13 @@ Parameters EnsembleInfoReaderFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer EnsembleInfoReaderFilter::clone() const +IFilter::UniquePointer ReadEnsembleInfoFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult EnsembleInfoReaderFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadEnsembleInfoFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pInputFileValue = filterArgs.value(k_InputFile_Key).string(); @@ -98,20 +98,20 @@ IFilter::PreflightResult EnsembleInfoReaderFilter::preflightImpl(const DataStruc ini::IniFile inputIni; inputIni.load(pInputFileValue); - if(inputIni.count(EnsembleInfoReader::k_EnsembleInfo) == 0) + if(inputIni.count(ReadEnsembleInfo::k_EnsembleInfo) == 0) { - return MakePreflightErrorResult(-13001, fmt::format("Could not find the group name {} from the input file '{}'", EnsembleInfoReader::k_EnsembleInfo, pInputFileValue)); + return MakePreflightErrorResult(-13001, fmt::format("Could not find the group name {} from the input file '{}'", ReadEnsembleInfo::k_EnsembleInfo, pInputFileValue)); } - if(inputIni[EnsembleInfoReader::k_EnsembleInfo].count(EnsembleInfoReader::k_NumberPhases) == 0) + if(inputIni[ReadEnsembleInfo::k_EnsembleInfo].count(ReadEnsembleInfo::k_NumberPhases) == 0) { return MakePreflightErrorResult( - -13002, fmt::format("Could not find the key {} in the {} group from the input file '{}'", EnsembleInfoReader::k_NumberPhases, EnsembleInfoReader::k_EnsembleInfo, pInputFileValue)); + -13002, fmt::format("Could not find the key {} in the {} group from the input file '{}'", ReadEnsembleInfo::k_NumberPhases, ReadEnsembleInfo::k_EnsembleInfo, pInputFileValue)); } - numPhases = inputIni[EnsembleInfoReader::k_EnsembleInfo][EnsembleInfoReader::k_NumberPhases].as(); // read number of phases from input file + numPhases = inputIni[ReadEnsembleInfo::k_EnsembleInfo][ReadEnsembleInfo::k_NumberPhases].as(); // read number of phases from input file if(0 == numPhases) // 0 was entered as the Number_Phases { - return MakePreflightErrorResult(-13003, fmt::format("The {} in the {} group must be greater than 0", EnsembleInfoReader::k_NumberPhases, EnsembleInfoReader::k_EnsembleInfo)); + return MakePreflightErrorResult(-13003, fmt::format("The {} in the {} group must be greater than 0", ReadEnsembleInfo::k_NumberPhases, ReadEnsembleInfo::k_EnsembleInfo)); } std::vector tupleDims(1, numPhases + 1); @@ -128,10 +128,10 @@ IFilter::PreflightResult EnsembleInfoReaderFilter::preflightImpl(const DataStruc } //------------------------------------------------------------------------------ -Result<> EnsembleInfoReaderFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadEnsembleInfoFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - EnsembleInfoReaderInputValues inputValues; + ReadEnsembleInfoInputValues inputValues; inputValues.InputFile = filterArgs.value(k_InputFile_Key).string(); inputValues.DataContainerName = filterArgs.value(k_DataContainerName_Key); @@ -139,6 +139,6 @@ Result<> EnsembleInfoReaderFilter::executeImpl(DataStructure& dataStructure, con inputValues.CrystalStructuresArrayName = inputValues.CellEnsembleAttributeMatrixName.createChildPath(filterArgs.value(k_CrystalStructuresArrayName_Key)); inputValues.PhaseTypesArrayName = inputValues.CellEnsembleAttributeMatrixName.createChildPath(filterArgs.value(k_PhaseTypesArrayName_Key)); - return EnsembleInfoReader(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return ReadEnsembleInfo(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EnsembleInfoReaderFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp similarity index 84% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EnsembleInfoReaderFilter.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp index 3dddc88a9c..3058c7e3b8 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/EnsembleInfoReaderFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class EnsembleInfoReaderFilter + * @class ReadEnsembleInfoFilter * @brief This filter reads in information about the crystal structure and phase types of all the Features that are contained in a Cell based volume. */ -class ORIENTATIONANALYSIS_EXPORT EnsembleInfoReaderFilter : public IFilter +class ORIENTATIONANALYSIS_EXPORT ReadEnsembleInfoFilter : public IFilter { public: - EnsembleInfoReaderFilter() = default; - ~EnsembleInfoReaderFilter() noexcept override = default; + ReadEnsembleInfoFilter() = default; + ~ReadEnsembleInfoFilter() noexcept override = default; - EnsembleInfoReaderFilter(const EnsembleInfoReaderFilter&) = delete; - EnsembleInfoReaderFilter(EnsembleInfoReaderFilter&&) noexcept = delete; + ReadEnsembleInfoFilter(const ReadEnsembleInfoFilter&) = delete; + ReadEnsembleInfoFilter(ReadEnsembleInfoFilter&&) noexcept = delete; - EnsembleInfoReaderFilter& operator=(const EnsembleInfoReaderFilter&) = delete; - EnsembleInfoReaderFilter& operator=(EnsembleInfoReaderFilter&&) noexcept = delete; + ReadEnsembleInfoFilter& operator=(const ReadEnsembleInfoFilter&) = delete; + ReadEnsembleInfoFilter& operator=(ReadEnsembleInfoFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_InputFile_Key = "input_file"; @@ -96,5 +96,5 @@ class ORIENTATIONANALYSIS_EXPORT EnsembleInfoReaderFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, EnsembleInfoReaderFilter, "ecf1ec45-bc27-4ddb-b2c0-3d465b8c182a"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadEnsembleInfoFilter, "ecf1ec45-bc27-4ddb-b2c0-3d465b8c182a"); /* LEGACY UUID FOR THIS FILTER 33a37a47-d002-5c18-b270-86025881fe1e */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index 9b50c3febe..1223824b90 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -41,7 +41,7 @@ Uuid ReadH5EbsdFilter::uuid() const //------------------------------------------------------------------------------ std::string ReadH5EbsdFilter::humanName() const { - return "Import H5EBSD File"; + return "Read H5EBSD File"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5EspritDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp similarity index 89% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5EspritDataFilter.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp index 2528b10365..fbd5803e29 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5EspritDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp @@ -1,6 +1,6 @@ -#include "ImportH5EspritDataFilter.hpp" +#include "ReadH5EspritDataFilter.hpp" -#include "OrientationAnalysis/Filters/Algorithms/ImportH5EspritData.hpp" +#include "OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp" #include "OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h" #include "complex/DataStructure/DataPath.hpp" @@ -30,37 +30,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string ImportH5EspritDataFilter::name() const +std::string ReadH5EspritDataFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string ImportH5EspritDataFilter::className() const +std::string ReadH5EspritDataFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ImportH5EspritDataFilter::uuid() const +Uuid ReadH5EspritDataFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ImportH5EspritDataFilter::humanName() const +std::string ReadH5EspritDataFilter::humanName() const { - return "Import Bruker Nano Esprit Data (.h5)"; + return "Read Bruker Nano Esprit Data (.h5)"; } //------------------------------------------------------------------------------ -std::vector ImportH5EspritDataFilter::defaultTags() const +std::vector ReadH5EspritDataFilter::defaultTags() const { return {className(), "IO", "Input", "Read", "Import"}; } //------------------------------------------------------------------------------ -Parameters ImportH5EspritDataFilter::parameters() const +Parameters ReadH5EspritDataFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter @@ -85,13 +85,13 @@ Parameters ImportH5EspritDataFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ImportH5EspritDataFilter::clone() const +IFilter::UniquePointer ReadH5EspritDataFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ImportH5EspritDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadH5EspritDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pSelectedScanNamesValue = filterArgs.value(k_SelectedScanNames_Key); @@ -201,11 +201,11 @@ IFilter::PreflightResult ImportH5EspritDataFilter::preflightImpl(const DataStruc } //------------------------------------------------------------------------------ -Result<> ImportH5EspritDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadH5EspritDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - ImportH5DataInputValues inputValues; - ImportH5EspritDataInputValues espritInputValues; + ReadH5DataInputValues inputValues; + ReadH5EspritDataInputValues espritInputValues; inputValues.SelectedScanNames = filterArgs.value(k_SelectedScanNames_Key); inputValues.ReadPatternData = filterArgs.value(k_ReadPatternData_Key); @@ -214,6 +214,6 @@ Result<> ImportH5EspritDataFilter::executeImpl(DataStructure& dataStructure, con inputValues.CellAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellAttributeMatrixName_Key)); espritInputValues.DegreesToRadians = filterArgs.value(k_DegreesToRadians_Key); - return ImportH5EspritData(dataStructure, messageHandler, shouldCancel, &inputValues, &espritInputValues)(); + return ReadH5EspritData(dataStructure, messageHandler, shouldCancel, &inputValues, &espritInputValues)(); } } // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5EspritDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp similarity index 85% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5EspritDataFilter.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp index 83e76a0b98..ee89a978a5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5EspritDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class ImportH5EspritDataFilter + * @class ReadH5EspritDataFilter * @brief This filter will read a single .h5 file into a new Image Geometry, allowing the immediate use of Filters on the data instead of having to generate the intermediate .h5ebsd file. */ -class ORIENTATIONANALYSIS_EXPORT ImportH5EspritDataFilter : public IFilter +class ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataFilter : public IFilter { public: - ImportH5EspritDataFilter() = default; - ~ImportH5EspritDataFilter() noexcept override = default; + ReadH5EspritDataFilter() = default; + ~ReadH5EspritDataFilter() noexcept override = default; - ImportH5EspritDataFilter(const ImportH5EspritDataFilter&) = delete; - ImportH5EspritDataFilter(ImportH5EspritDataFilter&&) noexcept = delete; + ReadH5EspritDataFilter(const ReadH5EspritDataFilter&) = delete; + ReadH5EspritDataFilter(ReadH5EspritDataFilter&&) noexcept = delete; - ImportH5EspritDataFilter& operator=(const ImportH5EspritDataFilter&) = delete; - ImportH5EspritDataFilter& operator=(ImportH5EspritDataFilter&&) noexcept = delete; + ReadH5EspritDataFilter& operator=(const ReadH5EspritDataFilter&) = delete; + ReadH5EspritDataFilter& operator=(ReadH5EspritDataFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_SelectedScanNames_Key = "selected_scan_names"; @@ -99,5 +99,5 @@ class ORIENTATIONANALYSIS_EXPORT ImportH5EspritDataFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ImportH5EspritDataFilter, "694a0d54-b492-41bc-993b-ce0f5006e927"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadH5EspritDataFilter, "694a0d54-b492-41bc-993b-ce0f5006e927"); /* LEGACY UUID FOR THIS FILTER 8abdea7d-f715-5a24-8165-7f946bbc2fe9 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5OimDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp similarity index 89% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5OimDataFilter.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp index a0a8b93b40..d7a99844aa 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5OimDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp @@ -1,6 +1,6 @@ -#include "ImportH5OimDataFilter.hpp" +#include "ReadH5OimDataFilter.hpp" -#include "OrientationAnalysis/Filters/Algorithms/ImportH5OimData.hpp" +#include "OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp" #include "OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h" #include "complex/DataStructure/DataPath.hpp" @@ -27,37 +27,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string ImportH5OimDataFilter::name() const +std::string ReadH5OimDataFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string ImportH5OimDataFilter::className() const +std::string ReadH5OimDataFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ImportH5OimDataFilter::uuid() const +Uuid ReadH5OimDataFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ImportH5OimDataFilter::humanName() const +std::string ReadH5OimDataFilter::humanName() const { - return "Import EDAX OIMAnalysis Data (.h5)"; + return "Read EDAX OIMAnalysis Data (.h5)"; } //------------------------------------------------------------------------------ -std::vector ImportH5OimDataFilter::defaultTags() const +std::vector ReadH5OimDataFilter::defaultTags() const { return {className(), "IO", "Input", "Read", "Import"}; } //------------------------------------------------------------------------------ -Parameters ImportH5OimDataFilter::parameters() const +Parameters ReadH5OimDataFilter::parameters() const { Parameters params; @@ -82,13 +82,13 @@ Parameters ImportH5OimDataFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ImportH5OimDataFilter::clone() const +IFilter::UniquePointer ReadH5OimDataFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ImportH5OimDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult ReadH5OimDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pSelectedScanNamesValue = filterArgs.value(k_SelectedScanNames_Key); @@ -197,10 +197,10 @@ IFilter::PreflightResult ImportH5OimDataFilter::preflightImpl(const DataStructur } //------------------------------------------------------------------------------ -Result<> ImportH5OimDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> ReadH5OimDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - ImportH5DataInputValues inputValues; + ReadH5DataInputValues inputValues; inputValues.SelectedScanNames = filterArgs.value(k_SelectedScanNames_Key); inputValues.ReadPatternData = filterArgs.value(k_ReadPatternData_Key); @@ -208,6 +208,6 @@ Result<> ImportH5OimDataFilter::executeImpl(DataStructure& dataStructure, const inputValues.CellEnsembleAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); inputValues.CellAttributeMatrixPath = inputValues.ImageGeometryPath.createChildPath(filterArgs.value(k_CellAttributeMatrixName_Key)); - return ImportH5OimData(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return ReadH5OimData(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5OimDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp similarity index 86% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5OimDataFilter.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp index c326b2daf7..ffeb76cca9 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ImportH5OimDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp @@ -8,21 +8,21 @@ namespace complex { /** - * @class ImportH5OimDataFilter + * @class ReadH5OimDataFilter * @brief This filter will read a single .h5 file into a new Image Geometry, allowing the immediate use of Filters on the data instead of having to generate the * intermediate .h5ebsd file. */ -class ORIENTATIONANALYSIS_EXPORT ImportH5OimDataFilter : public IFilter +class ORIENTATIONANALYSIS_EXPORT ReadH5OimDataFilter : public IFilter { public: - ImportH5OimDataFilter() = default; - ~ImportH5OimDataFilter() noexcept override = default; + ReadH5OimDataFilter() = default; + ~ReadH5OimDataFilter() noexcept override = default; - ImportH5OimDataFilter(const ImportH5OimDataFilter&) = delete; - ImportH5OimDataFilter(ImportH5OimDataFilter&&) noexcept = delete; + ReadH5OimDataFilter(const ReadH5OimDataFilter&) = delete; + ReadH5OimDataFilter(ReadH5OimDataFilter&&) noexcept = delete; - ImportH5OimDataFilter& operator=(const ImportH5OimDataFilter&) = delete; - ImportH5OimDataFilter& operator=(ImportH5OimDataFilter&&) noexcept = delete; + ReadH5OimDataFilter& operator=(const ReadH5OimDataFilter&) = delete; + ReadH5OimDataFilter& operator=(ReadH5OimDataFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_SelectedScanNames_Key = "selected_scan_names"; @@ -99,5 +99,5 @@ class ORIENTATIONANALYSIS_EXPORT ImportH5OimDataFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ImportH5OimDataFilter, "4ad3d47c-b1e1-4429-bc65-5e021be62ba0"); +COMPLEX_DEF_FILTER_TRAITS(complex, ReadH5OimDataFilter, "4ad3d47c-b1e1-4429-bc65-5e021be62ba0"); /* LEGACY UUID FOR THIS FILTER 3ff4701b-3a0c-52e3-910a-fa927aa6584c */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDGMTFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp similarity index 81% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDGMTFileFilter.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp index f09b8d1a22..4a3ef3673c 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDGMTFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp @@ -1,4 +1,4 @@ -#include "ExportGBCDGMTFileFilter.hpp" +#include "WriteGBCDGMTFileFilter.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/DataStructure/DataPath.hpp" @@ -7,7 +7,7 @@ #include "complex/Parameters/NumberParameter.hpp" #include "complex/Parameters/VectorParameter.hpp" -#include "OrientationAnalysis/Filters/Algorithms/ExportGBCDGMTFile.hpp" +#include "OrientationAnalysis/Filters/Algorithms/WriteGBCDGMTFile.hpp" #include @@ -18,37 +18,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string ExportGBCDGMTFileFilter::name() const +std::string WriteGBCDGMTFileFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string ExportGBCDGMTFileFilter::className() const +std::string WriteGBCDGMTFileFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ExportGBCDGMTFileFilter::uuid() const +Uuid WriteGBCDGMTFileFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ExportGBCDGMTFileFilter::humanName() const +std::string WriteGBCDGMTFileFilter::humanName() const { - return "Export GBCD Pole Figure (GMT 5)"; + return "Write GBCD Pole Figure (GMT 5)"; } //------------------------------------------------------------------------------ -std::vector ExportGBCDGMTFileFilter::defaultTags() const +std::vector WriteGBCDGMTFileFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters ExportGBCDGMTFileFilter::parameters() const +Parameters WriteGBCDGMTFileFilter::parameters() const { Parameters params; // Create the parameter descriptors that are needed for this filter @@ -70,13 +70,13 @@ Parameters ExportGBCDGMTFileFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ExportGBCDGMTFileFilter::clone() const +IFilter::UniquePointer WriteGBCDGMTFileFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ExportGBCDGMTFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteGBCDGMTFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pPhaseOfInterestValue = filterArgs.value(k_PhaseOfInterest_Key); @@ -118,16 +118,16 @@ IFilter::PreflightResult ExportGBCDGMTFileFilter::preflightImpl(const DataStruct } //------------------------------------------------------------------------------ -Result<> ExportGBCDGMTFileFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteGBCDGMTFileFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - ExportGBCDGMTFileInputValues inputValues; + WriteGBCDGMTFileInputValues inputValues; inputValues.PhaseOfInterest = filterArgs.value(k_PhaseOfInterest_Key); inputValues.MisorientationRotation = filterArgs.value(k_MisorientationRotation_Key); inputValues.OutputFile = filterArgs.value(k_OutputFile_Key); inputValues.GBCDArrayPath = filterArgs.value(k_GBCDArrayPath_Key); inputValues.CrystalStructuresArrayPath = filterArgs.value(k_CrystalStructuresArrayPath_Key); - return ExportGBCDGMTFile(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return WriteGBCDGMTFile(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDGMTFileFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp similarity index 84% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDGMTFileFilter.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp index 2f3153863f..e0601c219d 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDGMTFileFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class ExportGBCDGMTFileFilter + * @class WriteGBCDGMTFileFilter * @brief This filter will .... */ -class ORIENTATIONANALYSIS_EXPORT ExportGBCDGMTFileFilter : public IFilter +class ORIENTATIONANALYSIS_EXPORT WriteGBCDGMTFileFilter : public IFilter { public: - ExportGBCDGMTFileFilter() = default; - ~ExportGBCDGMTFileFilter() noexcept override = default; + WriteGBCDGMTFileFilter() = default; + ~WriteGBCDGMTFileFilter() noexcept override = default; - ExportGBCDGMTFileFilter(const ExportGBCDGMTFileFilter&) = delete; - ExportGBCDGMTFileFilter(ExportGBCDGMTFileFilter&&) noexcept = delete; + WriteGBCDGMTFileFilter(const WriteGBCDGMTFileFilter&) = delete; + WriteGBCDGMTFileFilter(WriteGBCDGMTFileFilter&&) noexcept = delete; - ExportGBCDGMTFileFilter& operator=(const ExportGBCDGMTFileFilter&) = delete; - ExportGBCDGMTFileFilter& operator=(ExportGBCDGMTFileFilter&&) noexcept = delete; + WriteGBCDGMTFileFilter& operator=(const WriteGBCDGMTFileFilter&) = delete; + WriteGBCDGMTFileFilter& operator=(WriteGBCDGMTFileFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_PhaseOfInterest_Key = "phase_of_interest"; @@ -96,4 +96,4 @@ class ORIENTATIONANALYSIS_EXPORT ExportGBCDGMTFileFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ExportGBCDGMTFileFilter, "31710abf-b8a6-423f-a03f-4b8885bd3633"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteGBCDGMTFileFilter, "31710abf-b8a6-423f-a03f-4b8885bd3633"); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDTriangleDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp similarity index 80% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDTriangleDataFilter.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp index 40fe349ff8..500dbe1881 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDTriangleDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp @@ -1,6 +1,6 @@ -#include "ExportGBCDTriangleDataFilter.hpp" +#include "WriteGBCDTriangleDataFilter.hpp" -#include "OrientationAnalysis/Filters/Algorithms/ExportGBCDTriangleData.hpp" +#include "OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.hpp" #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/EmptyAction.hpp" @@ -16,37 +16,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string ExportGBCDTriangleDataFilter::name() const +std::string WriteGBCDTriangleDataFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string ExportGBCDTriangleDataFilter::className() const +std::string WriteGBCDTriangleDataFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid ExportGBCDTriangleDataFilter::uuid() const +Uuid WriteGBCDTriangleDataFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string ExportGBCDTriangleDataFilter::humanName() const +std::string WriteGBCDTriangleDataFilter::humanName() const { - return "Export GBCD Triangles File"; + return "Write GBCD Triangles File"; } //------------------------------------------------------------------------------ -std::vector ExportGBCDTriangleDataFilter::defaultTags() const +std::vector WriteGBCDTriangleDataFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters ExportGBCDTriangleDataFilter::parameters() const +Parameters WriteGBCDTriangleDataFilter::parameters() const { Parameters params; @@ -73,13 +73,13 @@ Parameters ExportGBCDTriangleDataFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer ExportGBCDTriangleDataFilter::clone() const +IFilter::UniquePointer WriteGBCDTriangleDataFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult ExportGBCDTriangleDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteGBCDTriangleDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); @@ -104,10 +104,10 @@ IFilter::PreflightResult ExportGBCDTriangleDataFilter::preflightImpl(const DataS } //------------------------------------------------------------------------------ -Result<> ExportGBCDTriangleDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteGBCDTriangleDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - ExportGBCDTriangleDataInputValues inputValues; + WriteGBCDTriangleDataInputValues inputValues; inputValues.OutputFile = filterArgs.value(k_OutputFile_Key); inputValues.SurfaceMeshFaceLabelsArrayPath = filterArgs.value(k_SurfaceMeshFaceLabelsArrayPath_Key); @@ -115,6 +115,6 @@ Result<> ExportGBCDTriangleDataFilter::executeImpl(DataStructure& dataStructure, inputValues.SurfaceMeshFaceAreasArrayPath = filterArgs.value(k_SurfaceMeshFaceAreasArrayPath_Key); inputValues.FeatureEulerAnglesArrayPath = filterArgs.value(k_FeatureEulerAnglesArrayPath_Key); - return ExportGBCDTriangleData(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return WriteGBCDTriangleData(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDTriangleDataFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp similarity index 83% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDTriangleDataFilter.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp index 47e339bed7..0178cdb8b0 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ExportGBCDTriangleDataFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class ExportGBCDTriangleDataFilter + * @class WriteGBCDTriangleDataFilter * @brief This filter will .... */ -class ORIENTATIONANALYSIS_EXPORT ExportGBCDTriangleDataFilter : public IFilter +class ORIENTATIONANALYSIS_EXPORT WriteGBCDTriangleDataFilter : public IFilter { public: - ExportGBCDTriangleDataFilter() = default; - ~ExportGBCDTriangleDataFilter() noexcept override = default; + WriteGBCDTriangleDataFilter() = default; + ~WriteGBCDTriangleDataFilter() noexcept override = default; - ExportGBCDTriangleDataFilter(const ExportGBCDTriangleDataFilter&) = delete; - ExportGBCDTriangleDataFilter(ExportGBCDTriangleDataFilter&&) noexcept = delete; + WriteGBCDTriangleDataFilter(const WriteGBCDTriangleDataFilter&) = delete; + WriteGBCDTriangleDataFilter(WriteGBCDTriangleDataFilter&&) noexcept = delete; - ExportGBCDTriangleDataFilter& operator=(const ExportGBCDTriangleDataFilter&) = delete; - ExportGBCDTriangleDataFilter& operator=(ExportGBCDTriangleDataFilter&&) noexcept = delete; + WriteGBCDTriangleDataFilter& operator=(const WriteGBCDTriangleDataFilter&) = delete; + WriteGBCDTriangleDataFilter& operator=(WriteGBCDTriangleDataFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; @@ -96,5 +96,5 @@ class ORIENTATIONANALYSIS_EXPORT ExportGBCDTriangleDataFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, ExportGBCDTriangleDataFilter, "6e0da3a1-dc42-4b01-80aa-3af9e8209ee3"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteGBCDTriangleDataFilter, "6e0da3a1-dc42-4b01-80aa-3af9e8209ee3"); /* LEGACY UUID FOR THIS FILTER 433976f0-710a-5dcc-938e-fcde49cd842f */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/INLWriterFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp similarity index 83% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/INLWriterFilter.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp index 9fe2a70b47..798fd353d3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/INLWriterFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp @@ -1,6 +1,6 @@ -#include "INLWriterFilter.hpp" +#include "WriteINLFileFilter.hpp" -#include "OrientationAnalysis/Filters/Algorithms/INLWriter.hpp" +#include "OrientationAnalysis/Filters/Algorithms/WriteINLFile.hpp" #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/EmptyAction.hpp" @@ -17,37 +17,37 @@ using namespace complex; namespace complex { //------------------------------------------------------------------------------ -std::string INLWriterFilter::name() const +std::string WriteINLFileFilter::name() const { - return FilterTraits::name.str(); + return FilterTraits::name.str(); } //------------------------------------------------------------------------------ -std::string INLWriterFilter::className() const +std::string WriteINLFileFilter::className() const { - return FilterTraits::className; + return FilterTraits::className; } //------------------------------------------------------------------------------ -Uuid INLWriterFilter::uuid() const +Uuid WriteINLFileFilter::uuid() const { - return FilterTraits::uuid; + return FilterTraits::uuid; } //------------------------------------------------------------------------------ -std::string INLWriterFilter::humanName() const +std::string WriteINLFileFilter::humanName() const { - return "Export INL File"; + return "Write INL File"; } //------------------------------------------------------------------------------ -std::vector INLWriterFilter::defaultTags() const +std::vector WriteINLFileFilter::defaultTags() const { return {className(), "IO", "Output", "Write", "Export"}; } //------------------------------------------------------------------------------ -Parameters INLWriterFilter::parameters() const +Parameters WriteINLFileFilter::parameters() const { Parameters params; @@ -79,13 +79,13 @@ Parameters INLWriterFilter::parameters() const } //------------------------------------------------------------------------------ -IFilter::UniquePointer INLWriterFilter::clone() const +IFilter::UniquePointer WriteINLFileFilter::clone() const { - return std::make_unique(); + return std::make_unique(); } //------------------------------------------------------------------------------ -IFilter::PreflightResult INLWriterFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, +IFilter::PreflightResult WriteINLFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { auto pMaterialNameArrayPathValue = filterArgs.value(k_MaterialNameArrayPath_Key); @@ -105,10 +105,10 @@ IFilter::PreflightResult INLWriterFilter::preflightImpl(const DataStructure& dat } //------------------------------------------------------------------------------ -Result<> INLWriterFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, +Result<> WriteINLFileFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - INLWriterInputValues inputValues; + WriteINLFileInputValues inputValues; inputValues.OutputFile = filterArgs.value(k_OutputFile_Key); inputValues.ImageGeomPath = filterArgs.value(k_ImageGeomPath_Key); @@ -119,6 +119,6 @@ Result<> INLWriterFilter::executeImpl(DataStructure& dataStructure, const Argume inputValues.MaterialNameArrayPath = filterArgs.value(k_MaterialNameArrayPath_Key); inputValues.NumFeaturesArrayPath = filterArgs.value(k_NumFeaturesArrayPath_Key); - return INLWriter(dataStructure, messageHandler, shouldCancel, &inputValues)(); + return WriteINLFile(dataStructure, messageHandler, shouldCancel, &inputValues)(); } } // namespace complex diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/INLWriterFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp similarity index 86% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/INLWriterFilter.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp index 49d006c7ab..36cd6b651b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/INLWriterFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.hpp @@ -8,20 +8,20 @@ namespace complex { /** - * @class INLWriterFilter + * @class WriteINLFileFilter * @brief This filter will .... */ -class ORIENTATIONANALYSIS_EXPORT INLWriterFilter : public IFilter +class ORIENTATIONANALYSIS_EXPORT WriteINLFileFilter : public IFilter { public: - INLWriterFilter() = default; - ~INLWriterFilter() noexcept override = default; + WriteINLFileFilter() = default; + ~WriteINLFileFilter() noexcept override = default; - INLWriterFilter(const INLWriterFilter&) = delete; - INLWriterFilter(INLWriterFilter&&) noexcept = delete; + WriteINLFileFilter(const WriteINLFileFilter&) = delete; + WriteINLFileFilter(WriteINLFileFilter&&) noexcept = delete; - INLWriterFilter& operator=(const INLWriterFilter&) = delete; - INLWriterFilter& operator=(INLWriterFilter&&) noexcept = delete; + WriteINLFileFilter& operator=(const WriteINLFileFilter&) = delete; + WriteINLFileFilter& operator=(WriteINLFileFilter&&) noexcept = delete; // Parameter Keys static inline constexpr StringLiteral k_OutputFile_Key = "output_file"; @@ -99,5 +99,5 @@ class ORIENTATIONANALYSIS_EXPORT INLWriterFilter : public IFilter }; } // namespace complex -COMPLEX_DEF_FILTER_TRAITS(complex, INLWriterFilter, "a5a37eb3-c143-4b38-a89b-e0641a20dc7e"); +COMPLEX_DEF_FILTER_TRAITS(complex, WriteINLFileFilter, "a5a37eb3-c143-4b38-a89b-e0641a20dc7e"); /* LEGACY UUID FOR THIS FILTER 27c724cc-8b69-5ebe-b90e-29d33858a032 */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp index f735755328..f09b473195 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp @@ -68,7 +68,7 @@ Uuid WritePoleFigureFilter::uuid() const //------------------------------------------------------------------------------ std::string WritePoleFigureFilter::humanName() const { - return "Generate Pole Figure Images"; + return "Generate and Write Pole Figure Images"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp index bec2a8a675..106641c557 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.cpp @@ -38,7 +38,7 @@ Uuid WriteStatsGenOdfAngleFileFilter::uuid() const //------------------------------------------------------------------------------ std::string WriteStatsGenOdfAngleFileFilter::humanName() const { - return "Export StatsGenerator ODF Angle File"; + return "Write StatsGenerator ODF Angle File"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisLegacyUUIDMapping.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisLegacyUUIDMapping.hpp index 0ac13383e6..d302ea5b10 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisLegacyUUIDMapping.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisLegacyUUIDMapping.hpp @@ -18,9 +18,9 @@ // #include "OrientationAnalysis/Filters/FindTwinBoundarySchmidFactors.hpp" // #include "OrientationAnalysis/Filters/GenerateOrientationMatrixTranspose.hpp" // #include "OrientationAnalysis/Filters/ImportEbsdMontage.hpp" -// #include "OrientationAnalysis/Filters/ImportH5EspritData.hpp" -// #include "OrientationAnalysis/Filters/ImportH5OimData.hpp" -// #include "OrientationAnalysis/Filters/INLWriter.hpp" +// #include "OrientationAnalysis/Filters/ReadH5EspritData.hpp" +// #include "OrientationAnalysis/Filters/ReadH5OimData.hpp" +// #include "OrientationAnalysis/Filters/WriteINLFile.hpp" // #include "OrientationAnalysis/Filters/OrientationUtility.hpp" // #include "OrientationAnalysis/Filters/ReplaceElementAttributesWithNeighborValues.hpp" // #include "OrientationAnalysis/Filters/Stereographic3D.hpp" @@ -34,9 +34,9 @@ #include "OrientationAnalysis/Filters/ConvertQuaternionFilter.hpp" #include "OrientationAnalysis/Filters/CreateEnsembleInfoFilter.hpp" #include "OrientationAnalysis/Filters/EBSDSegmentFeaturesFilter.hpp" -#include "OrientationAnalysis/Filters/EnsembleInfoReaderFilter.hpp" -#include "OrientationAnalysis/Filters/ExportGBCDGMTFileFilter.hpp" -#include "OrientationAnalysis/Filters/ExportGBCDTriangleDataFilter.hpp" +#include "OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp" +#include "OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp" +#include "OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp" #include "OrientationAnalysis/Filters/FindAvgCAxesFilter.hpp" #include "OrientationAnalysis/Filters/FindAvgOrientationsFilter.hpp" #include "OrientationAnalysis/Filters/FindFeatureReferenceCAxisMisorientationsFilter.hpp" @@ -52,8 +52,8 @@ #include "OrientationAnalysis/Filters/GenerateGBCDPoleFigureFilter.hpp" #include "OrientationAnalysis/Filters/GenerateIPFColorsFilter.hpp" #include "OrientationAnalysis/Filters/GenerateQuaternionConjugateFilter.hpp" -#include "OrientationAnalysis/Filters/ImportH5EspritDataFilter.hpp" -#include "OrientationAnalysis/Filters/ImportH5OimDataFilter.hpp" +#include "OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp" +#include "OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp" #include "OrientationAnalysis/Filters/MergeTwinsFilter.hpp" #include "OrientationAnalysis/Filters/NeighborOrientationCorrelationFilter.hpp" #include "OrientationAnalysis/Filters/ReadAngDataFilter.hpp" @@ -68,7 +68,7 @@ #include "OrientationAnalysis/Filters/FindGBPDMetricBasedFilter.hpp" #include "OrientationAnalysis/Filters/FindSlipTransmissionMetricsFilter.hpp" #include "OrientationAnalysis/Filters/WriteStatsGenOdfAngleFileFilter.hpp" -#include "OrientationAnalysis/Filters/INLWriterFilter.hpp" +#include "OrientationAnalysis/Filters/WriteINLFileFilter.hpp" // @@__HEADER__TOKEN__DO__NOT__DELETE__@@ #include @@ -83,11 +83,11 @@ namespace complex {complex::Uuid::FromString("1a0848da-2edd-52c0-b111-62a4dc6d2886").value(), complex::FilterTraits::uuid}, // FindFeatureReferenceCAxisMisorientations {complex::Uuid::FromString("286dd493-4fea-54f4-b59e-459dd13bbe57").value(), complex::FilterTraits::uuid}, // FindMisorientations {complex::Uuid::FromString("2a0bfcd3-2517-5117-b164-964dfac8fe22").value(), complex::FilterTraits::uuid}, // CreateEnsembleInfoFilter - {complex::Uuid::FromString("33a37a47-d002-5c18-b270-86025881fe1e").value(), complex::FilterTraits::uuid}, // EnsembleInfoReader + {complex::Uuid::FromString("33a37a47-d002-5c18-b270-86025881fe1e").value(), complex::FilterTraits::uuid}, // ReadEnsembleInfo {complex::Uuid::FromString("3b0ababf-9c8d-538d-96af-e40775c4f0ab").value(), complex::FilterTraits::uuid}, // FindShapes - {complex::Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value(), complex::FilterTraits::uuid}, // ImportH5OimData + {complex::Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value(), complex::FilterTraits::uuid}, // ReadH5OimData {complex::Uuid::FromString("428e1f5b-e6d8-5e8b-ad68-56ff14ee0e8c").value(), complex::FilterTraits::uuid}, // FindFeatureReferenceMisorientations - {complex::Uuid::FromString("433976f0-710a-5dcc-938e-fcde49cd842f").value(), complex::FilterTraits::uuid}, // ExportGBCDTriangleDataFilter + {complex::Uuid::FromString("433976f0-710a-5dcc-938e-fcde49cd842f").value(), complex::FilterTraits::uuid}, // WriteGBCDTriangleDataFilter {complex::Uuid::FromString("439e31b7-3198-5d0d-aef6-65a9e9c1a016").value(), complex::FilterTraits::uuid}, // ConvertQuaternion {complex::Uuid::FromString("4ef7f56b-616e-5a80-9e68-1da8f35ad235").value(), complex::FilterTraits::uuid}, // ReadH5Ebsd {complex::Uuid::FromString("4fb2b9de-3124-534b-b914-dbbbdbc14604").value(), complex::FilterTraits::uuid}, // AlignSectionsMisorientation @@ -99,7 +99,7 @@ namespace complex {complex::Uuid::FromString("7cd30864-7bcf-5c10-aea7-d107373e2d40").value(), complex::FilterTraits::uuid}, // GenerateFaceMisorientationColoring {complex::Uuid::FromString("85900eba-3da9-5985-ac71-1d9d290a5d31").value(), complex::FilterTraits::uuid}, // VisualizeGBCDPoleFigureFilter {complex::Uuid::FromString("88d332c1-cf6c-52d3-a38d-22f6eae19fa6").value(), complex::FilterTraits::uuid}, // FindKernelAvgMisorientations - {complex::Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value(), complex::FilterTraits::uuid}, // ImportH5EspritData + {complex::Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value(), complex::FilterTraits::uuid}, // ReadH5EspritData {complex::Uuid::FromString("9a6677a6-b9e5-5fee-afa2-27e868cab8ca").value(), complex::FilterTraits::uuid}, // GenerateFZQuaternions {complex::Uuid::FromString("a10bb78e-fcff-553d-97d6-830a43c85385").value(), complex::FilterTraits::uuid}, // WritePoleFigure {complex::Uuid::FromString("a2b62395-1a7d-5058-a840-752d8f8e2430").value(), complex::FilterTraits::uuid}, // RodriguesConvertor @@ -114,19 +114,19 @@ namespace complex {complex::Uuid::FromString("e67ca06a-176f-58fc-a676-d6ee5553511a").value(), complex::FilterTraits::uuid}, // FindSchmids {complex::Uuid::FromString("ef9420b2-8c46-55f3-8ae4-f53790639de4").value(), complex::FilterTraits::uuid}, // RotateEulerRefFrame {complex::Uuid::FromString("f4a7c2df-e9b0-5da9-b745-a862666d6c99").value(), complex::FilterTraits::uuid}, // BadDataNeighborOrientationCheck - {complex::Uuid::FromString("f62065b4-54e9-53b1-bed7-2178a57d3c7a").value(), complex::FilterTraits::uuid}, // ExportGBCDGMTFileFilter + {complex::Uuid::FromString("f62065b4-54e9-53b1-bed7-2178a57d3c7a").value(), complex::FilterTraits::uuid}, // WriteGBCDGMTFileFilter {complex::Uuid::FromString("00d20627-5b88-56ba-ac7a-fc2a4b337903").value(), complex::FilterTraits::uuid}, // FindGBPDMetricBased // {complex::Uuid::FromString("17410178-4e5f-58b9-900e-8194c69200ab").value(), complex::FilterTraits::uuid}, // ReplaceElementAttributesWithNeighborValues // {complex::Uuid::FromString("179b0c7a-4e62-5070-ba49-ae58d5ccbfe8").value(), complex::FilterTraits::uuid}, // ImportEbsdMontage // {complex::Uuid::FromString("1a0848da-2edd-52c0-b111-62a4dc6d2886").value(), complex::FilterTraits::uuid}, // FindFeatureReferenceCAxisMisorientations - // {complex::Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value(), complex::FilterTraits::uuid}, // INLWriter + // {complex::Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value(), complex::FilterTraits::uuid}, // WriteINLFile // {complex::Uuid::FromString("3630623e-724b-5154-a060-a5fca4ecfff5").value(), complex::FilterTraits::uuid}, // Stereographic3D - // {complex::Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value(), complex::FilterTraits::uuid}, // ImportH5OimData + // {complex::Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value(), complex::FilterTraits::uuid}, // ReadH5OimData // {complex::Uuid::FromString("5af9c1e6-ed6f-5672-9ae0-2b931344d729").value(), complex::FilterTraits::uuid}, // OrientationUtility {complex::Uuid::FromString("68ae7b7e-b9f7-5799-9f82-ce21d0ccd55e").value(), complex::FilterTraits::uuid}, // FindCAxisLocations // {complex::Uuid::FromString("6e332fca-0475-5fec-821e-e01f668ec1d3").value(), complex::FilterTraits::uuid}, // EbsdToH5Ebsd {complex::Uuid::FromString("8071facb-8905-5699-b345-105ae4ac33ff").value(), complex::FilterTraits::uuid}, // FindBoundaryStrengths - // {complex::Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value(), complex::FilterTraits::uuid}, // ImportH5EspritData + // {complex::Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value(), complex::FilterTraits::uuid}, // ReadH5EspritData // {complex::Uuid::FromString("94f986fc-1295-5e32-9808-752855fa658a").value(), complex::FilterTraits::uuid}, // FindDistsToCharactGBs {complex::Uuid::FromString("97523038-5fb2-5e82-9177-ed3e8b24b4bd").value(), complex::FilterTraits::uuid}, // FindSlipTransmissionMetrics // {complex::Uuid::FromString("a10124f3-05d0-5f49-93a0-e93926f5b48b").value(), complex::FilterTraits::uuid}, // FindTwinBoundaries @@ -142,7 +142,7 @@ namespace complex // {complex::Uuid::FromString("ec58f4fe-8e51-527e-9536-8b6f185684be").value(), complex::FilterTraits::uuid}, // GenerateOrientationMatrixTranspose {complex::Uuid::FromString("d67e9f28-2fe5-5188-b0f8-323a7e603de6").value(), complex::FilterTraits::uuid}, // FindGBCDMetricBased {complex::Uuid::FromString("a4952f40-22dd-54ec-8c38-69c3fcd0e6f7").value(), complex::FilterTraits::uuid}, // WriteStatsGenOdfAngleFile - {complex::Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value(), complex::FilterTraits::uuid}, // INLWriter + {complex::Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value(), complex::FilterTraits::uuid}, // WriteINLFile // @@__MAP__UPDATE__TOKEN__DO__NOT__DELETE__@@ }; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.cpp index 1e7331bb09..bf5e78d4b5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/OrientationAnalysisPlugin.cpp @@ -18,7 +18,7 @@ std::map k_SimplToComplexFilterMapping = { {Uuid::FromString("{c4398303-db7d-506e-81ea-08f253895ccb}").value(), Uuid::FromString("c4398303-db7d-506e-81ea-08f253895ccb").value()}, /* CreateLambertSphere */ {Uuid::FromString("{b78d8825-d3ac-5351-be20-172f07fd2aec}").value(), Uuid::FromString("b78d8825-d3ac-5351-be20-172f07fd2aec").value()}, /* EMsoftSO3Sampler */ {Uuid::FromString("{6e332fca-0475-5fec-821e-e01f668ec1d3}").value(), Uuid::FromString("6e332fca-0475-5fec-821e-e01f668ec1d3").value()}, /* EbsdToH5Ebsd */ - {Uuid::FromString("{33a37a47-d002-5c18-b270-86025881fe1e}").value(), Uuid::FromString("33a37a47-d002-5c18-b270-86025881fe1e").value()}, /* EnsembleInfoReader */ + {Uuid::FromString("{33a37a47-d002-5c18-b270-86025881fe1e}").value(), Uuid::FromString("33a37a47-d002-5c18-b270-86025881fe1e").value()}, /* ReadEnsembleInfo */ {Uuid::FromString("{c5a9a96c-7570-5279-b383-cc25ebae0046}").value(), Uuid::FromString("c5a9a96c-7570-5279-b383-cc25ebae0046").value()}, /* FindAvgCAxes */ {Uuid::FromString("{bf7036d8-25bd-540e-b6de-3a5ab0e42c5f}").value(), Uuid::FromString("bf7036d8-25bd-540e-b6de-3a5ab0e42c5f").value()}, /* FindAvgOrientations */ {Uuid::FromString("{8071facb-8905-5699-b345-105ae4ac33ff}").value(), Uuid::FromString("8071facb-8905-5699-b345-105ae4ac33ff").value()}, /* FindBoundaryStrengths */ @@ -42,10 +42,10 @@ std::map k_SimplToComplexFilterMapping = { {Uuid::FromString("{a50e6532-8075-5de5-ab63-945feb0de7f7}").value(), Uuid::FromString("a50e6532-8075-5de5-ab63-945feb0de7f7").value()}, /* GenerateIPFColors */ {Uuid::FromString("{ec58f4fe-8e51-527e-9536-8b6f185684be}").value(), Uuid::FromString("ec58f4fe-8e51-527e-9536-8b6f185684be").value()}, /* GenerateOrientationMatrixTranspose */ {Uuid::FromString("{630d7486-75ea-5e04-874c-894460cd7c4d}").value(), Uuid::FromString("630d7486-75ea-5e04-874c-894460cd7c4d").value()}, /* GenerateQuaternionConjugate */ - {Uuid::FromString("{27c724cc-8b69-5ebe-b90e-29d33858a032}").value(), Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value()}, /* INLWriter */ + {Uuid::FromString("{27c724cc-8b69-5ebe-b90e-29d33858a032}").value(), Uuid::FromString("27c724cc-8b69-5ebe-b90e-29d33858a032").value()}, /* WriteINLFile */ {Uuid::FromString("{179b0c7a-4e62-5070-ba49-ae58d5ccbfe8}").value(), Uuid::FromString("179b0c7a-4e62-5070-ba49-ae58d5ccbfe8").value()}, /* ImportEbsdMontage */ - {Uuid::FromString("{8abdea7d-f715-5a24-8165-7f946bbc2fe9}").value(), Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value()}, /* ImportH5EspritData */ - {Uuid::FromString("{3ff4701b-3a0c-52e3-910a-fa927aa6584c}").value(), Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value()}, /* ImportH5OimData */ + {Uuid::FromString("{8abdea7d-f715-5a24-8165-7f946bbc2fe9}").value(), Uuid::FromString("8abdea7d-f715-5a24-8165-7f946bbc2fe9").value()}, /* ReadH5EspritData */ + {Uuid::FromString("{3ff4701b-3a0c-52e3-910a-fa927aa6584c}").value(), Uuid::FromString("3ff4701b-3a0c-52e3-910a-fa927aa6584c").value()}, /* ReadH5OimData */ {Uuid::FromString("{6427cd5e-0ad2-5a24-8847-29f8e0720f4f}").value(), Uuid::FromString("6427cd5e-0ad2-5a24-8847-29f8e0720f4f").value()}, /* NeighborOrientationCorrelation */ {Uuid::FromString("{5af9c1e6-ed6f-5672-9ae0-2b931344d729}").value(), Uuid::FromString("5af9c1e6-ed6f-5672-9ae0-2b931344d729").value()}, /* OrientationUtility */ {Uuid::FromString("{b8e128a8-c2a3-5e6c-a7ad-e4fb864e5d40}").value(), Uuid::FromString("b8e128a8-c2a3-5e6c-a7ad-e4fb864e5d40").value()}, /* ReadAngData */ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ImportH5Data.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp similarity index 87% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ImportH5Data.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp index 2f2d86b655..807044c293 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ImportH5Data.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp @@ -13,7 +13,7 @@ namespace complex { -struct ORIENTATIONANALYSIS_EXPORT ImportH5DataInputValues +struct ORIENTATIONANALYSIS_EXPORT ReadH5DataInputValues { OEMEbsdScanSelectionParameter::ValueType SelectedScanNames; bool ReadPatternData; @@ -25,14 +25,14 @@ struct ORIENTATIONANALYSIS_EXPORT ImportH5DataInputValues }; /** - * @class ImportH5Data + * @class ReadH5Data */ template -class ORIENTATIONANALYSIS_EXPORT ImportH5Data +class ORIENTATIONANALYSIS_EXPORT ReadH5Data { public: - ImportH5Data(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ImportH5DataInputValues* inputValues) + ReadH5Data(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues) : m_DataStructure(dataStructure) , m_ShouldCancel(shouldCancel) , m_MessageHandler(mesgHandler) @@ -42,12 +42,12 @@ class ORIENTATIONANALYSIS_EXPORT ImportH5Data m_Reader->setFileName(inputValues->SelectedScanNames.inputFilePath.string()); } - virtual ~ImportH5Data() noexcept = default; + virtual ~ReadH5Data() noexcept = default; - ImportH5Data(const ImportH5Data&) = delete; - ImportH5Data(ImportH5Data&&) noexcept = delete; - ImportH5Data& operator=(const ImportH5Data&) = delete; - ImportH5Data& operator=(ImportH5Data&&) noexcept = delete; + ReadH5Data(const ReadH5Data&) = delete; + ReadH5Data(ReadH5Data&&) noexcept = delete; + ReadH5Data& operator=(const ReadH5Data&) = delete; + ReadH5Data& operator=(ReadH5Data&&) noexcept = delete; Result<> execute() { @@ -137,7 +137,7 @@ class ORIENTATIONANALYSIS_EXPORT ImportH5Data DataStructure& m_DataStructure; const std::atomic_bool& m_ShouldCancel; const IFilter::MessageHandler& m_MessageHandler; - const ImportH5DataInputValues* m_InputValues; + const ReadH5DataInputValues* m_InputValues; }; } // namespace complex diff --git a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt index b9ea548532..a6d791d4f3 100644 --- a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt @@ -16,9 +16,9 @@ set(${PLUGIN_NAME}UnitTest_SRCS CreateEnsembleInfoTest.cpp EBSDSegmentFeaturesFilterTest.cpp EbsdToH5EbsdTest.cpp - EnsembleInfoReaderTest.cpp - ExportGBCDGMTFileTest.cpp - ExportGBCDTriangleDataTest.cpp + ReadEnsembleInfoTest.cpp + WriteGBCDGMTFileTest.cpp + WriteGBCDTriangleDataTest.cpp FindAvgCAxesTest.cpp FindAvgOrientationsTest.cpp FindBoundaryStrengthsTest.cpp @@ -41,9 +41,9 @@ set(${PLUGIN_NAME}UnitTest_SRCS GenerateGBCDPoleFigureTest.cpp GenerateIPFColorsTest.cpp GenerateQuaternionConjugateTest.cpp - ImportH5EspritDataTest.cpp - ImportH5OimDataTest.cpp - INLWriterTest.cpp + ReadH5EspritDataTest.cpp + ReadH5OimDataTest.cpp + WriteINLFileTest.cpp MergeTwinsTest.cpp NeighborOrientationCorrelationTest.cpp ReadAngDataTest.cpp @@ -62,7 +62,7 @@ set(DISABLED_TESTS FindTwinBoundariesTest.cpp FindTwinBoundarySchmidFactorsTest.cpp GenerateOrientationMatrixTransposeTest.cpp - INLWriterTest.cpp + WriteINLFileTest.cpp # ImportEbsdMontageTest.cpp # MISSING 1 or more Parameter Implementations ReplaceElementAttributesWithNeighborValuesTest.cpp diff --git a/src/Plugins/OrientationAnalysis/test/EnsembleInfoReaderTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp similarity index 69% rename from src/Plugins/OrientationAnalysis/test/EnsembleInfoReaderTest.cpp rename to src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp index 51a15c818b..8c2d8130c2 100644 --- a/src/Plugins/OrientationAnalysis/test/EnsembleInfoReaderTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadEnsembleInfoTest.cpp @@ -8,7 +8,7 @@ #include namespace fs = std::filesystem; -#include "OrientationAnalysis/Filters/EnsembleInfoReaderFilter.hpp" +#include "OrientationAnalysis/Filters/ReadEnsembleInfoFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" using namespace complex; @@ -30,19 +30,19 @@ void WriteTestFile(const std::string& filePath, const std::string& groups) } } // namespace -TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: Valid Filter Execution", "[OrientationAnalysis][EnsembleInfoReaderFilter]") +TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: Valid Filter Execution", "[OrientationAnalysis][ReadEnsembleInfoFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); // Instantiate the filter, a DataStructure object and an Arguments Object - EnsembleInfoReaderFilter filter; + ReadEnsembleInfoFilter filter; DataStructure ds; DataGroup* topLevelGroup = DataGroup::Create(ds, Constants::k_DataContainer); Arguments args; - args.insertOrAssign(EnsembleInfoReaderFilter::k_DataContainerName_Key, std::make_any(DataPath({Constants::k_DataContainer}))); - args.insertOrAssign(EnsembleInfoReaderFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); - args.insertOrAssign(EnsembleInfoReaderFilter::k_CrystalStructuresArrayName_Key, std::make_any(Constants::k_CrystalStructures)); - args.insertOrAssign(EnsembleInfoReaderFilter::k_PhaseTypesArrayName_Key, std::make_any(Constants::k_Phases)); + args.insertOrAssign(ReadEnsembleInfoFilter::k_DataContainerName_Key, std::make_any(DataPath({Constants::k_DataContainer}))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); + args.insertOrAssign(ReadEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any(Constants::k_CrystalStructures)); + args.insertOrAssign(ReadEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any(Constants::k_Phases)); std::string groups = "[EnsembleInfo]\nNumber_Phases = 2\n\n\ [1]\nCrystalStructure = Cubic_High\nPhaseType = PrimaryPhase\n\n\ @@ -51,12 +51,12 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: Valid Filter Execution SECTION("txt extension") { WriteTestFile(k_TestFileTxt, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileTxt))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileTxt))); } SECTION("ini extension") { WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); } // Preflight the filter and check result @@ -82,19 +82,19 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: Valid Filter Execution REQUIRE((*phaseTypes)[2] == 3); } -TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Execution") +TEST_CASE("OrientationAnalysis::ReadEnsembleInfoFilter: InValid Filter Execution") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); // Instantiate the filter, a DataStructure object and an Arguments Object - EnsembleInfoReaderFilter filter; + ReadEnsembleInfoFilter filter; DataStructure ds; DataGroup* topLevelGroup = DataGroup::Create(ds, Constants::k_DataContainer); Arguments args; - args.insertOrAssign(EnsembleInfoReaderFilter::k_DataContainerName_Key, std::make_any(DataPath({Constants::k_DataContainer}))); - args.insertOrAssign(EnsembleInfoReaderFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); - args.insertOrAssign(EnsembleInfoReaderFilter::k_CrystalStructuresArrayName_Key, std::make_any(Constants::k_CrystalStructures)); - args.insertOrAssign(EnsembleInfoReaderFilter::k_PhaseTypesArrayName_Key, std::make_any(Constants::k_Phases)); + args.insertOrAssign(ReadEnsembleInfoFilter::k_DataContainerName_Key, std::make_any(DataPath({Constants::k_DataContainer}))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); + args.insertOrAssign(ReadEnsembleInfoFilter::k_CrystalStructuresArrayName_Key, std::make_any(Constants::k_CrystalStructures)); + args.insertOrAssign(ReadEnsembleInfoFilter::k_PhaseTypesArrayName_Key, std::make_any(Constants::k_Phases)); SECTION("doc extension") { @@ -102,7 +102,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi [1]\nCrystalStructure = Cubic_High\nPhaseType = PrimaryPhase\n\n\ [2]\nCrystalStructure = Hexagonal_High\nPhaseType = MatrixPhase\n"; // the correct groups and keys for writing the .ini file WriteTestFile(k_TestFileDoc, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileDoc))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileDoc))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -112,7 +112,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi { std::string groups = "[EnsembleInf]\nNumber_Phases = 2\n\n[1]\nCrystalStructure = Cubic_High\nPhaseType = PrimaryPhase\n\n[2]\nCrystalStructure = Hexagonal_High\nPhaseType = MatrixPhase\n"; WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -122,7 +122,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi { std::string groups = "[EnsembleInfo]\n\n[1]\nCrystalStructure = Cubic_High\nPhaseType = PrimaryPhase\n\n[2]\nCrystalStructure = Hexagonal_High\nPhaseType = MatrixPhase\n"; WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -132,7 +132,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi { std::string groups = "[EnsembleInfo]\nNumber_Phases = 0\n\n[1]\nCrystalStructure = Cubic_High\nPhaseType = PrimaryPhase\n\n[2]\nCrystalStructure = Hexagonal_High\nPhaseType = MatrixPhase\n"; WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -142,7 +142,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi { std::string groups = "[EnsembleInfo]\nNumber_Phases = 2\n\n[1]\nCrystalStructure = Cubic_High\n\n\n[2]\nCrystalStructure = Hexagonal_High\nPhaseType = MatrixPhase\n"; WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -152,7 +152,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi { std::string groups = "[EnsembleInfo]\nNumber_Phases = 2\n\n[1]\nCrystalStructure = Cubic_High\nPhaseType = PrimaryPhase\n\n[2]\n\nPhaseType = MatrixPhase\n"; WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -162,7 +162,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi { std::string groups = "[EnsembleInfo]\nNumber_Phases = 2\n\n[1]\nCrystalStructure = Cubic_High\nPhaseType = PrimaryPase\n\n[2]\nCrystalStructure = Hexagonal_High\nPhaseType = MatrixPhase\n"; WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -172,7 +172,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi { std::string groups = "[EnsembleInfo]\nNumber_Phases = 2\n\n[1]\nCrystalStructure = Cubc\nPhaseType = PrimaryPhase\n\n[2]\nCrystalStructure = Hexagonal_High\nPhaseType = MatrixPhase\n"; WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); @@ -182,7 +182,7 @@ TEST_CASE("OrientationAnalysis::EnsembleInfoReaderFilter: InValid Filter Executi { std::string groups = "[EnsembleInfo]\nNumber_Phases = 2\n\n[1]\nCrystalStructure = Cubic_High\nPhaseType = PrimaryPhase\n\n[3]\nCrystalStructure = Hexagonal_High\nPhaseType = MatrixPhase\n"; WriteTestFile(k_TestFileIni, groups); - args.insertOrAssign(EnsembleInfoReaderFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); + args.insertOrAssign(ReadEnsembleInfoFilter::k_InputFile_Key, std::make_any(fs::path(k_TestFileIni))); // Preflight the filter and check result auto preflightResult = filter.preflight(ds, args); diff --git a/src/Plugins/OrientationAnalysis/test/ImportH5EspritDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp similarity index 62% rename from src/Plugins/OrientationAnalysis/test/ImportH5EspritDataTest.cpp rename to src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp index 0b52df3180..e36a8203df 100644 --- a/src/Plugins/OrientationAnalysis/test/ImportH5EspritDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5EspritDataTest.cpp @@ -6,7 +6,7 @@ #include "complex/Parameters/VectorParameter.hpp" #include "complex/UnitTest/UnitTestCommon.hpp" -#include "OrientationAnalysis/Filters/ImportH5EspritDataFilter.hpp" +#include "OrientationAnalysis/Filters/ReadH5EspritDataFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h" @@ -23,7 +23,7 @@ namespace const std::string k_ScanName = "Section_435"; } -TEST_CASE("OrientationAnalysis::ImportH5EspritDataFilter: Valid Filter Execution", "[OrientationAnalysis][ImportH5EspritDataFilter]") +TEST_CASE("OrientationAnalysis::ReadH5EspritDataFilter: Valid Filter Execution", "[OrientationAnalysis][ReadH5EspritDataFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -34,7 +34,7 @@ TEST_CASE("OrientationAnalysis::ImportH5EspritDataFilter: Valid Filter Execution DataStructure exemplarDataStructure = UnitTest::LoadDataStructure(exemplarFilePath); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportH5EspritDataFilter filter; + ReadH5EspritDataFilter filter; DataStructure dataStructure; Arguments args; @@ -42,14 +42,14 @@ TEST_CASE("OrientationAnalysis::ImportH5EspritDataFilter: Valid Filter Execution OEMEbsdScanSelectionParameter::ValueType scanSelections = {h5TestFile, EbsdLib::RefFrameZDir::LowtoHigh, {k_ScanName}}; // Create default Parameters for the filter. - args.insertOrAssign(ImportH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); - args.insertOrAssign(ImportH5EspritDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); - args.insertOrAssign(ImportH5EspritDataFilter::k_DegreesToRadians_Key, std::make_any(true)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); - args.insertOrAssign(ImportH5EspritDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); - args.insertOrAssign(ImportH5EspritDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); + args.insertOrAssign(ReadH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); + args.insertOrAssign(ReadH5EspritDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); + args.insertOrAssign(ReadH5EspritDataFilter::k_DegreesToRadians_Key, std::make_any(true)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5EspritDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); + args.insertOrAssign(ReadH5EspritDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -81,51 +81,51 @@ TEST_CASE("OrientationAnalysis::ImportH5EspritDataFilter: Valid Filter Execution UnitTest::CompareStringArrays(materialNameExemplar, materialName); } -TEST_CASE("OrientationAnalysis::ImportH5EspritDataFilter: InValid Filter Execution", "[OrientationAnalysis][ImportH5EspritDataFilter]") +TEST_CASE("OrientationAnalysis::ReadH5EspritDataFilter: InValid Filter Execution", "[OrientationAnalysis][ReadH5EspritDataFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportH5EspritDataFilter filter; + ReadH5EspritDataFilter filter; DataStructure dataStructure; Arguments args; - args.insertOrAssign(ImportH5EspritDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); - args.insertOrAssign(ImportH5EspritDataFilter::k_DegreesToRadians_Key, std::make_any(true)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); - args.insertOrAssign(ImportH5EspritDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); - args.insertOrAssign(ImportH5EspritDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); + args.insertOrAssign(ReadH5EspritDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); + args.insertOrAssign(ReadH5EspritDataFilter::k_DegreesToRadians_Key, std::make_any(true)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5EspritDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); + args.insertOrAssign(ReadH5EspritDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); auto h5TestFile = fs::path(fmt::format("{}/6_6_ImportH5Data/H5EspritReaderTest.h5", unit_test::k_TestFilesDir)); OEMEbsdScanSelectionParameter::ValueType scanSelections = {h5TestFile, EbsdLib::RefFrameZDir::LowtoHigh, {k_ScanName}}; SECTION("Invalid Z Spacing") { - args.insertOrAssign(ImportH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ZSpacing_Key, std::make_any(0.0f)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); + args.insertOrAssign(ReadH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ZSpacing_Key, std::make_any(0.0f)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); } SECTION("No Scan Names Selected") { scanSelections.scanNames.clear(); - args.insertOrAssign(ImportH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); + args.insertOrAssign(ReadH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); } SECTION("Invalid h5 file type (incompatible manufacturer)") { h5TestFile = fs::path(fmt::format("{}/6_6_ImportH5Data/EdaxOIMData.h5", unit_test::k_TestFilesDir)); scanSelections.inputFilePath = h5TestFile; - args.insertOrAssign(ImportH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); + args.insertOrAssign(ReadH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(false)); } SECTION("Pattern data doesn't exist error") { - args.insertOrAssign(ImportH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); - args.insertOrAssign(ImportH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(true)); + args.insertOrAssign(ReadH5EspritDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); + args.insertOrAssign(ReadH5EspritDataFilter::k_ReadPatternData_Key, std::make_any(true)); } // Preflight the filter and check result diff --git a/src/Plugins/OrientationAnalysis/test/ImportH5OimDataTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp similarity index 66% rename from src/Plugins/OrientationAnalysis/test/ImportH5OimDataTest.cpp rename to src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp index 4ecfea29ce..35efe75252 100644 --- a/src/Plugins/OrientationAnalysis/test/ImportH5OimDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5OimDataTest.cpp @@ -6,7 +6,7 @@ #include "complex/Parameters/VectorParameter.hpp" #include "complex/UnitTest/UnitTestCommon.hpp" -#include "OrientationAnalysis/Filters/ImportH5OimDataFilter.hpp" +#include "OrientationAnalysis/Filters/ReadH5OimDataFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysis/Parameters/OEMEbsdScanSelectionParameter.h" @@ -23,7 +23,7 @@ namespace const std::string k_ScanName = "Scan 1"; } -TEST_CASE("OrientationAnalysis::ImportH5OimDataFilter: Valid Filter Execution", "[OrientationAnalysis][ImportH5OimDataFilter]") +TEST_CASE("OrientationAnalysis::ReadH5OimDataFilter: Valid Filter Execution", "[OrientationAnalysis][ReadH5OimDataFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); @@ -34,7 +34,7 @@ TEST_CASE("OrientationAnalysis::ImportH5OimDataFilter: Valid Filter Execution", DataStructure exemplarDataStructure = UnitTest::LoadDataStructure(exemplarFilePath); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportH5OimDataFilter filter; + ReadH5OimDataFilter filter; DataStructure dataStructure; Arguments args; @@ -42,13 +42,13 @@ TEST_CASE("OrientationAnalysis::ImportH5OimDataFilter: Valid Filter Execution", OEMEbsdScanSelectionParameter::ValueType scanSelections = {h5TestFile, EbsdLib::RefFrameZDir::LowtoHigh, {k_ScanName}}; // Create default Parameters for the filter. - args.insertOrAssign(ImportH5OimDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5OimDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); - args.insertOrAssign(ImportH5OimDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); - args.insertOrAssign(ImportH5OimDataFilter::k_ReadPatternData_Key, std::make_any(true)); - args.insertOrAssign(ImportH5OimDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); - args.insertOrAssign(ImportH5OimDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); - args.insertOrAssign(ImportH5OimDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); + args.insertOrAssign(ReadH5OimDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5OimDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); + args.insertOrAssign(ReadH5OimDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); + args.insertOrAssign(ReadH5OimDataFilter::k_ReadPatternData_Key, std::make_any(true)); + args.insertOrAssign(ReadH5OimDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5OimDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); + args.insertOrAssign(ReadH5OimDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -80,44 +80,44 @@ TEST_CASE("OrientationAnalysis::ImportH5OimDataFilter: Valid Filter Execution", UnitTest::CompareStringArrays(materialNameExemplar, materialName); } -TEST_CASE("OrientationAnalysis::ImportH5OimDataFilter: InValid Filter Execution", "[OrientationAnalysis][ImportH5OimDataFilter]") +TEST_CASE("OrientationAnalysis::ReadH5OimDataFilter: InValid Filter Execution", "[OrientationAnalysis][ReadH5OimDataFilter]") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_ImportH5Data.tar.gz", "6_6_ImportH5Data"); // Instantiate the filter, a DataStructure object and an Arguments Object - ImportH5OimDataFilter filter; + ReadH5OimDataFilter filter; DataStructure dataStructure; Arguments args; - args.insertOrAssign(ImportH5OimDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); - args.insertOrAssign(ImportH5OimDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); - args.insertOrAssign(ImportH5OimDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); - args.insertOrAssign(ImportH5OimDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); + args.insertOrAssign(ReadH5OimDataFilter::k_Origin_Key, std::make_any(std::vector(3, 0.0f))); + args.insertOrAssign(ReadH5OimDataFilter::k_ImageGeometryName_Key, std::make_any(DataPath({ImageGeom::k_TypeName}))); + args.insertOrAssign(ReadH5OimDataFilter::k_CellAttributeMatrixName_Key, std::make_any(k_CellData)); + args.insertOrAssign(ReadH5OimDataFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(k_CellEnsembleData)); auto h5TestFile = fs::path(fmt::format("{}/6_6_ImportH5Data/EdaxOIMData.h5", unit_test::k_TestFilesDir)); OEMEbsdScanSelectionParameter::ValueType scanSelections = {h5TestFile, EbsdLib::RefFrameZDir::LowtoHigh, {k_ScanName}}; SECTION("Invalid Z Spacing") { - args.insertOrAssign(ImportH5OimDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5OimDataFilter::k_ZSpacing_Key, std::make_any(0.0f)); - args.insertOrAssign(ImportH5OimDataFilter::k_ReadPatternData_Key, std::make_any(false)); + args.insertOrAssign(ReadH5OimDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5OimDataFilter::k_ZSpacing_Key, std::make_any(0.0f)); + args.insertOrAssign(ReadH5OimDataFilter::k_ReadPatternData_Key, std::make_any(false)); } SECTION("No Scan Names Selected") { scanSelections.scanNames.clear(); - args.insertOrAssign(ImportH5OimDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5OimDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); - args.insertOrAssign(ImportH5OimDataFilter::k_ReadPatternData_Key, std::make_any(false)); + args.insertOrAssign(ReadH5OimDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5OimDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); + args.insertOrAssign(ReadH5OimDataFilter::k_ReadPatternData_Key, std::make_any(false)); } SECTION("Invalid h5 file type (incompatible manufacturer)") { h5TestFile = fs::path(fmt::format("{}/6_6_ImportH5Data/H5EspritReaderTest.h5", unit_test::k_TestFilesDir)); scanSelections.inputFilePath = h5TestFile; - args.insertOrAssign(ImportH5OimDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); - args.insertOrAssign(ImportH5OimDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); - args.insertOrAssign(ImportH5OimDataFilter::k_ReadPatternData_Key, std::make_any(false)); + args.insertOrAssign(ReadH5OimDataFilter::k_SelectedScanNames_Key, std::make_any(scanSelections)); + args.insertOrAssign(ReadH5OimDataFilter::k_ZSpacing_Key, std::make_any(1.0f)); + args.insertOrAssign(ReadH5OimDataFilter::k_ReadPatternData_Key, std::make_any(false)); } // Preflight the filter and check result diff --git a/src/Plugins/OrientationAnalysis/test/ExportGBCDGMTFileTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp similarity index 86% rename from src/Plugins/OrientationAnalysis/test/ExportGBCDGMTFileTest.cpp rename to src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp index 983d4de608..d75b1b190d 100644 --- a/src/Plugins/OrientationAnalysis/test/ExportGBCDGMTFileTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteGBCDGMTFileTest.cpp @@ -1,6 +1,6 @@ #include -#include "OrientationAnalysis/Filters/ExportGBCDGMTFileFilter.hpp" +#include "OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" @@ -39,7 +39,7 @@ inline constexpr StringLiteral k_GMT3("GMT3"); } // namespace -TEST_CASE("OrientationAnalysis::ExportGBCDGMTFileFilter", "[OrientationAnalysis][ExportGBCDGMTFile]") +TEST_CASE("OrientationAnalysis::WriteGBCDGMTFileFilter", "[OrientationAnalysis][WriteGBCDGMTFile]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); @@ -74,14 +74,14 @@ TEST_CASE("OrientationAnalysis::ExportGBCDGMTFileFilter", "[OrientationAnalysis] // Create Pole Figure auto outputFile = fs::path(fmt::format("{}/small_in100_sigma_3_1.dat", unit_test::k_BinaryTestOutputDir)); { - const ExportGBCDGMTFileFilter gmtFilter; + const WriteGBCDGMTFileFilter gmtFilter; Arguments args; - args.insertOrAssign(ExportGBCDGMTFileFilter::k_PhaseOfInterest_Key, std::make_any(1)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_MisorientationRotation_Key, std::make_any({60.0F, 1.0F, 1.0F, 1.0F})); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_OutputFile_Key, std::make_any(outputFile)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_GBCDArrayPath_Key, std::make_any(gbcdArrayPath)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_CrystalStructuresArrayPath_Key, std::make_any(crystalStructurePath)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_PhaseOfInterest_Key, std::make_any(1)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_MisorientationRotation_Key, std::make_any({60.0F, 1.0F, 1.0F, 1.0F})); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_OutputFile_Key, std::make_any(outputFile)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_GBCDArrayPath_Key, std::make_any(gbcdArrayPath)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_CrystalStructuresArrayPath_Key, std::make_any(crystalStructurePath)); // Preflight the filter and check result auto preflightResult = gmtFilter.preflight(dataStructure, args); @@ -160,14 +160,14 @@ TEST_CASE("OrientationAnalysis::ExportGBCDGMTFileFilter", "[OrientationAnalysis] auto outputFile = fs::path(fmt::format("{}/small_in100_sigma_9_1.dat", unit_test::k_BinaryTestOutputDir)); { - const ExportGBCDGMTFileFilter filter; + const WriteGBCDGMTFileFilter filter; Arguments args; - args.insertOrAssign(ExportGBCDGMTFileFilter::k_PhaseOfInterest_Key, std::make_any(1)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_MisorientationRotation_Key, std::make_any({39.0F, 1.0F, 1.0F, 0.0F})); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_OutputFile_Key, std::make_any(outputFile)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_GBCDArrayPath_Key, std::make_any(gbcdArrayPath)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_CrystalStructuresArrayPath_Key, std::make_any(crystalStructurePath)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_PhaseOfInterest_Key, std::make_any(1)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_MisorientationRotation_Key, std::make_any({39.0F, 1.0F, 1.0F, 0.0F})); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_OutputFile_Key, std::make_any(outputFile)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_GBCDArrayPath_Key, std::make_any(gbcdArrayPath)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_CrystalStructuresArrayPath_Key, std::make_any(crystalStructurePath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); @@ -246,14 +246,14 @@ TEST_CASE("OrientationAnalysis::ExportGBCDGMTFileFilter", "[OrientationAnalysis] auto outputFile = fs::path(fmt::format("{}/small_in100_sigma_11_1.dat", unit_test::k_BinaryTestOutputDir)); { - const ExportGBCDGMTFileFilter filter; + const WriteGBCDGMTFileFilter filter; Arguments args; - args.insertOrAssign(ExportGBCDGMTFileFilter::k_PhaseOfInterest_Key, std::make_any(1)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_MisorientationRotation_Key, std::make_any({50.5F, 1.0F, 1.0F, 0.0F})); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_OutputFile_Key, std::make_any(outputFile)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_GBCDArrayPath_Key, std::make_any(gbcdArrayPath)); - args.insertOrAssign(ExportGBCDGMTFileFilter::k_CrystalStructuresArrayPath_Key, std::make_any(crystalStructurePath)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_PhaseOfInterest_Key, std::make_any(1)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_MisorientationRotation_Key, std::make_any({50.5F, 1.0F, 1.0F, 0.0F})); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_OutputFile_Key, std::make_any(outputFile)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_GBCDArrayPath_Key, std::make_any(gbcdArrayPath)); + args.insertOrAssign(WriteGBCDGMTFileFilter::k_CrystalStructuresArrayPath_Key, std::make_any(crystalStructurePath)); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); diff --git a/src/Plugins/OrientationAnalysis/test/ExportGBCDTriangleDataTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp similarity index 84% rename from src/Plugins/OrientationAnalysis/test/ExportGBCDTriangleDataTest.cpp rename to src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp index 96599a3f53..9cc9b26f72 100644 --- a/src/Plugins/OrientationAnalysis/test/ExportGBCDTriangleDataTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteGBCDTriangleDataTest.cpp @@ -1,6 +1,6 @@ #include -#include "OrientationAnalysis/Filters/ExportGBCDTriangleDataFilter.hpp" +#include "OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "OrientationAnalysisTestUtils.hpp" @@ -41,7 +41,7 @@ inline constexpr float32 k_EPSILON = 0.001; } // namespace -TEST_CASE("OrientationAnalysis::ExportGBCDTriangleDataFilter: Valid filter execution") +TEST_CASE("OrientationAnalysis::WriteGBCDTriangleDataFilter: Valid filter execution") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); @@ -64,16 +64,16 @@ TEST_CASE("OrientationAnalysis::ExportGBCDTriangleDataFilter: Valid filter execu DataPath exemplarResultsGroupPath({k_ExemplarTriangleDumperResults}); DataPath generatedResultsGroupPath({k_NXTriangleDumperResults}); - // Run ExportGBCDTriangleData + // Run WriteGBCDTriangleData auto outputFile = fs::path(fmt::format("{}/small_in100_gbcd_triangles.ph", unit_test::k_BinaryTestOutputDir)); { - ExportGBCDTriangleDataFilter filter; + WriteGBCDTriangleDataFilter filter; Arguments args; - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_OutputFile_Key, std::make_any(outputFile)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceLabelsArrayPath_Key, std::make_any(faceLabels)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceNormalsArrayPath_Key, std::make_any(faceNormals)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceAreasArrayPath_Key, std::make_any(faceAreas)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_FeatureEulerAnglesArrayPath_Key, std::make_any(avgEulerAnglesPath)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_OutputFile_Key, std::make_any(outputFile)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceLabelsArrayPath_Key, std::make_any(faceLabels)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceNormalsArrayPath_Key, std::make_any(faceNormals)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceAreasArrayPath_Key, std::make_any(faceAreas)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_FeatureEulerAnglesArrayPath_Key, std::make_any(avgEulerAnglesPath)); auto preflightResult = filter.preflight(dataStructure, args); COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); @@ -189,14 +189,14 @@ TEST_CASE("OrientationAnalysis::ExportGBCDTriangleDataFilter: Valid filter execu } } -TEST_CASE("OrientationAnalysis::ExportGBCDTriangleDataFilter: InValid filter execution") +TEST_CASE("OrientationAnalysis::WriteGBCDTriangleDataFilter: InValid filter execution") { Application::GetOrCreateInstance()->loadPlugins(unit_test::k_BuildDir.view(), true); const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "6_6_Small_IN100_GBCD.tar.gz", "6_6_Small_IN100_GBCD"); // Instantiate the filter and an Arguments Object - ExportGBCDTriangleDataFilter filter; + WriteGBCDTriangleDataFilter filter; Arguments args; // Read the Small IN100 Data set @@ -217,22 +217,22 @@ TEST_CASE("OrientationAnalysis::ExportGBCDTriangleDataFilter: InValid filter exe SECTION("Invalid output file") { // Create default Parameters for the filter. - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_OutputFile_Key, std::make_any(fs::path("/Path/To/Output/File/To/Write.dat"))); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceLabelsArrayPath_Key, std::make_any(faceLabels)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceNormalsArrayPath_Key, std::make_any(faceNormals)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceAreasArrayPath_Key, std::make_any(faceAreas)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_FeatureEulerAnglesArrayPath_Key, std::make_any(avgEulerAnglesPath)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_OutputFile_Key, std::make_any(fs::path("/Path/To/Output/File/To/Write.dat"))); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceLabelsArrayPath_Key, std::make_any(faceLabels)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceNormalsArrayPath_Key, std::make_any(faceNormals)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceAreasArrayPath_Key, std::make_any(faceAreas)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_FeatureEulerAnglesArrayPath_Key, std::make_any(avgEulerAnglesPath)); } SECTION("Inconsistent Tuple Dimensions") { auto outputFile = fs::path(fmt::format("{}/TriangleDumperTest.ph", unit_test::k_BinaryTestOutputDir)); // Create default Parameters for the filter. - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_OutputFile_Key, std::make_any(outputFile)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceLabelsArrayPath_Key, std::make_any(gbcd)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceNormalsArrayPath_Key, std::make_any(faceNormals)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_SurfaceMeshFaceAreasArrayPath_Key, std::make_any(faceAreas)); - args.insertOrAssign(ExportGBCDTriangleDataFilter::k_FeatureEulerAnglesArrayPath_Key, std::make_any(avgEulerAnglesPath)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_OutputFile_Key, std::make_any(outputFile)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceLabelsArrayPath_Key, std::make_any(gbcd)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceNormalsArrayPath_Key, std::make_any(faceNormals)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_SurfaceMeshFaceAreasArrayPath_Key, std::make_any(faceAreas)); + args.insertOrAssign(WriteGBCDTriangleDataFilter::k_FeatureEulerAnglesArrayPath_Key, std::make_any(avgEulerAnglesPath)); } // Preflight the filter and check result diff --git a/src/Plugins/OrientationAnalysis/test/INLWriterTest.cpp b/src/Plugins/OrientationAnalysis/test/WriteINLFileTest.cpp similarity index 62% rename from src/Plugins/OrientationAnalysis/test/INLWriterTest.cpp rename to src/Plugins/OrientationAnalysis/test/WriteINLFileTest.cpp index 5ac6a296af..8890aa6308 100644 --- a/src/Plugins/OrientationAnalysis/test/INLWriterTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/WriteINLFileTest.cpp @@ -1,6 +1,6 @@ #include -#include "OrientationAnalysis/Filters/INLWriterFilter.hpp" +#include "OrientationAnalysis/Filters/WriteINLFileFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" #include "complex/Parameters/FileSystemPathParameter.hpp" @@ -19,7 +19,7 @@ const std::string k_MaterialName = "MaterialName"; const std::string k_NumFeatures = "NumFeatures"; const fs::path k_ExemplarFilePath = fs::path(fmt::format("{}/INL_writer/INLWriterExemplar.inl", unit_test::k_TestFilesDir)); -const fs::path k_WrittenFilePath = fs::path(fmt::format("{}/INLWriter.inl", unit_test::k_BinaryTestOutputDir)); +const fs::path k_WrittenFilePath = fs::path(fmt::format("{}/WriteINLFile.inl", unit_test::k_BinaryTestOutputDir)); void CompareResults() // compare hash of both file strings { @@ -63,24 +63,24 @@ void CompareResults() // compare hash of both file strings } } // namespace -TEST_CASE("OrientationAnalysis::INLWriterFilter: Valid Filter Execution", "[OrientationAnalysis][INLWriterFilter]") +TEST_CASE("OrientationAnalysis::WriteINLFileFilter: Valid Filter Execution", "[OrientationAnalysis][WriteINLFileFilter]") { const complex::UnitTest::TestFileSentinel testDataSentinel(complex::unit_test::k_CMakeExecutable, complex::unit_test::k_TestFilesDir, "INL_writer.tar.gz", "INL_writer"); // Instantiate the filter, a DataStructure object and an Arguments Object - INLWriterFilter filter; + WriteINLFileFilter filter; DataStructure dataStructure = UnitTest::LoadDataStructure(fs::path(fmt::format("{}/INL_writer/6_6_INL_writer.dream3d", unit_test::k_TestFilesDir))); Arguments args; // Create default Parameters for the filter. - args.insertOrAssign(INLWriterFilter::k_OutputFile_Key, std::make_any(k_WrittenFilePath)); - args.insertOrAssign(INLWriterFilter::k_ImageGeomPath_Key, std::make_any(DataPath({Constants::k_SmallIN100}))); - args.insertOrAssign(INLWriterFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_FeatureIds}))); - args.insertOrAssign(INLWriterFilter::k_CellPhasesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_Phases}))); - args.insertOrAssign(INLWriterFilter::k_CellEulerAnglesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_EulerAngles}))); - args.insertOrAssign(INLWriterFilter::k_CrystalStructuresArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_Phase_Data, Constants::k_CrystalStructures}))); - args.insertOrAssign(INLWriterFilter::k_MaterialNameArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_Phase_Data, ::k_MaterialName}))); - args.insertOrAssign(INLWriterFilter::k_NumFeaturesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_Phase_Data, ::k_NumFeatures}))); + args.insertOrAssign(WriteINLFileFilter::k_OutputFile_Key, std::make_any(k_WrittenFilePath)); + args.insertOrAssign(WriteINLFileFilter::k_ImageGeomPath_Key, std::make_any(DataPath({Constants::k_SmallIN100}))); + args.insertOrAssign(WriteINLFileFilter::k_FeatureIdsArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_FeatureIds}))); + args.insertOrAssign(WriteINLFileFilter::k_CellPhasesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_Phases}))); + args.insertOrAssign(WriteINLFileFilter::k_CellEulerAnglesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_EbsdScanData, Constants::k_EulerAngles}))); + args.insertOrAssign(WriteINLFileFilter::k_CrystalStructuresArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_Phase_Data, Constants::k_CrystalStructures}))); + args.insertOrAssign(WriteINLFileFilter::k_MaterialNameArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_Phase_Data, ::k_MaterialName}))); + args.insertOrAssign(WriteINLFileFilter::k_NumFeaturesArrayPath_Key, std::make_any(DataPath({Constants::k_SmallIN100, Constants::k_Phase_Data, ::k_NumFeatures}))); // Preflight the filter and check result auto preflightResult = filter.preflight(dataStructure, args); From a26403e72b5c209106561d4a40917c3c329a6907 Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Tue, 24 Oct 2023 11:55:35 -0400 Subject: [PATCH 07/19] Sort cmake lists alphabetical --- .../OrientationAnalysis/CMakeLists.txt | 24 +++++++++---------- .../OrientationAnalysis/test/CMakeLists.txt | 14 +++++------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/Plugins/OrientationAnalysis/CMakeLists.txt b/src/Plugins/OrientationAnalysis/CMakeLists.txt index db648328bb..d7a53c1747 100644 --- a/src/Plugins/OrientationAnalysis/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/CMakeLists.txt @@ -37,9 +37,6 @@ set(FilterList CreateEnsembleInfoFilter EBSDSegmentFeaturesFilter EbsdToH5EbsdFilter - ReadEnsembleInfoFilter - WriteGBCDGMTFileFilter - WriteGBCDTriangleDataFilter FindAvgCAxesFilter FindAvgOrientationsFilter FindBoundaryStrengthsFilter @@ -62,16 +59,19 @@ set(FilterList GenerateGBCDPoleFigureFilter GenerateIPFColorsFilter GenerateQuaternionConjugateFilter - ReadH5EspritDataFilter - ReadH5OimDataFilter - WriteINLFileFilter MergeTwinsFilter NeighborOrientationCorrelationFilter ReadAngDataFilter ReadCtfDataFilter + ReadEnsembleInfoFilter ReadH5EbsdFilter + ReadH5EspritDataFilter + ReadH5OimDataFilter RodriguesConvertorFilter RotateEulerRefFrameFilter + WriteGBCDGMTFileFilter + WriteGBCDTriangleDataFilter + WriteINLFileFilter WritePoleFigureFilter WriteStatsGenOdfAngleFileFilter ) @@ -167,9 +167,6 @@ set(filter_algorithms CreateEnsembleInfo EBSDSegmentFeatures EbsdToH5Ebsd - ReadEnsembleInfo - WriteGBCDGMTFile - WriteGBCDTriangleData FindAvgCAxes FindAvgOrientations FindBoundaryStrengths @@ -192,16 +189,19 @@ set(filter_algorithms GenerateIPFColors GenerateQuaternionConjugate GroupFeatures - ReadH5EspritData - ReadH5OimData - WriteINLFile MergeTwins NeighborOrientationCorrelation ReadAngData ReadCtfData + ReadEnsembleInfo ReadH5Ebsd + ReadH5EspritData + ReadH5OimData RodriguesConvertor RotateEulerRefFrame + WriteGBCDGMTFile + WriteGBCDTriangleData + WriteINLFile WritePoleFigure WriteStatsGenOdfAngleFile ) diff --git a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt index a6d791d4f3..efcec869a9 100644 --- a/src/Plugins/OrientationAnalysis/test/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/test/CMakeLists.txt @@ -16,9 +16,6 @@ set(${PLUGIN_NAME}UnitTest_SRCS CreateEnsembleInfoTest.cpp EBSDSegmentFeaturesFilterTest.cpp EbsdToH5EbsdTest.cpp - ReadEnsembleInfoTest.cpp - WriteGBCDGMTFileTest.cpp - WriteGBCDTriangleDataTest.cpp FindAvgCAxesTest.cpp FindAvgOrientationsTest.cpp FindBoundaryStrengthsTest.cpp @@ -41,16 +38,19 @@ set(${PLUGIN_NAME}UnitTest_SRCS GenerateGBCDPoleFigureTest.cpp GenerateIPFColorsTest.cpp GenerateQuaternionConjugateTest.cpp - ReadH5EspritDataTest.cpp - ReadH5OimDataTest.cpp - WriteINLFileTest.cpp MergeTwinsTest.cpp NeighborOrientationCorrelationTest.cpp ReadAngDataTest.cpp ReadCtfDataTest.cpp + ReadEnsembleInfoTest.cpp ReadH5EbsdTest.cpp + ReadH5EspritDataTest.cpp + ReadH5OimDataTest.cpp RodriguesConvertorTest.cpp RotateEulerRefFrameTest.cpp + WriteGBCDGMTFileTest.cpp + WriteGBCDTriangleDataTest.cpp + WriteINLFileTest.cpp WritePoleFigureTest.cpp WriteStatsGenOdfAngleFileTest.cpp ) @@ -62,7 +62,7 @@ set(DISABLED_TESTS FindTwinBoundariesTest.cpp FindTwinBoundarySchmidFactorsTest.cpp GenerateOrientationMatrixTransposeTest.cpp - WriteINLFileTest.cpp + WriteINLFileTest.cpp # ImportEbsdMontageTest.cpp # MISSING 1 or more Parameter Implementations ReplaceElementAttributesWithNeighborValuesTest.cpp From 169cf60e40e928502ef0637d2adca15a8555159f Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Tue, 24 Oct 2023 12:25:37 -0400 Subject: [PATCH 08/19] Update ITK I/O human names --- .../src/ITKImageProcessing/Filters/ITKImageReader.cpp | 2 +- .../src/ITKImageProcessing/Filters/ITKImageWriter.cpp | 2 +- .../ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp | 2 +- .../src/ITKImageProcessing/Filters/ITKImportImageStack.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.cpp index 5b3bff110b..9e92877394 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageReader.cpp @@ -258,7 +258,7 @@ Uuid ITKImageReader::uuid() const //------------------------------------------------------------------------------ std::string ITKImageReader::humanName() const { - return "ITK Image Reader"; + return "Read Image (ITK)"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.cpp index 0a9292de13..9d64a2a03e 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImageWriter.cpp @@ -236,7 +236,7 @@ Uuid ITKImageWriter::uuid() const //------------------------------------------------------------------------------ std::string ITKImageWriter::humanName() const { - return "ITK Image Export"; + return "Write Image (ITK)"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp index 26139c55a0..beb3977fae 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportFijiMontageFilter.cpp @@ -58,7 +58,7 @@ Uuid ITKImportFijiMontageFilter::uuid() const //------------------------------------------------------------------------------ std::string ITKImportFijiMontageFilter::humanName() const { - return "ITK Import Fiji Montage"; + return "Read Fiji Montage (ITK)"; } //------------------------------------------------------------------------------ diff --git a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp index 699e3ccff2..6554efa120 100644 --- a/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp +++ b/src/Plugins/ITKImageProcessing/src/ITKImageProcessing/Filters/ITKImportImageStack.cpp @@ -217,7 +217,7 @@ Uuid ITKImportImageStack::uuid() const //------------------------------------------------------------------------------ std::string ITKImportImageStack::humanName() const { - return "ITK Import Images (3D Stack)"; + return "Read Images [3D Stack] (ITK)"; } //------------------------------------------------------------------------------ From 654a5079ad7270991c099e1cc2640e130834baae Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Tue, 24 Oct 2023 16:10:18 -0400 Subject: [PATCH 09/19] clang formatting --- .../ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp | 3 +-- .../src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp | 2 +- .../ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp | 2 +- .../ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp | 2 +- .../Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp | 2 +- .../Filters/Algorithms/WriteAvizoUniformCoordinate.cpp | 2 +- .../Filters/Algorithms/WriteVtkRectilinearGrid.cpp | 2 +- .../src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp | 4 ++-- .../ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp | 2 +- .../src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp | 4 ++-- .../ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp | 4 ++-- .../src/ComplexCore/Filters/ReadRawBinaryFilter.cpp | 4 ++-- .../ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp | 4 ++-- .../src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp | 4 ++-- .../src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp | 4 ++-- .../Filters/WriteAvizoRectilinearCoordinateFilter.cpp | 4 ++-- .../ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp | 4 ++-- .../src/ComplexCore/Filters/WriteDREAM3DFilter.cpp | 2 +- .../src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp | 4 ++-- .../src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp | 4 ++-- .../src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp | 4 ++-- .../Filters/Algorithms/ReadH5EspritData.cpp | 2 +- .../Filters/Algorithms/WriteGBCDTriangleData.cpp | 2 +- .../OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp | 4 ++-- .../OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp | 4 ++-- .../src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp | 4 ++-- .../OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp | 4 ++-- .../Filters/WriteGBCDTriangleDataFilter.cpp | 4 ++-- .../src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp | 4 ++-- 29 files changed, 47 insertions(+), 48 deletions(-) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp index d3bf112bc1..7ba2754d4e 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadDeformKeyFileV12.cpp @@ -784,8 +784,7 @@ class IOHandler } // namespace // ----------------------------------------------------------------------------- -ReadDeformKeyFileV12::ReadDeformKeyFileV12(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - ReadDeformKeyFileV12InputValues* inputValues) +ReadDeformKeyFileV12::ReadDeformKeyFileV12(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadDeformKeyFileV12InputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp index 1bd4271b1a..9f678a4e98 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.cpp @@ -95,7 +95,7 @@ std::array CreateMinMaxCoords() } // End anonymous namespace ReadStlFile::ReadStlFile(DataStructure& data, fs::path stlFilePath, const DataPath& geometryPath, const DataPath& faceGroupPath, const DataPath& faceNormalsDataPath, bool scaleOutput, - float32 scaleFactor, const std::atomic_bool& shouldCancel) + float32 scaleFactor, const std::atomic_bool& shouldCancel) : m_DataStructure(data) , m_FilePath(std::move(stlFilePath)) , m_GeometryDataPath(geometryPath) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp index 689ffb410c..a205c4fd19 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadVolumeGraphicsFile.cpp @@ -14,7 +14,7 @@ inline const int32 k_VolBinaryAllocateMismatch = -91504; // ----------------------------------------------------------------------------- ReadVolumeGraphicsFile::ReadVolumeGraphicsFile(DataStructure& dataStructure, const IFilter::MessageHandler& msgHandler, const std::atomic_bool& shouldCancel, - ReadVolumeGraphicsFileInputValues* inputValues) + ReadVolumeGraphicsFileInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp index b9eac7adc6..0f5e24ddbc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAbaqusHexahedron.cpp @@ -331,7 +331,7 @@ void deleteFile(const std::vector& fileNames) // ----------------------------------------------------------------------------- WriteAbaqusHexahedron::WriteAbaqusHexahedron(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - WriteAbaqusHexahedronInputValues* inputValues) + WriteAbaqusHexahedronInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp index 9f191feeb5..d87c41b954 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoRectilinearCoordinate.cpp @@ -9,7 +9,7 @@ using namespace complex; // ----------------------------------------------------------------------------- WriteAvizoRectilinearCoordinate::WriteAvizoRectilinearCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - AvizoWriterInputValues* inputValues) + AvizoWriterInputValues* inputValues) : AvizoWriter(dataStructure, mesgHandler, shouldCancel, inputValues) { } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp index cfe1987459..4a6053b92c 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteAvizoUniformCoordinate.cpp @@ -10,7 +10,7 @@ using namespace complex; // ----------------------------------------------------------------------------- WriteAvizoUniformCoordinate::WriteAvizoUniformCoordinate(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - AvizoWriterInputValues* inputValues) + AvizoWriterInputValues* inputValues) : AvizoWriter(dataStructure, mesgHandler, shouldCancel, inputValues) { } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp index 23951eace6..8442b1ad48 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/WriteVtkRectilinearGrid.cpp @@ -221,7 +221,7 @@ struct WriteVtkDataArrayFunctor // ----------------------------------------------------------------------------- WriteVtkRectilinearGrid::WriteVtkRectilinearGrid(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - WriteVtkRectilinearGridInputValues* inputValues) + WriteVtkRectilinearGridInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp index ee10a76f7d..295acc79d8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadBinaryCTNorthstarFilter.cpp @@ -397,7 +397,7 @@ IFilter::UniquePointer ReadBinaryCTNorthstarFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadBinaryCTNorthstarFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pInputHeaderFileValue = filterArgs.value(k_InputHeaderFile_Key); auto pImageGeometryPathValue = filterArgs.value(k_ImageGeometryPath_Key); @@ -524,7 +524,7 @@ IFilter::PreflightResult ReadBinaryCTNorthstarFilter::preflightImpl(const DataSt //------------------------------------------------------------------------------ Result<> ReadBinaryCTNorthstarFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { ReadBinaryCTNorthstarInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp index 44b4bc79fb..ab800a66db 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDREAM3DFilter.cpp @@ -85,7 +85,7 @@ IFilter::PreflightResult ReadDREAM3DFilter::preflightImpl(const DataStructure& d } Result<> ReadDREAM3DFilter::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { return {}; } diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp index 5af6d5bf73..a4d0bfa754 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadDeformKeyFileV12Filter.cpp @@ -90,7 +90,7 @@ IFilter::UniquePointer ReadDeformKeyFileV12Filter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadDeformKeyFileV12Filter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pInputFilePathValue = filterArgs.value(k_InputFilePath_Key); @@ -170,7 +170,7 @@ IFilter::PreflightResult ReadDeformKeyFileV12Filter::preflightImpl(const DataStr //------------------------------------------------------------------------------ Result<> ReadDeformKeyFileV12Filter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { ReadDeformKeyFileV12InputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp index dbe4a0cde4..dfe372e0ba 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp @@ -145,7 +145,7 @@ IFilter::UniquePointer ReadHDF5Dataset::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pImportHDF5FileValue = filterArgs.value(k_ImportHDF5File_Key); auto pSelectedAttributeMatrixValue = pImportHDF5FileValue.parent; @@ -349,7 +349,7 @@ IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dat //------------------------------------------------------------------------------ Result<> ReadHDF5Dataset::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pImportHDF5FileValue = filterArgs.value(k_ImportHDF5File_Key); auto pSelectedAttributeMatrixValue = pImportHDF5FileValue.parent; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp index 0aa0330d0d..4434d66a6b 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadRawBinaryFilter.cpp @@ -88,7 +88,7 @@ IFilter::UniquePointer ReadRawBinaryFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadRawBinaryFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pInputFileValue = filterArgs.value(k_InputFile_Key); auto pScalarTypeValue = filterArgs.value(k_ScalarType_Key); @@ -167,7 +167,7 @@ IFilter::PreflightResult ReadRawBinaryFilter::preflightImpl(const DataStructure& //------------------------------------------------------------------------------ Result<> ReadRawBinaryFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { ReadRawBinaryInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp index 7d5495bee5..973a87011d 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadStlFileFilter.cpp @@ -95,7 +95,7 @@ IFilter::UniquePointer ReadStlFileFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadStlFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pStlFilePathValue = filterArgs.value(k_StlFilePath_Key); auto pTriangleGeometryPath = filterArgs.value(k_TriangleGeometryName_Key); @@ -172,7 +172,7 @@ IFilter::PreflightResult ReadStlFileFilter::preflightImpl(const DataStructure& d //------------------------------------------------------------------------------ Result<> ReadStlFileFilter::executeImpl(DataStructure& data, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pStlFilePathValue = filterArgs.value(k_StlFilePath_Key); auto pTriangleGeometryPath = filterArgs.value(k_TriangleGeometryName_Key); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp index 50aa0de7ba..8ead0128a4 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadVolumeGraphicsFileFilter.cpp @@ -406,7 +406,7 @@ IFilter::UniquePointer ReadVolumeGraphicsFileFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadVolumeGraphicsFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pVGHeaderFileValue = filterArgs.value(k_VGHeaderFile_Key); auto pNewImageGeometryPathValue = filterArgs.value(k_NewImageGeometry_Key); @@ -446,7 +446,7 @@ IFilter::PreflightResult ReadVolumeGraphicsFileFilter::preflightImpl(const DataS //------------------------------------------------------------------------------ Result<> ReadVolumeGraphicsFileFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { ReadVolumeGraphicsFileInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp index 07e7eacb41..a3ecd51dd6 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAbaqusHexahedronFilter.cpp @@ -73,7 +73,7 @@ IFilter::UniquePointer WriteAbaqusHexahedronFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteAbaqusHexahedronFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pHourglassStiffnessValue = filterArgs.value(k_HourglassStiffness_Key); auto pJobNameValue = filterArgs.value(k_JobName_Key); @@ -105,7 +105,7 @@ IFilter::PreflightResult WriteAbaqusHexahedronFilter::preflightImpl(const DataSt //------------------------------------------------------------------------------ Result<> WriteAbaqusHexahedronFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { WriteAbaqusHexahedronInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp index 7cebfee342..e5b3a68e37 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoRectilinearCoordinateFilter.cpp @@ -74,7 +74,7 @@ IFilter::UniquePointer WriteAvizoRectilinearCoordinateFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteAvizoRectilinearCoordinateFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); auto pWriteBinaryFileValue = filterArgs.value(k_WriteBinaryFile_Key); @@ -90,7 +90,7 @@ IFilter::PreflightResult WriteAvizoRectilinearCoordinateFilter::preflightImpl(co //------------------------------------------------------------------------------ Result<> WriteAvizoRectilinearCoordinateFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { AvizoWriterInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp index d03858e106..e426c3917f 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteAvizoUniformCoordinateFilter.cpp @@ -74,7 +74,7 @@ IFilter::UniquePointer WriteAvizoUniformCoordinateFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteAvizoUniformCoordinateFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); auto pWriteBinaryFileValue = filterArgs.value(k_WriteBinaryFile_Key); @@ -90,7 +90,7 @@ IFilter::PreflightResult WriteAvizoUniformCoordinateFilter::preflightImpl(const //------------------------------------------------------------------------------ Result<> WriteAvizoUniformCoordinateFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { AvizoWriterInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp index 8535ff3800..ab877ec4db 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteDREAM3DFilter.cpp @@ -77,7 +77,7 @@ IFilter::PreflightResult WriteDREAM3DFilter::preflightImpl(const DataStructure& //------------------------------------------------------------------------------ Result<> WriteDREAM3DFilter::executeImpl(DataStructure& dataStructure, const Arguments& args, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto exportFilePath = args.value(k_ExportFilePath); auto writeXdmf = args.value(k_WriteXdmf); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp index 4804e0ebe0..ea53db8e11 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteFeatureDataCSVFilter.cpp @@ -76,7 +76,7 @@ IFilter::UniquePointer WriteFeatureDataCSVFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteFeatureDataCSVFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { PreflightResult preflightResult; @@ -89,7 +89,7 @@ IFilter::PreflightResult WriteFeatureDataCSVFilter::preflightImpl(const DataStru //------------------------------------------------------------------------------ Result<> WriteFeatureDataCSVFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pOutputFilePath = filterArgs.value(k_FeatureDataFile_Key); auto pWriteNeighborListDataValue = filterArgs.value(k_WriteNeighborListData_Key); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp index 9bc89c1bbb..89781215fc 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteLosAlamosFFTFilter.cpp @@ -77,7 +77,7 @@ IFilter::UniquePointer WriteLosAlamosFFTFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteLosAlamosFFTFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); auto pFeatureIdsArrayPathValue = filterArgs.value(k_FeatureIdsArrayPath_Key); @@ -103,7 +103,7 @@ IFilter::PreflightResult WriteLosAlamosFFTFilter::preflightImpl(const DataStruct //------------------------------------------------------------------------------ Result<> WriteLosAlamosFFTFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { WriteLosAlamosFFTInputValues inputValues; diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp index 6de4164f2f..841bf4e7ec 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/WriteVtkRectilinearGridFilter.cpp @@ -71,7 +71,7 @@ IFilter::UniquePointer WriteVtkRectilinearGridFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteVtkRectilinearGridFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); auto pWriteBinaryFileValue = filterArgs.value(k_WriteBinaryFile_Key); @@ -108,7 +108,7 @@ IFilter::PreflightResult WriteVtkRectilinearGridFilter::preflightImpl(const Data //------------------------------------------------------------------------------ Result<> WriteVtkRectilinearGridFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { WriteVtkRectilinearGridInputValues inputValues; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp index beddd35a90..a5c95d3eef 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp @@ -8,7 +8,7 @@ using namespace complex; // ----------------------------------------------------------------------------- ReadH5EspritData::ReadH5EspritData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues, - ReadH5EspritDataInputValues* espritInputValues) + ReadH5EspritDataInputValues* espritInputValues) : ReadH5Data(dataStructure, mesgHandler, shouldCancel, inputValues) , m_EspritInputValues(espritInputValues) { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp index c91f010d06..ee2da35030 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WriteGBCDTriangleData.cpp @@ -7,7 +7,7 @@ using namespace complex; // ----------------------------------------------------------------------------- WriteGBCDTriangleData::WriteGBCDTriangleData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, - WriteGBCDTriangleDataInputValues* inputValues) + WriteGBCDTriangleDataInputValues* inputValues) : m_DataStructure(dataStructure) , m_InputValues(inputValues) , m_ShouldCancel(shouldCancel) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp index 2301c22c02..5b765761af 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadEnsembleInfoFilter.cpp @@ -78,7 +78,7 @@ IFilter::UniquePointer ReadEnsembleInfoFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadEnsembleInfoFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pInputFileValue = filterArgs.value(k_InputFile_Key).string(); auto pDataContainerNameValue = filterArgs.value(k_DataContainerName_Key); @@ -129,7 +129,7 @@ IFilter::PreflightResult ReadEnsembleInfoFilter::preflightImpl(const DataStructu //------------------------------------------------------------------------------ Result<> ReadEnsembleInfoFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { ReadEnsembleInfoInputValues inputValues; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp index fbd5803e29..bc08a98925 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EspritDataFilter.cpp @@ -92,7 +92,7 @@ IFilter::UniquePointer ReadH5EspritDataFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadH5EspritDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pSelectedScanNamesValue = filterArgs.value(k_SelectedScanNames_Key); auto pZSpacingValue = filterArgs.value(k_ZSpacing_Key); @@ -202,7 +202,7 @@ IFilter::PreflightResult ReadH5EspritDataFilter::preflightImpl(const DataStructu //------------------------------------------------------------------------------ Result<> ReadH5EspritDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { ReadH5DataInputValues inputValues; ReadH5EspritDataInputValues espritInputValues; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp index d7a99844aa..a38ee6b195 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5OimDataFilter.cpp @@ -89,7 +89,7 @@ IFilter::UniquePointer ReadH5OimDataFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult ReadH5OimDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pSelectedScanNamesValue = filterArgs.value(k_SelectedScanNames_Key); auto pZSpacingValue = filterArgs.value(k_ZSpacing_Key); @@ -198,7 +198,7 @@ IFilter::PreflightResult ReadH5OimDataFilter::preflightImpl(const DataStructure& //------------------------------------------------------------------------------ Result<> ReadH5OimDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { ReadH5DataInputValues inputValues; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp index 4a3ef3673c..777051c79e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDGMTFileFilter.cpp @@ -77,7 +77,7 @@ IFilter::UniquePointer WriteGBCDGMTFileFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteGBCDGMTFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pPhaseOfInterestValue = filterArgs.value(k_PhaseOfInterest_Key); auto pMisorientationRotationValue = filterArgs.value(k_MisorientationRotation_Key); @@ -119,7 +119,7 @@ IFilter::PreflightResult WriteGBCDGMTFileFilter::preflightImpl(const DataStructu //------------------------------------------------------------------------------ Result<> WriteGBCDGMTFileFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { WriteGBCDGMTFileInputValues inputValues; inputValues.PhaseOfInterest = filterArgs.value(k_PhaseOfInterest_Key); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp index 500dbe1881..4497fef0d6 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteGBCDTriangleDataFilter.cpp @@ -80,7 +80,7 @@ IFilter::UniquePointer WriteGBCDTriangleDataFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteGBCDTriangleDataFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pOutputFileValue = filterArgs.value(k_OutputFile_Key); auto pSurfaceMeshFaceLabelsArrayPathValue = filterArgs.value(k_SurfaceMeshFaceLabelsArrayPath_Key); @@ -105,7 +105,7 @@ IFilter::PreflightResult WriteGBCDTriangleDataFilter::preflightImpl(const DataSt //------------------------------------------------------------------------------ Result<> WriteGBCDTriangleDataFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { WriteGBCDTriangleDataInputValues inputValues; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp index 798fd353d3..c14f74301e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WriteINLFileFilter.cpp @@ -86,7 +86,7 @@ IFilter::UniquePointer WriteINLFileFilter::clone() const //------------------------------------------------------------------------------ IFilter::PreflightResult WriteINLFileFilter::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { auto pMaterialNameArrayPathValue = filterArgs.value(k_MaterialNameArrayPath_Key); @@ -106,7 +106,7 @@ IFilter::PreflightResult WriteINLFileFilter::preflightImpl(const DataStructure& //------------------------------------------------------------------------------ Result<> WriteINLFileFilter::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, - const std::atomic_bool& shouldCancel) const + const std::atomic_bool& shouldCancel) const { WriteINLFileInputValues inputValues; From 6dc5ded2b474a145165fa4ef73ba9b3c692d4104 Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Tue, 24 Oct 2023 16:13:05 -0400 Subject: [PATCH 10/19] fix test case that was originally disabled --- src/Plugins/ComplexCore/test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugins/ComplexCore/test/CMakeLists.txt b/src/Plugins/ComplexCore/test/CMakeLists.txt index 9bb9f85b40..5fa0c1e36c 100644 --- a/src/Plugins/ComplexCore/test/CMakeLists.txt +++ b/src/Plugins/ComplexCore/test/CMakeLists.txt @@ -89,7 +89,7 @@ set(${PLUGIN_NAME}UnitTest_SRCS QuickSurfaceMeshFilterTest.cpp ReadBinaryCTNorthstarTest.cpp ReadCSVFileTest.cpp - ReadDeformKeyFileV12Test.cpp + # ReadDeformKeyFileV12Test.cpp ReadHDF5DatasetTest.cpp ReadRawBinaryTest.cpp ReadStlFileTest.cpp From 4d08a3ff8c7796958249c80c6c79c9b4ab3ce223 Mon Sep 17 00:00:00 2001 From: nyoungbq Date: Tue, 24 Oct 2023 16:16:14 -0400 Subject: [PATCH 11/19] clang formatting --- .../src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp | 2 +- src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp | 2 +- .../OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp index 53aa615002..d0ff101bcb 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/Algorithms/ReadStlFile.hpp @@ -23,7 +23,7 @@ class COMPLEXCORE_EXPORT ReadStlFile { public: ReadStlFile(DataStructure& data, fs::path stlFilePath, const DataPath& geometryPath, const DataPath& faceGroupPath, const DataPath& faceNormalsDataPath, bool scaleOutput, float32 scaleFactor, - const std::atomic_bool& shouldCancel); + const std::atomic_bool& shouldCancel); ~ReadStlFile() noexcept; ReadStlFile(const ReadStlFile&) = delete; diff --git a/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp b/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp index c8e8ed0a2f..c2da14117a 100644 --- a/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp +++ b/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp @@ -1,5 +1,5 @@ -#include "ComplexCore/ComplexCore_test_dirs.hpp" #include "ComplexCore/Filters/ReadHDF5Dataset.hpp" +#include "ComplexCore/ComplexCore_test_dirs.hpp" #include "complex/Common/TypesUtility.hpp" #include "complex/DataStructure/DataArray.hpp" diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp index 6d22fde27f..0c0d7b99f7 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp @@ -23,7 +23,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EspritData : public ReadH5Data Date: Thu, 2 Nov 2023 12:36:52 -0400 Subject: [PATCH 12/19] Update version to 1.2.0 This is due to the renaming of the filters which causes API changes. Signed-off-by: Michael Jackson --- CMakeLists.txt | 2 +- conda/meta.yaml | 2 +- conda/recipe.yaml | 2 +- wrapping/python/docs/index_template.rst | 2 +- wrapping/python/docs/source/Installation.rst | 2 +- wrapping/python/docs/source/ReleaseNotes.rst | 2 +- wrapping/python/docs/source/conf.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1629264e2..2991a45e1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ option(COMPLEX_ENABLE_INSTALL "Enables COMPLEX install rules" ON) file(TO_CMAKE_PATH "${CMAKE_COMMAND}" CMAKE_COMMAND_NORM) project(complex - VERSION 1.1.0 + VERSION 1.2.0 DESCRIPTION "SIMPL Redesign" HOMEPAGE_URL "https://github.com/BlueQuartzSoftware/complex" LANGUAGES CXX diff --git a/conda/meta.yaml b/conda/meta.yaml index 010f5a5e2c..1d8c4d1914 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,5 @@ {% set name = "complex" %} -{% set version = "1.1.0" %} +{% set version = "1.2.0" %} package: name: {{ name|lower }} diff --git a/conda/recipe.yaml b/conda/recipe.yaml index a0cb5843f9..318d1f1b3b 100644 --- a/conda/recipe.yaml +++ b/conda/recipe.yaml @@ -1,5 +1,5 @@ context: - version: "1.1.0" + version: "1.2.0" name: complex package: diff --git a/wrapping/python/docs/index_template.rst b/wrapping/python/docs/index_template.rst index 270e4dfc1b..a3d09b4f60 100644 --- a/wrapping/python/docs/index_template.rst +++ b/wrapping/python/docs/index_template.rst @@ -5,7 +5,7 @@ DREAM3D-NX Python Docs ======================= -Latest Version: 1.1.0 +Latest Version: 1.2.0 --------------------- The *complex* library can be installed through an Anaconda packages from the *BlueQuartzSoftware* channel. This can be achieved diff --git a/wrapping/python/docs/source/Installation.rst b/wrapping/python/docs/source/Installation.rst index 751d0a46ef..59a6854c18 100644 --- a/wrapping/python/docs/source/Installation.rst +++ b/wrapping/python/docs/source/Installation.rst @@ -1,7 +1,7 @@ Installation ============ -Latest Version: 1.1.0 +Latest Version: 1.2.0 --------------------- The *complex* library can be installed through an Anaconda packages from the *BlueQuartzSoftware* channel. This can be achieved diff --git a/wrapping/python/docs/source/ReleaseNotes.rst b/wrapping/python/docs/source/ReleaseNotes.rst index 5f4bb884e1..8955e9248b 100644 --- a/wrapping/python/docs/source/ReleaseNotes.rst +++ b/wrapping/python/docs/source/ReleaseNotes.rst @@ -4,7 +4,7 @@ Release Notes The `complex` library is under activate development and while we strive to maintain a stable API bugs are found the necessitate the changing of the API. -Version 1.1.0 +Version 1.2.0 ------------- API Additions diff --git a/wrapping/python/docs/source/conf.py b/wrapping/python/docs/source/conf.py index c6c5872167..c609005f14 100644 --- a/wrapping/python/docs/source/conf.py +++ b/wrapping/python/docs/source/conf.py @@ -9,7 +9,7 @@ project = 'DREAM3D-NX' copyright = '2023, BlueQuartz Software, LLC' author = 'BlueQuartz Software, LLC' -release = '1.1.0' +release = '1.2.0' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration From 1160ff14fb53fefafa14e01741e01d4148d67f73 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Sat, 11 Nov 2023 20:47:46 -0500 Subject: [PATCH 13/19] Fixing various python related codes Signed-off-by: Michael Jackson --- cmake/Summary.cmake | 2 +- .../ComplexCore/docs/ReadCSVFileFilter.md | 44 ++--------- .../FindLargestCrossSections.d3dpipeline | 2 +- .../VtkRectilinearGridWriter.d3dpipeline | 2 +- .../ComplexCore/wrapping/python/complexpy.cpp | 18 ++++- ...AlignSectionsMutualInformation.d3dpipeline | 2 +- ...mall IN100 Full Reconstruction.d3dpipeline | 2 +- ...00 Crystallographic Statistics.d3dpipeline | 2 +- .../FindGBCD-GBPDMetricBased.d3dpipeline | 2 +- .../Filters/ReadH5EbsdFilter.cpp | 10 +-- .../Filters/ReadH5EbsdFilter.hpp | 2 +- .../Parameters/H5EbsdReaderParameter.cpp | 10 +-- .../Parameters/H5EbsdReaderParameter.h | 2 +- .../test/ReadH5EbsdTest.cpp | 4 +- .../wrapping/python/orientationanalysis.cpp | 4 +- wrapping/python/ReadMe.md | 11 +++ wrapping/python/docs/generate_sphinx_docs.cpp | 4 +- wrapping/python/docs/source/API.rst | 60 ++++++++++++--- wrapping/python/docs/source/ReleaseNotes.rst | 76 +++++++++++++++++-- wrapping/python/examples/import_hdf5.py | 17 +++++ wrapping/python/examples/pipeline.py | 16 ++-- wrapping/python/examples/read_csv_file.py | 4 +- 22 files changed, 209 insertions(+), 87 deletions(-) diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake index 5f2e314a03..73b128fdae 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -76,7 +76,7 @@ message(STATUS "* -------------- Complex Python Configuration Options ---------- message(STATUS "* COMPLEX_BUILD_PYTHON: ${COMPLEX_BUILD_PYTHON}") message(STATUS "* COMPLEX_EMBED_PYTHON: ${COMPLEX_EMBED_PYTHON}") message(STATUS "* Python3_EXECUTABLE: ${Python3_EXECUTABLE}") -message(STATUS "* MKDOCS_EXECUTABLE: ${MKDOCS_EXECUTABLE}") +message(STATUS "* COMPLEX_ENABLE_SPHINX_DOCS: ${COMPLEX_ENABLE_SPHINX_DOCS}") message(STATUS "* -------------- Known Plugins ------------------------------------------------------") foreach(plugin ${COMPLEX_PLUGIN_LIST}) diff --git a/src/Plugins/ComplexCore/docs/ReadCSVFileFilter.md b/src/Plugins/ComplexCore/docs/ReadCSVFileFilter.md index 7b10ea7611..9dc05747f8 100644 --- a/src/Plugins/ComplexCore/docs/ReadCSVFileFilter.md +++ b/src/Plugins/ComplexCore/docs/ReadCSVFileFilter.md @@ -1,16 +1,16 @@ -# Read CSV File +# Read CSV File -## Group (Subgroup) ## +## Group (Subgroup) IO (Input) -## Description ## +## Description This **Filter** reads text data from any text-based file and imports the data into DREAM3D-NX-style arrays. The user specifies which file to import, how the data is formatted, what to call each array, and what type each array should be. *Note:* This **Filter** is intended to read data that is column-oriented, such that each created DREAM3D-NX array corresponds to a column of data in the text file. Therefore, this **Filter** will only import scalar arrays. If multiple columns are in fact different components of the same array, then the columns may be imported as separate arrays and then combined in the correct order using the Combine Attribute Arrays **Filter**. -### Filling Out The Inputs ### +### Filling Out The Inputs The user first selects the **Input Text File** path, which then enables the rest of the interface. @@ -54,40 +54,12 @@ Afterwards, you end up with a data structure that looks like this: ![Input Text File Field](Images/Read_CSV_10.png) -## Parameters ## +% Auto generated parameter table will be inserted here -| Name | Type | Description | -|----------------------------------------------------------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Importer Data Object | ReadCSVData | The object that holds all data relevant to importing the data, such as input file path, custom headers, start import line number, data types for all the imported arrays, headers line number, header mode, imported array tuple dimensions, delimiters, etc. | -| Use Existing Attribute Matrix | bool | Determines whether or not to store the imported data arrays in an existing attribute matrix | -| Existing Attribute Matrix (Use Existing Attribute Matrix - ON) | DataPath | The data path to the existing attribute matrix where the imported arrays will be stored | -| New Attribute Matrix (Use Existing Attribute Matrix - OFF) | DataPath | The data path to the newly created attribute matrix where the imported arrays will be stored | - -## Required Geometry ## - -Not Applicable - -## Required Objects ## - -| Kind | Default Name | Description | -|------|--------------|------| -| **Attribute Matrix** | None | The existing attribute matrix to store the imported data arrays (only if Existing Attribute Matrix is turned ON) | - -## Created Objects ## - -| Kind | Default Name | Type | Component Dimensions | Description | -|------|--------------|------|----------------------|----------------------------------------------------------------| -| One or more **Element/Feature/Ensemble/etc. Data Arrays** | None | Any | 1 | One or more arrays that are created due to importing text data | - -## Example Pipelines ## - - -## License & Copyright ## +## License & Copyright Please see the description file distributed with this plugin. -## DREAM3DNX Help - -Check out our GitHub community page at [DREAM3DNX-Issues](https://github.com/BlueQuartzSoftware/DREAM3DNX-Issues) to report bugs, ask the community for help, discuss features, or get help from the developers. - +## DREAM3D-NX Help +If you need help, need to file a bug report or want to request a new feature, please head over to the [DREAM3DNX-Issues](https://github.com/BlueQuartzSoftware/DREAM3DNX-Issues) GItHub site where the community of DREAM3D-NX users can help answer your questions. diff --git a/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline b/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline index ddc92eb372..da085b23a6 100644 --- a/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/FindLargestCrossSections.d3dpipeline @@ -8,7 +8,7 @@ "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", "data_container_name": "DataContainer", - "read_h5_ebsd_filter": { + "read_h5_ebsd_parameter": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ diff --git a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline index c871126e3e..dca9e7e1f2 100644 --- a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline @@ -50,7 +50,7 @@ "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", "data_container_name": "DataContainer", - "read_h5_ebsd_filter": { + "read_h5_ebsd_parameter": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ diff --git a/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp b/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp index d58c908158..bf3e5e6525 100644 --- a/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp +++ b/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp @@ -435,7 +435,7 @@ PYBIND11_MODULE(complex, mod) arrayThresholdSet.def_property("thresholds", &ArrayThresholdSet::getArrayThresholds, &ArrayThresholdSet::setArrayThresholds); arrayThresholdSet.def("__repr__", [](const ArrayThresholdSet& self) { return "ArrayThresholdSet()"; }); - py::class_ readCSVData(mod, "ReadCSVData"); + py::class_ readCSVData(mod, "ReadCSVDataParameter"); py::enum_ csvHeaderMode(readCSVData, "HeaderMode"); csvHeaderMode.value("Line", ReadCSVData::HeaderMode::LINE); @@ -452,7 +452,7 @@ PYBIND11_MODULE(complex, mod) readCSVData.def_readwrite("tuple_dims", &ReadCSVData::tupleDims); readCSVData.def_readwrite("delimiters", &ReadCSVData::delimiters); readCSVData.def_readwrite("consecutive_delimiters", &ReadCSVData::consecutiveDelimiters); - readCSVData.def("__repr__", [](const ReadCSVData& self) { return "ReadCSVData()"; }); + readCSVData.def("__repr__", [](const ReadCSVData& self) { return "ReadCSVDataParameter()"; }); py::class_> abstractPlugin(mod, "AbstractPlugin"); py::class_> pythonPlugin(mod, "PythonPlugin"); @@ -1009,9 +1009,21 @@ PYBIND11_MODULE(complex, mod) return pipelineResult.value(); }, "path"_a); + pipeline.def( + "to_file", + [](Pipeline& self, const std::string& name, const std::filesystem::path& path) { + nlohmann::json pipelineJson = self.toJson(); + pipelineJson["name"] = name; + std::ofstream file(path, std::ios_base::binary); + file << pipelineJson; + }, + "name"_a, + "path"_a); pipeline.def("execute", &ExecutePipeline); pipeline.def( - "__getitem__", [](Pipeline& self, Pipeline::index_type index) { return self.at(index); }, py::return_value_policy::reference_internal); + "__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( diff --git a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline index 5f627ead7c..f53dde978b 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/AlignSectionsMutualInformation.d3dpipeline @@ -8,7 +8,7 @@ "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", "data_container_name": "DataContainer", - "read_h5_ebsd_filter": { + "read_h5_ebsd_parameter": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline index bc01d038cb..183802fad1 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline @@ -8,7 +8,7 @@ "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", "data_container_name": "DataContainer", - "read_h5_ebsd_filter": { + "read_h5_ebsd_parameter": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline index eaf165ace4..0aa10a9f08 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline @@ -95,7 +95,7 @@ "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", "data_container_name": "DataContainer", - "read_h5_ebsd_filter": { + "read_h5_ebsd_parameter": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline index 0a5a9b299d..4682783f13 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline @@ -351,7 +351,7 @@ "cell_attribute_matrix_name": "CellData", "cell_ensemble_attribute_matrix_name": "CellEnsembleData", "data_container_name": "DataContainer", - "read_h5_ebsd_filter": { + "read_h5_ebsd_parameter": { "end_slice": 117, "euler_representation": 0, "hdf5_data_paths": [ diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index 1223824b90..bc619fcafe 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -56,7 +56,7 @@ Parameters ReadH5EbsdFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_ReadH5EbsdFilter_Key, "Import H5Ebsd File", "The input .h5ebsd file path", H5EbsdReaderParameter::ValueType{})); + params.insert(std::make_unique(k_ReadH5EbsdParameter_Key, "Import H5Ebsd File", "Object that holds all relevant information to import data from the file.", H5EbsdReaderParameter::ValueType{})); params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); params.insert(std::make_unique(k_DataContainerName_Key, "Created Image Geometry", "The complete path to the imported Image Geometry", DataPath({"DataContainer"}))); @@ -81,7 +81,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da const std::atomic_bool& shouldCancel) const { - auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdFilter_Key); + auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdParameter_Key); auto imageGeomPath = filterArgs.value(k_DataContainerName_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); DataPath cellAttributeMatrixPath = imageGeomPath.createChildPath(pCellAttributeMatrixNameValue); @@ -153,7 +153,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da } std::set m_SelectedArrayNames; - for(const auto& selectedArrayName : pReadH5EbsdFilterValue.hdf5DataPaths) + for(const auto& selectedArrayName : pReadH5EbsdFilterValue.selectedArrayNames) { m_SelectedArrayNames.insert(selectedArrayName); } @@ -232,7 +232,7 @@ Result<> ReadH5EbsdFilter::executeImpl(DataStructure& dataStructure, const Argum /**************************************************************************** * Extract the actual input values from the 'filterArgs' object ***************************************************************************/ - auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdFilter_Key); + auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdParameter_Key); auto pDataContainerNameValue = filterArgs.value(k_DataContainerName_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pCellEnsembleAttributeMatrixNameValue = pDataContainerNameValue.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); @@ -246,7 +246,7 @@ Result<> ReadH5EbsdFilter::executeImpl(DataStructure& dataStructure, const Argum inputValues.startSlice = pReadH5EbsdFilterValue.startSlice; inputValues.endSlice = pReadH5EbsdFilterValue.endSlice; inputValues.eulerRepresentation = pReadH5EbsdFilterValue.eulerRepresentation; - inputValues.hdf5DataPaths = pReadH5EbsdFilterValue.hdf5DataPaths; + inputValues.hdf5DataPaths = pReadH5EbsdFilterValue.selectedArrayNames; inputValues.useRecommendedTransform = pReadH5EbsdFilterValue.useRecommendedTransform; inputValues.dataContainerPath = pDataContainerNameValue; inputValues.cellAttributeMatrixPath = pDataContainerNameValue.createChildPath(pCellAttributeMatrixNameValue); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp index 889ebb9782..c7cd6e1421 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp @@ -24,7 +24,7 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5EbsdFilter : public IFilter ReadH5EbsdFilter& operator=(ReadH5EbsdFilter&&) noexcept = delete; // Parameter Keys - static inline constexpr StringLiteral k_ReadH5EbsdFilter_Key = "read_h5_ebsd_filter"; + static inline constexpr StringLiteral k_ReadH5EbsdParameter_Key = "read_h5_ebsd_parameter"; static inline constexpr StringLiteral k_DataContainerName_Key = "data_container_name"; static inline constexpr StringLiteral k_CellAttributeMatrixName_Key = "cell_attribute_matrix_name"; static inline constexpr StringLiteral k_CellEnsembleAttributeMatrixName_Key = "cell_ensemble_attribute_matrix_name"; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.cpp index 7292cc2b96..d13f13219b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.cpp @@ -59,10 +59,10 @@ nlohmann::json H5EbsdReaderParameter::toJson(const std::any& value) const json[k_UseRecommendedTransform] = data.useRecommendedTransform; // DataPaths - if(!data.hdf5DataPaths.empty()) + if(!data.selectedArrayNames.empty()) { nlohmann::json dataPathsJson = nlohmann::json::array(); - for(const auto& dataPath : data.hdf5DataPaths) + for(const auto& dataPath : data.selectedArrayNames) { dataPathsJson.push_back(dataPath); } @@ -144,7 +144,7 @@ Result H5EbsdReaderParameter::fromJson(const nlohmann::json& json) con const auto& jsonDataPaths = json[k_HDF5DataPaths]; if(jsonDataPaths.is_null()) { - value.hdf5DataPaths = {}; + value.selectedArrayNames = {}; } else { @@ -170,7 +170,7 @@ Result H5EbsdReaderParameter::fromJson(const nlohmann::json& json) con return {{nonstd::make_unexpected(std::move(errors))}}; } - value.hdf5DataPaths = std::move(dataPaths); + value.selectedArrayNames = std::move(dataPaths); } return {{std::move(value)}}; @@ -208,7 +208,7 @@ Result<> H5EbsdReaderParameter::validate(const std::any& valueRef) const if(value.startSlice > value.endSlice) { - errors.push_back({-2002, fmt::format("StartSlice '{}' must be less than or equal EndSlice'{}'", value.startSlice, value.endSlice)}); + errors.push_back({-2002, fmt::format("StartSlice '{}' must be less than or equal EndSlice '{}'", value.startSlice, value.endSlice)}); return {nonstd::make_unexpected(std::move(errors))}; } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.h b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.h index db1344da50..229777eb2b 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.h +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.h @@ -24,7 +24,7 @@ class COMPLEX_EXPORT H5EbsdReaderParameter : public ValueParameter int32 startSlice = 0; int32 endSlice = 0; int32 eulerRepresentation = EbsdLib::AngleRepresentation::Radians; - std::vector hdf5DataPaths = {}; + std::vector selectedArrayNames = {}; bool useRecommendedTransform = {true}; }; diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp index 0a5506bd9f..5b3b46dd9f 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp @@ -40,10 +40,10 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati h5ebsdParamVal.startSlice = 1; h5ebsdParamVal.endSlice = 117; h5ebsdParamVal.eulerRepresentation = EbsdLib::AngleRepresentation::Radians; - h5ebsdParamVal.hdf5DataPaths = {Constants::k_ConfidenceIndex, Constants::k_EulerAngles, Constants::k_Fit, Constants::k_ImageQuality, Constants::k_Phases, Constants::k_SEMSignal}; + h5ebsdParamVal.selectedArrayNames = {Constants::k_ConfidenceIndex, Constants::k_EulerAngles, Constants::k_Fit, Constants::k_ImageQuality, Constants::k_Phases, Constants::k_SEMSignal}; h5ebsdParamVal.useRecommendedTransform = true; - args.insertOrAssign(ReadH5EbsdFilter::k_ReadH5EbsdFilter_Key, std::make_any(h5ebsdParamVal)); + args.insertOrAssign(ReadH5EbsdFilter::k_ReadH5EbsdParameter_Key, std::make_any(h5ebsdParamVal)); args.insertOrAssign(ReadH5EbsdFilter::k_DataContainerName_Key, std::make_any(Constants::k_DataContainerPath)); args.insertOrAssign(ReadH5EbsdFilter::k_CellAttributeMatrixName_Key, std::make_any(Constants::k_CellData)); args.insertOrAssign(ReadH5EbsdFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); diff --git a/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp b/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp index 0fee49b690..027c88e5eb 100644 --- a/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp +++ b/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp @@ -28,9 +28,9 @@ PYBIND11_MODULE(orientationanalysis, mod) h5EbsdReaderValueType.def(py::init<>()); h5EbsdReaderValueType.def_readwrite("input_file_path", &H5EbsdReaderParameter::ValueType::inputFilePath); h5EbsdReaderValueType.def_readwrite("start_slice", &H5EbsdReaderParameter::ValueType::startSlice); - h5EbsdReaderValueType.def_readwrite("end_slice", &H5EbsdReaderParameter::ValueType::startSlice); + h5EbsdReaderValueType.def_readwrite("end_slice", &H5EbsdReaderParameter::ValueType::endSlice); h5EbsdReaderValueType.def_readwrite("euler_representation", &H5EbsdReaderParameter::ValueType::eulerRepresentation); - h5EbsdReaderValueType.def_readwrite("hdf5_data_paths", &H5EbsdReaderParameter::ValueType::hdf5DataPaths); + h5EbsdReaderValueType.def_readwrite("selected_array_names", &H5EbsdReaderParameter::ValueType::selectedArrayNames); h5EbsdReaderValueType.def_readwrite("use_recommended_transform", &H5EbsdReaderParameter::ValueType::useRecommendedTransform); py::class_ oemEbsdScanSelectionValueType(oemEbsdScanSelectionParameter, "ValueType"); diff --git a/wrapping/python/ReadMe.md b/wrapping/python/ReadMe.md index 1d34445796..b010aba7dd 100644 --- a/wrapping/python/ReadMe.md +++ b/wrapping/python/ReadMe.md @@ -70,3 +70,14 @@ conda install -c bluequartzsoftware complex ``` If you plan to use jupyter notebooks, then any other kernels and such will also need to be installed. VS Code does this for you. + +## Test Python Bindings from Build Directory + +Ensure you are building the python bindings. + +```shell +COMPLEX_BUILD_PYTHON=ON +COMPLEX_EMBED_PYTHON=OFF +COMPLEX_ENABLE_SPHINX_DOCS=ON +Python3_EXECUTABLE=/path/to/python +``` diff --git a/wrapping/python/docs/generate_sphinx_docs.cpp b/wrapping/python/docs/generate_sphinx_docs.cpp index 25fbfd438e..daa17fedd6 100644 --- a/wrapping/python/docs/generate_sphinx_docs.cpp +++ b/wrapping/python/docs/generate_sphinx_docs.cpp @@ -43,8 +43,8 @@ const std::string k_WebServerFilterFolder = "Filters"; void GenerateParameterList() { ::s_ParameterMap.clear(); - ADD_PARAMETER_TRAIT(orientationanalysis.OEMEbsdScanSelectionParameter, "3935c833-aa51-4a58-81e9-3a51972c05ea") - ADD_PARAMETER_TRAIT(orientationanalysis.H5EbsdReaderParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b") + ADD_PARAMETER_TRAIT(complex.OEMEbsdScanSelectionParameter, "3935c833-aa51-4a58-81e9-3a51972c05ea") + ADD_PARAMETER_TRAIT(complex.H5EbsdReaderParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b") ADD_PARAMETER_TRAIT(complex.NumericTypeParameter, "a8ff9dbd-45e7-4ed6-8537-12dd53069bce") ADD_PARAMETER_TRAIT(complex.StringParameter, "5d6d1868-05f8-11ec-9a03-0242ac130003") ADD_PARAMETER_TRAIT(complex.DataStoreFormatParameter, "cfd5c150-2938-42a7-b023-4a9288fb6899") diff --git a/wrapping/python/docs/source/API.rst b/wrapping/python/docs/source/API.rst index 21f20e5cbd..45764db164 100644 --- a/wrapping/python/docs/source/API.rst +++ b/wrapping/python/docs/source/API.rst @@ -383,8 +383,8 @@ General Parameters This parameter represents the :ref:`DataPath` to a valid :ref:`complex.Geometry() ` -.. _ReadCSVFileParameter: -.. py:class:: ReadCSVFileParameter +.. _ReadCSVDataParameter: +.. py:class:: ReadCSVDataParameter This parameter is used for the :ref:`complex.ReadCSVFileFilter() ` and holds the information to import a file formatted as table data where each @@ -394,13 +394,13 @@ General Parameters + The file optionally can have a line of headers. The user can specify what line number the header is located. + The import can start at a user specified line number but will continue to the end of the file. - The primary python object that will hold the information to pass to the filter is the ReadCSVData class described below. + The primary python object that will hold the information to pass to the filter is the ReadCSVDataParameter class described below. - :ivar ValueType: ReadCSVData + :ivar ValueType: ReadCSVDataParameter - .. py:class:: ReadCSVFileParameter.ReadCSVData + .. py:class:: ReadCSVDataParameter - The ReadCSVData class holds all the necessary information to import a CSV formatted file into DREAM3D-NX. There are + The ReadCSVDataParameter class holds all the necessary information to import a CSV formatted file into DREAM3D-NX. There are a number of member variables that need to be set correctly before the filter will execute correctly. @@ -413,14 +413,15 @@ General Parameters :ivar skipped_array_mask: List[bool]. Booleans, one per column, that indicate whether or not to skip importing each created :ref:`DataArray `. :ivar tuple_dims: List[int]. The tuple dimensions for the created :ref:`DataArrays `. :ivar headers_line: Int. The line number of the file that has the headers listed on a single line. ONE (1) based indexing. - :ivar header_mode: 'cx.ReadCSVData.HeaderMode.'. Can be one of 'cx.ReadCSVData.HeaderMode.Line' or 'cx.ReadCSVData.HeaderMode.Custom'. + :ivar header_mode: 'cx.ReadCSVDataParameter.HeaderMode.'. Can be one of 'cx.ReadCSVDataParameter.HeaderMode.Line' or 'cx.ReadCSVDataParameter.HeaderMode.Custom'. .. code:: python data_structure = cx.DataStructure() + # Example File has 7 columns to import - read_csv_data = cx.ReadCSVData() + read_csv_data = cx.ReadCSVDataParameter() read_csv_data.input_file_path = "/tmp/test_csv_data.csv" read_csv_data.start_import_row = 2 read_csv_data.delimiters = [','] @@ -429,7 +430,7 @@ General Parameters 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 - read_csv_data.header_mode = cx.ReadCSVData.HeaderMode.Line + read_csv_data.header_mode = cx.ReadCSVDataParameter.HeaderMode.Line # This will store the imported arrays into a newly generated DataGroup result = cx.ReadCSVFileFilter.execute(data_structure=data_structure, @@ -443,6 +444,47 @@ General Parameters read_csv_data=read_csv_data # The ReadCSVData object with all member variables set. ) +.. _H5EbsdReaderParameter: +.. py:class:: H5EbsdReaderParameter + + This parameter is used for the :ref:`orientationAnalysis.ReadH5EbsdFilter() ` and holds the information to import the EBSD data from the file. + + The primary python object that will hold the information to pass to the filter is the H5EbsdReaderParameter class described below. + + :ivar ValueType: H5EbsdReaderParameter + + .. py:class:: H5EbsdReaderParameter + + The H5EbsdReaderParameter class holds all the necessary information to import EBSD data stored in the H5Ebsd file. + + :ivar euler_representation: Int. 0=Radians, 1=Degrees + :ivar start_slice: Int. The starting slice of EBSD data to import + :ivar end_slice: Int. The ending slice (inclusive) of EBSD data to import + :ivar selected_array_names: List[string]. The names of the EBSD data to import. These may differ slightly between the various OEMs. + :ivar input_file_path: PathLike. The path to the .h5ebsd file to read. + :ivar use_recommended_transform: Bool. Apply the stored sample and crystal reference frame transformations. + + .. code:: python + + data_structure = cx.DataStructure() + # Create the H5EbsdReaderParameter and assign values to it. + h5ebsdParameter = cxor.H5EbsdReaderParameter.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"] + h5ebsdParameter.input_file_path="Data/Output/Reconstruction/Small_IN100.h5ebsd" + h5ebsdParameter.start_slice=1 + h5ebsdParameter.use_recommended_transform=True + + # Execute Filter with Parameters + result = cxor.ReadH5EbsdFilter.execute( + data_structure=data_structure, + cell_attribute_matrix_name="CellData", + cell_ensemble_attribute_matrix_name="CellEnsembleData", + data_container_name=cx.DataPath("DataContainer"), + read_h5_ebsd_parameter=h5ebsdParameter + ) + .. _ImportHDF5DatasetParameter: .. py:class:: ImportHDF5DatasetParameter diff --git a/wrapping/python/docs/source/ReleaseNotes.rst b/wrapping/python/docs/source/ReleaseNotes.rst index 8955e9248b..abaca10f6a 100644 --- a/wrapping/python/docs/source/ReleaseNotes.rst +++ b/wrapping/python/docs/source/ReleaseNotes.rst @@ -7,8 +7,70 @@ found the necessitate the changing of the API. Version 1.2.0 ------------- -API Additions -^^^^^^^^^^^^^ +API Additions 1.2.0 +^^^^^^^^^^^^^^^^^^^ + +None + +Filter Changes 1.2.0 +^^^^^^^^^^^^^^^^^^^^ + +- All import and export filters have been renamed to either *ReadXXXX* or *WriteXXXX*. This will effect the python filter classes. + +- ComplexCore + ++----------------------------------------+---------------------------------------+-----------+ +| Old File Name | New File Name | Type | ++========================================+=======================================+===========+ +| AbaqusHexahedronWriterFilter | WriteAbaqusHexahedronFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| AvizoRectilinearCoordinateWriterFilter | WriteAvizoRectilinearCoordinateFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| AvizoUniformCoordinateWriterFilter | WriteAvizoUniformCoordinateFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| ExportDREAM3DFilter | WriteDREAM3DFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| FeatureDataCSVWriterFilter | WriteFeatureDataCSVFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| ImportDeformKeyFileV12Filter | ReadDeformKeyFileV12Filter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| ImportVolumeGraphicsFileFilter | ReadVolumeGraphicsFileFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| ImportBinaryCTNorthstarFilter | ReadBinaryCTNorthstarFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| LosAlamosFFTWriterFilter | WriteLosAlamosFFTFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| RawBinaryReaderFilter | ReadRawBinaryFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| StlFileReaderFilter | ReadStlFileFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| VtkRectilinearGridWriterFilter | WriteVtkRectilinearGridFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ + +- OrientationAnalysis + ++------------------------------+-----------------------------+-----------+ +| Old File Name | New File Name | Type | ++==============================+=============================+===========+ +| EnsembleInfoReaderFilter | ReadEnsembleInfoFilter | Filter | ++------------------------------+-----------------------------+-----------+ +| ExportGBCDGMTFileFilter | WriteGBCDGMTFileFilter | Filter | ++------------------------------+-----------------------------+-----------+ +| ExportGBCDTriangleDataFilter | WriteGBCDTriangleDataFilter | Filter | ++------------------------------+-----------------------------+-----------+ +| ImportH5Data | ReadH5Data | Utility | ++------------------------------+-----------------------------+-----------+ +| ImportH5OimDataFilter | ReadH5OimDataFilter | Filter | ++------------------------------+-----------------------------+-----------+ +| INLWriterFilter | WriteINLFileFilter | Filter | ++------------------------------+-----------------------------+-----------+ + + +Version 1.1.0 +------------- + +API Additions 1.1.0 +^^^^^^^^^^^^^^^^^^^ - DataPath: A :ref:`DataPath` object can now be constructed with a "/" separated string in addition to a list of strings. @@ -17,8 +79,8 @@ API Additions some_path = complex.DataPath("DataContainer/AttributeMatrix/DataArray") -Filter Changes -^^^^^^^^^^^^^^ +Filter Changes 1.1.0 +^^^^^^^^^^^^^^^^^^^^ - Filters that used a "Mask Array" or a "Good Voxels" array have all been changed to use following terms: @@ -28,11 +90,11 @@ Filter Changes - ImportCSVDataFilter: - This filter has been changed to "ReadCSVFilter". The input parameter has also changed. See the :ref:`ReadCSVFileParameter` for more information. + This filter has been changed to "ReadCSVFilter". The input parameter has also changed. See the :ref:`ReadCSVDataParameter` for more information. -Git Log -^^^^^^^ +Git Log 1.1.0 +^^^^^^^^^^^^^ - BUG: Export ASCII Data now exports multiple arrays correctly. (#756) - [2023-10-27] - ENH: Use "Mask" instead of "GoodVoxels" consistently for human facing strings. (#755) - [2023-10-27] diff --git a/wrapping/python/examples/import_hdf5.py b/wrapping/python/examples/import_hdf5.py index 6ef4744d7d..cac7d9fcec 100644 --- a/wrapping/python/examples/import_hdf5.py +++ b/wrapping/python/examples/import_hdf5.py @@ -7,6 +7,23 @@ # Create the DataStructure object data_structure = cx.DataStructure() +# Create the H5EbsdReaderParameter and assign values to it. +h5ebsdParameter = cxor.H5EbsdReaderParameter.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"] +h5ebsdParameter.input_file_path="Data/Output/Reconstruction/Small_IN100.h5ebsd" +h5ebsdParameter.start_slice=1 +h5ebsdParameter.use_recommended_transform=True + +# Execute Filter with Parameters +result = cxor.ReadH5EbsdFilter.execute( + data_structure=data_structure, + cell_attribute_matrix_name="CellData", + cell_ensemble_attribute_matrix_name="CellEnsembleData", + data_container_name=cx.DataPath("DataContainer"), + read_h5_ebsd_parameter=h5ebsdParameter +) dataset1 = cx.ImportHDF5DatasetParameter.DatasetImportInfo() dataset1.dataset_path = "/DataStructure/DataContainer/CellData/Confidence Index" diff --git a/wrapping/python/examples/pipeline.py b/wrapping/python/examples/pipeline.py index 0b8c697e94..db66bb66d8 100644 --- a/wrapping/python/examples/pipeline.py +++ b/wrapping/python/examples/pipeline.py @@ -8,11 +8,17 @@ data_structure = cx.DataStructure() -pipeline = cx.Pipeline() -pipeline.append(cx.CreateDataArray(), {'numeric_type': cx.NumericType.int32}) -pipeline[0].set_args({'numeric_type': cx.NumericType.int32}) +pipeline = cx.Pipeline().from_file("/Users/mjackson/Workspace1/complex/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(01) Small IN100 Archive.d3dpipeline") -did_execute = pipeline.execute(data_structure) +pipeline.to_file( "test pipeline", "/tmp/python_pipeline.d3dpipeline") + + + +# pipeline.append(cx.CreateDataArray(), {'numeric_type': cx.NumericType.int32}) +# pipeline[0].set_args({'numeric_type': cx.NumericType.int32}) + +# did_execute = pipeline.execute(data_structure) + +# print('Pipeline Execute: {}'.format(did_execute)) -print('Pipeline Execute: {}'.format(did_execute)) diff --git a/wrapping/python/examples/read_csv_file.py b/wrapping/python/examples/read_csv_file.py index 37a484e0b4..b34fd65eb3 100644 --- a/wrapping/python/examples/read_csv_file.py +++ b/wrapping/python/examples/read_csv_file.py @@ -7,7 +7,7 @@ # Create the DataStructure object data_structure = cx.DataStructure() # This file has 7 columns to import -read_csv_data = cx.ReadCSVData() +read_csv_data = cx.ReadCSVDataParameter() read_csv_data.input_file_path = "wrapping/python/examples/test_csv_data.csv" read_csv_data.start_import_row = 2 read_csv_data.delimiters = [','] @@ -16,7 +16,7 @@ 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 -read_csv_data.header_mode = cx.ReadCSVData.HeaderMode.Line +read_csv_data.header_mode = cx.ReadCSVDataParameter.HeaderMode.Line # This will store the imported arrays into a newly generated DataGroup result = cx.ReadCSVFileFilter.execute(data_structure=data_structure, From 448e20dfe636ca005ac75089c4bb19fd1bc2bf60 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 13 Nov 2023 10:19:58 -0500 Subject: [PATCH 14/19] FindFeaturePhases: Change k_FeaturePhasesArrayName_Key value Signed-off-by: Michael Jackson --- pipelines/Combo-EBSD-osc_r0c0.d3dpipeline | 2 +- pipelines/PorosityAnalysis.d3dpipeline | 2 +- .../pipelines/VtkRectilinearGridWriter.d3dpipeline | 2 +- .../ComplexCore/Filters/FindFeaturePhasesFilter.cpp | 8 ++++---- .../ComplexCore/Filters/FindFeaturePhasesFilter.hpp | 2 +- .../ComplexCore/test/FindFeaturePhasesFilterTest.cpp | 2 +- src/Plugins/ComplexCore/wrapping/python/complexpy.cpp | 11 ++++------- .../pipelines/(02) Image Segmentation.d3dpipeline | 2 +- .../(08) Small IN100 Full Reconstruction.d3dpipeline | 2 +- ...mall IN100 Crystallographic Statistics.d3dpipeline | 2 +- .../pipelines/FindGBCD-GBPDMetricBased.d3dpipeline | 2 +- .../OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp | 3 ++- 12 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline index 9a28522e9f..5b3132acea 100644 --- a/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline +++ b/pipelines/Combo-EBSD-osc_r0c0.d3dpipeline @@ -335,7 +335,7 @@ "cell_features_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_phases_array_path": "DataContainer/CellData/Phases", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "feature_phases_array_path": "Phases" + "feature_phases_array_name": "Phases" }, "comments": "", "filter": { diff --git a/pipelines/PorosityAnalysis.d3dpipeline b/pipelines/PorosityAnalysis.d3dpipeline index 23291fe1a6..be39249a71 100644 --- a/pipelines/PorosityAnalysis.d3dpipeline +++ b/pipelines/PorosityAnalysis.d3dpipeline @@ -154,7 +154,7 @@ "cell_features_attribute_matrix_path": "RoboMet.3D Image Stack/Pore Data", "cell_phases_array_path": "RoboMet.3D Image Stack/Optical Data/Phases", "feature_ids_path": "RoboMet.3D Image Stack/Optical Data/FeatureIds", - "feature_phases_array_path": "Phases" + "feature_phases_array_name": "Phases" }, "comments": "", "filter": { diff --git a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline b/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline index dca9e7e1f2..855c0f230b 100644 --- a/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline +++ b/src/Plugins/ComplexCore/pipelines/VtkRectilinearGridWriter.d3dpipeline @@ -234,7 +234,7 @@ "cell_features_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_phases_array_path": "DataContainer/CellData/Phases", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "feature_phases_array_path": "Phases" + "feature_phases_array_name": "Phases" }, "comments": "", "filter": { diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.cpp index d69b146c16..00874bcbf8 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.cpp @@ -49,7 +49,7 @@ Parameters FindFeaturePhasesFilter::parameters() const // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Cell Data"}); - params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Phases", "Specifies to which Ensemble each Element belongs", DataPath({"Phases"}), + params.insert(std::make_unique(k_CellPhasesArrayPath_Key, "Cell Phases", "Specifies to which Ensemble each Element belongs", DataPath({"Phases"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); params.insert(std::make_unique(k_CellFeatureIdsArrayPath_Key, "Feature Ids", "Specifies to which Feature each Element belongs", DataPath({"CellData", "FeatureIds"}), ArraySelectionParameter::AllowedTypes{DataType::int32}, ArraySelectionParameter::AllowedComponentShapes{{1}})); @@ -58,7 +58,7 @@ Parameters FindFeaturePhasesFilter::parameters() const params.insertSeparator(Parameters::Separator{"Created Feature Data"}); params.insert( - std::make_unique(k_FeaturePhasesArrayPath_Key, "Feature Phases", "The name of the feature attribute matrix in which to store the found feature phases array", "Phases")); + std::make_unique(k_FeaturePhasesArrayName_Key, "Feature Phases", "The name of the feature attribute matrix in which to store the found feature phases array", "Phases")); return params; } @@ -76,7 +76,7 @@ IFilter::PreflightResult FindFeaturePhasesFilter::preflightImpl(const DataStruct auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); auto pFeatureIdsArrayPathValue = filterArgs.value(k_CellFeatureIdsArrayPath_Key); auto pCellFeatureAMPathValue = filterArgs.value(k_CellFeaturesAttributeMatrixPath_Key); - auto pFeaturePhasesArrayPathValue = pCellFeatureAMPathValue.createChildPath(filterArgs.value(k_FeaturePhasesArrayPath_Key)); + auto pFeaturePhasesArrayPathValue = pCellFeatureAMPathValue.createChildPath(filterArgs.value(k_FeaturePhasesArrayName_Key)); complex::Result resultOutputActions; @@ -107,7 +107,7 @@ Result<> FindFeaturePhasesFilter::executeImpl(DataStructure& dataStructure, cons auto pCellPhasesArrayPathValue = filterArgs.value(k_CellPhasesArrayPath_Key); auto pFeatureIdsArrayPathValue = filterArgs.value(k_CellFeatureIdsArrayPath_Key); auto pCellFeatureAMPathValue = filterArgs.value(k_CellFeaturesAttributeMatrixPath_Key); - auto pFeaturePhasesArrayPathValue = pCellFeatureAMPathValue.createChildPath(filterArgs.value(k_FeaturePhasesArrayPath_Key)); + auto pFeaturePhasesArrayPathValue = pCellFeatureAMPathValue.createChildPath(filterArgs.value(k_FeaturePhasesArrayName_Key)); const Int32Array& cellPhases = dataStructure.getDataRefAs(pCellPhasesArrayPathValue); const Int32Array& featureIds = dataStructure.getDataRefAs(pFeatureIdsArrayPathValue); diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.hpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.hpp index 012e47003f..2e10071b82 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.hpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/FindFeaturePhasesFilter.hpp @@ -30,7 +30,7 @@ class COMPLEXCORE_EXPORT FindFeaturePhasesFilter : public IFilter // Parameter Keys static inline constexpr StringLiteral k_CellPhasesArrayPath_Key = "cell_phases_array_path"; static inline constexpr StringLiteral k_CellFeatureIdsArrayPath_Key = "feature_ids_path"; - static inline constexpr StringLiteral k_FeaturePhasesArrayPath_Key = "feature_phases_array_path"; + static inline constexpr StringLiteral k_FeaturePhasesArrayName_Key = "feature_phases_array_name"; static inline constexpr StringLiteral k_CellFeaturesAttributeMatrixPath_Key = "cell_features_attribute_matrix_path"; /** diff --git a/src/Plugins/ComplexCore/test/FindFeaturePhasesFilterTest.cpp b/src/Plugins/ComplexCore/test/FindFeaturePhasesFilterTest.cpp index 357f8077d5..1a4afae60d 100644 --- a/src/Plugins/ComplexCore/test/FindFeaturePhasesFilterTest.cpp +++ b/src/Plugins/ComplexCore/test/FindFeaturePhasesFilterTest.cpp @@ -32,7 +32,7 @@ TEST_CASE("ComplexCore::FindFeaturePhasesFilter(Valid Parameters)", "[ComplexCor args.insert(FindFeaturePhasesFilter::k_CellPhasesArrayPath_Key, std::make_any(cellPhasesPath)); args.insert(FindFeaturePhasesFilter::k_CellFeatureIdsArrayPath_Key, std::make_any(featureIdsPath)); args.insert(FindFeaturePhasesFilter::k_CellFeaturesAttributeMatrixPath_Key, std::make_any(cellFeatureDataPath)); - args.insert(FindFeaturePhasesFilter::k_FeaturePhasesArrayPath_Key, std::make_any(featurePhasesName)); + args.insert(FindFeaturePhasesFilter::k_FeaturePhasesArrayName_Key, std::make_any(featurePhasesName)); auto preflightResult = ffpFilter.preflight(dataStructure, args); COMPLEX_RESULT_REQUIRE_VALID(preflightResult.outputActions); diff --git a/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp b/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp index bf3e5e6525..293657690e 100644 --- a/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp +++ b/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp @@ -1010,20 +1010,17 @@ PYBIND11_MODULE(complex, mod) }, "path"_a); pipeline.def( - "to_file", - [](Pipeline& self, const std::string& name, const std::filesystem::path& path) { + "to_file", + [](Pipeline& self, const std::string& name, const std::filesystem::path& path) { nlohmann::json pipelineJson = self.toJson(); pipelineJson["name"] = name; std::ofstream file(path, std::ios_base::binary); file << pipelineJson; }, - "name"_a, - "path"_a); + "name"_a, "path"_a); pipeline.def("execute", &ExecutePipeline); pipeline.def( - "__getitem__", - [](Pipeline& self, Pipeline::index_type index) { return self.at(index); }, - py::return_value_policy::reference_internal); + "__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( diff --git a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline index 65a129f486..ee4e1d5a98 100644 --- a/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline +++ b/src/Plugins/ITKImageProcessing/pipelines/(02) Image Segmentation.d3dpipeline @@ -156,7 +156,7 @@ "cell_features_attribute_matrix_path": "ImageDataContainer/CellFeatureData", "cell_phases_array_path": "ImageDataContainer/Cell Data/Phases", "feature_ids_path": "ImageDataContainer/Cell Data/FeatureIds", - "feature_phases_array_path": "Phases" + "feature_phases_array_name": "Phases" }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline index 183802fad1..2d92f9338a 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Reconstruction/(08) Small IN100 Full Reconstruction.d3dpipeline @@ -192,7 +192,7 @@ "cell_features_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_phases_array_path": "DataContainer/CellData/Phases", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "feature_phases_array_path": "Phases" + "feature_phases_array_name": "Phases" }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline index 0aa10a9f08..07215df18c 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/EBSD Statistics/(05) Small IN100 Crystallographic Statistics.d3dpipeline @@ -279,7 +279,7 @@ "cell_features_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_phases_array_path": "DataContainer/CellData/Phases", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "feature_phases_array_path": "Phases" + "feature_phases_array_name": "Phases" }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline index 4682783f13..f09a8f1dc5 100644 --- a/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline +++ b/src/Plugins/OrientationAnalysis/pipelines/FindGBCD-GBPDMetricBased.d3dpipeline @@ -535,7 +535,7 @@ "cell_features_attribute_matrix_path": "DataContainer/CellFeatureData", "cell_phases_array_path": "DataContainer/CellData/Phases", "feature_ids_path": "DataContainer/CellData/FeatureIds", - "feature_phases_array_path": "Phases" + "feature_phases_array_name": "Phases" }, "comments": "", "filter": { diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index bc619fcafe..944903f744 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -56,7 +56,8 @@ Parameters ReadH5EbsdFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_ReadH5EbsdParameter_Key, "Import H5Ebsd File", "Object that holds all relevant information to import data from the file.", H5EbsdReaderParameter::ValueType{})); + params.insert(std::make_unique(k_ReadH5EbsdParameter_Key, "Import H5Ebsd File", "Object that holds all relevant information to import data from the file.", + H5EbsdReaderParameter::ValueType{})); params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); params.insert(std::make_unique(k_DataContainerName_Key, "Created Image Geometry", "The complete path to the imported Image Geometry", DataPath({"DataContainer"}))); From e1350e2ca90af272a51ae92628954117c1d5d979 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 13 Nov 2023 10:29:30 -0500 Subject: [PATCH 15/19] Python: Adjust release notes structure to separate versions. Signed-off-by: Michael Jackson --- wrapping/python/docs/index_template.rst | 3 +- ...{ReleaseNotes.rst => ReleaseNotes_110.rst} | 66 +----------------- .../python/docs/source/ReleaseNotes_120.rst | 69 +++++++++++++++++++ 3 files changed, 73 insertions(+), 65 deletions(-) rename wrapping/python/docs/source/{ReleaseNotes.rst => ReleaseNotes_110.rst} (56%) create mode 100644 wrapping/python/docs/source/ReleaseNotes_120.rst diff --git a/wrapping/python/docs/index_template.rst b/wrapping/python/docs/index_template.rst index a3d09b4f60..4575a5118e 100644 --- a/wrapping/python/docs/index_template.rst +++ b/wrapping/python/docs/index_template.rst @@ -24,13 +24,14 @@ by creating a new virtual environment :caption: Contents: Installation - ReleaseNotes Overview DataObjects Geometry API Python_Introduction Reference_Frame_Notes + ReleaseNotes_110 + ReleaseNotes_120 @PLUGIN_LIST@ Indices and tables diff --git a/wrapping/python/docs/source/ReleaseNotes.rst b/wrapping/python/docs/source/ReleaseNotes_110.rst similarity index 56% rename from wrapping/python/docs/source/ReleaseNotes.rst rename to wrapping/python/docs/source/ReleaseNotes_110.rst index abaca10f6a..bda9821495 100644 --- a/wrapping/python/docs/source/ReleaseNotes.rst +++ b/wrapping/python/docs/source/ReleaseNotes_110.rst @@ -1,71 +1,9 @@ -Release Notes -============= +Release Notes 1.1.0 +=================== The `complex` library is under activate development and while we strive to maintain a stable API bugs are found the necessitate the changing of the API. -Version 1.2.0 -------------- - -API Additions 1.2.0 -^^^^^^^^^^^^^^^^^^^ - -None - -Filter Changes 1.2.0 -^^^^^^^^^^^^^^^^^^^^ - -- All import and export filters have been renamed to either *ReadXXXX* or *WriteXXXX*. This will effect the python filter classes. - -- ComplexCore - -+----------------------------------------+---------------------------------------+-----------+ -| Old File Name | New File Name | Type | -+========================================+=======================================+===========+ -| AbaqusHexahedronWriterFilter | WriteAbaqusHexahedronFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| AvizoRectilinearCoordinateWriterFilter | WriteAvizoRectilinearCoordinateFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| AvizoUniformCoordinateWriterFilter | WriteAvizoUniformCoordinateFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| ExportDREAM3DFilter | WriteDREAM3DFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| FeatureDataCSVWriterFilter | WriteFeatureDataCSVFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| ImportDeformKeyFileV12Filter | ReadDeformKeyFileV12Filter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| ImportVolumeGraphicsFileFilter | ReadVolumeGraphicsFileFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| ImportBinaryCTNorthstarFilter | ReadBinaryCTNorthstarFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| LosAlamosFFTWriterFilter | WriteLosAlamosFFTFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| RawBinaryReaderFilter | ReadRawBinaryFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| StlFileReaderFilter | ReadStlFileFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ -| VtkRectilinearGridWriterFilter | WriteVtkRectilinearGridFilter | Filter | -+----------------------------------------+---------------------------------------+-----------+ - -- OrientationAnalysis - -+------------------------------+-----------------------------+-----------+ -| Old File Name | New File Name | Type | -+==============================+=============================+===========+ -| EnsembleInfoReaderFilter | ReadEnsembleInfoFilter | Filter | -+------------------------------+-----------------------------+-----------+ -| ExportGBCDGMTFileFilter | WriteGBCDGMTFileFilter | Filter | -+------------------------------+-----------------------------+-----------+ -| ExportGBCDTriangleDataFilter | WriteGBCDTriangleDataFilter | Filter | -+------------------------------+-----------------------------+-----------+ -| ImportH5Data | ReadH5Data | Utility | -+------------------------------+-----------------------------+-----------+ -| ImportH5OimDataFilter | ReadH5OimDataFilter | Filter | -+------------------------------+-----------------------------+-----------+ -| INLWriterFilter | WriteINLFileFilter | Filter | -+------------------------------+-----------------------------+-----------+ - - Version 1.1.0 ------------- diff --git a/wrapping/python/docs/source/ReleaseNotes_120.rst b/wrapping/python/docs/source/ReleaseNotes_120.rst new file mode 100644 index 0000000000..1876c36013 --- /dev/null +++ b/wrapping/python/docs/source/ReleaseNotes_120.rst @@ -0,0 +1,69 @@ +Release Notes 1.2.0 +=================== + +The `complex` library is under activate development and while we strive to maintain a stable API bugs are +found the necessitate the changing of the API. + +Version 1.2.0 +------------- + +API Additions 1.2.0 +^^^^^^^^^^^^^^^^^^^ + + .. code:: python + + cx.Pipeline().to_file(name, file_path) + +Filter Changes 1.2.0 +^^^^^^^^^^^^^^^^^^^^ + +- All import and export filters have been renamed to either *ReadXXXX* or *WriteXXXX*. This will effect the python filter classes. + +- ComplexCore + ++----------------------------------------+---------------------------------------+-----------+ +| Old File Name | New File Name | Type | ++========================================+=======================================+===========+ +| AbaqusHexahedronWriterFilter | WriteAbaqusHexahedronFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| AvizoRectilinearCoordinateWriterFilter | WriteAvizoRectilinearCoordinateFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| AvizoUniformCoordinateWriterFilter | WriteAvizoUniformCoordinateFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| ExportDREAM3DFilter | WriteDREAM3DFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| FeatureDataCSVWriterFilter | WriteFeatureDataCSVFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| ImportDeformKeyFileV12Filter | ReadDeformKeyFileV12Filter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| ImportVolumeGraphicsFileFilter | ReadVolumeGraphicsFileFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| ImportBinaryCTNorthstarFilter | ReadBinaryCTNorthstarFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| LosAlamosFFTWriterFilter | WriteLosAlamosFFTFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| RawBinaryReaderFilter | ReadRawBinaryFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| StlFileReaderFilter | ReadStlFileFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ +| VtkRectilinearGridWriterFilter | WriteVtkRectilinearGridFilter | Filter | ++----------------------------------------+---------------------------------------+-----------+ + +- OrientationAnalysis + ++------------------------------+-----------------------------+-----------+ +| Old File Name | New File Name | Type | ++==============================+=============================+===========+ +| EnsembleInfoReaderFilter | ReadEnsembleInfoFilter | Filter | ++------------------------------+-----------------------------+-----------+ +| ExportGBCDGMTFileFilter | WriteGBCDGMTFileFilter | Filter | ++------------------------------+-----------------------------+-----------+ +| ExportGBCDTriangleDataFilter | WriteGBCDTriangleDataFilter | Filter | ++------------------------------+-----------------------------+-----------+ +| ImportH5Data | ReadH5Data | Utility | ++------------------------------+-----------------------------+-----------+ +| ImportH5OimDataFilter | ReadH5OimDataFilter | Filter | ++------------------------------+-----------------------------+-----------+ +| INLWriterFilter | WriteINLFileFilter | Filter | ++------------------------------+-----------------------------+-----------+ + From 07994321f7dfd1a071ac802c1d676a500785f4dd Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 13 Nov 2023 11:22:06 -0500 Subject: [PATCH 16/19] Rename the ImportHDFDatasetParameter to ReadHDF5DataSetParameter Signed-off-by: Michael Jackson --- CMakeLists.txt | 2 +- .../ComplexCore/Filters/ReadHDF5Dataset.cpp | 8 ++-- .../ComplexCore/test/ReadHDF5DatasetTest.cpp | 48 +++++++++---------- .../ComplexCore/wrapping/python/complexpy.cpp | 24 +++++----- ...ameter.cpp => ReadH5EbsdFileParameter.cpp} | 24 +++++----- ...rParameter.h => ReadH5EbsdFileParameter.h} | 18 +++---- ...meter.cpp => ReadHDF5DatasetParameter.cpp} | 22 ++++----- ...meter.hpp => ReadHDF5DatasetParameter.hpp} | 18 +++---- wrapping/python/docs/generate_sphinx_docs.cpp | 2 +- wrapping/python/docs/source/API.rst | 16 +++---- 10 files changed, 91 insertions(+), 91 deletions(-) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/{H5EbsdReaderParameter.cpp => ReadH5EbsdFileParameter.cpp} (89%) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/{H5EbsdReaderParameter.h => ReadH5EbsdFileParameter.h} (70%) rename src/complex/Parameters/{ImportHDF5DatasetParameter.cpp => ReadHDF5DatasetParameter.cpp} (85%) rename src/complex/Parameters/{ImportHDF5DatasetParameter.hpp => ReadHDF5DatasetParameter.hpp} (89%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2991a45e1b..da38d7f90d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,7 +262,7 @@ set(CoreParameters NumberParameter NumericTypeParameter ReadCSVFileParameter - ImportHDF5DatasetParameter + ReadHDF5DatasetParameter StringParameter VectorParameter ) diff --git a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp index dfe372e0ba..1baab5e5ab 100644 --- a/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp +++ b/src/Plugins/ComplexCore/src/ComplexCore/Filters/ReadHDF5Dataset.cpp @@ -4,7 +4,7 @@ #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/CreateArrayAction.hpp" #include "complex/Parameters/DataGroupSelectionParameter.hpp" -#include "complex/Parameters/ImportHDF5DatasetParameter.hpp" +#include "complex/Parameters/ReadHDF5DatasetParameter.hpp" #include "complex/Utilities/DataArrayUtilities.hpp" #include "complex/Utilities/Parsing/HDF5/H5.hpp" #include "complex/Utilities/Parsing/HDF5/Readers/FileReader.hpp" @@ -132,7 +132,7 @@ Parameters ReadHDF5Dataset::parameters() const Parameters params; params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_ImportHDF5File_Key, "Select HDF5 File", "The HDF5 file data to import", ImportHDF5DatasetParameter::ValueType{})); + params.insert(std::make_unique(k_ImportHDF5File_Key, "Select HDF5 File", "The HDF5 file data to import", ReadHDF5DatasetParameter::ValueType{})); return params; } @@ -147,7 +147,7 @@ IFilter::UniquePointer ReadHDF5Dataset::clone() const IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dataStructure, const Arguments& filterArgs, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pImportHDF5FileValue = filterArgs.value(k_ImportHDF5File_Key); + auto pImportHDF5FileValue = filterArgs.value(k_ImportHDF5File_Key); auto pSelectedAttributeMatrixValue = pImportHDF5FileValue.parent; auto inputFile = pImportHDF5FileValue.inputFile; auto datasetImportInfoList = pImportHDF5FileValue.datasets; @@ -351,7 +351,7 @@ IFilter::PreflightResult ReadHDF5Dataset::preflightImpl(const DataStructure& dat Result<> ReadHDF5Dataset::executeImpl(DataStructure& dataStructure, const Arguments& filterArgs, const PipelineFilter* pipelineNode, const MessageHandler& messageHandler, const std::atomic_bool& shouldCancel) const { - auto pImportHDF5FileValue = filterArgs.value(k_ImportHDF5File_Key); + auto pImportHDF5FileValue = filterArgs.value(k_ImportHDF5File_Key); auto pSelectedAttributeMatrixValue = pImportHDF5FileValue.parent; auto inputFile = pImportHDF5FileValue.inputFile; fs::path inputFilePath(inputFile); diff --git a/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp b/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp index c2da14117a..1345a6088b 100644 --- a/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp +++ b/src/Plugins/ComplexCore/test/ReadHDF5DatasetTest.cpp @@ -4,7 +4,7 @@ #include "complex/Common/TypesUtility.hpp" #include "complex/DataStructure/DataArray.hpp" #include "complex/Parameters/DataGroupCreationParameter.hpp" -#include "complex/Parameters/ImportHDF5DatasetParameter.hpp" +#include "complex/Parameters/ReadHDF5DatasetParameter.hpp" #include "complex/UnitTest/UnitTestCommon.hpp" #include "complex/Utilities/Parsing/HDF5/H5Support.hpp" #include "complex/Utilities/Parsing/HDF5/Writers/FileWriter.hpp" @@ -152,8 +152,8 @@ void testFilterPreflight(ReadHDF5Dataset& filter) AttributeMatrix* levelZeroAttributeMatrix = AttributeMatrix::Create(dataStructure, levelZeroAMName, {COMPDIMPROD * TUPLEDIMPROD}); std::optional levelZeroPath = {DataPath::FromString(Constants::k_LevelZero.view()).value()}; - ImportHDF5DatasetParameter::ValueType val = {levelZeroPath, "", {}}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + ReadHDF5DatasetParameter::ValueType val = {levelZeroPath, "", {}}; + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); // Check empty file path error auto results = filter.preflight(dataStructure, args); @@ -161,35 +161,35 @@ void testFilterPreflight(ReadHDF5Dataset& filter) // Check incorrect extension error val = {levelZeroPath, "foo.txt", {}}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); // Check non-existent file error val = {levelZeroPath, "foo.h5", {}}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); // Put in the correct file path val = {levelZeroPath, m_FilePath, {}}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); // Check no datasets checked error results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); // Check empty dataset path error - std::list importInfoList; - ImportHDF5DatasetParameter::DatasetImportInfo importInfo; + std::list importInfoList; + ReadHDF5DatasetParameter::DatasetImportInfo importInfo; importInfo.componentDimensions = ""; importInfo.tupleDimensions = ""; importInfo.dataSetPath = ""; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -199,7 +199,7 @@ void testFilterPreflight(ReadHDF5Dataset& filter) importInfo.dataSetPath = "/Foo"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -210,7 +210,7 @@ void testFilterPreflight(ReadHDF5Dataset& filter) importInfo.dataSetPath = "Pointer/Pointer1DArrayDataset<" + typeStr + ">"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); // Check empty component dimensions results = filter.preflight(dataStructure, args); @@ -221,7 +221,7 @@ void testFilterPreflight(ReadHDF5Dataset& filter) importInfo.componentDimensions = "(abcdg 635w"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -231,7 +231,7 @@ void testFilterPreflight(ReadHDF5Dataset& filter) importInfo.componentDimensions = "12, 6"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -240,14 +240,14 @@ void testFilterPreflight(ReadHDF5Dataset& filter) importInfo.tupleDimensions = "(abcdg 635w"; importInfoList.push_back(importInfo); val = {levelZeroPath, m_FilePath, importInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); // Check empty parent attribute matrix/data group val = {std::optional{}, m_FilePath, importInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(!results.outputActions.valid()); @@ -256,7 +256,7 @@ void testFilterPreflight(ReadHDF5Dataset& filter) importInfo.componentDimensions = "1"; importInfoList.push_back(importInfo); val = {DataPath::FromString(levelZeroAMName), m_FilePath, importInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); results = filter.preflight(dataStructure, args); REQUIRE(results.outputActions.valid()); } @@ -280,7 +280,7 @@ std::string createVectorString(std::vector vec) // ----------------------------------------------------------------------------- template -void DatasetTest(ReadHDF5Dataset& filter, const std::list& importInfoList, bool useParentGroup, bool resultsValid) +void DatasetTest(ReadHDF5Dataset& filter, const std::list& importInfoList, bool useParentGroup, bool resultsValid) { if(importInfoList.empty()) { @@ -297,15 +297,15 @@ void DatasetTest(ReadHDF5Dataset& filter, const std::list dsetInfoList = importInfoList; - for(ImportHDF5DatasetParameter::DatasetImportInfo& info : dsetInfoList) + std::list dsetInfoList = importInfoList; + for(ReadHDF5DatasetParameter::DatasetImportInfo& info : dsetInfoList) { info.dataSetPath = StringUtilities::replace(info.dataSetPath, "@TYPE_STRING@", typeStr); } Arguments args; - ImportHDF5DatasetParameter::ValueType val = {parentGroup, m_FilePath, dsetInfoList}; - args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); + ReadHDF5DatasetParameter::ValueType val = {parentGroup, m_FilePath, dsetInfoList}; + args.insertOrAssign(ReadHDF5Dataset::k_ImportHDF5File_Key.str(), std::make_any(val)); // Execute Dataset Test if(dsetInfoList.size() > 1) @@ -328,7 +328,7 @@ void DatasetTest(ReadHDF5Dataset& filter, const std::list importInfoList; - ImportHDF5DatasetParameter::DatasetImportInfo info; + std::list importInfoList; + ReadHDF5DatasetParameter::DatasetImportInfo info; info.componentDimensions = fmt::format("{}", fmt::join(cDims, ", ")); info.tupleDimensions = fmt::format("{}", fmt::join(tDims, ", ")); diff --git a/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp b/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp index 293657690e..6ba421f9f1 100644 --- a/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp +++ b/src/Plugins/ComplexCore/wrapping/python/complexpy.cpp @@ -68,13 +68,13 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include @@ -720,7 +720,7 @@ PYBIND11_MODULE(complex, mod) auto generatedFileListParameter = COMPLEX_PY_BIND_PARAMETER(mod, GeneratedFileListParameter); auto geometrySelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, GeometrySelectionParameter); auto importTextDataParameter = COMPLEX_PY_BIND_PARAMETER(mod, ReadCSVFileParameter); - auto importHDF5DatasetParameter = COMPLEX_PY_BIND_PARAMETER(mod, ImportHDF5DatasetParameter); + auto importHDF5DatasetParameter = COMPLEX_PY_BIND_PARAMETER(mod, ReadHDF5DatasetParameter); auto multiArraySelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, MultiArraySelectionParameter); auto multiPathSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, MultiPathSelectionParameter); auto neighborListSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, NeighborListSelectionParameter); @@ -747,18 +747,18 @@ PYBIND11_MODULE(complex, mod) auto vectorFloat32Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorFloat32Parameter); auto vectorFloat64Parameter = COMPLEX_PY_BIND_VECTOR_PARAMETER(mod, VectorFloat64Parameter); - py::class_ datasetImportInfo(importHDF5DatasetParameter, "DatasetImportInfo"); + py::class_ datasetImportInfo(importHDF5DatasetParameter, "DatasetImportInfo"); datasetImportInfo.def(py::init<>()); - datasetImportInfo.def_readwrite("dataset_path", &ImportHDF5DatasetParameter::DatasetImportInfo::dataSetPath); - datasetImportInfo.def_readwrite("component_dims", &ImportHDF5DatasetParameter::DatasetImportInfo::componentDimensions); - datasetImportInfo.def_readwrite("tuple_dims", &ImportHDF5DatasetParameter::DatasetImportInfo::tupleDimensions); + datasetImportInfo.def_readwrite("dataset_path", &ReadHDF5DatasetParameter::DatasetImportInfo::dataSetPath); + datasetImportInfo.def_readwrite("component_dims", &ReadHDF5DatasetParameter::DatasetImportInfo::componentDimensions); + datasetImportInfo.def_readwrite("tuple_dims", &ReadHDF5DatasetParameter::DatasetImportInfo::tupleDimensions); - py::class_ importHdf5DatasetInfo(importHDF5DatasetParameter, "ValueType"); + py::class_ importHdf5DatasetInfo(importHDF5DatasetParameter, "ValueType"); importHdf5DatasetInfo.def(py::init<>()); - importHdf5DatasetInfo.def_readwrite("parent", &ImportHDF5DatasetParameter::ValueType::parent); - importHdf5DatasetInfo.def_readwrite("input_file", &ImportHDF5DatasetParameter::ValueType::inputFile); - importHdf5DatasetInfo.def_readwrite("datasets", &ImportHDF5DatasetParameter::ValueType::datasets); - importHdf5DatasetInfo.def("__repr__", [](const ImportHDF5DatasetParameter::ValueType& self) { return "ImportHDF5DatasetParameter.ValueType()"; }); + importHdf5DatasetInfo.def_readwrite("parent", &ReadHDF5DatasetParameter::ValueType::parent); + importHdf5DatasetInfo.def_readwrite("input_file", &ReadHDF5DatasetParameter::ValueType::inputFile); + importHdf5DatasetInfo.def_readwrite("datasets", &ReadHDF5DatasetParameter::ValueType::datasets); + importHdf5DatasetInfo.def("__repr__", [](const ReadHDF5DatasetParameter::ValueType& self) { return "ReadHDF5DatasetParameter.ValueType()"; }); py::enum_ generatedFileListOrdering(generatedFileListParameter, "Ordering"); generatedFileListOrdering.value("LowToHigh", GeneratedFileListParameter::Ordering::LowToHigh); @@ -1070,7 +1070,7 @@ PYBIND11_MODULE(complex, mod) internals->addConversion(); internals->addConversion(); internals->addConversion(); - internals->addConversion(); + internals->addConversion(); internals->addConversion(); internals->addConversion(); internals->addConversion(); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp similarity index 89% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.cpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp index d13f13219b..5a2250b101 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.cpp @@ -1,4 +1,4 @@ -#include "H5EbsdReaderParameter.h" +#include "ReadH5EbsdFileParameter.h" #include "complex/Common/Any.hpp" #include "complex/Common/StringLiteral.hpp" @@ -29,26 +29,26 @@ constexpr StringLiteral k_HDF5DataPaths = "hdf5_data_paths"; } // namespace //----------------------------------------------------------------------------- -H5EbsdReaderParameter::H5EbsdReaderParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) +ReadH5EbsdFileParameter::ReadH5EbsdFileParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : ValueParameter(name, humanName, helpText) , m_DefaultValue(defaultValue) { } //----------------------------------------------------------------------------- -Uuid H5EbsdReaderParameter::uuid() const +Uuid ReadH5EbsdFileParameter::uuid() const { - return ParameterTraits::uuid; + return ParameterTraits::uuid; } //----------------------------------------------------------------------------- -IParameter::AcceptedTypes H5EbsdReaderParameter::acceptedTypes() const +IParameter::AcceptedTypes ReadH5EbsdFileParameter::acceptedTypes() const { return {typeid(ValueType)}; } //----------------------------------------------------------------------------- -nlohmann::json H5EbsdReaderParameter::toJson(const std::any& value) const +nlohmann::json ReadH5EbsdFileParameter::toJson(const std::any& value) const { const auto& data = GetAnyRef(value); nlohmann::json json; @@ -77,9 +77,9 @@ nlohmann::json H5EbsdReaderParameter::toJson(const std::any& value) const } //----------------------------------------------------------------------------- -Result H5EbsdReaderParameter::fromJson(const nlohmann::json& json) const +Result ReadH5EbsdFileParameter::fromJson(const nlohmann::json& json) const { - static constexpr StringLiteral prefix = "FilterParameter 'H5EbsdReaderParameter' Error: "; + static constexpr StringLiteral prefix = "FilterParameter 'ReadH5EbsdFileParameter' Error: "; if(!json.is_object()) { @@ -177,19 +177,19 @@ Result H5EbsdReaderParameter::fromJson(const nlohmann::json& json) con } //----------------------------------------------------------------------------- -IParameter::UniquePointer H5EbsdReaderParameter::clone() const +IParameter::UniquePointer ReadH5EbsdFileParameter::clone() const { - return std::make_unique(name(), humanName(), helpText(), m_DefaultValue); + return std::make_unique(name(), humanName(), helpText(), m_DefaultValue); } //----------------------------------------------------------------------------- -std::any H5EbsdReaderParameter::defaultValue() const +std::any ReadH5EbsdFileParameter::defaultValue() const { return m_DefaultValue; } //----------------------------------------------------------------------------- -Result<> H5EbsdReaderParameter::validate(const std::any& valueRef) const +Result<> ReadH5EbsdFileParameter::validate(const std::any& valueRef) const { std::vector errors; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.h b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h similarity index 70% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.h rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h index 229777eb2b..573b27bd5e 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/H5EbsdReaderParameter.h +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h @@ -11,7 +11,7 @@ namespace complex { -class COMPLEX_EXPORT H5EbsdReaderParameter : public ValueParameter +class COMPLEX_EXPORT ReadH5EbsdFileParameter : public ValueParameter { public: @@ -28,7 +28,7 @@ class COMPLEX_EXPORT H5EbsdReaderParameter : public ValueParameter bool useRecommendedTransform = {true}; }; - H5EbsdReaderParameter() = delete; + ReadH5EbsdFileParameter() = delete; /** * @brief Constructor @@ -37,14 +37,14 @@ class COMPLEX_EXPORT H5EbsdReaderParameter : public ValueParameter * @param helpText The help text that should be displayed to a user * @param defaultValue The default value for the parameter */ - H5EbsdReaderParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue); + ReadH5EbsdFileParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue); - ~H5EbsdReaderParameter() override = default; + ~ReadH5EbsdFileParameter() override = default; - H5EbsdReaderParameter(const H5EbsdReaderParameter&) = delete; - H5EbsdReaderParameter(H5EbsdReaderParameter&&) noexcept = delete; - H5EbsdReaderParameter& operator=(const H5EbsdReaderParameter&) = delete; - H5EbsdReaderParameter& operator=(H5EbsdReaderParameter&&) noexcept = delete; + ReadH5EbsdFileParameter(const ReadH5EbsdFileParameter&) = delete; + ReadH5EbsdFileParameter(ReadH5EbsdFileParameter&&) noexcept = delete; + ReadH5EbsdFileParameter& operator=(const ReadH5EbsdFileParameter&) = delete; + ReadH5EbsdFileParameter& operator=(ReadH5EbsdFileParameter&&) noexcept = delete; /** * @brief @@ -94,4 +94,4 @@ class COMPLEX_EXPORT H5EbsdReaderParameter : public ValueParameter }; } // namespace complex -COMPLEX_DEF_PARAMETER_TRAITS(complex::H5EbsdReaderParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b"); +COMPLEX_DEF_PARAMETER_TRAITS(complex::ReadH5EbsdFileParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b"); diff --git a/src/complex/Parameters/ImportHDF5DatasetParameter.cpp b/src/complex/Parameters/ReadHDF5DatasetParameter.cpp similarity index 85% rename from src/complex/Parameters/ImportHDF5DatasetParameter.cpp rename to src/complex/Parameters/ReadHDF5DatasetParameter.cpp index ef9c110a6c..726dcebee2 100644 --- a/src/complex/Parameters/ImportHDF5DatasetParameter.cpp +++ b/src/complex/Parameters/ReadHDF5DatasetParameter.cpp @@ -28,7 +28,7 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include "ImportHDF5DatasetParameter.hpp" +#include "ReadHDF5DatasetParameter.hpp" using namespace complex; namespace @@ -41,26 +41,26 @@ constexpr StringLiteral k_ParentGroupKey = "parent_group"; namespace complex { // ----------------------------------------------------------------------------- -ImportHDF5DatasetParameter::ImportHDF5DatasetParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) +ReadHDF5DatasetParameter::ReadHDF5DatasetParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue) : ValueParameter(name, humanName, helpText) , m_DefaultValue(defaultValue) { } // ----------------------------------------------------------------------------- -Uuid ImportHDF5DatasetParameter::uuid() const +Uuid ReadHDF5DatasetParameter::uuid() const { - return ParameterTraits::uuid; + return ParameterTraits::uuid; } // ----------------------------------------------------------------------------- -IParameter::AcceptedTypes ImportHDF5DatasetParameter::acceptedTypes() const +IParameter::AcceptedTypes ReadHDF5DatasetParameter::acceptedTypes() const { return {typeid(ValueType)}; } // ----------------------------------------------------------------------------- -nlohmann::json ImportHDF5DatasetParameter::toJson(const std::any& value) const +nlohmann::json ReadHDF5DatasetParameter::toJson(const std::any& value) const { const auto& datasetImportInfo = GetAnyRef(value); nlohmann::json json; @@ -79,7 +79,7 @@ nlohmann::json ImportHDF5DatasetParameter::toJson(const std::any& value) const } // ----------------------------------------------------------------------------- -Result ImportHDF5DatasetParameter::fromJson(const nlohmann::json& json) const +Result ReadHDF5DatasetParameter::fromJson(const nlohmann::json& json) const { static constexpr StringLiteral prefix = "FilterParameter 'ImportHDF5DatasetParameter' JSON Error: "; if(!json.is_object()) @@ -126,19 +126,19 @@ Result ImportHDF5DatasetParameter::fromJson(const nlohmann::json& json } // ----------------------------------------------------------------------------- -IParameter::UniquePointer ImportHDF5DatasetParameter::clone() const +IParameter::UniquePointer ReadHDF5DatasetParameter::clone() const { - return std::make_unique(name(), humanName(), helpText(), m_DefaultValue); + return std::make_unique(name(), humanName(), helpText(), m_DefaultValue); } // ----------------------------------------------------------------------------- -std::any ImportHDF5DatasetParameter::defaultValue() const +std::any ReadHDF5DatasetParameter::defaultValue() const { return m_DefaultValue; } // ----------------------------------------------------------------------------- -Result<> ImportHDF5DatasetParameter::validate(const std::any& value) const +Result<> ReadHDF5DatasetParameter::validate(const std::any& value) const { [[maybe_unused]] auto data = std::any_cast(value); return {}; diff --git a/src/complex/Parameters/ImportHDF5DatasetParameter.hpp b/src/complex/Parameters/ReadHDF5DatasetParameter.hpp similarity index 89% rename from src/complex/Parameters/ImportHDF5DatasetParameter.hpp rename to src/complex/Parameters/ReadHDF5DatasetParameter.hpp index cc7849bc2f..844c7e5dca 100644 --- a/src/complex/Parameters/ImportHDF5DatasetParameter.hpp +++ b/src/complex/Parameters/ReadHDF5DatasetParameter.hpp @@ -43,7 +43,7 @@ namespace complex { -class COMPLEX_EXPORT ImportHDF5DatasetParameter : public ValueParameter +class COMPLEX_EXPORT ReadHDF5DatasetParameter : public ValueParameter { public: struct DatasetImportInfo @@ -113,15 +113,15 @@ class COMPLEX_EXPORT ImportHDF5DatasetParameter : public ValueParameter std::list datasets; }; - ImportHDF5DatasetParameter() = delete; - ImportHDF5DatasetParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue); - ~ImportHDF5DatasetParameter() override = default; + ReadHDF5DatasetParameter() = delete; + ReadHDF5DatasetParameter(const std::string& name, const std::string& humanName, const std::string& helpText, const ValueType& defaultValue); + ~ReadHDF5DatasetParameter() override = default; - ImportHDF5DatasetParameter(const ImportHDF5DatasetParameter&) = delete; - ImportHDF5DatasetParameter(ImportHDF5DatasetParameter&&) noexcept = delete; + ReadHDF5DatasetParameter(const ReadHDF5DatasetParameter&) = delete; + ReadHDF5DatasetParameter(ReadHDF5DatasetParameter&&) noexcept = delete; - ImportHDF5DatasetParameter& operator=(const ImportHDF5DatasetParameter&) = delete; - ImportHDF5DatasetParameter& operator=(ImportHDF5DatasetParameter&&) noexcept = delete; + ReadHDF5DatasetParameter& operator=(const ReadHDF5DatasetParameter&) = delete; + ReadHDF5DatasetParameter& operator=(ReadHDF5DatasetParameter&&) noexcept = delete; /** * @brief Returns the parameter's uuid. @@ -174,4 +174,4 @@ class COMPLEX_EXPORT ImportHDF5DatasetParameter : public ValueParameter }; } // namespace complex -COMPLEX_DEF_PARAMETER_TRAITS(complex::ImportHDF5DatasetParameter, "32e83e13-ee4c-494e-8bab-4e699df74a5a"); +COMPLEX_DEF_PARAMETER_TRAITS(complex::ReadHDF5DatasetParameter, "32e83e13-ee4c-494e-8bab-4e699df74a5a"); diff --git a/wrapping/python/docs/generate_sphinx_docs.cpp b/wrapping/python/docs/generate_sphinx_docs.cpp index daa17fedd6..66e257769e 100644 --- a/wrapping/python/docs/generate_sphinx_docs.cpp +++ b/wrapping/python/docs/generate_sphinx_docs.cpp @@ -72,7 +72,7 @@ void GenerateParameterList() ADD_PARAMETER_TRAIT(complex.FileSystemPathParameter, "f9a93f3d-21ef-43a1-a958-e57cbf3b2909") ADD_PARAMETER_TRAIT(complex.BoolParameter, "b6936d18-7476-4855-9e13-e795d717c50f") - ADD_PARAMETER_TRAIT(complex.ImportHDF5DatasetParameter, "32e83e13-ee4c-494e-8bab-4e699df74a5a") + ADD_PARAMETER_TRAIT(complex.ReadHDF5DatasetParameter, "32e83e13-ee4c-494e-8bab-4e699df74a5a") ADD_PARAMETER_TRAIT(complex.Dream3dImportParameter, "170a257d-5952-4854-9a91-4281cd06f4f5") ADD_PARAMETER_TRAIT(complex.DynamicTableParameter, "eea76f1a-fab9-4704-8da5-4c21057cf44e") diff --git a/wrapping/python/docs/source/API.rst b/wrapping/python/docs/source/API.rst index 45764db164..1a96358d3c 100644 --- a/wrapping/python/docs/source/API.rst +++ b/wrapping/python/docs/source/API.rst @@ -486,21 +486,21 @@ General Parameters ) -.. _ImportHDF5DatasetParameter: -.. py:class:: ImportHDF5DatasetParameter +.. _ReadHDF5DatasetParameter: +.. py:class:: ReadHDF5DatasetParameter This parameter is used for the :ref:`complex.ReadHDF5Dataset` and holds the information to import specific data sets from within the HDF5 file into DREAM3D/complex - .. py:class:: ImportHDF5DatasetParameter.ValueType + .. py:class:: ReadHDF5DatasetParameter.ValueType This holds the main parameter values which consist of the following data members :ivar input_file: A "PathLike" value to the HDF5 file on the file system - :ivar datasets: list[ImportHDF5DatasetParameter.DatasetImportInfo, ....] + :ivar datasets: list[ReadHDF5DatasetParameter.DatasetImportInfo, ....] :ivar parent: Optional: The :ref:`DataPath` object to a parente group to create the :ref:`DataArray` into. If left blank the :ref:`DataArray` will be created at the top level of the :ref:`DataStructure` - .. py:class:: ImportHDF5DatasetParameter.DatasetImportInfo + .. py:class:: ReadHDF5DatasetParameter.DatasetImportInfo The DatasetImportInfo class has 3 data members that hold information on a specific data set inside the HDF5 file that the programmer wants to import. @@ -511,17 +511,17 @@ General Parameters .. code:: python - dataset1 = cx.ImportHDF5DatasetParameter.DatasetImportInfo() + dataset1 = cx.ReadHDF5DatasetParameter.DatasetImportInfo() dataset1.dataset_path = "/DataStructure/DataContainer/CellData/Confidence Index" dataset1.tuple_dims = "117,201,189" dataset1.component_dims = "1" - dataset2 = cx.ImportHDF5DatasetParameter.DatasetImportInfo() + dataset2 = cx.ReadHDF5DatasetParameter.DatasetImportInfo() dataset2.dataset_path = "/DataStructure/DataContainer/CellData/EulerAngles" dataset2.tuple_dims = "117,201,189" dataset2.component_dims = "3" - import_hdf5_param = cx.ImportHDF5DatasetParameter.ValueType() + import_hdf5_param = cx.ReadHDF5DatasetParameter.ValueType() import_hdf5_param.input_file = "SmallIN100_Final.dream3d" import_hdf5_param.datasets = [dataset1, dataset2] # import_hdf5_param.parent = cx.DataPath(["Imported Data"]) From 05f94f7555fdd08b0ca4a00cd1525fcb0cfe181f Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 13 Nov 2023 11:22:24 -0500 Subject: [PATCH 17/19] Rename the H5EbsdReaderParameter to ReadH5EbsdFileParameter Signed-off-by: Michael Jackson --- .../OrientationAnalysis/CMakeLists.txt | 2 +- .../Filters/Algorithms/ReadH5Ebsd.hpp | 2 +- .../Filters/ReadH5EbsdFilter.cpp | 10 +++++----- .../test/ReadH5EbsdTest.cpp | 6 +++--- .../wrapping/python/orientationanalysis.cpp | 20 +++++++++---------- wrapping/python/docs/generate_sphinx_docs.cpp | 2 +- wrapping/python/docs/source/API.rst | 14 ++++++------- wrapping/python/examples/import_hdf5.py | 4 ++-- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/Plugins/OrientationAnalysis/CMakeLists.txt b/src/Plugins/OrientationAnalysis/CMakeLists.txt index d7a53c1747..30542466ea 100644 --- a/src/Plugins/OrientationAnalysis/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/CMakeLists.txt @@ -108,7 +108,7 @@ create_complex_plugin(NAME ${PLUGIN_NAME} # include directories that are needed for the parameter. # ------------------------------------------------------------------------------ set(complex_injected_parameters - H5EbsdReaderParameter + ReadH5EbsdFileParameter OEMEbsdScanSelectionParameter #EbsdToH5EbsdParameter ) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp index 7ceee9484d..872dae6062 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp @@ -1,7 +1,7 @@ #pragma once #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "OrientationAnalysis/Parameters/H5EbsdReaderParameter.h" +#include "OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h" #include "complex/DataStructure/DataPath.hpp" #include "complex/DataStructure/DataStructure.hpp" diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp index 944903f744..e40ddf0ce5 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/ReadH5EbsdFilter.cpp @@ -1,7 +1,7 @@ #include "ReadH5EbsdFilter.hpp" #include "OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.hpp" -#include "OrientationAnalysis/Parameters/H5EbsdReaderParameter.h" +#include "OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h" #include "complex/DataStructure/DataPath.hpp" #include "complex/Filter/Actions/CreateArrayAction.hpp" @@ -56,8 +56,8 @@ Parameters ReadH5EbsdFilter::parameters() const Parameters params; // Create the parameter descriptors that are needed for this filter params.insertSeparator(Parameters::Separator{"Input Parameters"}); - params.insert(std::make_unique(k_ReadH5EbsdParameter_Key, "Import H5Ebsd File", "Object that holds all relevant information to import data from the file.", - H5EbsdReaderParameter::ValueType{})); + params.insert(std::make_unique(k_ReadH5EbsdParameter_Key, "Import H5Ebsd File", "Object that holds all relevant information to import data from the file.", + ReadH5EbsdFileParameter::ValueType{})); params.insertSeparator(Parameters::Separator{"Created Data Structure Objects"}); params.insert(std::make_unique(k_DataContainerName_Key, "Created Image Geometry", "The complete path to the imported Image Geometry", DataPath({"DataContainer"}))); @@ -82,7 +82,7 @@ IFilter::PreflightResult ReadH5EbsdFilter::preflightImpl(const DataStructure& da const std::atomic_bool& shouldCancel) const { - auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdParameter_Key); + auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdParameter_Key); auto imageGeomPath = filterArgs.value(k_DataContainerName_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); DataPath cellAttributeMatrixPath = imageGeomPath.createChildPath(pCellAttributeMatrixNameValue); @@ -233,7 +233,7 @@ Result<> ReadH5EbsdFilter::executeImpl(DataStructure& dataStructure, const Argum /**************************************************************************** * Extract the actual input values from the 'filterArgs' object ***************************************************************************/ - auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdParameter_Key); + auto pReadH5EbsdFilterValue = filterArgs.value(k_ReadH5EbsdParameter_Key); auto pDataContainerNameValue = filterArgs.value(k_DataContainerName_Key); auto pCellAttributeMatrixNameValue = filterArgs.value(k_CellAttributeMatrixName_Key); auto pCellEnsembleAttributeMatrixNameValue = pDataContainerNameValue.createChildPath(filterArgs.value(k_CellEnsembleAttributeMatrixName_Key)); diff --git a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp index 5b3b46dd9f..85e54fd995 100644 --- a/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp +++ b/src/Plugins/OrientationAnalysis/test/ReadH5EbsdTest.cpp @@ -1,6 +1,6 @@ #include "OrientationAnalysis/Filters/ReadH5EbsdFilter.hpp" #include "OrientationAnalysis/OrientationAnalysis_test_dirs.hpp" -#include "OrientationAnalysis/Parameters/H5EbsdReaderParameter.h" +#include "OrientationAnalysis/Parameters/ReadH5EbsdFileParameter.h" #include "complex/Core/Application.hpp" #include "complex/Parameters/ArrayCreationParameter.hpp" @@ -35,7 +35,7 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati ReadH5EbsdFilter filter; Arguments args; - H5EbsdReaderParameter::ValueType h5ebsdParamVal; + ReadH5EbsdFileParameter::ValueType h5ebsdParamVal; h5ebsdParamVal.inputFilePath = fmt::format("{}/Small_IN100.h5ebsd", unit_test::k_TestFilesDir); h5ebsdParamVal.startSlice = 1; h5ebsdParamVal.endSlice = 117; @@ -43,7 +43,7 @@ TEST_CASE("OrientationAnalysis::ReadH5Ebsd: Valid filter execution", "[Orientati h5ebsdParamVal.selectedArrayNames = {Constants::k_ConfidenceIndex, Constants::k_EulerAngles, Constants::k_Fit, Constants::k_ImageQuality, Constants::k_Phases, Constants::k_SEMSignal}; h5ebsdParamVal.useRecommendedTransform = true; - args.insertOrAssign(ReadH5EbsdFilter::k_ReadH5EbsdParameter_Key, std::make_any(h5ebsdParamVal)); + args.insertOrAssign(ReadH5EbsdFilter::k_ReadH5EbsdParameter_Key, std::make_any(h5ebsdParamVal)); args.insertOrAssign(ReadH5EbsdFilter::k_DataContainerName_Key, std::make_any(Constants::k_DataContainerPath)); args.insertOrAssign(ReadH5EbsdFilter::k_CellAttributeMatrixName_Key, std::make_any(Constants::k_CellData)); args.insertOrAssign(ReadH5EbsdFilter::k_CellEnsembleAttributeMatrixName_Key, std::make_any(Constants::k_EnsembleAttributeMatrix)); diff --git a/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp b/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp index 027c88e5eb..74a36d1b9e 100644 --- a/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp +++ b/src/Plugins/OrientationAnalysis/wrapping/python/orientationanalysis.cpp @@ -2,8 +2,8 @@ #include -#include #include +#include #include "OrientationAnalysis/OrientationAnalysisFilterBinding.hpp" @@ -21,17 +21,17 @@ PYBIND11_MODULE(orientationanalysis, mod) auto* plugin = internals.addPlugin(); - auto h5EbsdReaderParameter = COMPLEX_PY_BIND_PARAMETER(mod, H5EbsdReaderParameter); + auto h5EbsdReaderParameter = COMPLEX_PY_BIND_PARAMETER(mod, ReadH5EbsdFileParameter); auto oemEbsdScanSelectionParameter = COMPLEX_PY_BIND_PARAMETER(mod, OEMEbsdScanSelectionParameter); - py::class_ h5EbsdReaderValueType(h5EbsdReaderParameter, "ValueType"); + py::class_ h5EbsdReaderValueType(h5EbsdReaderParameter, "ValueType"); h5EbsdReaderValueType.def(py::init<>()); - h5EbsdReaderValueType.def_readwrite("input_file_path", &H5EbsdReaderParameter::ValueType::inputFilePath); - h5EbsdReaderValueType.def_readwrite("start_slice", &H5EbsdReaderParameter::ValueType::startSlice); - h5EbsdReaderValueType.def_readwrite("end_slice", &H5EbsdReaderParameter::ValueType::endSlice); - h5EbsdReaderValueType.def_readwrite("euler_representation", &H5EbsdReaderParameter::ValueType::eulerRepresentation); - h5EbsdReaderValueType.def_readwrite("selected_array_names", &H5EbsdReaderParameter::ValueType::selectedArrayNames); - h5EbsdReaderValueType.def_readwrite("use_recommended_transform", &H5EbsdReaderParameter::ValueType::useRecommendedTransform); + h5EbsdReaderValueType.def_readwrite("input_file_path", &ReadH5EbsdFileParameter::ValueType::inputFilePath); + h5EbsdReaderValueType.def_readwrite("start_slice", &ReadH5EbsdFileParameter::ValueType::startSlice); + h5EbsdReaderValueType.def_readwrite("end_slice", &ReadH5EbsdFileParameter::ValueType::endSlice); + h5EbsdReaderValueType.def_readwrite("euler_representation", &ReadH5EbsdFileParameter::ValueType::eulerRepresentation); + h5EbsdReaderValueType.def_readwrite("selected_array_names", &ReadH5EbsdFileParameter::ValueType::selectedArrayNames); + h5EbsdReaderValueType.def_readwrite("use_recommended_transform", &ReadH5EbsdFileParameter::ValueType::useRecommendedTransform); py::class_ oemEbsdScanSelectionValueType(oemEbsdScanSelectionParameter, "ValueType"); oemEbsdScanSelectionValueType.def(py::init<>()); @@ -49,7 +49,7 @@ PYBIND11_MODULE(orientationanalysis, mod) OEMEbsdScanSelectionParameter::ExtensionsType>(), "name"_a, "human_name"_a, "help_text"_a, "default_value"_a, "reader_type"_a, "extensions_type"_a); - internals.addConversion(); + internals.addConversion(); internals.addConversion(); OrientationAnalysis::BindFilters(mod, internals); diff --git a/wrapping/python/docs/generate_sphinx_docs.cpp b/wrapping/python/docs/generate_sphinx_docs.cpp index 66e257769e..89b2e6954b 100644 --- a/wrapping/python/docs/generate_sphinx_docs.cpp +++ b/wrapping/python/docs/generate_sphinx_docs.cpp @@ -44,7 +44,7 @@ void GenerateParameterList() { ::s_ParameterMap.clear(); ADD_PARAMETER_TRAIT(complex.OEMEbsdScanSelectionParameter, "3935c833-aa51-4a58-81e9-3a51972c05ea") - ADD_PARAMETER_TRAIT(complex.H5EbsdReaderParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b") + ADD_PARAMETER_TRAIT(complex.ReadH5EbsdFileParameter, "FAC15aa6-b367-508e-bf73-94ab6be0058b") ADD_PARAMETER_TRAIT(complex.NumericTypeParameter, "a8ff9dbd-45e7-4ed6-8537-12dd53069bce") ADD_PARAMETER_TRAIT(complex.StringParameter, "5d6d1868-05f8-11ec-9a03-0242ac130003") ADD_PARAMETER_TRAIT(complex.DataStoreFormatParameter, "cfd5c150-2938-42a7-b023-4a9288fb6899") diff --git a/wrapping/python/docs/source/API.rst b/wrapping/python/docs/source/API.rst index 1a96358d3c..b9daee9e3f 100644 --- a/wrapping/python/docs/source/API.rst +++ b/wrapping/python/docs/source/API.rst @@ -445,17 +445,17 @@ General Parameters ) .. _H5EbsdReaderParameter: -.. py:class:: H5EbsdReaderParameter +.. py:class:: ReadH5EbsdFileParameter This parameter is used for the :ref:`orientationAnalysis.ReadH5EbsdFilter() ` and holds the information to import the EBSD data from the file. - The primary python object that will hold the information to pass to the filter is the H5EbsdReaderParameter class described below. + The primary python object that will hold the information to pass to the filter is the ReadH5EbsdFileParameter class described below. - :ivar ValueType: H5EbsdReaderParameter + :ivar ValueType: ReadH5EbsdFileParameter - .. py:class:: H5EbsdReaderParameter + .. py:class:: ReadH5EbsdFileParameter - The H5EbsdReaderParameter class holds all the necessary information to import EBSD data stored in the H5Ebsd file. + The ReadH5EbsdFileParameter class holds all the necessary information to import EBSD data stored in the H5Ebsd file. :ivar euler_representation: Int. 0=Radians, 1=Degrees :ivar start_slice: Int. The starting slice of EBSD data to import @@ -467,8 +467,8 @@ General Parameters .. code:: python data_structure = cx.DataStructure() - # Create the H5EbsdReaderParameter and assign values to it. - h5ebsdParameter = cxor.H5EbsdReaderParameter.ValueType() + # Create the ReadH5EbsdFileParameter and assign values to it. + h5ebsdParameter = cxor.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"] diff --git a/wrapping/python/examples/import_hdf5.py b/wrapping/python/examples/import_hdf5.py index cac7d9fcec..558c80019a 100644 --- a/wrapping/python/examples/import_hdf5.py +++ b/wrapping/python/examples/import_hdf5.py @@ -7,8 +7,8 @@ # Create the DataStructure object data_structure = cx.DataStructure() -# Create the H5EbsdReaderParameter and assign values to it. -h5ebsdParameter = cxor.H5EbsdReaderParameter.ValueType() +# Create the ReadH5EbsdFileParameter and assign values to it. +h5ebsdParameter = cxor.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"] From 418e5bc8ed5f05affb68a3a328fc3ea6f156495e Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 13 Nov 2023 11:40:11 -0500 Subject: [PATCH 18/19] Upate python codes to WriteDREAM3DFilter Signed-off-by: Michael Jackson --- wrapping/python/examples/basic_arrays.py | 2 +- wrapping/python/examples/basic_ebsd_ipf.py | 8 ++++---- wrapping/python/examples/geometry_examples.py | 4 ++-- wrapping/python/examples/import_d3d.py | 4 ++-- wrapping/python/examples/output_file.py | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wrapping/python/examples/basic_arrays.py b/wrapping/python/examples/basic_arrays.py index 43375a49d8..46f1058df5 100644 --- a/wrapping/python/examples/basic_arrays.py +++ b/wrapping/python/examples/basic_arrays.py @@ -125,7 +125,7 @@ output_file_path = "/tmp/output_file_example.dream3d" -result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure, +result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) if len(result.errors) != 0: diff --git a/wrapping/python/examples/basic_ebsd_ipf.py b/wrapping/python/examples/basic_ebsd_ipf.py index 56f0c95bb1..10ba833b5a 100644 --- a/wrapping/python/examples/basic_ebsd_ipf.py +++ b/wrapping/python/examples/basic_ebsd_ipf.py @@ -28,7 +28,7 @@ # Rotate the Euler Reference Frame #------------------------------------------------------------------------------ result = cxor.RotateEulerRefFrameFilter.execute(data_structure=data_structure, - cell_euler_angles_array_path=cx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), + euler_angles_array_path=cx.DataPath(["Small IN100", "Scan Data", "EulerAngles"]), rotation_axis=[0,0,1,90]) if len(result.errors) != 0: print('Errors: {}', result.errors) @@ -139,7 +139,7 @@ #------------------------------------------------------------------------------ color_control_points = cx.Json('{"RGBPoints": [0,0,0,0,0.4,0.901960784314,0,0,0.8,0.901960784314,0.901960784314,0,1,1,1,1]}') result = cx.GenerateColorTableFilter.execute(data_structure=data_structure, - rgb_array_path="CI Color", + output_rgb_array_name="CI Color", selected_data_array_path=cx.DataPath(["Small IN100", "Scan Data", "Confidence Index"]), selected_preset=color_control_points) if len(result.errors) != 0: @@ -181,14 +181,14 @@ # Write the DataStructure to a .dream3d file #------------------------------------------------------------------------------ output_file_path = "basic_ebsd_example.dream3d" -result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure, +result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) if len(result.errors) != 0: print('Errors: {}', result.errors) print('Warnings: {}', result.warnings) else: - print("No errors running the ExportDREAM3DFilter") + print("No errors running the WriteDREAM3DFilter") diff --git a/wrapping/python/examples/geometry_examples.py b/wrapping/python/examples/geometry_examples.py index 9bb63e6623..178b524363 100644 --- a/wrapping/python/examples/geometry_examples.py +++ b/wrapping/python/examples/geometry_examples.py @@ -215,9 +215,9 @@ output_file_path = "geometry_examples.dream3d" -result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) +result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) if len(result.errors) != 0: print('Errors: {}', result.errors) print('Warnings: {}', result.warnings) else: - print("No errors running the ExportDREAM3DFilter filter") + print("No errors running the WriteDREAM3DFilter filter") diff --git a/wrapping/python/examples/import_d3d.py b/wrapping/python/examples/import_d3d.py index 72cd598654..141267b05b 100644 --- a/wrapping/python/examples/import_d3d.py +++ b/wrapping/python/examples/import_d3d.py @@ -39,14 +39,14 @@ # Write the DataStructure to a .dream3d file #------------------------------------------------------------------------------ output_file_path = "/tmp/import_data.dream3d" -result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure, +result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) if len(result.errors) != 0: print('Errors: {}', result.errors) print('Warnings: {}', result.warnings) else: - print("No errors running the ExportDREAM3DFilter") + print("No errors running the WriteDREAM3DFilter") #------------------------------------------------------------------------------ diff --git a/wrapping/python/examples/output_file.py b/wrapping/python/examples/output_file.py index da922eea50..b41e2fd63d 100644 --- a/wrapping/python/examples/output_file.py +++ b/wrapping/python/examples/output_file.py @@ -31,7 +31,7 @@ print(npdata) output_file_path = "output_file_example.dream3d" -result = cx.ExportDREAM3DFilter.execute(data_structure=data_structure, +result = cx.WriteDREAM3DFilter.execute(data_structure=data_structure, export_file_path=output_file_path, write_xdmf_file=True) if len(result.errors) != 0: From 7ee5e7b0a6dfe91d104df60b090ae2cc16d7c953 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 13 Nov 2023 11:40:42 -0500 Subject: [PATCH 19/19] Fix runtime exception when parent file path is empty. Signed-off-by: Michael Jackson --- src/complex/Utilities/Parsing/HDF5/Writers/FileWriter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/complex/Utilities/Parsing/HDF5/Writers/FileWriter.cpp b/src/complex/Utilities/Parsing/HDF5/Writers/FileWriter.cpp index 7b13afdf3b..7b4f89e945 100644 --- a/src/complex/Utilities/Parsing/HDF5/Writers/FileWriter.cpp +++ b/src/complex/Utilities/Parsing/HDF5/Writers/FileWriter.cpp @@ -13,7 +13,7 @@ Result FileWriter::CreateFile(const std::filesystem::path& filepath) auto parentPath = filepath.parent_path(); try { - if(!std::filesystem::exists(parentPath)) + if(!parentPath.empty() && !std::filesystem::exists(parentPath)) { if(!std::filesystem::create_directories(parentPath)) {