Skip to content

Commit 9b667ae

Browse files
authored
ENH: WritePoleFigure filter layout code moved to EbsdLib 2.4.0 (#1587)
* ENH: WritePoleFigure layout codes moved to EbsdLib * TEST: Update unit tests * Update to EbsdLib 2.4.0 --------- Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
1 parent e1fb6e3 commit 9b667ae

8 files changed

Lines changed: 220 additions & 404 deletions

File tree

conda/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ source:
99
- path: ../
1010
folder: simplnx
1111
- git_url: https://github.com/BlueQuartzSoftware/EbsdLib
12-
git_rev: v1.0.40
12+
git_rev: v2.4.0
1313
folder: EbsdLib
1414
- git_url: https://github.com/BlueQuartzSoftware/H5Support
1515
git_rev: v1.0.13

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp

Lines changed: 38 additions & 353 deletions
Large diffs are not rendered by default.

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ class ORIENTATIONANALYSIS_EXPORT WritePoleFigure
9999
const WritePoleFigureInputValues* m_InputValues = nullptr;
100100
const std::atomic_bool& m_ShouldCancel;
101101
const IFilter::MessageHandler& m_MessageHandler;
102-
103-
std::vector<unsigned char> m_FiraSansRegular;
104-
std::vector<unsigned char> m_LatoRegular;
105-
std::vector<unsigned char> m_LatoBold;
106102
};
107103

108104
} // namespace nx::core

src/Plugins/OrientationAnalysis/src/OrientationAnalysis/Filters/WritePoleFigureFilter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "simplnx/Parameters/NumberParameter.hpp"
2424
#include "simplnx/Parameters/StringParameter.hpp"
2525

26+
#define CANVAS_ITY_IMPLEMENTATION
2627
#include <canvas_ity.hpp>
2728

2829
#include <filesystem>

src/Plugins/OrientationAnalysis/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ if(EXISTS "${DREAM3D_DATA_DIR}" AND SIMPLNX_DOWNLOAD_TEST_FILES)
148148
download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME H5Oina_Test_Data.tar.gz SHA512 346573ac6b96983680078e8b0a401aa25bd9302dff382ca86ae4e503ded6db3947c4c5611ee603db519d8a8dc6ed35b044a7bfea9880fade5ab54479d140ea03 )
149149
download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME INL_writer.tar.gz SHA512 7d723351e51e84540abfbc38e69a6014852ba34808f9d216a27063a616bcfbd5eb708405305fd83334e48c9ca133d3d0be797c05040e4a115cc612e385d9ada6)
150150
download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME neighbor_orientation_correlation.tar.gz SHA512 122367452174ade2f24dde7a4610bddc4f147a223722d9b30c1df9eaa2cd2bf25e1c7957aba83f3f9de79b4eadd79339b848f9530d1ebf44c69244ea5442cf85)
151-
download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME PoleFigure_Exemplars_v4.tar.gz SHA512 86235279c61ac40405ec00d74703855aa84f7985114dfe4f7bb14a84a73f59092df3f5c087220ceb62325186dfaa08d843ec86dd0710800e376d95e4047cefbe)
151+
download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME PoleFigure_Exemplars_v5.tar.gz SHA512 a092b02a734ac706143c1c9ded0206f141b1f8a1359621e0bbfdbc8b4188ccc075151405d1c931292e9d9952e428877f14196e751f82a3c1cdbf734366ea1293)
152152
download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME read_ang_test.tar.gz SHA512 de7cd89d925da01f291f44686964ec89d469659d0005219f9869afe26b8f62af278461ac3f5deb3afe7f3e65ec074ab3a1357d77a1a5f92eb3a1ea8cc5e4b236)
153153
download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME segment_features_test_data.tar.gz SHA512 317d69384330d40c673f8e1a42df003dede5ac85331b2549e9f45467f7af6b74284f8dad1120427690719ebcd5066830e17031533381cc2cc0cc8622a422b914)
154154
download_test_data(DREAM3D_DATA_DIR ${DREAM3D_DATA_DIR} ARCHIVE_NAME Small_IN100_Ang_Files.tar.gz SHA512 79e9f6948d4e8e06187e11216a67596fa786ffd2700e51f594ad014090383eb8bcc003e14de2e88082aa9ae512cc4fc9cee22c80066fc54f38c3ebc75267eb5b)

src/Plugins/OrientationAnalysis/test/WritePoleFigureTest.cpp

Lines changed: 177 additions & 43 deletions
Large diffs are not rendered by default.

vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"kind": "git",
1010
"repository": "https://github.com/bluequartzsoftware/simplnx-registry",
11-
"baseline": "abb3d4151d1425152fd85a75d35f9d7b035a3b0d",
11+
"baseline": "31f074f6bc2f70a2e18200dfe296bed484c0d249",
1212
"packages": [
1313
"benchmark",
1414
"blosc",

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"dependencies": [
7878
{
7979
"name": "ebsdlib",
80-
"version>=": "2.3.0"
80+
"version>=": "2.4.0"
8181
}
8282
]
8383
},

0 commit comments

Comments
 (0)