Skip to content

Commit e90c66d

Browse files
authored
Merge pull request #4141 from Sigma1912/qt_preview_use_new_initcode_creator
qt_preview: Use new function to create initcodes
2 parents 6589510 + e73ba3d commit e90c66d

1 file changed

Lines changed: 3 additions & 14 deletions

File tree

src/emc/usr_intf/gremlin/qt5_graphics.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from rs274 import interpret
3030
import linuxcnc
3131
import gcode
32+
import preview_helpers
3233

3334
import re
3435
import tempfile
@@ -396,20 +397,8 @@ def load(self,filename = None):
396397
if parameter:
397398
shutil.copy(parameter, temp_parameter)
398399
canon.parameter_file = temp_parameter
399-
unitcode = "G%d" % (20 + (s.linear_units == 1))
400-
initcode = "G53 G0 "
401-
for i in range(9):
402-
if s.axis_mask & (1<<i):
403-
axis = "XYZABCUVW"[i]
404-
if (axis == "A" and self.a_axis_wrapped) or\
405-
(axis == "B" and self.b_axis_wrapped) or\
406-
(axis == "C" and self.c_axis_wrapped):
407-
pos = s.position[i] % 360.000
408-
else:
409-
pos = s.position[i]
410-
position = " %s%.8f" % (axis, pos)
411-
initcode += position
412-
result, seq = self.load_preview(filename, canon, unitcode, initcode)
400+
initcodes = preview_helpers.create_unitcode_and_initcode(s, self.inifile)
401+
result, seq = self.load_preview(filename, canon, *initcodes)
413402
if result > gcode.MIN_ERROR:
414403
self.report_gcode_error(result, seq, filename)
415404
self.logger.set_depth(self.from_internal_linear_unit(self.get_foam_z()),

0 commit comments

Comments
 (0)