Merge pull request #16 from missionpinball/0.50_and_all_data

0.50 and all data
missionpinball · Apr 19, 2017 · c2d3e7a · c2d3e7a
2 parents b9cfa79 + 4cf4f13
commit c2d3e7a
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/mpfmonitor/core/mpfmon.py b/mpfmonitor/core/mpfmon.py
@@ -324,9 +324,10 @@ def paint(self, painter, view, index):
             return
 
         if index.column() == 0:
-            super().paint(painter, view, index)
             return
 
+        text += " " + str(index.model().itemFromIndex(index).data())
+
         painter.save()
 
         painter.setRenderHint(QPainter.Antialiasing, True)
@@ -439,8 +440,8 @@ def boundingRect(self):
         return QRectF(self.device_size / -2, self.device_size / -2,
                       self.device_size, self.device_size)
 
-    def paint(self, painter, option, widget):
-        if self.device_type == 'led':
+    def paint(self, painter, option, widget=None):
+        if self.device_type == 'light':
             color = self.widget.data()['color']
 
             painter.setRenderHint(QPainter.Antialiasing, True)
@@ -463,15 +464,6 @@ def paint(self, painter, option, widget):
             painter.drawRect(self.device_size / -2, self.device_size / -2,
                              self.device_size, self.device_size)
 
-        elif self.device_type == 'light':
-            color = [self.widget.data()['brightness']] * 3
-
-            painter.setRenderHint(QPainter.Antialiasing, True)
-            painter.setPen(QPen(Qt.white, 3, Qt.SolidLine))
-            painter.setBrush(QBrush(QColor(*color), Qt.SolidPattern))
-            painter.drawEllipse(self.device_size / -2, self.device_size / -2,
-                                self.device_size, self.device_size)
-
     def notify(self, source):
         if source == self.widget:
             self.update()