Skip to content

Commit d0d35ca

Browse files
committed
qtplasmac_gcode use consistant file names
1 parent 0199d9c commit d0d35ca

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
# assume gui to be qtplasmac unless a specific gui selected
4545
if 'axis' in ini.find('DISPLAY', 'DISPLAY'):
4646
gui = 'plasmac'
47-
materialFile = '{}.mats'.format(ini.find('EMC', 'MACHINE'))
4847
tmpPath = '/tmp/plasmac'
4948
cutTypePin = 'axisui.cut-type'
5049
matNumPin = 'axisui.material-change-number'
@@ -57,7 +56,6 @@
5756
notice = 'The line numbers in the original file may differ from what is shown below.\n\n'
5857
else:
5958
gui = 'qtplasmac'
60-
materialFile = '{}_material.cfg'.format(ini.find('EMC', 'MACHINE'))
6159
tmpPath = '/tmp/qtplasmac'
6260
cutTypePin = 'qtplasmac.cut_type'
6361
matNumPin = 'qtplasmac.material_change_number'
@@ -75,6 +73,7 @@
7573
notice += 'will be highlighted. The line numbers may differ from what is shown below.\n\n'
7674
filteredBkp = '{}/filtered_bkp.ngc'.format(tmpPath)
7775
errorFile = '{}/gcode_errors.txt'.format(tmpPath)
76+
materialFile = '{}_material.cfg'.format(ini.find('EMC', 'MACHINE'))
7877
tmpMaterialFile = '{}/{}_material.gcode'.format(tmpPath, ini.find('EMC', 'MACHINE'))
7978
tmpMatNum = 1000000
8079
tmpMatNam = ''

0 commit comments

Comments
 (0)