Skip to content

Fix DXF polygon loading by correctly joining oriented segments #264

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
tokoro10g wants to merge 1 commit into
base: staging
Choose a base branch
from
+12 −9
Open

Fix DXF polygon loading by correctly joining oriented segments #264

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
21 changes: 12 additions & 9 deletions uilib/widgets/polygonEditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,25 +78,28 @@ def loadDXF(self, path=None):
close = 0.001 # Max distance between endpoints of adjacent segments
join = None
while join != []:
join = [] # Will be populated like [ida, idb, flip] if there is work to do
join = [] # Will be populated like [ida, idb, flipa, flipb] if there is work to do
for (chunkId, chunk), (compChunkID, compChunk) in itertools.combinations(enumerate(chunks), 2):
if motorlib.geometry.dist(chunk[0], compChunk[-1]) < close:
join = [compChunkID, chunkId, False]
join = [compChunkID, chunkId, False, False]
break
elif motorlib.geometry.dist(chunk[-1], compChunk[0]) < close:
join = [chunkId, compChunkID, False]
join = [chunkId, compChunkID, False, False]
break
elif motorlib.geometry.dist(chunk[-1], compChunk[-1]) < close:
join = [chunkId, compChunkID, True]
join = [chunkId, compChunkID, False, True]
break
elif motorlib.geometry.dist(chunk[0], compChunk[0]) < close:
join = [chunkId, compChunkID, True]
join = [chunkId, compChunkID, True, False]
break
if join != []: # Add the second chunk on to the first and flip it if the bool is true
addChunk = chunks[join[1]]
if join != []: # Connect the chunks
firstChunk = chunks[join[0]]
secondChunk = chunks[join[1]]
if join[2]:
addChunk.reverse()
chunks[join[0]] += addChunk
firstChunk.reverse()
if join[3]:
secondChunk.reverse()
chunks[join[0]] = firstChunk + secondChunk
del chunks[join[1]]

oldLen = len(chunks)
Expand Down