Summary
Description: Unnamed repository; edit this file to name it for gitweb.
Last Change: Mon 8/30/10 20:43
Recent Commits
>
--git a/pts-core/functions/pts-functions_config.php b/pts-core/functions/pts-functions_config.php
index 1bca016..afd93fd 100644
--- a/pts-core/functions/pts-functions_config.php
+++ b/pts-core/functions/pts-functions_config.php
@@ -54,7 +54,7 @@ function pts_read_user_config($xml_pointer, $value = null, $tandem_xml = null)
}
function pts_find_home($path)
{
- if(strpos($path, '~') !== FALSE)
+ if(strpos($path, "~/") !== FALSE)
{
/* $whoami = trim(shell_exec("whoami"));
@@ -64,7 +64,7 @@ function pts_find_home($path)
$home_path = "/home/$whoami"; */
$home_path = pts_posix_userhome();
- $path = str_replace('~', $home_path, $path);
+ $path = str_replace("~/", $home_path, $path);
}
return $path;
}
diff --git a/pts-core/objects/object_pts_Graph.php b/pts-core/objects/object_pts_Graph.php
index 0b343c8..cef37d0 100644
--- a/pts-core/objects/object_pts_Graph.php
+++ b/pts-core/objects/object_pts_Graph.php
@@ -54,6 +54,8 @@ class pts_Graph
var $graph_font_size_sub_heading = 12; // Font size of headers
var $graph_font_size_axis_heading = 11; // Font size of axis headers
var $graph_watermark_text = "PHORONIX-TEST-SUITE.COM"; // Text for watermark in upper right hand corner. If null, no watermark will display
+ var $graph_version = "";
+ var $graph_proportion = "";
// CHANGE DIRECTORY FOR TTF FONT LOCATION INSIDE __construct FUNCTION
@@ -95,6 +97,17 @@ class pts_Graph
{
$this->graph_identifiers = $data_array;
}
+ public function loadGraphVersion($data)
+ {
+ $this->graph_version = "PTS v" . $data;
+ }
+ public function loadGraphProportion($data)
+ {
+ if($data == "HIB")
+ $this->graph_proportion = "* More is better";
+ else if($data == "LIB")
+ $this->graph_proportion = "* Less is better";
+ }
public function loadGraphData($data_array)
{
loadGraphValues($data_array);
@@ -295,7 +308,6 @@ class pts_Graph
imagefilledrectangle($this->graph_image, $this->graph_left_start, $this->graph_top_start, $this->graph_left_end, $this->graph_top_end, $this->graph_color_body);
imagerectangle($this->graph_image, $this->graph_left_start, $this->graph_top_start, $this->graph_left_end, $this->graph_top_end, $this->graph_color_border);
-
if($this->graph_body_image != FALSE)
{
imagecopymerge($this->graph_image, $this->graph_body_image, $this->graph_left_start + (($this->graph_left_end - $this->graph_left_start) / 2) - imagesx($this->graph_body_image) / 2, $this->graph_top_start + (($this->graph_top_end - $this->graph_top_start) / 2) - imagesy($this->graph_body_image) / 2, 0, 0, imagesx($this->graph_body_image), imagesy($this->graph_body_image), 95);
@@ -303,6 +315,7 @@ 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_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 4baa083..b726a0b 100644
--- a/pts-core/pts-results-viewer/viewer.xsl
+++ b/pts-core/pts-results-viewer/viewer.xsl
@@ -57,7 +57,7 @@
</div>
</xsl:for-each>
</div>
- <div class="pts_benchmark_img_area"><img width="580" height="300"><xsl:attribute name="src">http://www.phoronix-test-suite.com/pts-grapher/r/graph-remote.php?t=<xsl:value-of select="Name" />&s=<xsl:value-of select="Attributes"/>&n=<xsl:value-of select="Version"/>&u=<xsl:value-of select="Scale"/>&p=<xsl:value-of select="Proportion"/>&i=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Identifier"/>;</xsl:for-each></xsl:for-each>&v=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Value"/>;</xsl:for-each></xsl:for-each>
+ <div class="pts_benchmark_img_area"><img width="580" height="300"><xsl:attribute name="src">http://www.phoronix-test-suite.com/pts-grapher/r/graph-remote.php?t=<xsl:value-of select="Name" />&s=<xsl:value-of select="Attributes"/>&n=<xsl:value-of select="Version"/>&u=<xsl:value-of select="Scale"/>&p=<xsl:value-of select="Proportion" />&i=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Identifier"/>;</xsl:for-each></xsl:for-each>&v=<xsl:for-each select="Results/Group"><xsl:for-each select="Entry"><xsl:value-of select="Value"/>;</xsl:for-each></xsl:for-each>
</xsl:attribute></img></div>
</xsl:for-each>
</div>
<
Copyright © 2010 by Phoronix Media