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

Merge pull request #722 from Elv13/expose_graph 

awful.widget.graph: Expose private data
This commit is contained in:
Emmanuel Lepage Vallée 2016-02-29 04:16:17 -05:00
parent 78f93940c7 19f874a73f
commit b010849c3c
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/awful/widget/graph.lua
View File

@ -17,8 +17,6 @@ local base = require("wibox.widget.base")
local graph = { mt = {} } local graph = { mt = {} }
local data = setmetatable({}, { __mode = "k" })
--- Set the graph border color. --- Set the graph border color.
-- If the value is nil, no border will be drawn. -- If the value is nil, no border will be drawn.
-- --
@ -70,26 +68,26 @@ local properties = { "width", "height", "border_color", "stack",
"max_value", "scale" } "max_value", "scale" }
function graph.draw(_graph, _, cr, width, height) function graph.draw(_graph, _, cr, width, height)
local max_value = data[_graph].max_value local max_value = _graph._data.max_value
local values = data[_graph].values local values = _graph._data.values
cr:set_line_width(1) cr:set_line_width(1)
-- Draw the background first -- Draw the background first
cr:set_source(color(data[_graph].background_color or "#000000aa")) cr:set_source(color(_graph._data.background_color or "#000000aa"))
cr:paint() cr:paint()
-- Account for the border width -- Account for the border width
cr:save() cr:save()
if data[_graph].border_color then if _graph._data.border_color then
cr:translate(1, 1) cr:translate(1, 1)
width, height = width - 2, height - 2 width, height = width - 2, height - 2
end end
-- Draw a stacked graph -- Draw a stacked graph
if data[_graph].stack then if _graph._data.stack then
if data[_graph].scale then if _graph._data.scale then
for _, v in ipairs(values) do for _, v in ipairs(values) do
for _, sv in ipairs(v) do for _, sv in ipairs(v) do
if sv > max_value then if sv > max_value then
@ -103,8 +101,8 @@ function graph.draw(_graph, _, cr, width, height)
local rel_i = 0 local rel_i = 0
local rel_x = i + 0.5 local rel_x = i + 0.5
if data[_graph].stack_colors then if _graph._data.stack_colors then
for idx, col in ipairs(data[_graph].stack_colors) do for idx, col in ipairs(_graph._data.stack_colors) do
local stack_values = values[idx] local stack_values = values[idx]
if stack_values and i < #stack_values then if stack_values and i < #stack_values then
local value = stack_values[#stack_values - i] + rel_i local value = stack_values[#stack_values - i] + rel_i
@ -118,7 +116,7 @@ function graph.draw(_graph, _, cr, width, height)
end end
end end
else else
if data[_graph].scale then if _graph._data.scale then
for _, v in ipairs(values) do for _, v in ipairs(values) do
if v > max_value then if v > max_value then
max_value = v max_value = v
@ -137,7 +135,7 @@ function graph.draw(_graph, _, cr, width, height)
cr:line_to(i + 0.5, height) cr:line_to(i + 0.5, height)
end end
end end
cr:set_source(color(data[_graph].color or "#ff0000")) cr:set_source(color(_graph._data.color or "#ff0000"))
cr:stroke() cr:stroke()
end end
@ -147,19 +145,19 @@ function graph.draw(_graph, _, cr, width, height)
cr:restore() cr:restore()
-- Draw the border last so that it overlaps already drawn values -- Draw the border last so that it overlaps already drawn values
if data[_graph].border_color then if _graph._data.border_color then
-- We decremented these by two above -- We decremented these by two above
width, height = width + 2, height + 2 width, height = width + 2, height + 2
-- Draw the border -- Draw the border
cr:rectangle(0.5, 0.5, width - 1, height - 1) cr:rectangle(0.5, 0.5, width - 1, height - 1)
cr:set_source(color(data[_graph].border_color or "#ffffff")) cr:set_source(color(_graph._data.border_color or "#ffffff"))
cr:stroke() cr:stroke()
end end
end end
function graph.fit(_graph) function graph.fit(_graph)
return data[_graph].width, data[_graph].height return _graph._data.width, _graph._data.height
end end
--- Add a value to the graph --- Add a value to the graph
@ -170,28 +168,28 @@ local function add_value(_graph, value, group)
if not _graph then return end if not _graph then return end
value = value or 0 value = value or 0
local values = data[_graph].values local values = _graph._data.values
local max_value = data[_graph].max_value local max_value = _graph._data.max_value
value = math.max(0, value) value = math.max(0, value)
if not data[_graph].scale then if not _graph._data.scale then
value = math.min(max_value, value) value = math.min(max_value, value)
end end
if data[_graph].stack and group then if _graph._data.stack and group then
if not data[_graph].values[group] if not _graph._data.values[group]
or type(data[_graph].values[group]) ~= "table" or type(_graph._data.values[group]) ~= "table"
then then
data[_graph].values[group] = {} _graph._data.values[group] = {}
end end
values = data[_graph].values[group] values = _graph._data.values[group]
end end
table.insert(values, value) table.insert(values, value)
local border_width = 0 local border_width = 0
if data[_graph].border_color then border_width = 2 end if _graph._data.border_color then border_width = 2 end
-- Ensure we never have more data than we can draw -- Ensure we never have more data than we can draw
while #values > data[_graph].width - border_width do while #values > _graph._data.width - border_width do
table.remove(values, 1) table.remove(values, 1)
end end
@ -204,7 +202,7 @@ end
-- @param height The height to set. -- @param height The height to set.
function graph:set_height(height) function graph:set_height(height)
if height >= 5 then if height >= 5 then
data[self].height = height self._data.height = height
self:emit_signal("widget::layout_changed") self:emit_signal("widget::layout_changed")
end end
return self return self
@ -214,7 +212,7 @@ end
-- @param width The width to set. -- @param width The width to set.
function graph:set_width(width) function graph:set_width(width)
if width >= 5 then if width >= 5 then
data[self].width = width self._data.width = width
self:emit_signal("widget::layout_changed") self:emit_signal("widget::layout_changed")
end end
return self return self
@ -224,8 +222,8 @@ end
for _, prop in ipairs(properties) do for _, prop in ipairs(properties) do
if not graph["set_" .. prop] then if not graph["set_" .. prop] then
graph["set_" .. prop] = function(_graph, value) graph["set_" .. prop] = function(_graph, value)
if data[_graph][prop] ~= value then if _graph._data[prop] ~= value then
data[_graph][prop] = value _graph._data[prop] = value
_graph:emit_signal("widget::redraw_needed") _graph:emit_signal("widget::redraw_needed")
end end
return _graph return _graph
@ -233,7 +231,7 @@ for _, prop in ipairs(properties) do
end end
if not graph["get_" .. prop] then if not graph["get_" .. prop] then
graph["get_" .. prop] = function(_graph) graph["get_" .. prop] = function(_graph)
return data[_graph][prop] return _graph._data[prop]
end end
end end
end end
@ -252,7 +250,7 @@ function graph.new(args)
local _graph = base.make_widget() local _graph = base.make_widget()
data[_graph] = { width = width, height = height, values = {}, max_value = 1 } _graph._data = { width = width, height = height, values = {}, max_value = 1 }
-- Set methods -- Set methods
_graph.add_value = add_value _graph.add_value = add_value