Adding Jog to location dialog box

Author: fra589

cn5X.py

@@ -24,6 +24,7 @@
 
 import sys, os, time
 from datetime import datetime
+from xml.dom.minidom import parse, Node, Element
 import locale
 import argparse
 import serial, serial.tools.list_ports
@@ -47,7 +48,7 @@
 from cn5X_helpProbe import cn5XHelpProbe
 from grblG92 import dlgG92
 from grblG28_30_1 import dlgG28_30_1
-from xml.dom.minidom import parse, Node, Element
+from cn5X_jog import dlgJog
 
 class upperCaseValidator(QValidator):
   def validate(self, string, pos):
@@ -192,6 +193,9 @@ def __init__(self, parent=None):
     self.__yMax      = False
     self.__yMaxValue = None
 
+    # Flag pour unicité de la boite de dialogue Jog
+    self.dlgJog = None
+
     '''---------- Connections des evennements de l'interface graphique ----------'''
 
     self.ui.btnUrgence.pressed.connect(self.on_arretUrgence)             # Evenements du bouton d'arret d'urgence
@@ -227,6 +231,8 @@ def __init__(self, parent=None):
     self.ui.mnuSaveG92.triggered.connect(self.on_mnuSaveG92)
     self.ui.mnuRestoreG92.triggered.connect(self.on_mnuRestoreG92)
     self.ui.mnuG92_1.triggered.connect(self.on_mnuG92_1)
+    
+    self.ui.mnuJog_to.triggered.connect(self.on_mnuJog_to)
 
     # Sous-menu G28/G30
     self.ui.mnuPredefinedLocations.aboutToShow.connect(self.on_mnuPredefinedLocations)
@@ -830,6 +836,22 @@ def on_mnuG92_1(self):
     self.__grblCom.gcodePush("G92.1")
 
 
+  @pyqtSlot()
+  def on_mnuJog_to(self):
+    ''' Appel de la boite de dialogue Jog '''
+    if self.dlgJog is None:
+      self.dlgJog = dlgJog(self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
+      self.dlgJog.setParent(self)
+      self.dlgJog.sig_close.connect(self.on_dlgJogFinished)
+      self.dlgJog.showDialog()
+
+
+  def on_dlgJogFinished(self):
+    print("dlgJog closed")
+    self.dlgJog.sig_close.disconnect(self.on_dlgJogFinished)
+    self.dlgJog = None
+
+
   @pyqtSlot()
   def on_mnuPredefinedLocations(self):
     if self.__settings.value("dontConfirmG28", False, type=bool):

cn5X.qrc

@@ -1,5 +1,12 @@
 <RCC>
   <qresource prefix="cn5X">
+    <file>images/btnJogNone.svg</file>
+    <file>images/btnJogA.svg</file>
+    <file>images/btnJogB.svg</file>
+    <file>images/btnJogC.svg</file>
+    <file>images/btnJogX.svg</file>
+    <file>images/btnJogY.svg</file>
+    <file>images/btnJogZ.svg</file>
     <file>images/questionG28.1.svg</file>
     <file>images/questionG28.svg</file>
     <file>images/questionG30.1.svg</file>
@@ -79,7 +86,6 @@
     <file>images/btnStop.svg</file>
     <file>images/btnUrgence.svg</file>
     <file>images/btnUrgenceOff.svg</file>
-    <file>images/XYZAB-48.svg</file>
     <file>images/XYZAB.svg</file>
     <file>fonts/LEDCalculator.ttf</file>
   </qresource>

cn5X_config.py

@@ -26,7 +26,7 @@
 
 ORG_NAME           = "fra589"
 APP_NAME           = "cn5X++"
-APP_VERSION_STRING = "0.8.2"
+APP_VERSION_STRING = "0.8.3"
 APP_VERSION_DATE   = "20210208"
 
 DEFAULT_NB_AXIS    = 3 # Laisser 3 permet de gerer un Grbl original a 3 axes