Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

API: EbsdLib-1.0.34 update & update method names used from EbsdLib. #1122

Merged
merged 1 commit into from
Nov 5, 2024
Merged

API: EbsdLib-1.0.34 update & update method names used from EbsdLib. #1122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadAngData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ std::pair<int32, std::string> 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);
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadCtfData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ std::pair<int32, std::string> 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;

Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/ReadH5Ebsd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<float> latticeConstant = phases[i]->getLatticeConstants();

Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/OrientationAnalysis/src/OrientationAnalysis/utilities/IEbsdOemReader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<float32> lc = phase->getLatticeConstants();

Expand Down
2 changes: 1 addition & 1 deletion vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"zlib",
"zstd"
],
"baseline": "5cbecba3986aca7f685eac32cced67e741bea9fa"
"baseline": "708d8ca1b2d319188172a600038eb3503a2f6a96"
}
]
}
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"dependencies": [
{
"name": "ebsdlib",
"version>=": "1.0.32"
"version>=": "1.0.34"
}
]
},
Expand Down
Loading