qtvcp/gladevcp -action: add ability; return to mode after INI mdi

Author: c-morley

lib/python/gladevcp/gtk_action.py

@@ -191,7 +191,7 @@ def CALL_MDI_WAIT(self, code, time=5, mode_return=False):
             self.ensure_mode(premode)
         return 0
 
-    def CALL_INI_MDI(self, key):
+    def CALL_INI_MDI(self, key, mode_return = False):
         try:
             # prefer named INI MDI commands
             mdi = INFO.get_ini_mdi_command(key)
@@ -209,11 +209,21 @@ def CALL_INI_MDI(self, key):
 
 
         mdi_list = mdi.split(';')
+        if mode_return:
+            self.RECORD_CURRENT_MODE()
+            self._a = STATUS.connect('command-stopped', lambda w: self.return_mode_after_finish())
         self.ensure_mode(linuxcnc.MODE_MDI)
         for code in (mdi_list):
             LOG.debug('CALL_INI_MDI command:{}'.format(code))
             self.cmd.mdi('%s' % code)
 
+    # when command stops - we try to continue the generator.
+    # if generator is done - return to recorded mode.
+    def return_mode_after_finish(self):
+        print('ini command end')
+        self.RESTORE_RECORDED_MODE()
+        STATUS.handler_disconnect(self._a)
+
     def CALL_OWORD(self, code, time=5):
         LOG.debug('OWORD_COMMAND= {}'.format(code))
         self.ensure_mode(linuxcnc.MODE_MDI)

lib/python/qtvcp/qt_action.py

@@ -227,7 +227,7 @@ def CALL_MDI_WAIT(self, code, time=5, mode_return=False):
             self.ensure_mode(premode)
         return 0
 
-    def CALL_INI_MDI(self, key):
+    def CALL_INI_MDI(self, key, mode_return = False):
         try:
             # prefer named INI MDI commands
             mdi = INFO.get_ini_mdi_command(key)
@@ -244,11 +244,21 @@ def CALL_INI_MDI(self, key):
                 return
 
         mdi_list = mdi.split(';')
+        if mode_return:
+            self.RECORD_CURRENT_MODE()
+            self._a = STATUS.connect('command-stopped', lambda w: self.return_mode_after_finish())
         self.ensure_mode(linuxcnc.MODE_MDI)
         for code in (mdi_list):
             LOG.debug('CALL_INI_MDI command:{}'.format(code))
             self.cmd.mdi('%s' % code)
 
+    # when command stops - we try to continue the generator.
+    # if generator is done - return to recorded mode.
+    def return_mode_after_finish(self):
+        print('ini command end')
+        self.RESTORE_RECORDED_MODE()
+        STATUS.handler_disconnect(self._a)
+
     def CALL_OWORD(self, code, time=5):
         LOG.debug('OWORD_COMMAND= {}'.format(code))
         self.ensure_mode(linuxcnc.MODE_MDI)