From 382861a2f63a4bd7a6660b399caf08600b49acb1 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Tue, 5 Nov 2024 12:55:46 -0500 Subject: [PATCH] API: EbsdLib-1.0.34 update. (#1122) API: Update method names used from EbsdLib. Signed-off-by: Michael Jackson --- .../src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp | 2 +- .../src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp | 2 +- .../src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp | 2 +- .../src/OrientationAnalysis/utilities/IEbsdOemReader.hpp | 2 +- vcpkg-configuration.json | 2 +- vcpkg.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp index 8f3506f4d0..afcec94ab3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp @@ -79,7 +79,7 @@ std::pair ReadAngData::loadMaterialInfo(AngReader* reader) c for(const AngPhase::Pointer& phase : phases) { const int32_t phaseID = phase->getPhaseIndex(); - crystalStructures[phaseID] = phase->determineLaueGroup(); + crystalStructures[phaseID] = phase->determineOrientationOpsIndex(); std::string materialName = phase->getMaterialName(); materialName = nx::core::StringUtilities::replace(materialName, "MaterialName", ""); materialName = nx::core::StringUtilities::trimmed(materialName); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp index b0b2da0c1e..ae1196fee3 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp @@ -82,7 +82,7 @@ std::pair ReadCtfData::loadMaterialInfo(CtfReader* reader) c for(const CtfPhase::Pointer& phase : phases) { const int32_t phaseID = phase->getPhaseIndex(); - crystalStructures[phaseID] = phase->determineLaueGroup(); + crystalStructures[phaseID] = phase->determineOrientationOpsIndex(); const std::string materialName = phase->getMaterialName(); materialNames[phaseID] = materialName; diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp index 028d1e15ce..6050739e6a 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp @@ -90,7 +90,7 @@ nx::core::Result<> LoadInfo(const nx::core::ReadH5EbsdInputValues* mInputValues, for(size_t i = 0; i < phases.size(); i++) { int32_t phaseID = phases[i]->getPhaseIndex(); - xtalData[phaseID] = phases[i]->determineLaueGroup(); + xtalData[phaseID] = phases[i]->determineOrientationOpsIndex(); matNameData[phaseID] = phases[i]->getMaterialName(); std::vector latticeConstant = phases[i]->getLatticeConstants(); diff --git a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp index e6f3544469..2ebf3ee4d4 100644 --- a/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp +++ b/src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp @@ -119,7 +119,7 @@ class ORIENTATIONANALYSIS_EXPORT IEbsdOemReader for(const auto& phase : phases) { const int32 phaseId = phase->getPhaseIndex(); - crystalStructures[phaseId] = phase->determineLaueGroup(); + crystalStructures[phaseId] = phase->determineOrientationOpsIndex(); materialNames[phaseId] = phase->getMaterialName(); std::vector lc = phase->getLatticeConstants(); diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index b8ac5d0796..60a84c51f0 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -33,7 +33,7 @@ "zlib", "zstd" ], - "baseline": "5cbecba3986aca7f685eac32cced67e741bea9fa" + "baseline": "708d8ca1b2d319188172a600038eb3503a2f6a96" } ] } diff --git a/vcpkg.json b/vcpkg.json index 917dd54a39..f89cd33ad6 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -74,7 +74,7 @@ "dependencies": [ { "name": "ebsdlib", - "version>=": "1.0.32" + "version>=": "1.0.34" } ] },