From da04aede4da9dac27297524dd3959435f01c39d0 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Mon, 17 Jun 2024 11:38:48 -0400 Subject: [PATCH] Rename super class to alleviate confusion. Signed-off-by: Michael Jackson --- src/Plugins/OrientationAnalysis/CMakeLists.txt | 2 +- .../Filters/Algorithms/ReadH5EspritData.cpp | 2 +- .../Filters/Algorithms/ReadH5EspritData.hpp | 4 ++-- .../Filters/Algorithms/ReadH5OimData.cpp | 4 ++-- .../Filters/Algorithms/ReadH5OimData.hpp | 4 ++-- .../Filters/Algorithms/ReadH5OinaData.cpp | 2 +- .../Filters/Algorithms/ReadH5OinaData.hpp | 4 ++-- .../{ReadH5Data.hpp => IEbsdOemReader.hpp} | 14 +++++++------- 8 files changed, 18 insertions(+), 18 deletions(-) rename src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/{ReadH5Data.hpp => IEbsdOemReader.hpp} (90%) diff --git a/src/Plugins/OrientationAnalysis/CMakeLists.txt b/src/Plugins/OrientationAnalysis/CMakeLists.txt index 5bb428d234..5e92d576a2 100644 --- a/src/Plugins/OrientationAnalysis/CMakeLists.txt +++ b/src/Plugins/OrientationAnalysis/CMakeLists.txt @@ -236,7 +236,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/ReadH5Data.hpp" + "${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/IEbsdOemReader.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/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp index 4243a3fcae..87e0e4ccff 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.cpp @@ -9,7 +9,7 @@ using namespace nx::core; // ----------------------------------------------------------------------------- ReadH5EspritData::ReadH5EspritData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues, ReadH5EspritDataInputValues* espritInputValues) -: ReadH5Data(dataStructure, mesgHandler, shouldCancel, inputValues) +: IEbsdOemReader(dataStructure, mesgHandler, shouldCancel, inputValues) , m_EspritInputValues(espritInputValues) { } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp index 3a15701875..6a0d9a4bca 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5EspritData.hpp @@ -1,7 +1,7 @@ #pragma once #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "OrientationAnalysis/utilities/ReadH5Data.hpp" +#include "OrientationAnalysis/utilities/IEbsdOemReader.hpp" #include "simplnx/DataStructure/DataStructure.hpp" #include "simplnx/Filter/IFilter.hpp" @@ -19,7 +19,7 @@ struct ORIENTATIONANALYSIS_EXPORT ReadH5EspritDataInputValues * @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 +class ORIENTATIONANALYSIS_EXPORT ReadH5EspritData : public IEbsdOemReader { public: ReadH5EspritData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues, diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.cpp index a106a8cb70..4a21a0f781 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.cpp @@ -7,7 +7,7 @@ using namespace nx::core; // ----------------------------------------------------------------------------- ReadH5OimData::ReadH5OimData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadH5DataInputValues* inputValues) -: ReadH5Data(dataStructure, mesgHandler, shouldCancel, inputValues) +: IEbsdOemReader(dataStructure, mesgHandler, shouldCancel, inputValues) { } @@ -93,4 +93,4 @@ Result<> ReadH5OimData::copyRawEbsdData(int index) } return {}; -} \ No newline at end of file +} diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp index 23a1849e09..85d68fea02 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OimData.hpp @@ -1,7 +1,7 @@ #pragma once #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "OrientationAnalysis/utilities/ReadH5Data.hpp" +#include "OrientationAnalysis/utilities/IEbsdOemReader.hpp" namespace nx::core { @@ -11,7 +11,7 @@ namespace nx::core * intermediate .h5ebsd file. */ -class ORIENTATIONANALYSIS_EXPORT ReadH5OimData : public ReadH5Data +class ORIENTATIONANALYSIS_EXPORT ReadH5OimData : public IEbsdOemReader { public: ReadH5OimData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadH5DataInputValues* inputValues); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OinaData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OinaData.cpp index 6420eac84a..f071cff539 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OinaData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OinaData.cpp @@ -49,7 +49,7 @@ void convertHexEulerAngle(const ReadH5DataInputValues* m_InputValues, size_t tot // ----------------------------------------------------------------------------- ReadH5OinaData::ReadH5OinaData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadH5DataInputValues* inputValues) -: ReadH5Data(dataStructure, mesgHandler, shouldCancel, inputValues) +: IEbsdOemReader(dataStructure, mesgHandler, shouldCancel, inputValues) { } diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OinaData.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OinaData.hpp index 55a185fe9d..f58f4beda2 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OinaData.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5OinaData.hpp @@ -1,7 +1,7 @@ #pragma once #include "OrientationAnalysis/OrientationAnalysis_export.hpp" -#include "OrientationAnalysis/utilities/ReadH5Data.hpp" +#include "OrientationAnalysis/utilities/IEbsdOemReader.hpp" namespace nx::core { @@ -12,7 +12,7 @@ namespace nx::core * intermediate .h5ebsd file. */ -class ORIENTATIONANALYSIS_EXPORT ReadH5OinaData : public ReadH5Data +class ORIENTATIONANALYSIS_EXPORT ReadH5OinaData : public IEbsdOemReader { public: ReadH5OinaData(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, ReadH5DataInputValues* inputValues); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp similarity index 90% rename from src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp rename to src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp index da3b2f4490..e6f3544469 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/ReadH5Data.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp @@ -32,10 +32,10 @@ struct ORIENTATIONANALYSIS_EXPORT ReadH5DataInputValues */ template -class ORIENTATIONANALYSIS_EXPORT ReadH5Data +class ORIENTATIONANALYSIS_EXPORT IEbsdOemReader { public: - ReadH5Data(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues) + IEbsdOemReader(DataStructure& dataStructure, const IFilter::MessageHandler& mesgHandler, const std::atomic_bool& shouldCancel, const ReadH5DataInputValues* inputValues) : m_DataStructure(dataStructure) , m_ShouldCancel(shouldCancel) , m_MessageHandler(mesgHandler) @@ -45,12 +45,12 @@ class ORIENTATIONANALYSIS_EXPORT ReadH5Data m_Reader->setFileName(inputValues->SelectedScanNames.inputFilePath.string()); } - virtual ~ReadH5Data() noexcept = default; + virtual ~IEbsdOemReader() noexcept = default; - ReadH5Data(const ReadH5Data&) = delete; - ReadH5Data(ReadH5Data&&) noexcept = delete; - ReadH5Data& operator=(const ReadH5Data&) = delete; - ReadH5Data& operator=(ReadH5Data&&) noexcept = delete; + IEbsdOemReader(const IEbsdOemReader&) = delete; + IEbsdOemReader(IEbsdOemReader&&) noexcept = delete; + IEbsdOemReader& operator=(const IEbsdOemReader&) = delete; + IEbsdOemReader& operator=(IEbsdOemReader&&) noexcept = delete; Result<> execute() {