Skip to content

Commit 890ab54

Browse files
committed
qtplasmac: fix gcode filter comments error
1 parent 88491c7 commit 890ab54

3 files changed

Lines changed: 8 additions & 3 deletions

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 = '236.299'
1+
VERSION = '236.300'
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>236.300 2023 Nov 07</u></b>
30+
<ul style="margin:0;">
31+
<li>fix gcode filter comments error</li>
32+
</ul>
33+
2934
<br><b><u>236.299 2023 Nov 05</u></b>
3035
<ul style="margin:0;">
3136
<li>rework versioning due to master branch diverging</li>

src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ def process_file(self):
199199
if line[0] in 'nN':
200200
line = self.remove_line_numbers(line)
201201
# if any obvious illegal characters then comment the line
202-
if self.illegal_character(line):
202+
if line[0] != ';' and self.illegal_character(line):
203203
continue
204204
# check for material edit
205205
if line[:3] == '(o=':
@@ -218,7 +218,7 @@ def process_file(self):
218218
self.gcodeList.append(line)
219219
continue
220220
# full line comments - only remove line numbers
221-
if line[0] in ';(' and not line[:3] == '(o=)':
221+
elif line[0] in ';(':
222222
if len(line) > 1:
223223
l0 = line[0]
224224
tmp = line[1:].strip()

0 commit comments

Comments
 (0)