jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qtplasmac: set laser button active when using, laser/camera interlocking

Browse source
This commit is contained in:
Greg Carl 2023-01-24 16:08:16 -05:00
parent c9e692e2d5
commit c21e726181
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
View file

@ -1,4 +1,4 @@
VERSION = '1.235.263' VERSION = '1.235.264'
''' '''
qtplasmac_handler.py qtplasmac_handler.py
@ -3462,6 +3462,9 @@ class HandlerClass:
self.laserOnPin.set(0) self.laserOnPin.set(0)
self.laserButtonState = 'reset' self.laserButtonState = 'reset'
self.w.laser.setText(_translate('HandlerClass', 'LASER')) self.w.laser.setText(_translate('HandlerClass', 'LASER'))
self.button_normal('laser')
self.w.touch_xy.setEnabled(True)
self.w.camera.setEnabled(True)
def ohmic_led_timeout(self): def ohmic_led_timeout(self):
if not self.ohmicLedInPin.get(): if not self.ohmicLedInPin.get():
@ -4963,10 +4966,14 @@ class HandlerClass:
if self.w.preview_stack.currentIndex() != 3: if self.w.preview_stack.currentIndex() != 3:
self.w.preview_stack.setCurrentIndex(3) self.w.preview_stack.setCurrentIndex(3)
self.button_active('camera') self.button_active('camera')
self.w.touch_xy.setEnabled(False)
self.w.laser.setEnabled(False)
self.cameraOn = True self.cameraOn = True
else: else:
self.w.preview_stack.setCurrentIndex(0) self.w.preview_stack.setCurrentIndex(0)
self.button_normal('camera') self.button_normal('camera')
self.w.touch_xy.setEnabled(True)
self.w.laser.setEnabled(True)
self.cameraOn = False self.cameraOn = False
ACTION.SET_MANUAL_MODE() ACTION.SET_MANUAL_MODE()
self.vkb_hide() self.vkb_hide()
@ -4979,6 +4986,9 @@ class HandlerClass:
return return
if self.laserButtonState == 'reset': if self.laserButtonState == 'reset':
self.laserButtonState = 'laser' self.laserButtonState = 'laser'
self.button_normal('laser')
self.w.touch_xy.setEnabled(True)
self.w.camera.setEnabled(True)
return return
xPos = STATUS.get_position()[0][0] - self.laserOffsetX xPos = STATUS.get_position()[0][0] - self.laserOffsetX
yPos = STATUS.get_position()[0][1] - self.laserOffsetY yPos = STATUS.get_position()[0][1] - self.laserOffsetY
@ -4990,9 +5000,15 @@ class HandlerClass:
if self.laserButtonState == 'laser': if self.laserButtonState == 'laser':
self.w.laser.setText(_translate('HandlerClass', 'MARK\nEDGE')) self.w.laser.setText(_translate('HandlerClass', 'MARK\nEDGE'))
self.laserButtonState = 'markedge' self.laserButtonState = 'markedge'
self.button_active('laser')
self.w.touch_xy.setEnabled(False)
self.w.camera.setEnabled(False)
self.laserOnPin.set(1) self.laserOnPin.set(1)
return return
elif self.laserButtonState == 'setorigin': elif self.laserButtonState == 'setorigin':
self.button_normal('laser')
self.w.touch_xy.setEnabled(True)
self.w.camera.setEnabled(True)
self.laserOnPin.set(0) self.laserOnPin.set(0)
self.laserButtonState = self.sheet_align(self.laserButtonState, self.w.laser, self.laserOffsetX, self.laserOffsetY) self.laserButtonState = self.sheet_align(self.laserButtonState, self.w.laser, self.laserOffsetX, self.laserOffsetY)

8
share/qtvcp/screens/qtplasmac/versions.html
View file

@ -30,6 +30,14 @@
</table> </table>
<br> <br>
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** ---> <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
<br><b><u>v1.235.264 2023 Jan 24</u></b>
<ul style="margin:0;">
<li>use status for motion type</li>
<li>laser/camera button interlocking</li>
<li>set laser button active when in use</li>
</ul>
<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
<br><b><u>v1.235.263 2023 Jan 21</u></b> <br><b><u>v1.235.263 2023 Jan 21</u></b>
<ul style="margin:0;"> <ul style="margin:0;">
<li>change default spotting threshold</li> <li>change default spotting threshold</li>