G28 G30 update

Author: fra589

cn5X.py

@@ -809,6 +809,7 @@ def on_gotoG28(self):
     Make a rapid move from current location to the position defined by the last G28.1
     If no positions are stored with G28.1 then all axes will go to the machine origin.
     '''
+    '''
     if not self.__settings.value("dontConfirmG28", False, type=bool):
       # Confirmation :
       m = msgBox(
@@ -830,13 +831,20 @@ def on_gotoG28(self):
     else:
       # Envoi sans confirmation
       self.__grblCom.gcodePush("G28")
+    '''
+    ''' Appel de la boite de dialogue G28 '''
+    dlg = dlgG28_30_1("G28", self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
+    dlg.setParent(self)
+    dlg.showDialog()
+
 
   @pyqtSlot()
   def on_gotoG30(self):
     '''
     Make a rapid move from current location to the position defined by the last G30.1
     If no positions are stored with G30.1 then all axes will go to the machine origin.
     '''
+    '''
     if not self.__settings.value("dontConfirmG30", False, type=bool):
       # Confirmation :
       m = msgBox(
@@ -858,20 +866,25 @@ def on_gotoG30(self):
     else:
       # Envoi sans confirmation
       self.__grblCom.gcodePush("G30")
+    '''
+    ''' Appel de la boite de dialogue G30 '''
+    dlg = dlgG28_30_1("G30", self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
+    dlg.setParent(self)
+    dlg.showDialog()
 
 
   @pyqtSlot()
   def on_mnuDefineG28(self):
     ''' Appel de la boite de dialogue G28.1 '''
-    dlg = dlgG28_30_1("G28", self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
+    dlg = dlgG28_30_1("G28.1", self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
     dlg.setParent(self)
     dlg.showDialog()
 
 
   @pyqtSlot()
   def on_mnuDefineG30(self):
     ''' Appel de la boite de dialogue G30.1 '''
-    dlg = dlgG28_30_1("G30", self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
+    dlg = dlgG28_30_1("G30.1", self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
     dlg.setParent(self)
     dlg.showDialog()
 

cn5X.qrc

@@ -1,9 +1,17 @@
 <RCC>
   <qresource prefix="cn5X">
-    <file>images/origine.svg</file>
     <file>images/questionG28.1.svg</file>
-    <file>images/questionG33.1.svg</file>
+    <file>images/questionG28.svg</file>
+    <file>images/questionG30.1.svg</file>
+    <file>images/questionG30.svg</file>
+    <file>images/origine.svg</file>
     <file>images/btnEmergency.svg</file>
+    <file>images/chkBoxChecked.svg</file>
+    <file>images/chkBoxDisabledChecked.svg</file>
+    <file>images/chkBoxDisabledUnChecked.svg</file>
+    <file>images/chkBoxUnChecked.svg</file>
+    <file>images/questionG28.svg</file>
+    <file>images/questionG30.svg</file>
     <file>images/btnEmergencyOff.svg</file>
     <file>images/btnProbeInCercle.svg</file>
     <file>images/btnProbeInX+.svg</file>