Ajout boite de dialogue tool change

Author: fra589

cn5X.py

@@ -50,6 +50,7 @@
 from grblG28_30_1 import dlgG28_30_1
 from cn5X_jog import dlgJog
 from cn5X_beep import cn5XBeeper
+from cn5X_toolChange import dlgToolChange
 
 class upperCaseValidator(QValidator):
   def validate(self, string, pos):
@@ -239,6 +240,7 @@ def arretUrgence():
     self.ui.mnuG92_1.triggered.connect(self.on_mnuG92_1)
 
     self.ui.mnuJog_to.triggered.connect(self.on_mnuJog_to)
+    self.ui.mnuToolChange.triggered.connect(self.on_mnuToolChange)
 
     # Sous-menu G28/G30
     self.ui.mnuPredefinedLocations.aboutToShow.connect(self.on_mnuPredefinedLocations)
@@ -603,17 +605,20 @@ def on_mnuBar(self):
         self.ui.mnuSet_origine.setEnabled(False)
         self.ui.mnuPredefinedLocations.setEnabled(False)
         self.ui.mnuJog_to.setEnabled(False)
+        self.ui.mnuToolChange.setEnabled(False)
       else:
         self.ui.mnu_GrblConfig.setEnabled(False)
         self.ui.mnuSet_origine.setEnabled(True)
         self.ui.mnuPredefinedLocations.setEnabled(True)
         self.ui.mnuJog_to.setEnabled(True)
+        self.ui.mnuToolChange.setEnabled(True)
     else:
       self.ui.mnu_MPos.setEnabled(False)
       self.ui.mnu_WPos.setEnabled(False)
       self.ui.mnuSet_origine.setEnabled(False)
       self.ui.mnuPredefinedLocations.setEnabled(False)
       self.ui.mnuJog_to.setEnabled(False)
+      self.ui.mnuToolChange.setEnabled(False)
       self.ui.mnuResetSerial.setEnabled(False)
       self.ui.mnu_GrblConfig.setEnabled(False)
 
@@ -859,11 +864,28 @@ def on_mnuJog_to(self):
 
 
   def on_dlgJogFinished(self):
-    print("dlgJog closed")
+    ''' Supression de la boite de dialogue après fermeture '''
     self.dlgJog.sig_close.disconnect(self.on_dlgJogFinished)
     self.dlgJog = None
 
 
+  def on_mnuToolChange(self):
+    ''' Appel de la boite de dialogue de changement d'outils '''
+    self.dlgToolChange = dlgToolChange(self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
+    self.dlgToolChange.setParent(self)
+    self.dlgToolChange.sig_close.connect(self.on_dlgToolChangeFinished)
+    RC = self.dlgToolChange.showDialog()
+    if RC == QtWidgets.QDialog.Accepted:
+      print("Changement d'outil OK")
+    else:
+      print("Changement d'outil annulé")
+
+  def on_dlgToolChangeFinished(self):
+    ''' Supression de la boite de dialogue après fermeture '''
+    self.dlgToolChange.sig_close.disconnect(self.on_dlgToolChangeFinished)
+    self.dlgToolChange = None
+
+
   @pyqtSlot()
   def on_mnuPredefinedLocations(self):
     if self.__settings.value("dontConfirmG28", False, type=bool):

cn5X.qrc

@@ -1,6 +1,10 @@
 <RCC>
   <qresource prefix="cn5X">
     <file>images/ledVerteAlumee.svg</file>
+    <file>images/btnGo.svg</file>
+    <file>images/fraise.svg</file>
+    <file>images/btnGo_down.svg</file>
+    <file>images/btnGo_light.svg</file>
     <file>images/ledVerteEteinte.svg</file>
     <file>images/btnG30.svg</file>
     <file>images/btnG30_down.svg</file>

cn5X_gcodeFile.py

@@ -30,6 +30,7 @@
 from cn5X_config import *
 from msgbox import *
 from grblCom import grblCom
+from cn5X_toolChange import dlgToolChange
 
 
 class gcodeFile(QObject):
@@ -266,3 +267,25 @@ def gcodeChanged(self):
   def setGcodeChanged(self, value:bool):
     self.__gcodeChanged = value
 
+
+  def showToolChange(self):
+    ''' Appel de la boite de dialogue de changement d'outils '''
+    self.dlgToolChange = dlgToolChange(self.__grblCom, self.__decode, self.__nbAxis, self.__axisNames)
+    self.dlgToolChange.setParent(self)
+    self.dlgToolChange.sig_close.connect(self.on_dlgToolChangeFinished)
+    
+    RC = self.dlgToolChange.showDialog()
+    if RC == QtWidgets.QDialog.Accepted:
+      print("Changement d'outil OK")
+      return True
+    else:
+      print("Changement d'outil annulé")
+      return False
+
+
+  def on_dlgToolChangeFinished(self):
+    ''' Supression de la boite de dialogue après fermeture '''
+    self.dlgToolChange.sig_close.disconnect(self.on_dlgToolChangeFinished)
+    self.dlgToolChange = None
+
+

cn5X_jog.py

@@ -30,7 +30,7 @@
 from dlgJog import *
 
 class dlgJog(QObject):
-  ''' Classe assurant la gestion de la boite de dialogue G92 '''
+  ''' Classe assurant la gestion de la boite de dialogue Jogging '''
 
   sig_close = pyqtSignal()         # Emis a la fermeture de la boite de dialogue
 
@@ -147,7 +147,8 @@ def showDialog(self):
     # Mise à jour de la vitesse de déplacement:
     self.di.dsbJogSpeed.setValue(self.parent().ui.dsbJogSpeed.value())
 
-    RC = self.__dlg.open()
+    ###RC = self.__dlg.open()
+    RC = self.__dlg.exec() # Use exec to make the dialog application modal.
     return RC