Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stack graph mode works with max_value 

Signed-off-by: Konstantin Stepanov <kstep@p-nut.info>
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Konstantin Stepanov 2010-07-25 14:48:14 +03:00 committed by Uli Schlachter
parent a77209c7fe
commit 457913a0e8
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/awful/widget/graph.lua.in
View File

@ -85,6 +85,8 @@ local properties = { "width", "height", "border_color", "stack",
local function update(graph) local function update(graph)
-- Create new empty image -- Create new empty image
local img = capi.image.argb32(data[graph].width, data[graph].height, nil) local img = capi.image.argb32(data[graph].width, data[graph].height, nil)
local max_value = data[graph].max_value
local values = data[graph].values
local border_width = 0 local border_width = 0
if data[graph].border_color then if data[graph].border_color then
@ -93,6 +95,17 @@ local function update(graph)
-- Draw a stacked graph -- Draw a stacked graph
if data[graph].stack then if data[graph].stack then
if data[graph].scale then
for _, v in ipairs(values) do
for __, sv in ipairs(v) do
if sv > max_value then
max_value = sv
end
end
end
end
-- Draw the background first -- Draw the background first
img:draw_rectangle(border_width, border_width, img:draw_rectangle(border_width, border_width,
data[graph].width - (2 * border_width), data[graph].width - (2 * border_width),
@ -105,14 +118,14 @@ local function update(graph)
if data[graph].stack_colors then if data[graph].stack_colors then
for idx, color in ipairs(data[graph].stack_colors) do for idx, color in ipairs(data[graph].stack_colors) do
local values = data[graph].values[idx] local stack_values = values[idx]
if values and i < #values then if stack_values and i < #stack_values then
local value = values[#values - i] + rel_i local value = stack_values[#stack_values - i] + rel_i
img:draw_line(rel_x, border_width - 1 + img:draw_line(rel_x, border_width - 1 +
math.ceil((data[graph].height - 2 * border_width) * (1 - rel_i)), math.ceil((data[graph].height - 2 * border_width) * (1 - (rel_i / max_value))),
rel_x, border_width - 1 + rel_x, border_width - 1 +
math.ceil((data[graph].height - 2 * border_width) * (1 - value)), math.ceil((data[graph].height - 2 * border_width) * (1 - (value / max_value))),
color or "red") color or "red")
rel_i = value rel_i = value
end end
@ -120,8 +133,6 @@ local function update(graph)
end end
end end
else else
local values = data[graph].values
local max_value = data[graph].max_value
if data[graph].scale then if data[graph].scale then
for _, v in ipairs(values) do for _, v in ipairs(values) do