Skip to content

Commit cdcb1a5

Browse files
committed
qtplasmac: reload after g10 for bounds checking
Previously if a rotation was applied via MDI, the usual bounds checking was not invoked, and if the cut paths fell outside of the machine envelope the user was not notified and some interlocking broke as well.
1 parent 0c7f9df commit cdcb1a5

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '016.086'
1+
VERSION = '016.087'
22
LCNCVER = '2.10'
33

44
'''
@@ -28,7 +28,7 @@
2828
from subprocess import Popen, PIPE
2929
from subprocess import run as RUN
3030
from subprocess import call as CALL
31-
from importlib import reload, util
31+
from importlib import reload
3232
import time
3333
import tarfile
3434
import math
@@ -475,6 +475,7 @@ def initialized__(self):
475475
STATUS.connect('periodic', lambda w: self.update_periodic())
476476
STATUS.connect('metric-mode-changed', self.metric_mode_changed)
477477
STATUS.connect('motion-type-changed', lambda w, data: self.motion_type_changed(data))
478+
STATUS.connect('reload-display', lambda w: self.g10_reload())
478479
self.startupTimer = QTimer()
479480
self.startupTimer.timeout.connect(self.startup_timeout)
480481
self.startupTimer.setSingleShot(True)
@@ -2336,6 +2337,10 @@ def plasmac_stop_changed(self, state):
23362337
'gouge-speed', 'gouge-speed-distance', 'creep-speed', 'creep-speed-distance']:
23372338
hal.set_p(f'plasmac.{pin}', '0')
23382339

2340+
def g10_reload(self):
2341+
if self.fileOpened:
2342+
self.file_reload_clicked()
2343+
23392344
def file_reload_clicked(self):
23402345
proceed = self.editor_close_check()
23412346
if not proceed:

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.10</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29+
<br><b><u>016.087 2026 Aug 01</u></b>
30+
<ul style="margin:0;">
31+
<li>reload file with G10 rotation in MDI for bounds checking</li>
32+
</ul>
33+
2934
<br><b><u>016.086 2026 Jun 07</u></b>
3035
<ul style="margin:0;">
3136
<li>fix double "qtvcp" ghost windows on repeated switches to the conversational tab</li>

0 commit comments

Comments
 (0)