qtvcp -add new widgets axis picker and user DRO label

together used to make a user DRO label separate from the system DRO.
Probably most useful for setup references

Author: c-morley

lib/python/qtvcp/plugins/toolbutton_plugin.py

@@ -4,6 +4,7 @@
 from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin
 from qtvcp.widgets.system_tool_button import SystemToolButton
 from qtvcp.widgets.action_tool_button import ActionToolButton
+from qtvcp.widgets.axisPickTool_button import AxisPickToolButton
 from qtvcp.widgets.qtvcp_icons import Icon
 
 ICON = Icon()
@@ -94,3 +95,46 @@ def domXml(self):
 
     def includeFile(self):
         return "qtvcp.widgets.action_tool_button"
+
+####################################
+# AxisPickToolButton
+####################################
+class AxisPickToolButtonPlugin(QPyDesignerCustomWidgetPlugin):
+    def __init__(self, parent=None):
+        super(AxisPickToolButtonPlugin, self).__init__(parent)
+        self.initialized = False
+
+    def initialize(self, formEditor):
+        if self.initialized:
+            return
+        self.initialized = True
+
+    def isInitialized(self):
+        return self.initialized
+
+    def createWidget(self, parent):
+        return AxisPickToolButton(parent)
+
+    def name(self):
+        return "AxisPickToolButton"
+
+    def group(self):
+        return "Linuxcnc - Widgets"
+
+    def icon(self):
+        return QtGui.QIcon(QtGui.QPixmap(ICON.get_path('AxisPicktoolbutton')))
+
+    def toolTip(self):
+        return "Tool Button for selecting an available Axis"
+
+    def whatsThis(self):
+        return ""
+
+    def isContainer(self):
+        return False
+
+    def domXml(self):
+        return '<widget class="AxisPickToolButton" name="axispicktoolbutton" />\n'
+
+    def includeFile(self):
+        return "qtvcp.widgets.axisPickTool_button"

lib/python/qtvcp/plugins/widgets_plugin.py

@@ -3,6 +3,7 @@
 from PyQt5 import QtGui
 from PyQt5.QtDesigner import QPyDesignerCustomWidgetPlugin
 from qtvcp.widgets.dro_widget import DROLabel
+from qtvcp.widgets.user_dro_label import UserDROLabel
 from qtvcp.widgets.mdi_line import MDILine
 from qtvcp.widgets.operator_value_line import OperatorValueLine
 from qtvcp.widgets.tool_chooser import ToolChooser
@@ -64,6 +65,48 @@ def domXml(self):
     def includeFile(self):
         return "qtvcp.widgets.dro_widget"
 
+####################################
+# Axis Position UserDROLabel
+####################################
+class UserDROLabelPlugin(QPyDesignerCustomWidgetPlugin):
+    def __init__(self, parent=None):
+        super(UserDROLabelPlugin, self).__init__(parent)
+        self.initialized = False
+
+    def initialize(self, formEditor):
+        if self.initialized:
+            return
+        self.initialized = True
+
+    def isInitialized(self):
+        return self.initialized
+
+    def createWidget(self, parent):
+        return UserDROLabel(parent)
+
+    def name(self):
+        return "UserDROLabel"
+
+    def group(self):
+        return "Linuxcnc - Widgets"
+
+    def icon(self):
+        return QtGui.QIcon(QtGui.QPixmap(ICON.get_path('UserDROLabel')))
+
+    def toolTip(self):
+        return "User Referenced Axis Position Display Widget"
+
+    def whatsThis(self):
+        return ""
+
+    def isContainer(self):
+        return False
+
+    def domXml(self):
+        return '<widget class="UserDROLabel" name="userdro" />\n'
+
+    def includeFile(self):
+        return "qtvcp.widgets.user_dro_label"
 
 ####################################
 # MDI edit line

lib/python/qtvcp/widgets/axisPickTool_button.py

@@ -0,0 +1,90 @@
+from PyQt5.QtWidgets import (QToolButton, QMenu, QAction,
+    QComboBox, QWidgetAction, QSizePolicy)
+from PyQt5.QtCore import pyqtProperty, pyqtSignal
+from PyQt5.QtGui import QIcon
+
+from qtvcp.widgets.widget_baseclass import _HalWidgetBase
+from qtvcp.widgets.indicatorMixIn import IndicatedMixIn
+from qtvcp.core import Status, Action, Info
+from qtvcp import logger
+
+# Instiniate the libraries with global reference
+# STATUS gives us status messages from linuxcnc
+# AUX_PRGM holds helper program loader
+# INI holds ini details
+# ACTION gives commands to linuxcnc
+# LOG is for running code logging
+STATUS = Status()
+INFO = Info()
+ACTION = Action()
+LOG = logger.getLogger(__name__)
+# Force the log level for this module
+#LOG.setLevel(logger.DEBUG) # One of DEBUG, INFO, WARNING, ERROR, CRITICAL
+
+class AxisPickToolButton(QToolButton, IndicatedMixIn):
+    AxisSelected = pyqtSignal(str)
+    CurrentAxisPosition = pyqtSignal(str,float)
+
+    def __init__(self, parent=None):
+        super(AxisPickToolButton, self).__init__(parent)
+        self._textTemplate =  'Axis: %s'
+        self._currentAxis = 'X'
+
+
+    def _hal_init(self):
+        self.createAxisButton(self._currentAxis)
+        self.axisTriggered(self._currentAxis)
+
+    def createAxisButton(self, text):
+        tmpl = lambda s: self._textTemplate % s
+        self.setText(tmpl(text))
+        self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+        self.setMinimumSize(70, 40)
+        self.clicked.connect(self.axisClicked)
+        SettingMenu = QMenu()
+        self.settingMenu = SettingMenu
+        for i in INFO.AVAILABLE_AXES:
+            axisButton = QAction(QIcon('exit24.png'), i, self)
+            # weird lambda i=i to work around 'function closure'
+            axisButton.triggered.connect(lambda state, i=i: self.axisTriggered(i))
+            SettingMenu.addAction(axisButton)
+        self.setMenu(SettingMenu)
+
+    def axisTriggered(self, data):
+        tmpl = lambda s: self._textTemplate % s
+        self.setText(tmpl(data))
+        self.AxisSelected.emit(data)
+
+    def axisClicked(self):
+        conversion = {'X':0, 'Y':1, "Z":2, 'A':3, "B":4, "C":5, 'U':6, 'V':7, 'W':8}
+        digitValue = 0.0
+        try:
+            p,relp,dtg = STATUS.get_position()
+            text = self.text()
+            for let in INFO.AVAILABLE_AXES:
+                if let == text[-1]:
+                    digitValue =  round(p[conversion[let]],5)
+                    break
+        except Exception as e:
+            print(e)
+            return
+        print(let, digitValue)
+        self.AxisSelected.emit(let)
+        self.CurrentAxisPosition.emit(let, digitValue)
+
+    def setTextTemplate(self, data):
+        self._textTemplate = data
+    def getTextTemplate(self):
+        return self._textTemplate
+    def resetTextTemplate(self):
+        self._textTemplate =  'Axis: %s'
+    textTemplate = pyqtProperty(str, getTextTemplate, setTextTemplate, resetTextTemplate)
+
+    def setCurrentAxis(self, data):
+        self._currentAxis = data
+    def getCurrentAxis(self):
+        return self._currentAxis
+    def resetCurrentAxis(self):
+        self._currentAxis = 'X'
+    currentAxis = pyqtProperty(str, getCurrentAxis, setCurrentAxis, resetCurrentAxis)
+