Skip to content

Commit b4ec770

Browse files
committed
qtplasmac: gcode error message
fix missing error message for invalid parameter in temporary material
1 parent 7c3b471 commit b4ec770

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '238.309'
1+
VERSION = '238.310'
22
LCNCVER = '2.9'
33
DOCSVER = LCNCVER
44

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.9</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29+
<br><b><u>238.310 2024 Mar 21</u></b>
30+
<ul style="margin:0;">
31+
<li>fix missing error message for invalid parameter in temporary material</li>
32+
</ul>
33+
2934
<br><b><u>238.309 2024 Mar 15</u></b>
3035
<ul style="margin:0;">
3136
<li>prevent torch hitting material during offset probing</li>

src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ def __init__(self, *args):
122122
self.errorNoMat = []
123123
self.errorBadMat = []
124124
self.errorTempMat = []
125+
self.errorTempValid = []
125126
self.errorNewMat = []
126127
self.errorEditMat = []
127128
self.errorWriteMat = []
@@ -1072,6 +1073,7 @@ def check_material_edit(self, data):
10721073
self.errorLines.append(self.lineNumOrg)
10731074
except:
10741075
self.set_code_error()
1076+
self.errorTempValid.append(self.lineNum)
10751077
self.errorLines.append(self.lineNumOrg)
10761078

10771079
def set_temporary_material(self, data):
@@ -1229,6 +1231,9 @@ def write_errors(self):
12291231
if self.errorTempMat:
12301232
msg = 'Error attempting to add a temporary material.\n'
12311233
errorText += self.message_set(self.errorTempMat, msg)
1234+
if self.errorTempValid:
1235+
msg = 'Invalid parameter in temporary material.\n'
1236+
errorText += self.message_set(self.errorTempValid, msg)
12321237
if self.errorNewMat:
12331238
msg = 'Cannot add new material, number is in use.\n'
12341239
errorText += self.message_set(self.errorNewMat, msg)

0 commit comments

Comments
 (0)