qtvcp -indicatedmixin Button: add double led option

A different style to show state - one of two LEDs

Author: c-morley

docs/src/gui/images/qtvcp_indicatorButton.png

@@ -3038,12 +3038,13 @@ This class *modifies `QPushButton` behaviour*.
 
 *`indicator_option`* _puts a 'LED' on the top of the button_.
 
-.QtVCP `PushButton`: Indicated Action Button, LED Indicator Option
-image::images/qtvcp_actionButton.png["QtVCP PushButton: Indicated Action Button, LED Indicator Option",scale="25%",align="center"]
+.QtVCP `PushButton`: IndicatedPushButton Button, LED Indicator Option
+image::images/qtvcp_indicatorButton.png["QtVCP IndicatedPushButton: Indicated Action Button, LED Indicator Option",scale="25%",align="center"]
 
 //FIXME Better document IndicatedPushButton
 // https://github.com/LinuxCNC/linuxcnc/blob/master/lib/python/qtvcp/widgets/simple_widgets.py#L317
 It can be a _triangle_, _circle_, _top bar_, or _side bar_. +
+The _triangle_ and _circle_ LEDs can display double vertical LEDs optionally each with it's own HAL pin. + 
 The _size_ and _position_ can be adjusted.
 
 It will indicate:
@@ -3055,17 +3056,18 @@ It will indicate:
 .Properties
 These properties are available to customize the indicator (not all are applicable to every LED shape):
 
+*`doubleIndicator`*:: with riangle or round LEDs add a second vertical LED.
 *`on_color`*::
 *`off_color`*::
-*`flashIndicator`*::
-*`flashRate`*::
-*`indicator_size`*::
-*`circle_diameter`*::
-*`shape_option`*::
-*`right_edge_offset`*::
-*`top_edge_offset`*::
-*`height_fraction`*::
-*`width_fraction`*::
+*`flashIndicator`*:: When the indicator is true, flash the LED on and off.
+*`flashRate`*:: Rate of the flashing
+*`indicator_size`*:: Size of triangle LED
+*`circle_diameter`*:: Diameter of round LED
+*`shape_option`*:: 0-4 LED shape type
+*`right_edge_offset`*:: Space from right edge
+*`top_edge_offset`*:: Space from top edge
+*`height_fraction`*:: Used for bar Leds
+*`width_fraction`*:: Used for bar Leds
 *`corner_radius`*:: Indicator corner radius.
 
 The LED indicator color can be defined in a _stylesheet_ with the following code added to the `.qss` file:

docs/src/gui/qtvcp-widgets.adoc

@@ -20,6 +20,7 @@ class IndicatedMixIn( _HalWidgetBase):
     def __init__(self):
         super(IndicatedMixIn, self).__init__()
         self._indicator_state = False # Current State
+        self._indicator2_state = False # Current State
         # if user want to block their signals
         self._external_block_signal = False
 
@@ -35,6 +36,7 @@ def __init__(self):
 
         # indicator LED data
         self.draw_indicator = False # Show LED
+        self._doubleIndicator = False # show second ZED
         self._HAL_pin = False # control by HAL
         self._shape = 0 # 0 triangle, 1 circle
         self._size = .3 # triangle
@@ -50,6 +52,7 @@ def __init__(self):
         self._flashState = False
         # is flashing on?
         self._flashing = True
+        self._flashing2 = True
         # should flash?
         self._flashOption = False
         self._flashRate = 200
@@ -111,6 +114,10 @@ def _hal_init(self):
                 pname = self._pin_name_
             self.hal_pin_led = self.HAL_GCOMP_.newpin(pname + '-led', hal.HAL_BIT, hal.HAL_IN)
             self.hal_pin_led.value_changed.connect(lambda data: self.indicator_update(data))
