scripts: Renamed Attr -> CsvAttr

Mainly to avoid confusion with littlefs's attrs, uattrs, rattrs, etc.

This risked things getting _really_ confusing as the scripts evolve.
This commit is contained in:
Christopher Haster
2025-05-15 18:48:46 -05:00
parent aebe5b1d1b
commit 651c3e1eb4
9 changed files with 70 additions and 70 deletions
+8 -8
View File
@@ -326,7 +326,7 @@ def fold(results, by=None, x=None, y=None, defines=[]):
return datasets, dataattrs
# a representation of optionally key-mapped attrs
class Attr:
class CsvAttr:
def __init__(self, attrs, defaults=None):
if attrs is None:
attrs = []
@@ -350,20 +350,20 @@ class Attr:
self.keyed[attr[0]].append(attr[1])
# create attrs object for defaults
if isinstance(defaults, Attr):
if isinstance(defaults, CsvAttr):
self.defaults = defaults
elif defaults is not None:
self.defaults = Attr(defaults)
self.defaults = CsvAttr(defaults)
else:
self.defaults = None
def __repr__(self):
if self.defaults is None:
return 'Attr(%r)' % (
return 'CsvAttr(%r)' % (
[(','.join(attr[0]), attr[1])
for attr in self.attrs])
else:
return 'Attr(%r, %r)' % (
return 'CsvAttr(%r, %r)' % (
[(','.join(attr[0]), attr[1])
for attr in self.attrs],
[(','.join(attr[0]), attr[1])
@@ -851,14 +851,14 @@ def main(csv_paths, output, *,
svg = True
# what colors/alphas/formats to use?
colors_ = Attr(colors, defaults=COLORS_DARK if dark else COLORS)
colors_ = CsvAttr(colors, defaults=COLORS_DARK if dark else COLORS)
formats_ = Attr(formats, defaults=(
formats_ = CsvAttr(formats, defaults=(
FORMATS_POINTS_AND_LINES if points_and_lines
else FORMATS_POINTS if points
else FORMATS))
labels_ = Attr(labels)
labels_ = CsvAttr(labels)
if font_color is not None:
font_color_ = font_color