tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-03-22 Sergio Martin <sergio.martin@artica.es> 

* include/graphs/functions_pchart.php
	  include/graphs/pChart/pDraw.class.php: Added to pchart library the
	parameter to set an independent font size to graph ticks and set it
	on the graph charts one point less



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5818 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-03-22 12:56:53 +00:00
parent d21b47222d
commit ced185dcbb
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-03-22 Sergio Martin <sergio.martin@artica.es>
* include/graphs/functions_pchart.php
include/graphs/pChart/pDraw.class.php: Added to pchart library the
parameter to set an independent font size to graph ticks and set it
on the graph charts one point less
2012-03-22 Miguel de Dios <miguel.dedios@artica.es>
& Sergio Martin <sergio.martin@artica.es> using Gobby collaborative
real-time editor http://obby.0x539.de

7
pandora_console/include/graphs/functions_pchart.php
View File

@ -737,7 +737,12 @@ function pch_vertical_graph ($graph_type, $index, $data, $width, $height,
"GridG"=>200,
"GridB"=>200,
"DrawSubTicks"=>TRUE,
"CycleBackground"=>TRUE, "Mode" => $mode, "LabelRotation" => 60, "XMargin" => 0, "MinDivHeight" => 20);
"CycleBackground"=>TRUE,
"Mode" => $mode,
"LabelRotation" => 40,
"XMargin" => 0,
"MinDivHeight" => 20,
"TicksFontSize" => $font_size - 1);
$myPicture->drawScale($scaleSettings);
/* Turn on shadow computing */

5
pandora_console/include/graphs/pChart/pDraw.class.php
View File

@ -1744,7 +1744,8 @@
$BackgroundAlpha2 = isset($Format["BackgroundAlpha2"]) ? $Format["BackgroundAlpha2"] : 20;
$LabelingMethod = isset($Format["LabelingMethod"]) ? $Format["LabelingMethod"] : LABELING_ALL;
$LabelSkip = isset($Format["LabelSkip"]) ? $Format["LabelSkip"] : 1;
$LabelRotation = isset($Format["LabelRotation"]) ? $Format["LabelRotation"] : 0;
$TicksFontSize = isset($Format["TicksFontSize"]) ? $Format["TicksFontSize"] : $this->FontSize;
$LabelRotation = isset($Format["LabelRotation"]) ? $Format["LabelRotation"] : 0;
$LabelValuesRotation = isset($Format["LabelValuesRotation"]) ? $Format["LabelValuesRotation"] : 0;
$SkippedAxisTicks = isset($Format["SkippedAxisTicks"]) ? $Format["SkippedAxisTicks"] : $GridTicks+2;
$SkippedAxisR = isset($Format["SkippedAxisR"]) ? $Format["SkippedAxisR"] : $GridR;
@ -1967,7 +1968,7 @@
$ID++; $Skipped = TRUE;
if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) )
{
$Bounds = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
$Bounds = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("FontSize"=>$TicksFontSize,"Angle"=>$LabelRotation,"Align"=>$LabelAlign));
$TxtBottom = $YPos+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
$MaxBottom = max($MaxBottom,$TxtBottom);
$LastValue = $Value;