Adapted progress callback of gcodeInterpreter to also work if a list object is supplied as gcodeFile (e.g. when using loadList instead of load)
parent
c6cca8c7a3
commit
083498865d
|
@ -75,10 +75,12 @@ class gcode(object):
|
||||||
if type(line) is tuple:
|
if type(line) is tuple:
|
||||||
line = line[0]
|
line = line[0]
|
||||||
if self.progressCallback != None:
|
if self.progressCallback != None:
|
||||||
if filePos != gcodeFile.tell():
|
if isinstance(gcodeFile, (file)):
|
||||||
filePos = gcodeFile.tell()
|
|
||||||
self.progressCallback(float(filePos) / float(self._fileSize))
|
self.progressCallback(float(filePos) / float(self._fileSize))
|
||||||
|
elif isinstance(gcodeFile, (list)):
|
||||||
|
self.progressCallback(float(filePos) / float(len(gcodeFile)))
|
||||||
|
filePos += 1
|
||||||
|
|
||||||
#Parse Cura_SF comments
|
#Parse Cura_SF comments
|
||||||
if line.startswith(';TYPE:'):
|
if line.startswith(';TYPE:'):
|
||||||
pathType = line[6:].strip()
|
pathType = line[6:].strip()
|
||||||
|
|
Loading…
Reference in New Issue