Pts-Results-Viewer improvements...

9 files changed, 17 insertions, 13 deletions

diff --git a/CHANGE-LOG b/CHANGE-LOG
index 66f0cc9..0320f42 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -20,6 +20,7 @@ Phoronix Test Suite
 - Improved GPU and related detections support... Now can read the anti-aliasing and anistropic filtering levels for NVIDIA graphics cards as well as the core temperature
 - Add MONITOR= environmental variable. If MONITOR=gpu.temp, the low, average, and high temperatures will be reported at end of test
 - Add a lot more sensor and monitoring support... Add MONITOR=sys.temp and MONITOR=cpu.temp. Multiple sensors supported that are delimited by comma (depends upon LM_Sensors)
+- Clean up pts-results-viewer as well as switching to Liberation Sans for the font in graph rendering and clean up graph alignment
 
 Phoronix Test Suite 0.4.0
 April 24, 2008
diff --git a/README b/README
index 8442216..d944710 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ Phoronix Test Suite is licensed under the GNU GPLv3. See COPYING file for more d
 
 Patches, new profiles, etc welcome. Non-technical support messages can be directed to phoronix [at] phoronix.com.
 
-The default font that ships with the Phoronix Test Suite for the results graphing is from the DejaVu font collection: http://dejavu.sourceforge.net/
+The default font that ships with the Phoronix Test Suite for the results graphing is from the Liberation (GPL Licensed) font collection: https://www.redhat.com/promo/fonts/
 
 Phoronix Test Suite requires PHP 5 to be installed as well as the PHP GD graphics module.
 
diff --git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php
index 2be2e08..2232fcc 100644
--- a/pts-core/functions/pts-functions_config.php
+++ b/pts-core/functions/pts-functions_config.php
@@ -79,11 +79,12 @@ function pts_graph_config_init()
 	$config->addXmlObject("PhoronixTestSuite/Graphs/FontSize/Axis", 3, pts_read_graph_config("PhoronixTestSuite/Graphs/FontSize/Axis", "11", $read_config));
 
 	// Text Font
-	$config->addXmlObject("PhoronixTestSuite/Graphs/Font/Type", 4, pts_read_graph_config("PhoronixTestSuite/Graphs/Font/Type", "DejaVuSans.ttf", $read_config));
+	$config->addXmlObject("PhoronixTestSuite/Graphs/Font/FontType", 4, pts_read_graph_config("PhoronixTestSuite/Graphs/Font/FontType", "Sans.ttf", $read_config));
 
 	// Other
 	$config->addXmlObject("PhoronixTestSuite/Graphs/Other/RenderBorder", 4, pts_read_graph_config("PhoronixTestSuite/Graphs/Other/RenderBorder", "FALSE", $read_config));
 	$config->addXmlObject("PhoronixTestSuite/Graphs/Other/NumberOfMarks", 4, pts_read_graph_config("PhoronixTestSuite/Graphs/Other/NumberOfMarks", "6", $read_config));
+	$config->addXmlObject("PhoronixTestSuite/Graphs/Other/Watermark", 4, pts_read_graph_config("PhoronixTestSuite/Graphs/Other/Watermark", "PHORONIX-TEST-SUITE.COM", $read_config));
 
 	file_put_contents(PTS_USER_DIR . "graph-config.xml", $config->getXML());
 }
diff --git a/pts-core/objects/pts_BarGraph.php b/pts-core/objects/pts_BarGraph.php
index 4d9c4d3..1ed83b5 100644
--- a/pts-core/objects/pts_BarGraph.php
+++ b/pts-core/objects/pts_BarGraph.php
@@ -50,7 +50,7 @@ class pts_BarGraph extends pts_CustomGraph
 
 			imageline($this->graph_image, $px_bound_right, $px_from_top_start, $px_bound_right, $px_from_top_end, $this->graph_color_notches);
 
-			$this->gd_write_text_center($this->graph_identifiers[$i], $font_size, $this->graph_color_headers, $px_bound_left + ceil($identifier_width / 2), $px_from_top_end - 1, FALSE, TRUE);
+			$this->gd_write_text_center($this->graph_identifiers[$i], $font_size, $this->graph_color_headers, $px_bound_left + ceil($identifier_width / 2), $px_from_top_end - 5, FALSE, TRUE);
 		}
 	}
 	protected function render_graph_bars()
diff --git a/pts-core/objects/pts_CustomGraph.php b/pts-core/objects/pts_CustomGraph.php
index 47bb74f..82d7b63 100644
--- a/pts-core/objects/pts_CustomGraph.php
+++ b/pts-core/objects/pts_CustomGraph.php
@@ -27,7 +27,8 @@ class pts_CustomGraph extends pts_Graph
 		$this->graph_color_paint = explode(", ", pts_read_graph_config("PhoronixTestSuite/Graphs/Colors/ObjectPaint", null, $read_config)); // Colors to use for the bars / lines, one color for each key
 
 		// Text
-		$this->graph_font = pts_read_graph_config("PhoronixTestSuite/Graphs/Font/Type", null, $read_config); // TTF file name
+		$this->graph_watermark_text = pts_read_graph_config("PhoronixTestSuite/Graphs/Other/Watermark", null, $read_config); // watermark
+		$this->graph_font = pts_read_graph_config("PhoronixTestSuite/Graphs/Font/FontType", null, $read_config); // TTF file name
 		$this->graph_font_size_heading = pts_read_graph_config("PhoronixTestSuite/Graphs/FontSize/Headers", null, $read_config); // Font size of headings
 		$this->graph_font_size_bars = pts_read_graph_config("PhoronixTestSuite/Graphs/FontSize/ObjectText", null, $read_config); // Font size for text on the bars/objects
 		$this->graph_font_size_identifiers = pts_read_graph_config("PhoronixTestSuite/Graphs/FontSize/Identifiers", null, $read_config); // Font size of identifiers