+            if self._doubleIndicator:
+                self.hal_pin_led2 = self.HAL_GCOMP_.newpin(pname + '-led2', hal.HAL_BIT, hal.HAL_IN)
+                self.hal_pin_led2.value_changed.connect(lambda data: self.indicator2_update(data))
+
         elif self._ind_status:
             self._init_state_change()
         self._globalParameter = {'__builtins__' : None, 'MAIN_INSTANCE':self.QTVCP_INSTANCE_,
@@ -208,6 +215,7 @@ def _update(state):
             # update indicator to button state if halpin or status won't
             if self._HAL_pin is False and self._ind_status is False:
                 self.indicator_update(state)
+                self.indicator2_update(not state)
             # if using state labels option update the labels
             if self._state_text:
                 self.setText(None)
@@ -386,6 +394,10 @@ def indicator_update(self, data):
         self._flashing = self._indicator_state = data
         self.update()
 
+    def indicator2_update(self, data):
+        self._flashing2 = self._indicator2_state = data
+        self.update()
+
     # override paint function to first paint the stock button
     # then our indicator paint routine
     def paintEvent(self, event):
@@ -397,16 +409,29 @@ def paintEvent(self, event):
     def paintIndicator(self):
             p = QtGui.QPainter(self)
 
- 
             if self._flashOption and self._flashing:
                 if self._flashState:
                     color = self._on_color
                 else:
                     color = self._off_color
-            elif self._indicator_state:
-                color = self._on_color
             else:
-                color = self._off_color
+                if self._indicator_state:
+                    color = self._on_color
+                else:
+                    color = self._off_color
+
+            # second LED
+            if self._flashOption and self._flashing2:
+                if self._flashState:
+                    color2 = self._on_color
+                else:
+                    color2 = self._off_color
+            else:
+
+                if self._indicator2_state:
+                    color2 = self._on_color
+                else:
+                    color2 = self._off_color
 
             # right triangle
             if self._shape == 0:
@@ -428,6 +453,21 @@ def paintIndicator(self):
                 p.drawLine(triangle.point(1), triangle.point(2))
                 p.drawPolygon(triangle)
 
+                # second LED
+                if self._doubleIndicator:
+                    bot_right = rect.bottomRight() - QtCore.QPoint(self._right_edge_offset,self._top_edge_offset)
+
+                    gradient = QtGui.QLinearGradient(bot_right- QtCore.QPoint(size, 0), bot_right)
+                    gradient.setColorAt(0, QtCore.Qt.white)
+                    gradient.setColorAt(1, color2)
+                    p.setBrush(QtGui.QBrush(gradient))
+                    p.setPen(color2)
+
+                    triangle = QtGui.QPolygon([bot_right, bot_right - QtCore.QPoint(size, 0),
+                                           bot_right - QtCore.QPoint(0, size)])
+                    p.drawLine(triangle.point(1), triangle.point(2))
+                    p.drawPolygon(triangle)
+
             # circle
             elif self._shape == 1:
                 x = int(self.width() - self._diameter - self._right_edge_offset)
@@ -441,6 +481,18 @@ def paintIndicator(self):
                 p.setRenderHint(QtGui.QPainter.Antialiasing, True)
                 p.drawEllipse(x, y, self._diameter - 1, self._diameter - 1)
 
+                # second LED
+                if self._doubleIndicator:
+                    y = self.height() - self._diameter - self._top_edge_offset
+                    gradient = QtGui.QRadialGradient(x + self._diameter / 2, y + self._diameter / 2,
+                                       self._diameter * 0.4, self._diameter * 0.4, self._diameter * 0.4)
+                    gradient.setColorAt(0, QtCore.Qt.white)
+                    gradient.setColorAt(1, color2)
+                    p.setBrush(QtGui.QBrush(gradient))
+                    p.setPen(color2)
+                    p.setRenderHint(QtGui.QPainter.Antialiasing, True)
+                    p.drawEllipse(x, y, self._diameter - 1, self._diameter - 1)
+
             # top bar
             elif self._shape == 2:
                 rect = p.window()
@@ -491,7 +543,7 @@ def paintIndicator(self):
                 else:
                     size = int(self.height() * self._size)
 
-                gradient = QtGui.QLinearGradient(top_left- QtCore.QPoint(size, 0), top_left)
+                gradient = QtGui.QLinearGradient(top_left + QtCore.QPoint(size, 0), top_left)
                 gradient.setColorAt(0, QtCore.Qt.white)
                 gradient.setColorAt(1, color)
                 p.setBrush(QtGui.QBrush(gradient))
@@ -502,6 +554,20 @@ def paintIndicator(self):
                 p.drawLine(triangle.point(1), triangle.point(2))
                 p.drawPolygon(triangle)
 
+                # second LED
+                if self._doubleIndicator:
+                    top_bot = rect.bottomLeft() - QtCore.QPoint(self._right_edge_offset, self._top_edge_offset)
+                    gradient = QtGui.QLinearGradient(top_bot + QtCore.QPoint(size, 0), top_bot)
+                    gradient.setColorAt(0, QtCore.Qt.white)
+                    gradient.setColorAt(1, color2)
+                    p.setBrush(QtGui.QBrush(gradient))
+                    p.setPen(color2)
+
+                    triangle = QtGui.QPolygon([top_bot, top_bot + QtCore.QPoint(size, 0),
+                                           top_bot - QtCore.QPoint(0, size)])
+                    p.drawLine(triangle.point(1), triangle.point(2))
+                    p.drawPolygon(triangle)
+
     def set_indicator(self, data):
         self.draw_indicator = data
         self.update()
@@ -589,6 +655,15 @@ def reset_indicator_size(self):
         self._size = 0.3
         self.update()
 
+    def set_doubleIndicator(self, data):
+        self._doubleIndicator = data
+        self.update()
+    def get_doubleIndicator(self):
+        return self._doubleIndicator
+    def reset_doubleIndicator(self):
+        self._doubleIndicator = True
+        self.update()
+
     def set_circle_diameter(self, data):
         self._diameter = data
         self.update()
@@ -686,6 +761,7 @@ def reset_pin_name(self):
 
     pin_name = QtCore.pyqtProperty(str, get_pin_name, set_pin_name, reset_pin_name)
     indicator_option = QtCore.pyqtProperty(bool, get_indicator, set_indicator, reset_indicator)
+    doubleIndicator = QtCore.pyqtProperty(bool, get_doubleIndicator, set_doubleIndicator, reset_doubleIndicator)
     indicator_HAL_pin_option = QtCore.pyqtProperty(bool, get_HAL_pin, set_HAL_pin, reset_HAL_pin)
     indicator_status_option = QtCore.pyqtProperty(bool, get_ind_status, set_ind_status, reset_ind_status)
     checked_state_text_option = QtCore.pyqtProperty(bool, get_state_text, set_state_text, reset_state_text)