From fbd852b79b6ff0100b9c58cd2cb1384b4e355cc4 Mon Sep 17 00:00:00 2001
From: facetoe <facetoe@ymail.com>
Date: Sun, 12 Oct 2014 12:03:25 +0800
Subject: [PATCH] Modified CpuUsageBar to show either a vertical or horizontal
 bar.

---
 i3pystatus/cpu_usage_bar.py | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/i3pystatus/cpu_usage_bar.py b/i3pystatus/cpu_usage_bar.py
index 2c3b037..c5fef33 100644
--- a/i3pystatus/cpu_usage_bar.py
+++ b/i3pystatus/cpu_usage_bar.py
@@ -1,15 +1,18 @@
 # -*- coding:utf-8 -*-
-
+from i3pystatus.core.color import ColorRangeModule
 from i3pystatus.cpu_usage import CpuUsage
-from i3pystatus.core.util import make_bar
+from i3pystatus.core.util import make_bar, make_vertical_bar
 
-class CpuUsageBar(CpuUsage):
+
+class CpuUsageBar(CpuUsage, ColorRangeModule):
     """
     Shows CPU usage as a bar (made with unicode box characters).
     The first output will be inacurate.
 
     Linux only
 
+    Requires the PyPI package `colour`.
+
     Available formatters:
 
     * {usage_bar}       usage average of all cores
@@ -19,10 +22,23 @@ class CpuUsageBar(CpuUsage):
     """
 
     format = "{usage_bar}"
+    bar_type = 'horizontal'
+    cpu = 'usage_bar'
+
     settings = (
         ("format", "format string"),
+        ("bar_type", "whether the bar should be vertical or horizontal. "
+                     "Allowed values: `vertical` or `horizontal`"),
+        ("cpu", "cpu to base the colors on. Choices are 'usage_cpu' for all or 'usage_cpu*'."
+                " Replace '*' 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'")
     )
 
+    def init(self):
+        super().init()
+        self.colors = self.get_hex_color_range(self.start_color, self.end_color, 100)
+
     def run(self):
         cpu_usage = self.get_usage()
 
@@ -30,7 +46,12 @@ class CpuUsageBar(CpuUsage):
 
         for core, usage in cpu_usage.items():
             core = core.replace('usage', 'usage_bar')
-            cpu_usage_bar[core] = make_bar(usage)
+            if self.bar_type == 'horizontal':
+                cpu_usage_bar[core] = make_bar(usage)
+            elif self.bar_type == 'vertical':
+                cpu_usage_bar[core] = make_vertical_bar(usage)
+            else:
+                raise Exception("bar_type must be 'horizontal' or 'vertical'!")
 
         cpu_usage.update(cpu_usage_bar)
 
@@ -38,6 +59,6 @@ class CpuUsageBar(CpuUsage):
         cpu_usage['usage_bar'] = cpu_usage['usage_bar_cpu']
 
         self.output = {
-            "full_text": self.format.format_map(cpu_usage)
+            "full_text": self.format.format_map(cpu_usage),
+            'color': self.get_gradient(cpu_usage[self.cpu], self.colors, 100)
         }
-