try to get qtdragon MPG scrolling button to work on vcp

Author: c-morley

lib/python/qtvcp/widgets/axis_tool_button.py

@@ -226,6 +226,7 @@ def _a_from_j(self, axis):
         return axis, r[jnum]
 
     def selectJoint(self):
+        print(self.objectName(),'select',self._joint,self._axis,self.isChecked())
         if self._block_signal or self._joint == -1 or self._axis == '': return
         if self.isChecked() == True:
             if STATUS.is_joint_mode():
@@ -251,7 +252,7 @@ def selectJoint(self):
                 self.hal_pin_axis.set(False)
 
     def ChangeState(self, joint = None, axis = None):
-        #print(self.objectName(),'change',joint,axis,self._axis)
+        print(self.objectName(),'change',joint,axis,self._axis,self.isChecked())
         # joint mode
         if STATUS.is_joint_mode():
             if int(joint) != self._joint:
@@ -269,12 +270,18 @@ def ChangeState(self, joint = None, axis = None):
         # axis mode
         else:
             if str(axis) != self._axis and self.isChecked():
+                print(self.objectName(),'Set false')
+                if not self.group() == 0:
+                    self.group().setExclusive(False)
                 self._block_signal = True
                 self.setChecked(False)
                 self._block_signal = False
+                if not self.group() == 0:
+                    self.group().setExclusive(True)
                 if self._halpin_option and self._axis != '':
                     self.hal_pin_joint.set(False)
             elif str(axis) == self._axis and not self.isChecked():
+                print(self.objectName(),'Set True')
                 self._block_signal = True
                 self.setChecked(True)
                 self._block_signal = False

share/qtvcp/screens/qtdragon/qtdragon_handler.py

@@ -157,6 +157,7 @@ def __init__(self, halcomp, widgets, paths):
         STATUS.connect('macro-call-request', lambda w, name: self.request_macro_call(name))
         STATUS.connect('ok-request', lambda w, state: self.dialog_ext_control(w,1,1))
         STATUS.connect('cancel-request', lambda w, state: self.dialog_ext_control(w,1,0))
+        STATUS.connect('axis-selection-changed', lambda w,data: self.mpg_selection_changed(data))
 
         self.swoopPath = os.path.join(paths.IMAGEDIR,'lcnc_swoop.png')
         self.swoopURL = QtCore.QUrl.fromLocalFile(self.swoopPath)
@@ -1418,6 +1419,16 @@ def btn_systemtool_toggled(self, state):
         if state:
             STATUS.emit('dro-reference-change-request', 1)
 
+    def mpg_selection_changed(self, data):
+        if data =='MPG0':
+            self.w.btn_mpg_scroll.setChecked(True)
+            self.recolorMPGFocusBorder()
+        elif data == 'None':
+            self.w.btn_mpg_scroll.group().setExclusive(False)
+            self.w.btn_mpg_scroll.setChecked(False)
+            self.w.btn_mpg_scroll.group().setExclusive(True)
+            self.removeMPGFocusBorder()
+
     def MPG_select_changed(self, button):
         #print(button)
         # Auto exclusive doesn't allow unchecking all buttons
@@ -1437,8 +1448,10 @@ def MPG_select_changed(self, button):
             if self.w.btn_mpg_scroll.isChecked():
                 ACTION.SET_SELECTED_AXIS('MPG0')
                 self.recolorMPGFocusBorder()
-        else:
+            else:
                 self.removeMPGFocusBorder()
+        else:
+            self.removeMPGFocusBorder()
 
         #self.set_statusbar('MPG output Selected: {}'.format(cmd.toolTip()),DEFAULT,noLog=True)
         self._lastSelectButton = button