summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-31 11:52:28 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-31 11:52:28 -0500
commitc5428b8a6188b8452cac7db1adbebb0305444ac5 (patch)
tree68750a87b1f33710016fdcc3b9ec4fa5f2e77363
parent43dd8d436139ddd1d2711a63465a3f39e85ac8fa (diff)
downloadphoronix-test-suite-upstream-c5428b8a6188b8452cac7db1adbebb0305444ac5.tar.gz
phoronix-test-suite-upstream-c5428b8a6188b8452cac7db1adbebb0305444ac5.tar.xz
phoronix-test-suite-upstream-c5428b8a6188b8452cac7db1adbebb0305444ac5.zip
pts_Graph: Add more stock colors to painter
-rw-r--r--CHANGE-LOG1
-rw-r--r--pts-core/functions/pts-functions_config.php2
-rw-r--r--pts-core/objects/pts_Graph/pts_Graph.php3
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index 0306de3..a396d3a 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -28,6 +28,7 @@ Phoronix Test Suite (Git)
- pts: Adjust more test profiles from using $argv to $LOG_FILE
- pts_Graph: Tweak formatting of basic graph attributes
- pts_Graph: When rendering a graph on a percent basis, format scale for 100-point basis
+- pts_Graph: Add more stock colors to painter
- bilde_renderer: Add and implement draw_polygon and draw_ellipse to drawing API
- bilde_renderer: When setting the image quality level to use with the render_image() function, base it on a 100-point scale
- bilde_renderer: Add support for dynamically resizing the image drawing buffer
diff --git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php
index e56967e..cdd455d 100644
--- a/pts-core/functions/pts-functions_config.php
+++ b/pts-core/functions/pts-functions_config.php
@@ -248,7 +248,7 @@ function pts_graph_config_init()
$config->addXmlObject(P_GRAPH_COLOR_NOTCHES, 2, pts_read_graph_config(P_GRAPH_COLOR_NOTCHES, "#000000", $read_config));
$config->addXmlObject(P_GRAPH_COLOR_BORDER, 2, pts_read_graph_config(P_GRAPH_COLOR_BORDER, "#FFFFFF", $read_config));
$config->addXmlObject(P_GRAPH_COLOR_ALTERNATE, 2, pts_read_graph_config(P_GRAPH_COLOR_ALTERNATE, "#B0B59E", $read_config));
- $config->addXmlObject(P_GRAPH_COLOR_PAINT, 2, pts_read_graph_config(P_GRAPH_COLOR_PAINT, "#3B433A, #BB2413, #FF9933, #006C00, #5028CA", $read_config));
+ $config->addXmlObject(P_GRAPH_COLOR_PAINT, 2, pts_read_graph_config(P_GRAPH_COLOR_PAINT, "#3B433A, #BB2413, #FF9933, #006C00, #5028CA, #B30000, #A8BC00, #00F6FF, #8A00AC, #790066, #797766, #5598b1", $read_config));
// Text Colors
$config->addXmlObject(P_GRAPH_COLOR_HEADERS, 2, pts_read_graph_config(P_GRAPH_COLOR_HEADERS, "#2b6b29", $read_config));
diff --git a/pts-core/objects/pts_Graph/pts_Graph.php b/pts-core/objects/pts_Graph/pts_Graph.php
index b62b63a..b69b942 100644
--- a/pts-core/objects/pts_Graph/pts_Graph.php
+++ b/pts-core/objects/pts_Graph/pts_Graph.php
@@ -45,7 +45,8 @@ abstract class pts_Graph
var $graph_color_body_text = "#FFFFFF"; // Color of graph body text
var $graph_color_body_light = "#B0B59E"; // Color of the border around graph bars (if doing a bar graph)
- var $graph_color_paint = array("#3B433A", "#BB2413", "#FF9933", "#006C00", "#5028CA"); // Colors to use for the bars / lines, one color for each key
+ var $graph_color_paint = array("#3B433A", "#BB2413", "#FF9933", "#006C00", "#5028CA", "#B30000",
+ "#A8BC00", "#00F6FF", "#8A00AC", "#790066", "#797766", "#5598b1"); // Colors to use for the bars / lines, one color for each key
// Text
var $graph_font = "Sans.ttf"; // TTF file name