Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b0b1625

Browse filesBrowse files
committed
BUG: Fix Quick Surface Mesh Crashing bug
Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
1 parent f6ca211 commit b0b1625
Copy full SHA for b0b1625

File tree

Expand file treeCollapse file tree

3 files changed

+21
-15
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+21
-15
lines changed

‎Documentation/ReferenceManual/5_ReleaseNotes/ReleaseNotes_6_5_0.md

Copy file name to clipboardExpand all lines: Documentation/ReferenceManual/5_ReleaseNotes/ReleaseNotes_6_5_0.md
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,20 @@ The developers of DREAM.3D maintain a pair of Google Groups for discussions on t
1010

1111
[DREAM.3D Developers List](https://groups.google.com/forum/?hl=en#!forum/dream3d-developers)
1212

13+
## Version 6.5.171 ##
1314

14-
## Version 6.5.XX ##
15+
## Version 6.5.171 ##
1516

16-
### 6.5.XX Fixed DREAM3D Issues ###
17+
### 6.5.171 Fixed DREAM3D Issues ###
1718

1819
+ Adjusted segmentation algorithm in AlignSectionsMutualInformation to remove the random seed value generation. We just start in the 0,0 position and start looking for a viable voxel.
1920
+ Fixed issue validating mu values in `GeneratePrimaryStatsData` filter
2021
+ Fixed crash if user changes phase name in `GeneratePrimaryStatsData` filter
22+
+ Fixed issue in QuickSurfaceMesh which caused a crash for certain microstructures.
2123

2224
### SIMPL Changes ###
2325

2426

25-
2627
## Version 6.5.168 ##
2728

2829
### 6.5.168 Fixed DREAM3D Issues ###

‎Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.cpp

Copy file name to clipboardExpand all lines: Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.cpp
+13-10Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ using EdgeMap = std::unordered_map<Edge, int64_t, EdgeHasher>;
100100
QuickSurfaceMesh::QuickSurfaceMesh()
101101
: m_SelectedDataArrayPaths(QVector<DataArrayPath>())
102102
, m_SurfaceDataContainerName(SIMPL::Defaults::TriangleDataContainerName)
103-
, m_TripleLineDataContainerName("TripleLines")
103+
//, m_TripleLineDataContainerName("TripleLines")
104104
, m_VertexAttributeMatrixName(SIMPL::Defaults::VertexAttributeMatrixName)
105105
, m_FaceAttributeMatrixName(SIMPL::Defaults::FaceAttributeMatrixName)
106106
, m_FeatureIdsArrayPath(SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, SIMPL::CellData::FeatureIds)
@@ -1572,11 +1572,11 @@ void QuickSurfaceMesh::execute()
15721572
{
15731573
return;
15741574
}
1575-
DataContainer::Pointer tripleLineDC = getDataContainerArray()->getDataContainer(getTripleLineDataContainerName());
1576-
if(getErrorCondition() < 0)
1577-
{
1578-
return;
1579-
}
1575+
// DataContainer::Pointer tripleLineDC = getDataContainerArray()->getDataContainer(getTripleLineDataContainerName());
1576+
// if(getErrorCondition() < 0)
1577+
// {
1578+
// return;
1579+
// }
15801580
IGeometryGrid::Pointer grid = m->getGeometryAs<IGeometryGrid>();
15811581

15821582
size_t udims[3] = {0, 0, 0};
@@ -1611,12 +1611,13 @@ void QuickSurfaceMesh::execute()
16111611

16121612
createNodesAndTriangles(m_NodeIds, nodeCount, triangleCount);
16131613

1614+
#if 0
16141615
int64_t* triangle = triangleGeom->getTriPointer(0);
16151616

16161617
FloatArrayType::Pointer vertices = triangleGeom->getVertices();
1617-
SharedEdgeList::Pointer edges = EdgeGeom::CreateSharedEdgeList(0);
1618-
EdgeGeom::Pointer edgeGeom = EdgeGeom::CreateGeometry(edges, vertices, SIMPL::Geometry::EdgeGeometry);
1619-
tripleLineDC->setGeometry(edgeGeom);
1618+
// SharedEdgeList::Pointer edges = EdgeGeom::CreateSharedEdgeList(0);
1619+
// EdgeGeom::Pointer edgeGeom = EdgeGeom::CreateGeometry(edges, vertices, SIMPL::Geometry::EdgeGeometry);
1620+
// tripleLineDC->setGeometry(edgeGeom);
16201621

16211622
int64_t edgeCount = 0;
16221623
for(int64_t i = 0; i < triangleCount; i++)
@@ -1665,8 +1666,9 @@ void QuickSurfaceMesh::execute()
16651666
edgeCount++;
16661667
}
16671668
}
1669+
#endif
16681670
}
1669-
1671+
#if 0
16701672
// -----------------------------------------------------------------------------
16711673
//
16721674
// -----------------------------------------------------------------------------
@@ -1885,6 +1887,7 @@ void QuickSurfaceMesh::generateTripleLines()
18851887
dca->addDataContainer(dc);
18861888
dc->setGeometry(tripleLineEdge);
18871889
}
1890+
#endif
18881891

18891892
// -----------------------------------------------------------------------------
18901893
//

‎Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.h

Copy file name to clipboardExpand all lines: Source/Plugins/SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.h
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ class SurfaceMeshing_EXPORT QuickSurfaceMesh : public AbstractFilter
7272
SIMPL_FILTER_PARAMETER(QString, SurfaceDataContainerName)
7373
Q_PROPERTY(QString SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
7474

75-
SIMPL_FILTER_PARAMETER(QString, TripleLineDataContainerName)
76-
Q_PROPERTY(QString TripleLineDataContainerName READ getTripleLineDataContainerName WRITE setTripleLineDataContainerName)
75+
// SIMPL_FILTER_PARAMETER(QString, TripleLineDataContainerName)
76+
// Q_PROPERTY(QString TripleLineDataContainerName READ getTripleLineDataContainerName WRITE setTripleLineDataContainerName)
7777

7878
SIMPL_FILTER_PARAMETER(QString, VertexAttributeMatrixName)
7979
Q_PROPERTY(QString VertexAttributeMatrixName READ getVertexAttributeMatrixName WRITE setVertexAttributeMatrixName)
@@ -233,10 +233,12 @@ class SurfaceMeshing_EXPORT QuickSurfaceMesh : public AbstractFilter
233233
*/
234234
void updateVertexInstancePointers();
235235

236+
#if 0
236237
/**
237238
* @brief generateTripleLines
238239
*/
239240
void generateTripleLines();
241+
#endif
240242

241243
public:
242244
QuickSurfaceMesh(const QuickSurfaceMesh&) = delete; // Copy Constructor Not Implemented

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.