## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-import collections
import itertools
+import math
import qtcompat
import sigrok.core as sr
import util
# idRole holds tuples, and using them to sort doesn't work.
self.setSortRole(MeasurementDataModel.descRole)
- # Used in 'format_value()' to check against.
- self.inf = float('inf')
-
# A generator for the colors of the channels.
self._colorgen = self._make_colorgen()
return ''
def format_value(self, mag):
- if mag == self.inf:
+ if math.isinf(mag):
return u'\u221E'
return '{:f}'.format(mag)
item = QtGui.QStandardItem()
item.setData(uid, MeasurementDataModel.idRole)
item.setData(desc, MeasurementDataModel.descRole)
- item.setData(collections.defaultdict(Trace), MeasurementDataModel.tracesRole)
+ item.setData({}, MeasurementDataModel.tracesRole)
item.setData(next(self._colorgen), MeasurementDataModel.colorRole)
self.appendRow(item)
self.sort(0)
# 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 = (timestamp, value)
- traces = item.data(MeasurementDataModel.tracesRole)
- traces[unit].append(sample)
+ if not math.isinf(value) and not math.isnan(value):
+ sample = (timestamp, value)
+ traces = item.data(MeasurementDataModel.tracesRole)
+
+ # It's not possible to use 'collections.defaultdict' here, because
+ # PySide doesn't return the original type that was passed in.
+ if not (unit in traces):
+ traces[unit] = Trace()
+ traces[unit].append(sample)
+
+ item.setData(traces, MeasurementDataModel.tracesRole)
class MultimeterDelegate(QtGui.QStyledItemDelegate):
'''Delegate to show the data items from a MeasurementDataModel.'''
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)
+ if c.isValid():
+ # False if cancel is pressed (resulting in a black
+ # color)
+ item = model.itemFromIndex(index)
+ item.setData(c, MeasurementDataModel.colorRole)
return True