diff --git a/pts-core/objects/pts_Graph.php b/pts-core/objects/pts_Graph.php
index e98cd29..3ac94d2 100644
--- a/pts-core/objects/pts_Graph.php
+++ b/pts-core/objects/pts_Graph.php
@@ -26,9 +26,9 @@ class pts_Graph
 	var $graph_attr_height = 300; // Graph height
 	var $graph_attr_big_border = FALSE; // Border around graph or not
 
-	var $graph_left_start = 27; // Distance in px to start graph from left side
+	var $graph_left_start = 28; // Distance in px to start graph from left side
 	var $graph_left_end_opp = 10; // Distance in px to end graph from right side
-	var $graph_top_start = 59; // Distance in px to start graph from top side
+	var $graph_top_start = 56; // Distance in px to start graph from top side
 	var $graph_top_end_opp = 22; // Distance in px to end graph from bottom side
 
 	// Colors
@@ -45,7 +45,7 @@ class pts_Graph
 	var $graph_color_paint = array("#3B433A", "#BB2413", "#FF9933", "#006C00", "#5028CA"); // Colors to use for the bars / lines, one color for each key
 
 	// Text
-	var $graph_font = "DejaVuSans.ttf"; // TTF file name
+	var $graph_font = "Sans.ttf"; // TTF file name
 	var $graph_font_size_tick_mark = 10; // Tick mark size
 	var $graph_font_size_key = 9; // Size of height for keys
 	var $graph_font_size_heading = 18; // Font size of headings
@@ -333,11 +333,11 @@ class pts_Graph
 		}
 		
 		// Text
-		$this->gd_write_text_left($this->graph_proportion, 7, $this->graph_color_body_light, $this->graph_left_start + 1, $this->graph_top_start - 6);
-		$this->gd_write_text_right($this->graph_version, 7, $this->graph_color_body_light, $this->graph_left_end - 2, $this->graph_top_start - 6);
+		$this->gd_write_text_left($this->graph_proportion, 7, $this->graph_color_body_light, $this->graph_left_start + 1, $this->graph_top_start - 7);
+		$this->gd_write_text_right($this->graph_version, 7, $this->graph_color_body_light, $this->graph_left_end - 1, $this->graph_top_start - 7);
 		$this->gd_write_text_center($this->graph_title, $this->graph_font_size_heading, $this->graph_color_main_headers, "GRAPH_CENTER", 6);
-		$this->gd_write_text_center($this->graph_sub_title, $this->graph_font_size_sub_heading, $this->graph_color_main_headers, "GRAPH_CENTER", 36);
-		$this->gd_write_text_center($this->graph_y_title, $this->graph_font_size_axis_heading, $this->graph_color_headers, 4, $this->graph_top_start + (($this->graph_top_end - $this->graph_top_start) / 2), TRUE);
+		$this->gd_write_text_center($this->graph_sub_title, $this->graph_font_size_sub_heading, $this->graph_color_main_headers, "GRAPH_CENTER", 31);
+		$this->gd_write_text_center($this->graph_y_title, $this->graph_font_size_axis_heading, $this->graph_color_headers, 3, $this->graph_top_start + (($this->graph_top_end - $this->graph_top_start) / 2), TRUE);
 	}
 	protected function render_graph_value_ticks()
 	{
@@ -353,7 +353,7 @@ class pts_Graph
 
 			imageline($this->graph_image, $px_from_left_start, $px_from_top, $px_from_left_end, $px_from_top, $this->graph_color_notches);
 
-			$this->gd_write_text_right($display_value, $this->graph_font_size_tick_mark, $this->graph_color_text, $px_from_left_start - 3, $px_from_top);
+			$this->gd_write_text_right($display_value, $this->graph_font_size_tick_mark, $this->graph_color_text, $px_from_left_start - 1, $px_from_top - 2);
 
 			if($i != 0 && $this->graph_type == "LINE_GRAPH")
 			{
diff --git a/pts-core/pts-results-viewer/DejaVuSans.ttf b/pts-core/pts-results-viewer/DejaVuSans.ttf
deleted file mode 100644
index 3299ee5..0000000
--- a/pts-core/pts-results-viewer/DejaVuSans.ttf
+++ /dev/null
diff --git a/pts-core/pts-results-viewer/Sans.ttf b/pts-core/pts-results-viewer/Sans.ttf
new file mode 100644
index 0000000..f1466ec
--- /dev/null
+++ b/pts-core/pts-results-viewer/Sans.ttf
diff --git a/pts-core/pts-results-viewer/pts-viewer.css b/pts-core/pts-results-viewer/pts-viewer.css
index ddd1618..033bbde 100644
--- a/pts-core/pts-results-viewer/pts-viewer.css
+++ b/pts-core/pts-results-viewer/pts-viewer.css
@@ -5,7 +5,7 @@ body
 	padding: 0;
 	font-family: arial, helvetica, sans-serif;
 	font-size: 13px;
-	background-color: #FFF;
+	background-color: #F9F9F9;
 	color: #000;
 }
 a
@@ -62,6 +62,7 @@ div#pts_container
 	border: solid #EEE;
 	border-width: 0 1px;
 	min-height: 700px;
+	background-color: #FFF;
 }
 div.pts_box
 {