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

ENH: Improve performance of the Surface Mesh to Regular Grid. #1146

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

ENH: Improve performance of the Surface Mesh to Regular Grid. #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c9b1b86
ENH: Improve performance of the Surface Mesh to Regular Grid.
imikejackson Nov 26, 2024
866d981
ENH: Parallelize the codes over the z slice being raster.
imikejackson Nov 28, 2024
22eaee5
Start to debug unit test failure for Slice Triangle Geometry
imikejackson Dec 2, 2024
2eb3cff
Add check for canceled filter
imikejackson Dec 3, 2024
49cc2cf
Sets the correct order for dealing with Image Geometry Dims, Origin a…
imikejackson Dec 3, 2024
80c71f3
Fix broken unit tests.
imikejackson Dec 9, 2024
95d8dde
Address PR Review feedback.
imikejackson Dec 17, 2024
5d109c5
Fix issue in SliceTriangleGeometry where double/triple points were be…
imikejackson Dec 18, 2024
850e97e
Fix multiple bugs in SliceTriangleGeometry
imikejackson Jan 3, 2025
07d39a6
Rewrote core algorithm of CreateScanPathsFilter
imikejackson Jan 3, 2025
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,7 @@ set(SIMPLNX_HDRS
${SIMPLNX_SOURCE_DIR}/Utilities/ClusteringUtilities.hpp
${SIMPLNX_SOURCE_DIR}/Utilities/MontageUtilities.hpp
${SIMPLNX_SOURCE_DIR}/Utilities/SIMPLConversion.hpp
${SIMPLNX_SOURCE_DIR}/Utilities/IntersectionUtilities.hpp

${SIMPLNX_SOURCE_DIR}/Utilities/Math/GeometryMath.hpp
${SIMPLNX_SOURCE_DIR}/Utilities/Math/MatrixMath.hpp
Expand Down
1 change: 0 additions & 1 deletion src/Plugins/OrientationAnalysis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ set(PLUGIN_EXTRA_SOURCES
"${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/TiffWriter.cpp"
"${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/delaunator.cpp"
"${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/delaunator.h"
"${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/IntersectionUtilities.hpp"
"${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/GrainMapper3DUtilities.hpp"
"${${PLUGIN_NAME}_SOURCE_DIR}/src/${PLUGIN_NAME}/utilities/GrainMapper3DUtilities.cpp"
)
Expand Down
6 changes: 3 additions & 3 deletions ...lugins/OrientationAnalysis/src/OrientationAnalysis/Filters/Algorithms/WritePoleFigure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include "OrientationAnalysis/utilities/FiraSansRegular.hpp"
#include "OrientationAnalysis/utilities/Fonts.hpp"
#include "OrientationAnalysis/utilities/IntersectionUtilities.hpp"
#include "OrientationAnalysis/utilities/LatoBold.hpp"
#include "OrientationAnalysis/utilities/LatoRegular.hpp"
#include "OrientationAnalysis/utilities/TiffWriter.hpp"
Expand All @@ -15,6 +14,7 @@
#include "simplnx/DataStructure/Geometry/TriangleGeom.hpp"
#include "simplnx/Pipeline/Pipeline.hpp"
#include "simplnx/Utilities/DataArrayUtilities.hpp"
#include "simplnx/Utilities/IntersectionUtilities.hpp"
#include "simplnx/Utilities/ParallelTaskAlgorithm.hpp"
#include "simplnx/Utilities/Parsing/DREAM3D/Dream3dIO.hpp"
#include "simplnx/Utilities/RTree.hpp"
Expand Down Expand Up @@ -123,7 +123,7 @@ class ComputeIntensityStereographicProjection
size_t numTris = delaunayGeom->getNumberOfFaces();
for(size_t tIndex = 0; tIndex < numTris; tIndex++)
{
std::array<float, 6> boundBox = nx::IntersectionUtilities::GetBoundingBoxAtTri(*delaunayGeom, tIndex);
std::array<float, 6> boundBox = nx::core::IntersectionUtilities::GetBoundingBoxAtTri(*delaunayGeom, tIndex);
m_RTree.Insert(boundBox.data(), boundBox.data() + 3, tIndex); // Note, all values including zero are fine in this version
}

Expand Down Expand Up @@ -167,7 +167,7 @@ class ComputeIntensityStereographicProjection

// Get the vertex Indices from the triangle
delaunayGeom->getFacePointIds(triIndex, triVertIndices);
bool inTriangle = nx::IntersectionUtilities::RayTriangleIntersect2(rayOrigin, rayDirection, v0, v1, v2, barycentricCoord);
bool inTriangle = nx::core::IntersectionUtilities::RayTriangleIntersect2(rayOrigin, rayDirection, v0, v1, v2, barycentricCoord);
if(inTriangle)
{
// Linear Interpolate dx and dy values using the barycentric coordinates
Expand Down
Loading
Loading