diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2019-08-01 00:41:14 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2019-08-01 01:04:40 +0300 |
| commit | 4ca5727785ddeec33e26c6f8e5f5390ac2c75ed7 (patch) | |
| tree | 5751043ef384e7f0006103c626f01ba879aae6bb /applications | |
| parent | e6f30bb7f39c67e1b2eaf312aa8d1f06e7b0a0ab (diff) | |
luci-app-statistics: add options for graph series sorting and color
Add two data series-level options "negweight" and "posweight" that
will use the numerical value of the data instance name
as the sorting factor. This enables e.g. sorting by CPU frequency
in the cpufreq module.
Add new graph-level option "ordercolor" to use colorsfrom a
pre-defined color table for the data series. This enables keeping
similar colors for similar data series in different plugin instances.
E.g. CPU frequencies in several cores that are handled and displayed
separately.
(note: the table has 8 items and if there are more series, it uses
the same colors again. The table can be easily extended/modified)
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-app-statistics/luasrc/statistics/rrdtool.lua | 11 | ||||
| -rw-r--r-- | applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua | 16 |
2 files changed, 26 insertions, 1 deletions
diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua index 4586b23ca..c4ea88de9 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool.lua @@ -407,7 +407,9 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index ) transform_rpn = dopts.transform_rpn or "0,+", noarea = dopts.noarea or false, title = dopts.title or nil, - weight = dopts.weight or nil, + weight = dopts.weight or + (dopts.negweight and -tonumber(dinst)) or + (dopts.posweight and tonumber(dinst)) or nil, ds = dsource, type = dtype, instance = dinst, @@ -487,6 +489,13 @@ function Graph._generic( self, opts, plugin, plugin_instance, dtype, index ) return x < y end) + -- define colors in order + if opts.ordercolor then + for i, source in ipairs(_sources) do + source.color = self.colors:defined(i) + end + end + -- create DEF statements for each instance for i, source in ipairs(_sources) do -- fixup properties for per instance mode... diff --git a/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua b/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua index 0d3af712f..88b3bbcfe 100644 --- a/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua +++ b/applications/luci-app-statistics/luasrc/statistics/rrdtool/colors.lua @@ -25,6 +25,22 @@ function Instance.to_string( self, c ) ) end +function Instance.defined( self, i ) + local t = { + {230, 25, 75}, + {245, 130, 48}, + {255, 225, 25}, + {60, 180, 75}, + {70, 240, 240}, + {0, 130, 200}, + {0, 0, 128}, + {170, 110, 40} + } + return string.format( + "%02x%02x%02x", + t[(i-1) % #t + 1][1], t[(i-1) % #t +1][2], t[(i-1) % #t + 1][3] ) +end + function Instance.random( self ) local r = math.random(255) local g = math.random(255) |