Skip to content

fix lost last point when contour is not closed line #2

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

Open
sawyerzhu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix lost last point when contour is not closed line #2

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
35 changes: 33 additions & 2 deletions marching.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,63 +78,87 @@ func marchingSquares(m *ContourMap, w, h int, z float64) []Contour {
case 1:
edgePoint[te] = t
nextEdge[t] = le
edgePoint[le] = l
case 2:
edgePoint[re] = r
nextEdge[r] = te
edgePoint[te] = t
case 3:
edgePoint[re] = r
nextEdge[r] = le
edgePoint[le] = l
case 4:
edgePoint[le] = l
nextEdge[l] = be
edgePoint[be] = b
case 5:
edgePoint[te] = t
nextEdge[t] = be
edgePoint[be] = b
case 6:
if connectHigh {
edgePoint[le] = l
nextEdge[l] = te
edgePoint[te] = t

edgePoint[re] = r
nextEdge[r] = be
edgePoint[be] = b
} else {
edgePoint[re] = r
nextEdge[r] = te
edgePoint[te] = t

edgePoint[le] = l
nextEdge[l] = be
edgePoint[be] = b
}
case 7:
edgePoint[re] = r
nextEdge[r] = be
edgePoint[be] = b
case 8:
edgePoint[be] = b
nextEdge[b] = re
edgePoint[re] = r
case 9:
if connectHigh {
edgePoint[te] = t
nextEdge[t] = re
edgePoint[re] = r

edgePoint[be] = b
nextEdge[b] = le
edgePoint[le] = l
} else {
edgePoint[te] = t
nextEdge[t] = le
edgePoint[le] = l

edgePoint[be] = b
nextEdge[b] = re
edgePoint[re] = r
}
case 10:
edgePoint[be] = b
nextEdge[b] = te
edgePoint[te] = t
case 11:
edgePoint[be] = b
nextEdge[b] = le
edgePoint[le] = l
case 12:
edgePoint[le] = l
nextEdge[l] = re
edgePoint[re] = r
case 13:
edgePoint[te] = t
nextEdge[t] = re
edgePoint[re] = r
case 14:
edgePoint[le] = l
nextEdge[l] = te
edgePoint[te] = t
}
}
}
Expand All @@ -155,11 +179,15 @@ func marchingSquares(m *ContourMap, w, h int, z float64) []Contour {
var e edge
if len(boundaryEdgePoint) > 0 {
for e = range boundaryEdgePoint {
break
if _, has := nextEdge[edgePoint[e]]; has {
break
}
}
} else {
for e = range edgePoint {
break
if _, has := nextEdge[edgePoint[e]]; has {
break
}
}
}
e0 := e
Expand All @@ -176,11 +204,14 @@ func marchingSquares(m *ContourMap, w, h int, z float64) []Contour {
if !ok {
break
}

contour = append(contour, p)

delete(edgePoint, e)
if e.Boundary {
delete(boundaryEdgePoint, e)
}

e = nextEdge[p]
}

Expand Down