utils/rendering: frame collectors should respect column order
Previously FrameCollector.write_frames used "columns" argument only as a
filter for which columns to write, but the order would always be the
same as in raw output.
The Instrument API requires that the column ordering in the resulting
MeasurementsCsv matches the ordering of channels specified in reset()
(if any). This means the collectors should respect the ordering
specified in the "columns" parameter (which gets populated based on
active channels).
diff --git a/devlib/utils/rendering.py b/devlib/utils/rendering.py
index a273cc7..665135a 100644
--- a/devlib/utils/rendering.py
+++ b/devlib/utils/rendering.py
@@ -83,9 +83,14 @@
header = self.header
frames = self.frames
else:
- header = [c for c in self.header if c in columns]
- indexes = [self.header.index(c) for c in header]
+ indexes = []
+ for c in columns:
+ if c not in self.header:
+ msg = 'Invalid column "{}"; must be in {}'
+ raise ValueError(msg.format(c, self.header))
+ indexes.append(self.header.index(c))
frames = [[f[i] for i in indexes] for f in self.frames]
+ header = columns
with open(outfile, 'w') as wfh:
writer = csv.writer(wfh)
if header: