Timestamp measurements as early as possible.

[sigrok-meter.git] / datamodel.py

diff --git a/datamodel.py b/datamodel.py
index 8132e40cc2287bec123a02a2e18a2ad01ede2920..6ce91581bbed334e51d3ba2feda120af8a0eaa3d 100644 (file)
--- a/datamodel.py
+++ b/datamodel.py
@@ -22,7 +22,6 @@ import collections
 import itertools
 import qtcompat
 import sigrok.core as sr
-import time
 import util
 
 try:
@@ -33,6 +32,17 @@ except ImportError:
 QtCore = qtcompat.QtCore
 QtGui = qtcompat.QtGui
 
+class Trace(object):
+    '''Class to hold the measured samples.'''
+
+    def __init__(self):
+        self.samples = []
+        self.new = False
+
+    def append(self, sample):
+        self.samples.append(sample)
+        self.new = True
+
 class MeasurementDataModel(QtGui.QStandardItemModel):
     '''Model to hold the measured values.'''
 
@@ -42,8 +52,8 @@ class MeasurementDataModel(QtGui.QStandardItemModel):
     '''Role used to store the device vendor and model.'''
     descRole = QtCore.Qt.UserRole + 2
 
-    '''Role used to store past samples.'''
-    samplesRole = QtCore.Qt.UserRole + 3
+    '''Role used to store a dictionary with the traces'''
+    tracesRole = QtCore.Qt.UserRole + 3
 
     '''Role used to store the color to draw the graph of the channel.'''
     colorRole = QtCore.Qt.UserRole + 4
@@ -126,14 +136,14 @@ class MeasurementDataModel(QtGui.QStandardItemModel):
         item = QtGui.QStandardItem()
         item.setData(uid, MeasurementDataModel.idRole)
         item.setData(desc, MeasurementDataModel.descRole)
-        item.setData(collections.defaultdict(list), MeasurementDataModel.samplesRole)
+        item.setData(collections.defaultdict(Trace), MeasurementDataModel.tracesRole)
         item.setData(next(self._colorgen), MeasurementDataModel.colorRole)
         self.appendRow(item)
         self.sort(0)
         return item
 
-    @QtCore.Slot(object, object, object)
-    def update(self, device, channel, data):
+    @QtCore.Slot(float, sr.classes.Device, sr.classes.Channel, tuple)
+    def update(self, timestamp, device, channel, data):
         '''Update the data for the device (+channel) with the most recent
         measurement from the given payload.'''
 
@@ -150,9 +160,9 @@ class MeasurementDataModel(QtGui.QStandardItemModel):
 
         # The samples role is a dictionary that contains the old samples for each unit.
         # Should be trimmed periodically, otherwise it grows larger and larger.
-        sample = (time.time(), value)
-        d = item.data(MeasurementDataModel.samplesRole)
-        d[unit].append(sample)
+        sample = (timestamp, value)
+        traces = item.data(MeasurementDataModel.tracesRole)
+        traces[unit].append(sample)
 
 class MultimeterDelegate(QtGui.QStyledItemDelegate):
     '''Delegate to show the data items from a MeasurementDataModel.'''
@@ -160,41 +170,61 @@ class MultimeterDelegate(QtGui.QStyledItemDelegate):
     def __init__(self, parent, font):
         '''Initialize the delegate.
 
-        :param font: Font used for the description text, the value is drawn
-                     with a slightly bigger and bold variant of the font.
+        :param font: Font used for the text.
         '''
 
         super(self.__class__, self).__init__(parent)
 
         self._nfont = font
-        self._bfont = QtGui.QFont(self._nfont)
-
-        self._bfont.setBold(True)
-        if self._bfont.pixelSize() != -1:
-            self._bfont.setPixelSize(self._bfont.pixelSize() * 1.2)
-        else:
-            self._bfont.setPointSizeF(self._bfont.pointSizeF() * 1.2)
 
         fi = QtGui.QFontInfo(self._nfont)
         self._nfontheight = fi.pixelSize()
 
-        fm = QtGui.QFontMetrics(self._bfont)
+        fm = QtGui.QFontMetrics(self._nfont)
         r = fm.boundingRect('-XX.XXXXXX X XX')
-        self._size = QtCore.QSize(r.width() * 1.4, r.height() * 2.2)
 
-        # Values used to calculate the positions of the strings in the
-        # 'paint()' function.
-        self._space_width = fm.boundingRect('_').width()
-        self._value_width = fm.boundingRect('-XX.XXXXXX').width()
+        w = 1.4 * r.width() + 2 * self._nfontheight
+        h = 2.6 * self._nfontheight
+        self._size = QtCore.QSize(w, h)
 
     def sizeHint(self, option=None, index=None):
         return self._size
 
+    def _color_rect(self, outer):
+        '''Returns the dimensions of the clickable rectangle.'''
+        x1 = (outer.height() - self._nfontheight) / 2
+        r = QtCore.QRect(x1, x1, self._nfontheight, self._nfontheight)
+        r.translate(outer.topLeft())
+        return r
+
     def paint(self, painter, options, index):
         value, unit = index.data(QtCore.Qt.DisplayRole)
         desc = index.data(MeasurementDataModel.descRole)
+        color = index.data(MeasurementDataModel.colorRole)
 
         painter.setFont(self._nfont)
+
+        # Draw the clickable rectangle.
+        painter.fillRect(self._color_rect(options.rect), color)
+
+        # Draw the text
+        h = options.rect.height()
         p = options.rect.topLeft()
-        p += QtCore.QPoint(self._nfontheight, 2 * self._nfontheight)
+        p += QtCore.QPoint(h, (h + self._nfontheight) / 2 - 2)
         painter.drawText(p, desc + ': ' + value + ' ' + unit)
+
+    def editorEvent(self, event, model, options, index):
+        if type(event) is QtGui.QMouseEvent:
+            if event.type() == QtCore.QEvent.MouseButtonPress:
+                rect = self._color_rect(options.rect)
+                if rect.contains(event.x(), event.y()):
+                    c = index.data(MeasurementDataModel.colorRole)
+                    c = QtGui.QColorDialog.getColor(c, None,
+                        'Choose new color for channel')
+
+                    item = model.itemFromIndex(index)
+                    item.setData(c, MeasurementDataModel.colorRole)
+
+                    return True
+
+        return False