Skip to content

Commit 6712e58

Browse files
committed
qtplasmac: fix rfl selection behavior
1 parent 1afc365 commit 6712e58

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '1.227.213'
1+
VERSION = '1.227.214'
22

33
'''
44
qtplasmac_handler.py
@@ -1610,7 +1610,8 @@ def set_start_line(self, line):
16101610
self.startLine = 0
16111611
self.rflSelected = False
16121612
self.w.gcodegraphics.clear_highlight()
1613-
if line < 1:
1613+
if line <= 1:
1614+
self.rflSelected = False
16141615
self.w.gcode_display.setCursorPosition(0, 0)
16151616
self.w.gcode_display.moveMarker(0)
16161617

@@ -1726,7 +1727,10 @@ def run_clicked(self):
17261727
userInput = self.dialog_run_from_line()
17271728
# rfl cancel clicked
17281729
if userInput['cancel']:
1729-
self.clear_rfl()
1730+
if 'rfl.ngc' in self.lastLoadedProgram:
1731+
self.set_start_line(-1)
1732+
else:
1733+
self.clear_rfl()
17301734
self.set_run_button_state()
17311735
else:
17321736
# rfl load clicked

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ <h2>QtPlasmaC Version History</h2>
3030
</table>
3131
<br>
3232
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
33+
<br><b><u>v1.227.214 2022 July 05</u></b>
34+
<ul style="margin:0;">
35+
<li>fix rfl selection behavior</li>
36+
</ul>
37+
<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
38+
3339
<br><b><u>v1.227.213 2022 July 05</u></b>
3440
<ul style="margin:0;">
3541
<li>fix jog-inhibit error message</li>

0 commit comments

Comments
 (0)