Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Wed 2/3/10 13:04
Recent Commits
>
--git a/pts-core/objects/object_pts_Graph.php b/pts-core/objects/object_pts_Graph.php
index cef37d0..f1ea90e 100644
--- a/pts-core/objects/object_pts_Graph.php
+++ b/pts-core/objects/object_pts_Graph.php
@@ -99,14 +99,15 @@ class pts_Graph
}
public function loadGraphVersion($data)
{
- $this->graph_version = "PTS v" . $data;
+ if(!empty($data))
+ $this->graph_version = "Phoronix Test Suite v" . $data;
}
public function loadGraphProportion($data)
{
- if($data == "HIB")
- $this->graph_proportion = "* More is better";
- else if($data == "LIB")
+ if($data == "LIB")
$this->graph_proportion = "* Less is better";
+ //else if($data == "HIB")
+ // $this->graph_proportion = "* More is better";
}
public function loadGraphData($data_array)
{
@@ -184,6 +185,9 @@ class pts_Graph
}
protected function gd_write_text_center($String, $Size, $Color, $CenterX, $CenterY, $Rotate = FALSE, $Big = FALSE)
{
+ if(empty($String))
+ return;
+
$Font = $this->graph_font;
$ttf_dimensions = $this->return_ttf_string_dimensions(strtoupper($String), $Font, $Size, $Big);
@@ -231,6 +235,9 @@ class pts_Graph
}
protected function gd_write_text_right($String, $Size, $Color, $RightX, $CenterY, $Rotate = FALSE)
{
+ if(empty($String))
+ return;
+
$Font = $this->graph_font;
$ttf_dimensions = $this->return_ttf_string_dimensions($String, $Font, $Size);
@@ -246,6 +253,9 @@ class pts_Graph
}
protected function gd_write_text_left($String, $Size, $Color, $LeftX, $CenterY, $Rotate = FALSE)
{
+ if(empty($String))
+ return;
+
$Font = $this->graph_font;
$ttf_dimensions = $this->return_ttf_string_dimensions($String, $Font, $Size);
@@ -315,7 +325,8 @@ 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 - 8);
+ $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_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", 30);
$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);
diff --git a/pts-core/pts-results-viewer/viewer.xsl b/pts-core/pts-results-viewer/viewer.xsl
index b726a0b..ccc51ae 100644
--- a/pts-core/pts-results-viewer/viewer.xsl
+++ b/pts-core/pts-results-viewer/viewer.xsl
@@ -23,7 +23,7 @@
<p id="tsd_show" style="display: none;"><div class="pts_area_box"><p><xsl:value-of select="PhoronixTestSuite/Suite/Description"/></p><p style="font-size: 11px;"><em>This test is maintained by <xsl:value-of select="PhoronixTestSuite/Suite/Maintainer" />.</em></p><p><a onclick="switchShow('tsd_hidden');switchShow('tsd_show');"><< Hide Test Details</a></p></div></p>
<p class="pts_benchmark_descriptor" id="tsd_hidden"><a onclick="switchShow('tsd_hidden');switchShow('tsd_show');hideObject('tips_show');showObject('tips_hidden');">Show Test Details >></a></p>
<xsl:variable name="idcount"><xsl:value-of select="count(PhoronixTestSuite/System)" /></xsl:variable>
- <xsl:variable name="idwidth"><xsl:value-of select="floor(820 div $idcount) - 1" /></xsl:variable>
+ <xsl:variable name="idwidth"><xsl:value-of select="floor(820 div $idcount) - 1" /></xsl:variable>
<h1>System Hardware</h1>
<div class="pts_chart_box">
<xsl:for-each select="PhoronixTestSuite/System"><div class="pts_column_head"><xsl:attribute name="style">width: <xsl:value-of select="$idwidth" />px;</xsl:attribute><xsl:value-of select="AssociatedIdentifiers" /></div></xsl:for-each>
<
Copyright © 2010 by Phoronix Media