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

Improve "Inkscape" cleanup to be more flexible #1506

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve "Inkscape" cleanup to be more flexible #1506

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f7be57
Improve "Inkscape" cleanup to be more flexible
tschundler Dec 31, 2020
05e0ddb
Better handling of Header + Footer during cleanup
tschundler Jan 1, 2021
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
86 changes: 38 additions & 48 deletions bCNC/CNC.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ def loadConfig(config):
CNC.travel_y /= 25.4
CNC.travel_z /= 25.4
# a,b,c are in degrees no conversion required

section = "Error"
if CNC.drillPolicy == 1:
ERROR_HANDLING["G98"] = 1
Expand Down Expand Up @@ -921,8 +921,8 @@ def initPath(self, x=None, y=None, z=None, a=None, b=None, c=None):
if c is None:
self.c = self.cval = CNC.vars['wc'] or 0
else:
self.c = self.cval = c
self.c = self.cval = c

self.ival = self.jval = self.kval = 0.0
self.uval = self.vval = self.wval = 0.0
self.dx = self.dy = self.dz = 0.0
Expand Down Expand Up @@ -950,7 +950,7 @@ def resetEnableMargins(self):
# Selected blocks margin
CNC.vars["xmin"] = CNC.vars["ymin"] = CNC.vars["zmin"] = 1000000.0
CNC.vars["xmax"] = CNC.vars["ymax"] = CNC.vars["zmax"] = -1000000.0

#----------------------------------------------------------------------
def resetAllMargins(self):
self.resetEnableMargins()
Expand Down Expand Up @@ -4502,63 +4502,53 @@ def roundLines(self, items, acc=None):
#----------------------------------------------------------------------
# Inkscape g-code tools on slice/slice it raises the tool to the
# safe height then plunges again.
# Comment out all these patterns
#
# FIXME needs re-working...
# Comment out all movements with no X/Y component that stop at the same
# plane that they started, if the initial z motion is upward.
#----------------------------------------------------------------------
def inkscapeLines(self):
undoinfo = []

# Loop over all blocks
self.initPath()
newlines = []
#last = None
last = -1 # line location when it was last raised with dx=dy=0.0
pending = [] # Accumulator for lines we may want to nullify.
dz = 123456 # Ensure initial setup isn't touched.
isZero = lambda x: -0.001 < x < 0.001
comment = lambda l: l if l[:1] in ("(","%","#",";") else "(%s)"%(l)

#for line in self.iterate():
#for bid,block in enumerate(self.blocks):
# for li,line in enumerate(block):
for line in self.lines():
# step id
# 0 - normal cutting z<0
# 1 - z>0 raised with dx=dy=0.0
# 2 - z<0 plunged with dx=dy=0.0
cmd = CNC.parseLine(line)
if cmd is None:
newlines.append(line)
if pending:
pending.append(line)
else:
newlines.append(line)
continue

self.cnc.motionStart(cmd)
xyz = self.cnc.motionPath()
if self.cnc.dx==0.0 and self.cnc.dy==0.0:
if self.cnc.z>0.0 and self.cnc.dz>0.0:
last = len(newlines)
#last = bid, li

#elif self.cnc.z<0.0 and self.cnc.dz<0.0 and last is not None:
elif self.cnc.z<0.0 and self.cnc.dz<0.0 and last>=0:
# comment out all lines from last
#lb, ll = last
#while bid!=lb or li!=ll:
# b = self.blocks[lb]
# line = b[ll]
# if line and line[0] not in ("(","%"):
# undoinfo.append(b.setLineUndo(ll,"(%s)"%(line)))
# ll += 1
# if ll>=len(b):
# lb += 1
# ll = 0
# last = None
for i in range(last,len(newlines)):
s = newlines[i]
if s and s[0] != '(':
newlines[i] = "(%s)"%(s)
last = -1
else:
#last = None
last = -1
newlines.append(line)
self.cnc.motionPath()
# No XY motion, but maybe Z motion.
if isZero(self.cnc.dx) and isZero(self.cnc.dy):
dz += self.cnc.dz
# If z-motion is upward or block has already started,
# it becomes a candidate to remobve.
if pending or dz >= 0:
pending.append(line)
self.cnc.motionEnd()
continue
self.cnc.motionEnd()

# XY motion has resumed / continues, so may need to dump pending movement.
if pending:
if isZero(dz):
pending = map(comment, pending)
newlines += pending
pending = []

newlines.append(line)
dz = 0

if pending: # Footer usually has no motion; don't squelch it.
newlines += pending

self.addUndo(self.setLinesUndo(newlines))

#----------------------------------------------------------------------
Expand Down