From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 24 Sep 2020 12:16:34 +0000 (+0000)
Subject: graphs: Make the first column slightly wider
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d542dec5cf62a6ed2af66fe2d0b0c6d5086232b4;p=collecty.git

graphs: Make the first column slightly wider

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/collecty/constants.py b/src/collecty/constants.py
index 0d4f81c..f4b50e8 100644
--- a/src/collecty/constants.py
+++ b/src/collecty/constants.py
@@ -67,10 +67,12 @@ GRAPH_DEFAULT_WIDTH = 768
 GRAPH_DEFAULT_HEIGHT = 480
 
 # Default column widths
-LEGEND     = "%18s"
-LABEL      = "%-16s"
-PERCENTAGE = "%15.2lf%%"
-INTEGER    = "%18.0lf"
+LABEL       = "%-24s"
+EMPTY_LABEL = "%26s" % ""
+
+COLUMN      = "%16s"
+PERCENTAGE  = "%13.2lf%%"
+INTEGER     = "%16.0lf"
 
 EMPTY_LINE = "COMMENT: \\n"
 
diff --git a/src/collecty/plugins/contextswitches.py b/src/collecty/plugins/contextswitches.py
index f160609..ff3d744 100644
--- a/src/collecty/plugins/contextswitches.py
+++ b/src/collecty/plugins/contextswitches.py
@@ -34,11 +34,11 @@ class GraphTemplateContextSwitches(base.GraphTemplate):
 		_ = self.locale.translate
 
 		return [
-			"COMMENT:%s" % (LEGEND % ""),
-			"COMMENT:%s" % (LEGEND % _("Current")),
-			"COMMENT:%s" % (LEGEND % _("Average")),
-			"COMMENT:%s" % (LEGEND % _("Minimum")),
-			"COMMENT:%s\\j" % (LEGEND % _("Maximum")),
+			"COMMENT:%s" % EMPTY_LABEL,
+			"COMMENT:%s" % (COLUMN % _("Current")),
+			"COMMENT:%s" % (COLUMN % _("Average")),
+			"COMMENT:%s" % (COLUMN % _("Minimum")),
+			"COMMENT:%s\\j" % (COLUMN % _("Maximum")),
 
 			"AREA:ctxt%s:%s" % (
 				lighten(PRIMARY, AREA_OPACITY),
@@ -48,7 +48,8 @@ class GraphTemplateContextSwitches(base.GraphTemplate):
 			"GPRINT:ctxt_avg:%s" % INTEGER,
 			"GPRINT:ctxt_min:%s" % INTEGER,
 			"GPRINT:ctxt_max:%s" % INTEGER,
-			"LINE2:ctxt%s" % PRIMARY,
+
+			"LINE1:ctxt%s" % PRIMARY,
 		]
 
 	lower_limit = 0
diff --git a/src/collecty/plugins/processor.py b/src/collecty/plugins/processor.py
index 5f6ab46..e94f0aa 100644
--- a/src/collecty/plugins/processor.py
+++ b/src/collecty/plugins/processor.py
@@ -41,11 +41,11 @@ class GraphTemplateProcessor(base.GraphTemplate):
 			"CDEF:total=usage,idle,+",
 
 			# Headline
-			"COMMENT:%s" % (LEGEND % ""),
-			"COMMENT:%s" % (LEGEND % _("Current")),
-			"COMMENT:%s" % (LEGEND % _("Average")),
-			"COMMENT:%s" % (LEGEND % _("Minimum")),
-			"COMMENT:%s\\j" % (LEGEND % _("Maximum")),
+			"COMMENT:%s" % EMPTY_LABEL,
+			"COMMENT:%s" % (COLUMN % _("Current")),
+			"COMMENT:%s" % (COLUMN % _("Average")),
+			"COMMENT:%s" % (COLUMN % _("Minimum")),
+			"COMMENT:%s\\j" % (COLUMN % _("Maximum")),
 
 			"CDEF:usage_p=100,usage,*,total,/",
 			"COMMENT:  %s" % (LABEL % _("Total")),