masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

braille graph option

Browse Source
This commit is contained in:
Matus Telgarsky 2015-01-27 15:10:26 -05:00
parent 5865995d0f
commit 49d2f3bb0a
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
i3pystatus/core/util.py
View File

@ -365,24 +365,40 @@ def internet():
return False
def make_graph(values, upper_limit=100.0):
def make_graph(values, upper_limit=100.0, style="blocks"):
"""
Draws a graph made of unicode characters.
:param values: An array of values to graph.
:param upper_limit: Maximum value for the y axis.
:param style: Drawing style (currently 'blocks' or 'braille').
:returns: Bar as a string
"""
values = [float(n) for n in values]
mn, mx = min(values), max(max(values), float(upper_limit))
extent = mx - mn
if style == 'blocks':
bar = u'_▁▂▃▄▅▆▇█'
bar_count = len(bar) - 1
mn, mx = min(values), float(upper_limit)
extent = mx - mn
if extent == 0:
graph = '_' * len(values)
else:
graph = ''.join(bar[int((n - mn) / extent * bar_count)] for n in values)
elif style == 'braille':
#idea from https://github.com/asciimoo/drawille
#unicode values from http://en.wikipedia.org/wiki/Braille
v2 = values if len(values) % 2 == 0 else values + [mn]
l = len(v2) // 2
if extent == 0:
graph = chr(0x2800) * l #should be visually equiv to ' '
else:
graph = ''
for i in range(0, l, 2):
b1 = [ 0, 0x40, 0x44, 0x46, 0x47 ][ round(4 * (v2[i] - mn) / extent) ]
b2 = [ 0, 0x80, 0xa0, 0xb0, 0xb8 ][ round(4 * (v2[i + 1] - mn) / extent) ]
graph += chr(0x2800 + b1 + b2)
else:
raise NotImplementedError("Graph drawing style '%s' unimplemented." % style)
return graph

7
i3pystatus/cpu_usage_graph.py
View File

@ -24,10 +24,13 @@ class CpuUsageGraph(CpuUsage, ColorRangeModule):
("cpu", "cpu to monitor, choices are 'usage_cpu' for all or 'usage_cpu*'. R"
"eplace '*' by core number starting at 0."),
("start_color", "Hex or English name for start of color range, eg '#00FF00' or 'green'"),
("end_color", "Hex or English name for end of color range, eg '#FF0000' or 'red'")
("end_color", "Hex or English name for end of color range, eg '#FF0000' or 'red'"),
("graph_width", "Width of the cpu usage graph"),
("graph_style", "Graph style, currently 'blocks' or 'braille'"),
)
graph_width = 15
graph_style = 'blocks'
format = '{cpu_graph}'
cpu = 'usage_cpu'
@ -43,7 +46,7 @@ class CpuUsageGraph(CpuUsage, ColorRangeModule):
self.cpu_readings.insert(0, core_reading)
self.cpu_readings = self.cpu_readings[:self.graph_width]
graph = make_graph(self.cpu_readings, 100.0)
graph = make_graph(self.cpu_readings, 100.0, self.graph_style)
format_options.update({'cpu_graph': graph})
color = self.get_gradient(core_reading, self.colors)

4
i3pystatus/network.py
View File

@ -254,6 +254,7 @@ class Network(IntervalModule, ColorRangeModule):
("start_color", "Hex or English name for start of color range, eg '#00FF00' or 'green'"),
("end_color", "Hex or English name for end of color range, eg '#FF0000' or 'red'"),
("graph_width", "Width of the network traffic graph"),
("graph_style", "Graph style, currently 'blocks' or 'braille'"),
("upper_limit",
"Expected max kb/s. This value controls how the network traffic graph is drawn and in what color"),
("graph_type", "Whether to draw the network traffic graph for input or output. "
@ -276,6 +277,7 @@ class Network(IntervalModule, ColorRangeModule):
dynamic_color = True
graph_type = 'input'
graph_width = 15
graph_style = 'blocks'
upper_limit = 150.0
# Network traffic settings
@ -329,7 +331,7 @@ class Network(IntervalModule, ColorRangeModule):
# Cycle array by inserting at the start and chopping off the last element
self.kbs_arr.insert(0, kbs)
self.kbs_arr = self.kbs_arr[:self.graph_width]
return make_graph(self.kbs_arr, self.upper_limit)
return make_graph(self.kbs_arr, self.upper_limit, self.graph_style)
def run(self):
format_values = dict(kbs="", network_graph="", bytes_sent="", bytes_recv="", packets_sent="", packets_recv="",