summaryrefslogtreecommitdiffstats
path: root/admin/survey/pChart/classes
diff options
context:
space:
mode:
Diffstat (limited to 'admin/survey/pChart/classes')
-rw-r--r--admin/survey/pChart/classes/class.MyHorBar.php883
-rw-r--r--admin/survey/pChart/classes/class.pChart.php33
-rw-r--r--admin/survey/pChart/classes/class.pData.php4
3 files changed, 463 insertions, 457 deletions
diff --git a/admin/survey/pChart/classes/class.MyHorBar.php b/admin/survey/pChart/classes/class.MyHorBar.php
index 8194add..ed822d2 100644
--- a/admin/survey/pChart/classes/class.MyHorBar.php
+++ b/admin/survey/pChart/classes/class.MyHorBar.php
@@ -1,16 +1,16 @@
-<?php
-
+<?php
+
/*
pChart - a PHP class to build charts!
Copyright (C) 2008 Jean-Damien POGOLOTTI
- Version 1.27d last updated on 09/30/08
-
- Extension by Gabriele FERRI
- http://www.gabrieleferri.it
- MyHorBar.class is writen to extend pChart.class to write a horizontal bar charts
- Copyright (C) 2009 Gabriele FERRI
- version 1.0beta 08/05/2009
- Contact me with bug reports and comments: info@gabrieleferri.it
+ Version 1.27d last updated on 09/30/08
+
+ Extension by Gabriele FERRI
+ http://www.gabrieleferri.it
+ MyHorBar.class is writen to extend pChart.class to write a horizontal bar charts
+ Copyright (C) 2009 Gabriele FERRI
+ version 1.0beta 08/05/2009
+ Contact me with bug reports and comments: info@gabrieleferri.it
http://pchart.sourceforge.net
@@ -27,16 +27,17 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
- Draw methods :
+
+ Draw methods :
drawHorBarGraph($Data,$DataDescription,$Shadow=TRUE,$Alpha=100)
- drawHorScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
- drawHorGrid($LineWidth,$Mosaic,$R=220,$G=220,$B=220,$Alpha=100)
- drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnBottom=FALSE,$TickWidth=4,$FreeText=NULL,$Angle=0)
-*/
-
+ drawHorScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
+ drawHorGrid($LineWidth,$Mosaic,$R=220,$G=220,$B=220,$Alpha=100)
+ drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnBottom=FALSE,$TickWidth=4,$FreeText=NULL,$Angle=0)
+*/
+
class MyHorBar extends pChart
- {
-
+ {
+
/* This function draw a bar graph */
function drawHorBarGraph($Data,$DataDescription,$insideValues=false,$insideValuesSmall=false,$Shadow=TRUE,$Alpha=100)
{
@@ -45,22 +46,23 @@ class MyHorBar extends pChart
$this->validateData("drawBarGraph",$Data);
$GraphID = 0;
- $Series = count($DataDescription["Values"]);
+ $Series = (isset($DataDescription["Values"])?count($DataDescription["Values"]):0);
$SeriesWidth = $this->DivisionWidth / ($Series+1);
-
- $SerieYOffset = $this->DivisionWidth / 2 - $SeriesWidth * $Series / 2;
-
+
+ $SerieYOffset = $this->DivisionWidth / 2 - $SeriesWidth * $Series / 2;
+
$XZero = $this->GArea_X1 + ((0-$this->VMin) * $this->DivisionRatio);
- if ( $XZero < $this->GArea_X1 ) { $XZero = $this->GArea_X1; }
+ if ( $XZero < $this->GArea_X1 ) { $XZero = $this->GArea_X1; }
$SerieID = 0;
+ if(isset($DataDescription["Values"]))
foreach ( $DataDescription["Values"] as $Key2 => $ColName )
{
$ID = 0;
foreach ( $DataDescription["Description"] as $keyI => $ValueI )
{ if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
- $YPos = $this->GArea_Y1 + $this->GAreaXOffset + $SerieYOffset + $SeriesWidth * $SerieID;
+ $YPos = $this->GArea_Y1 + $this->GAreaXOffset + $SerieYOffset + $SeriesWidth * $SerieID;
$XLast = -1;
foreach ( $Data as $Key => $Values )
@@ -69,8 +71,8 @@ class MyHorBar extends pChart
{
if ( is_numeric($Data[$Key][$ColName]) )
{
- $Value = $Data[$Key][$ColName];
-
+ $Value = $Data[$Key][$ColName];
+
$XPos = $this->GArea_X1 + (($Value-$this->VMin) * $this->DivisionRatio);
/* Save point into the image map if option activated */
@@ -82,46 +84,46 @@ class MyHorBar extends pChart
if ( $Shadow && $Alpha == 100 )
$this->drawRectangle($XZero,$YPos+1,$XPos,$YPos+$SeriesWidth-1,25,25,25,TRUE,$Alpha);
- $this->drawFilledRectangle($XZero,$YPos+1,$XPos,$YPos+$SeriesWidth-1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-
- // Izrisemo vrednosti znotraj stolpca
- if($insideValues == true){
-
- if($DataDescription["Unit"]["Y"] == '%')
- $Value = round($Value, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'));
- else
- $Value = round($Value, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'));
-
- if ( $DataDescription["Format"]["Y"] == "number" )
- $Text = $Value.$DataDescription["Unit"]["Y"];
- if ( $DataDescription["Format"]["Y"] == "time" )
- $Text = $this->ToTime($Value);
- if ( $DataDescription["Format"]["Y"] == "date" )
- $Text = $this->ToDate($Value);
- if ( $DataDescription["Format"]["Y"] == "metric" )
- $Text = $this->ToMetric($Value);
- if ( $DataDescription["Format"]["Y"] == "currency" )
- $Text = $this->ToCurrency($Value);
-
- $Position = imageftbbox($this->FontSize,0,$this->FontName,$Text);
- $TextWidth = $Position[2]-$Position[0];
-
- $X = ($XZero + $XPos) / 2;
- $Y = ($YPos+1 + $YPos+$SeriesWidth-1) / 2;
-
- $text_colors = $this->getContrastTextColor($this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
- $C_TextColor = $this->AllocateColor($this->Picture,$text_colors['R'],$text_colors['G'],$text_colors['B']);
-
- //imagettftext($this->Picture,$this->FontSize,0,$XPos-($this->FontSize/2),$this->GArea_Y1-10,$C_TextColor,$this->FontName,$Value);
- if($Value > 0 && ($this->VMin != 1 || $Value > 1) && ($XPos-$XZero > 20)){
- imagettftext($this->Picture,$this->FontSize,0,$X-($TextWidth/2),$Y+4,$C_TextColor,$this->FontName,$Text);
- }
- // Izrisemo se majhne vrednosti zraven stolpca
- elseif($insideValuesSmall == true){
- $C_TextColor = $this->AllocateColor($this->Picture,0,0,0);
- imagettftext($this->Picture,$this->FontSize,0,$XPos+4,$Y+4,$C_TextColor,$this->FontName,$Text);
- }
- }
+ $this->drawFilledRectangle($XZero,$YPos+1,$XPos,$YPos+$SeriesWidth-1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
+
+ // Izrisemo vrednosti znotraj stolpca
+ if($insideValues == true){
+
+ if($DataDescription["Unit"]["Y"] == '%')
+ $Value = round($Value, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'));
+ else
+ $Value = round($Value, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'));
+
+ if ( $DataDescription["Format"]["Y"] == "number" )
+ $Text = $Value.$DataDescription["Unit"]["Y"];
+ if ( $DataDescription["Format"]["Y"] == "time" )
+ $Text = $this->ToTime($Value);
+ if ( $DataDescription["Format"]["Y"] == "date" )
+ $Text = $this->ToDate($Value);
+ if ( $DataDescription["Format"]["Y"] == "metric" )
+ $Text = $this->ToMetric($Value);
+ if ( $DataDescription["Format"]["Y"] == "currency" )
+ $Text = $this->ToCurrency($Value);
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Text);
+ $TextWidth = $Position[2]-$Position[0];
+
+ $X = ($XZero + $XPos) / 2;
+ $Y = ($YPos+1 + $YPos+$SeriesWidth-1) / 2;
+
+ $text_colors = $this->getContrastTextColor($this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ $C_TextColor = $this->AllocateColor($this->Picture,$text_colors['R'],$text_colors['G'],$text_colors['B']);
+
+ //imagettftext($this->Picture,$this->FontSize,0,$XPos-($this->FontSize/2),$this->GArea_Y1-10,$C_TextColor,$this->FontName,$Value);
+ if($Value > 0 && ($this->VMin != 1 || $Value > 1) && ($XPos-$XZero > 20)){
+ imagettftext($this->Picture,$this->FontSize,0,$X-($TextWidth/2),$Y+4,$C_TextColor,$this->FontName,$Text);
+ }
+ // Izrisemo se majhne vrednosti zraven stolpca
+ elseif($insideValuesSmall == true){
+ $C_TextColor = $this->AllocateColor($this->Picture,0,0,0);
+ imagettftext($this->Picture,$this->FontSize,0,$XPos+4,$Y+4,$C_TextColor,$this->FontName,$Text);
+ }
+ }
}
}
@@ -129,173 +131,173 @@ class MyHorBar extends pChart
}
$SerieID++;
}
- }
-
- /* Izrisemo horizontalni graf s sestavljenimi stolpci */
- function drawStackedHorBarGraph($Data,$DataDescription,$insideValues=false,$Alpha=100)
- {
- /* Validate the Data and DataDescription array */
- $this->validateDataDescription("drawBarGraph",$DataDescription);
- $this->validateData("drawBarGraph",$Data);
-
- $GraphID = 0;
- $Series = count($DataDescription["Values"]);
- $SeriesWidth = $this->DivisionWidth * .8; //$this->DivisionWidth / ($Series+1);
-
- $SerieYOffset = $this->DivisionWidth / 2;
-
- $XZero = $this->GArea_X1 + ((0-$this->VMin) * $this->DivisionRatio);
- if ( $XZero < $this->GArea_X1 ) { $XZero = $this->GArea_X1; }
-
- $SerieID = 0;
- $LastValue = array();
- foreach ( $DataDescription["Values"] as $Key2 => $ColName )
- {
- $ID = 0;
-
- foreach ( $DataDescription["Description"] as $keyI => $ValueI )
- { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
- $YPos = $this->GArea_Y1 + $this->GAreaXOffset + $SerieYOffset - $SeriesWidth / 2;
-
- $XLast = -1;
- foreach ( $Data as $Key => $Values )
- {
- if ( isset($Data[$Key][$ColName]))
- {
- if ( is_numeric($Data[$Key][$ColName]) )
- {
- $Value = $Data[$Key][$ColName];
-
- if ( isset($LastValue[$Key]) )
- {
- $XPos = $this->GArea_X1 + ((($Value+$LastValue[$Key])-$this->VMin) * $this->DivisionRatio);
- $XLeft = $this->GArea_X1 + (($LastValue[$Key]-$this->VMin) * $this->DivisionRatio);
- $LastValue[$Key] += $Value;
- }
- else
- {
- $XPos = $this->GArea_X1 + (($Value-$this->VMin) * $this->DivisionRatio);
- $XLeft = $XZero;
- $LastValue[$Key] = $Value;
- }
-
- /* Save point into the image map if option activated */
- if ( $this->BuildMap )
- {
- $this->addToImageMap(min($XLeft,$XPos),$YPos+1,max($XLeft,$XPos), $YPos+$SeriesWidth-1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
- }
-
- if ( $Shadow && $Alpha == 100 )
- $this->drawRectangle($XLeft,$YPos+1,$XPos,$YPos+$SeriesWidth-1,25,25,25,TRUE,$Alpha);
-
- $this->drawFilledRectangle($XLeft,$YPos+1,$XPos,$YPos+$SeriesWidth-1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-
- // Izrisemo vrednosti znotraj stolpca
- if($insideValues == true){
- $X = 0;
- $Y = 0;
-
- if($DataDescription["Unit"]["Y"] == '%')
- $Value = round($Value, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'));
- else
- $Value = round($Value, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'));
-
- if ( $DataDescription["Format"]["Y"] == "number" )
- $Text = $Value.$DataDescription["Unit"]["Y"];
- if ( $DataDescription["Format"]["Y"] == "time" )
- $Text = $this->ToTime($Value);
- if ( $DataDescription["Format"]["Y"] == "date" )
- $Text = $this->ToDate($Value);
- if ( $DataDescription["Format"]["Y"] == "metric" )
- $Text = $this->ToMetric($Value);
- if ( $DataDescription["Format"]["Y"] == "currency" )
- $Text = $this->ToCurrency($Value);
-
- $Position = imageftbbox($this->FontSize,0,$this->FontName,$Text);
- $TextWidth = $Position[2]-$Position[0];
-
- $X = ($XLeft + $XPos) / 2;
- $Y = ($YPos+1 + $YPos+$SeriesWidth-1) / 2;
-
- $text_colors = $this->getContrastTextColor($this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
- $C_TextColor = $this->AllocateColor($this->Picture,$text_colors['R'],$text_colors['G'],$text_colors['B']);
-
- //imagettftext($this->Picture,$this->FontSize,0,$XPos-($this->FontSize/2),$this->GArea_Y1-10,$C_TextColor,$this->FontName,$Value);
- if($Value > 0 && ($XPos-$XLeft > 20))
- imagettftext($this->Picture,$this->FontSize,0,$X-($TextWidth/2),$Y+4,$C_TextColor,$this->FontName,$Text);
- }
-
-
- }
- }
- $YPos = $YPos + $this->DivisionWidth;
- }
- $SerieID++;
- }
- }
-
-
- /* Izrisemo navpicen linijski graf */
- function drawVerLineGraph($Data,$DataDescription,$insideValues=false,$Shadow=TRUE,$Alpha=100)
- {
- /* Validate the Data and DataDescription array */
- $this->validateDataDescription("drawBarGraph",$DataDescription);
- $this->validateData("drawBarGraph",$Data);
-
- $GraphID = 0;
- $Series = count($DataDescription["Values"]);
- $SeriesWidth = $this->DivisionWidth / ($Series+1);
-
- $SerieYOffset = $this->DivisionWidth / 2;
-
- $XZero = $this->GArea_X1 + ((0-$this->VMin) * $this->DivisionRatio);
- if ( $XZero < $this->GArea_X1 ) { $XZero = $this->GArea_X1; }
-
- $SerieID = 0;
- foreach ( $DataDescription["Values"] as $Key2 => $ColName )
- {
- $ID = 0;
- foreach ( $DataDescription["Description"] as $keyI => $ValueI )
- { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
- $YPos = $this->GArea_Y1 + $this->GAreaXOffset + $SerieYOffset;
-
- $XLast = -1;
- foreach ( $Data as $Key => $Values )
- {
- if ( isset($Data[$Key][$ColName]))
- {
- if ( is_numeric($Data[$Key][$ColName]) )
- {
- $Value = $Data[$Key][$ColName];
-
- $XPos = $this->GArea_X1 + (($Value-$this->VMin) * $this->DivisionRatio);
-
- // Save point into the image map if option activated
- if ( $this->BuildMap )
- {
- $this->addToImageMap(min($XZero,$XPos),$YPos+1,max($XZero,$XPos), $YPos+$SeriesWidth-1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
- }
-
- if ( $XLast != -1 ){
- $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
- $this->drawFilledCircle($XLast+1,$YLast+1,$SmallRadius=2,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
- }
-
- $XLast = $XPos;
- $YLast = $YPos;
- }
- }
- $YPos = $YPos + $this->DivisionWidth;
- }
- $SerieID++;
-
- $this->drawFilledCircle($XLast+1,$YLast+1,$SmallRadius=2,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
- }
- }
-
-
+ }
+
+ /* Izrisemo horizontalni graf s sestavljenimi stolpci */
+ function drawStackedHorBarGraph($Data,$DataDescription,$insideValues=false,$Alpha=100)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawBarGraph",$DataDescription);
+ $this->validateData("drawBarGraph",$Data);
+
+ $GraphID = 0;
+ $Series = count($DataDescription["Values"]);
+ $SeriesWidth = $this->DivisionWidth * .8; //$this->DivisionWidth / ($Series+1);
+
+ $SerieYOffset = $this->DivisionWidth / 2;
+
+ $XZero = $this->GArea_X1 + ((0-$this->VMin) * $this->DivisionRatio);
+ if ( $XZero < $this->GArea_X1 ) { $XZero = $this->GArea_X1; }
+
+ $SerieID = 0;
+ $LastValue = array();
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $YPos = $this->GArea_Y1 + $this->GAreaXOffset + $SerieYOffset - $SeriesWidth / 2;
+
+ $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ {
+ if ( is_numeric($Data[$Key][$ColName]) )
+ {
+ $Value = $Data[$Key][$ColName];
+
+ if ( isset($LastValue[$Key]) )
+ {
+ $XPos = $this->GArea_X1 + ((($Value+$LastValue[$Key])-$this->VMin) * $this->DivisionRatio);
+ $XLeft = $this->GArea_X1 + (($LastValue[$Key]-$this->VMin) * $this->DivisionRatio);
+ $LastValue[$Key] += $Value;
+ }
+ else
+ {
+ $XPos = $this->GArea_X1 + (($Value-$this->VMin) * $this->DivisionRatio);
+ $XLeft = $XZero;
+ $LastValue[$Key] = $Value;
+ }
+
+ /* Save point into the image map if option activated */
+ if ( $this->BuildMap )
+ {
+ $this->addToImageMap(min($XLeft,$XPos),$YPos+1,max($XLeft,$XPos), $YPos+$SeriesWidth-1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
+ }
+
+ if ( /* $Shadow */false && $Alpha == 100 )
+ $this->drawRectangle($XLeft,$YPos+1,$XPos,$YPos+$SeriesWidth-1,25,25,25,TRUE,$Alpha);
+
+ $this->drawFilledRectangle($XLeft,$YPos+1,$XPos,$YPos+$SeriesWidth-1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
+
+ // Izrisemo vrednosti znotraj stolpca
+ if($insideValues == true){
+ $X = 0;
+ $Y = 0;
+
+ if($DataDescription["Unit"]["Y"] == '%')
+ $Value = round($Value, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'));
+ else
+ $Value = round($Value, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'));
+
+ if ( $DataDescription["Format"]["Y"] == "number" )
+ $Text = $Value.$DataDescription["Unit"]["Y"];
+ if ( $DataDescription["Format"]["Y"] == "time" )
+ $Text = $this->ToTime($Value);
+ if ( $DataDescription["Format"]["Y"] == "date" )
+ $Text = $this->ToDate($Value);
+ if ( $DataDescription["Format"]["Y"] == "metric" )
+ $Text = $this->ToMetric($Value);
+ if ( $DataDescription["Format"]["Y"] == "currency" )
+ $Text = $this->ToCurrency($Value);
+
+ $Position = imageftbbox($this->FontSize,0,$this->FontName,$Text);
+ $TextWidth = $Position[2]-$Position[0];
+
+ $X = ($XLeft + $XPos) / 2;
+ $Y = ($YPos+1 + $YPos+$SeriesWidth-1) / 2;
+
+ $text_colors = $this->getContrastTextColor($this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ $C_TextColor = $this->AllocateColor($this->Picture,$text_colors['R'],$text_colors['G'],$text_colors['B']);
+
+ //imagettftext($this->Picture,$this->FontSize,0,$XPos-($this->FontSize/2),$this->GArea_Y1-10,$C_TextColor,$this->FontName,$Value);
+ if($Value > 0 && ($XPos-$XLeft > 20))
+ imagettftext($this->Picture,$this->FontSize,0,$X-($TextWidth/2),$Y+4,$C_TextColor,$this->FontName,$Text);
+ }
+
+
+ }
+ }
+ $YPos = $YPos + $this->DivisionWidth;
+ }
+ $SerieID++;
+ }
+ }
+
+
+ /* Izrisemo navpicen linijski graf */
+ function drawVerLineGraph($Data,$DataDescription,$insideValues=false,$Shadow=TRUE,$Alpha=100)
+ {
+ /* Validate the Data and DataDescription array */
+ $this->validateDataDescription("drawBarGraph",$DataDescription);
+ $this->validateData("drawBarGraph",$Data);
+
+ $GraphID = 0;
+ $Series = count($DataDescription["Values"]);
+ $SeriesWidth = $this->DivisionWidth / ($Series+1);
+
+ $SerieYOffset = $this->DivisionWidth / 2;
+
+ $XZero = $this->GArea_X1 + ((0-$this->VMin) * $this->DivisionRatio);
+ if ( $XZero < $this->GArea_X1 ) { $XZero = $this->GArea_X1; }
+
+ $SerieID = 0;
+ foreach ( $DataDescription["Values"] as $Key2 => $ColName )
+ {
+ $ID = 0;
+ foreach ( $DataDescription["Description"] as $keyI => $ValueI )
+ { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
+
+ $YPos = $this->GArea_Y1 + $this->GAreaXOffset + $SerieYOffset;
+
+ $XLast = -1;
+ foreach ( $Data as $Key => $Values )
+ {
+ if ( isset($Data[$Key][$ColName]))
+ {
+ if ( is_numeric($Data[$Key][$ColName]) )
+ {
+ $Value = $Data[$Key][$ColName];
+
+ $XPos = $this->GArea_X1 + (($Value-$this->VMin) * $this->DivisionRatio);
+
+ // Save point into the image map if option activated
+ if ( $this->BuildMap )
+ {
+ $this->addToImageMap(min($XZero,$XPos),$YPos+1,max($XZero,$XPos), $YPos+$SeriesWidth-1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
+ }
+
+ if ( $XLast != -1 ){
+ $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
+ $this->drawFilledCircle($XLast+1,$YLast+1,$SmallRadius=2,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ }
+
+ $XLast = $XPos;
+ $YLast = $YPos;
+ }
+ }
+ $YPos = $YPos + $this->DivisionWidth;
+ }
+ $SerieID++;
+
+ $this->drawFilledCircle($XLast+1,$YLast+1,$SmallRadius=2,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
+ }
+ }
+
+
/* Compute and draw the scale */
function drawHorScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE,$roundText=35)
{
@@ -305,16 +307,16 @@ class MyHorBar extends pChart
$C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
$this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y1,$R,$G,$B);
- $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
- if($RightScale)
+ $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
+ if($RightScale)
$this->drawLine($this->GArea_X2,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
if ( $this->VMin == NULL && $this->VMax == NULL)
{
if (isset($DataDescription["Values"][0]))
{
- $this->VMin = $Data[0][$DataDescription["Values"][0]];
- $this->VMax = $Data[0][$DataDescription["Values"][0]];
+ $this->VMin = isset($Data[0][$DataDescription["Values"][0]])?$Data[0][$DataDescription["Values"][0]]:null;
+ $this->VMax = isset($Data[0][$DataDescription["Values"][0]])?$Data[0][$DataDescription["Values"][0]]:null;
}
else { $this->VMin = 2147483647; $this->VMax = -2147483647; }
@@ -361,11 +363,11 @@ class MyHorBar extends pChart
}
}
- if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) ){
+ if ( $this->VMax!=null && $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) ){
if(preg_replace('/\.[0-9]+/','',$this->VMax) == 100)
- $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax);
- else
- $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
+ $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax);
+ else
+ $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
}
/* If all values are the same */
@@ -380,12 +382,12 @@ class MyHorBar extends pChart
/* Compute automatic scaling */
$ScaleOk = FALSE; $Factor = 1;
- $MinDivHeight = 25;
-
+ $MinDivHeight = 25;
+
$MaxDivs = ($this->GArea_X2 - $this->GArea_X1) / $MinDivHeight;
if ( $this->VMin == 0 && $this->VMax == 0 )
- { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
+ { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
elseif ($MaxDivs > 1)
{
@@ -425,61 +427,61 @@ class MyHorBar extends pChart
$Divisions = 2;
if ($Scale == 1 && $Divisions%2 == 1)
- $Divisions--;
-
- // Posebeni primeri skal
- // 0 - 10
- if ( $this->VMin == 0 && in_array($this->VMax,array(3,4,5,6,7,8,9,10)) ){
- $Divisions = $this->VMax;
- }
- // 10 - 25
- elseif ( $this->VMin == 0 && $this->VMax > 10 && $this->VMax <= 25){
- $this->VMax = $this->roundToNearest($this->VMax, 5);
- $Divisions = $this->VMax/5;
- }
- // 25 - 50
- elseif ( $this->VMin == 0 && $this->VMax > 25 && $this->VMax <= 50 ){
- $this->VMax = $this->roundToNearest($this->VMax, 10);
- $Divisions = $this->VMax/10;
- }
- // 50+
- elseif ( $this->VMin == 0 && $this->VMax > 50 && $this->VMax <= 200 ){
- $this->VMax = $this->roundToNearest($this->VMax, 20);
- $Divisions = $this->VMax/20;
- }
- // 200+
- elseif ( $this->VMin == 0 && $this->VMax > 200 ){
- $this->VMax = $this->roundToNearest($this->VMax, 100);
- $Divisions = 8;
+ $Divisions--;
+
+ // Posebeni primeri skal
+ // 0 - 10
+ if ( $this->VMin == 0 && in_array($this->VMax,array(3,4,5,6,7,8,9,10)) ){
+ $Divisions = $this->VMax;
+ }
+ // 10 - 25
+ elseif ( $this->VMin == 0 && $this->VMax > 10 && $this->VMax <= 25){
+ $this->VMax = $this->roundToNearest($this->VMax, 5);
+ $Divisions = $this->VMax/5;
+ }
+ // 25 - 50
+ elseif ( $this->VMin == 0 && $this->VMax > 25 && $this->VMax <= 50 ){
+ $this->VMax = $this->roundToNearest($this->VMax, 10);
+ $Divisions = $this->VMax/10;
+ }
+ // 50+
+ elseif ( $this->VMin == 0 && $this->VMax > 50 && $this->VMax <= 200 ){
+ $this->VMax = $this->roundToNearest($this->VMax, 20);
+ $Divisions = $this->VMax/20;
+ }
+ // 200+
+ elseif ( $this->VMin == 0 && $this->VMax > 200 ){
+ $this->VMax = $this->roundToNearest($this->VMax, 100);
+ $Divisions = 8;
}
}
else
$Divisions = $this->Divisions;
-
- $Divisions = ($Divisions == 0) ? 1 : $Divisions;
+
+ $Divisions = ($Divisions == 0) ? 1 : $Divisions;
$this->DivisionCount = $Divisions;
$DataRange = $this->VMax - $this->VMin;
if ( $DataRange < 0.1 ) { $DataRange = .1; }
-
- $this->DivisionHeight = ( $this->GArea_X2 - $this->GArea_X1 ) / $Divisions;
+
+ $this->DivisionHeight = ( $this->GArea_X2 - $this->GArea_X1 ) / $Divisions;
$this->DivisionRatio = ( $this->GArea_X2 - $this->GArea_X1 ) / $DataRange;
-
+
$this->GAreaYOffset = 0;
if ( count($Data) > 1 )
{
- if ( $WithMargin == FALSE )
+ if ( $WithMargin == FALSE )
$this->DivisionWidth = ( $this->GArea_Y2 - $this->GArea_Y1 ) / (count($Data)-1);
else
- {
- $this->DivisionWidth = ( $this->GArea_Y2 - $this->GArea_Y1 ) / (count($Data));
+ {
+ $this->DivisionWidth = ( $this->GArea_Y2 - $this->GArea_Y1 ) / (count($Data));
$this->GAreaYOffset = $this->DivisionWidth / 2;
}
}
else
- {
- $this->DivisionWidth = $this->GArea_Y2 - $this->GArea_Y1;
+ {
+ $this->DivisionWidth = $this->GArea_Y2 - $this->GArea_Y1;
$this->GAreaYOffset = $this->DivisionWidth / 2;
}
@@ -487,39 +489,41 @@ class MyHorBar extends pChart
if ( $DrawTicks == FALSE )
return(0);
-
- $XPos = $this->GArea_X1;
- $YMin = NULL;
+
+ $XPos = $this->GArea_X1;
+ $YMin = NULL;
for($i=1;$i<=$Divisions+1;$i++)
- {
+ {
$this->drawLine($XPos,$this->GArea_Y1,$XPos,$this->GArea_Y1-floor($this->FontSize/2),$R,$G,$B);
- $Value = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
+ $Value = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
$OrigValue = $Value;
$Value = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
- if ( $DataDescription["Format"]["Y"] == "number" )
- $Value = $Value.$DataDescription["Unit"]["Y"];
- if ( $DataDescription["Format"]["Y"] == "time" )
- $Value = $this->ToTime($Value);
- if ( $DataDescription["Format"]["Y"] == "date" )
- $Value = $this->ToDate($Value);
- if ( $DataDescription["Format"]["Y"] == "metric" )
- $Value = $this->ToMetric($Value);
- if ( $DataDescription["Format"]["Y"] == "currency" )
- $Value = $this->ToCurrency($Value);
-
- // Ce je oznacba na skali decimalka je ne izpisemo (ker zaokrozujemo na cela stevila)
- if($Decimals == 0)
- $Value = ($OrigValue != $Value) ? '' : $Value;
+ if(isset($DataDescription["Format"]["Y"])){
+ if ( $DataDescription["Format"]["Y"] == "number" )
+ $Value = $Value.$DataDescription["Unit"]["Y"];
+ if ( $DataDescription["Format"]["Y"] == "time" )
+ $Value = $this->ToTime($Value);
+ if ( $DataDescription["Format"]["Y"] == "date" )
+ $Value = $this->ToDate($Value);
+ if ( $DataDescription["Format"]["Y"] == "metric" )
+ $Value = $this->ToMetric($Value);
+ if ( $DataDescription["Format"]["Y"] == "currency" )
+ $Value = $this->ToCurrency($Value);
+ }
+
+ // Ce je oznacba na skali decimalka je ne izpisemo (ker zaokrozujemo na cela stevila)
+ if($Decimals == 0)
+ $Value = ($OrigValue != $Value) ? '' : $Value;
$Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
$TextWidth = $Position[2]-$Position[0];
imagettftext($this->Picture,$this->FontSize,0,$XPos-($TextWidth/2),$this->GArea_Y1-$this->FontSize,$C_TextColor,$this->FontName,$Value);
-
+
if ( $YMin > $this->GArea_Y1-10-$TextWidth || $YMin == NULL ) { $YMin = $this->GArea_Y1-10-$TextWidth; }
-
+
$XPos = $XPos + $this->DivisionHeight;
}
@@ -535,56 +539,56 @@ class MyHorBar extends pChart
/* Horizontal Axis */
$YPos = $this->GArea_Y1 + $this->GAreaYOffset;
- $ID = 1;
+ $ID = 1;
$XMax = NULL;
foreach ( $Data as $Key => $Values )
{
if ( $ID % $SkipLabels == 0 )
- {
+ {
$this->drawLine($this->GArea_X1,floor($YPos),$this->GArea_X1-floor($this->FontSize/2),floor($YPos),$R,$G,$B);
-
- $Value = $Data[$Key][$DataDescription["Position"]];
-
- //razbijemo text v dve vrstici
- $Value2 = '';
- if(($roundText == 60 || $roundText == 80 || $roundText == 40) && strlen($Value)>$roundText){
-
- $pos = strrpos(substr($Value,0,$roundText), ' ');
-
- $Value2 = substr($Value, $pos);
- $Value = substr($Value, 0, $pos);
-
- //$Value2 = substr($Value, 61);
- //$Value = substr($Value, 0, 60);
-
- $Value2 = $this->snippet($Value2, $roundText);
- }
+
+ $Value = $Data[$Key][$DataDescription["Position"]];
+
+ //razbijemo text v dve vrstici
+ $Value2 = '';
+ if(($roundText == 60 || $roundText == 80 || $roundText == 40) && strlen($Value)>$roundText){
+
+ $pos = strrpos(substr($Value,0,$roundText), ' ');
+
+ $Value2 = substr($Value, $pos);
+ $Value = substr($Value, 0, $pos);
+
+ //$Value2 = substr($Value, 61);
+ //$Value = substr($Value, 0, 60);
+
+ $Value2 = $this->snippet($Value2, $roundText);
+ }
// snippet - skrajsamo text na poljubno dolzino
- else{
- $Value = $this->snippet($Data[$Key][$DataDescription["Position"]], $roundText);
- }
-
- // Labele na desni za sem. diferencial
- if(isset($DataDescription["Right"])){
- $ValueSem = $Data[$Key][$DataDescription["Right"]];
-
- //razbijemo text v dve vrstici
- $ValueSem2 = '';
- if(($roundText == 60 || $roundText == 80 || $roundText == 40) && strlen($ValueSem)>$roundText){
-
- $pos = strrpos(substr($ValueSem,0,$roundText), ' ');
-
- $ValueSem2 = substr($ValueSem, $pos);
- $ValueSem = substr($ValueSem, 0, $pos);
-
- $ValueSem2 = $this->snippet($ValueSem2, $roundText);
- }
- // snippet - skrajsamo text na poljubno dolzino
- else{
- $ValueSem = $this->snippet($Data[$Key][$DataDescription["Right"]], $roundText);
- }
- }
-
+ else{
+ $Value = $this->snippet($Data[$Key][$DataDescription["Position"]], $roundText);
+ }
+
+ // Labele na desni za sem. diferencial
+ if(isset($DataDescription["Right"])){
+ $ValueSem = $Data[$Key][$DataDescription["Right"]];
+
+ //razbijemo text v dve vrstici
+ $ValueSem2 = '';
+ if(($roundText == 60 || $roundText == 80 || $roundText == 40) && strlen($ValueSem)>$roundText){
+
+ $pos = strrpos(substr($ValueSem,0,$roundText), ' ');
+
+ $ValueSem2 = substr($ValueSem, $pos);
+ $ValueSem = substr($ValueSem, 0, $pos);
+
+ $ValueSem2 = $this->snippet($ValueSem2, $roundText);
+ }
+ // snippet - skrajsamo text na poljubno dolzino
+ else{
+ $ValueSem = $this->snippet($Data[$Key][$DataDescription["Right"]], $roundText);
+ }
+ }
+
if ( $DataDescription["Format"]["X"] == "number" )
$Value = $Value.$DataDescription["Unit"]["X"];
if ( $DataDescription["Format"]["X"] == "time" )
@@ -598,77 +602,78 @@ class MyHorBar extends pChart
$Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
$TextWidth = abs($Position[2])+abs($Position[0]);
- $TextHeight = abs($Position[5])-abs($Position[1]);
-
- if(($roundText == 60 || $roundText == 80 || $roundText == 40) && $Value2 != ''){
- $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value2);
- $TextWidth2 = abs($Position[2])+abs($Position[0]);
+ $TextHeight = abs($Position[5])-abs($Position[1]);
+
+ if(($roundText == 60 || $roundText == 80 || $roundText == 40) && $Value2 != ''){
+ $Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value2);
+ $TextWidth2 = abs($Position[2])+abs($Position[0]);
}
if ( $Angle == 0 )
- {
- //izpisemo v 2 vrsticah
- if(($roundText == 60 || $roundText == 80 || $roundText == 40) && $Value2 != ''){
- $XPos = $this->GArea_Y2+floor($this->FontSize*2);
- imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X1-$this->FontSize-floor($TextWidth),floor($YPos)-(2*floor($this->FontSize/8)),$C_TextColor,$this->FontName,$Value);
- imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X1-$this->FontSize-floor($TextWidth2),floor($YPos)+$TextHeight+(3*floor($this->FontSize/8)),$C_TextColor,$this->FontName,$Value2);
- }
- else{
- $XPos = $this->GArea_Y2+floor($this->FontSize*2); imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X1-$this->FontSize-floor($TextWidth),floor($YPos)+floor($TextHeight/2),$C_TextColor,$this->FontName,$Value);
+ {
+ //izpisemo v 2 vrsticah
+ if(($roundText == 60 || $roundText == 80 || $roundText == 40) && $Value2 != ''){
+ $XPos = $this->GArea_Y2+floor($this->FontSize*2);
+ imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X1-$this->FontSize-floor($TextWidth),floor($YPos)-(2*floor($this->FontSize/8)),$C_TextColor,$this->FontName,$Value);
+ imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X1-$this->FontSize-floor($TextWidth2),floor($YPos)+$TextHeight+(3*floor($this->FontSize/8)),$C_TextColor,$this->FontName,$Value2);
+ }
+ else{
+ $XPos = $this->GArea_Y2+floor($this->FontSize*2);
+ imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X1-$this->FontSize-floor($TextWidth),floor($YPos)+floor($TextHeight/2),$C_TextColor,$this->FontName,$Value);
}
}
else
- {
- $XPos = $this->GArea_Y2+10+$TextHeight;
- if ( $Angle <= 90 )
+ {
+ $XPos = $this->GArea_Y2+10+$TextHeight;
+ if ( $Angle <= 90 )
imagettftext($this->Picture,$this->FontSize,$Angle,$XPos,floor($YPos)-$TextWidth+5,$C_TextColor,$this->FontName,$Value);
- else
+ else
imagettftext($this->Picture,$this->FontSize,$Angle,$XPos,floor($YPos)+$TextWidth+5,$C_TextColor,$this->FontName,$Value);
- }
- if ( $XMax < $XPos || $XMax == NULL ) { $XMax = $XPos; }
-
- // Se izpis skale na desni (pri semanticnem diferencialu)
- if(isset($DataDescription["Right"]) && $RightScale){
- $this->drawLine($this->GArea_X2,floor($YPos),$this->GArea_X2+5,floor($YPos),$R,$G,$B);
-
- //izpisemo v 2 vrsticah
- if($roundText == 40 && $ValueSem2 != ''){
- $XPos = $this->GArea_Y2+floor($this->FontSize*2);
- imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X2+$this->FontSize,floor($YPos)-(2*floor($this->FontSize/8)),$C_TextColor,$this->FontName,$ValueSem);
- imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X2+$this->FontSize,floor($YPos)+$TextHeight+(3*floor($this->FontSize/8)),$C_TextColor,$this->FontName,$ValueSem2);
- }
- else{
- imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X2+$this->FontSize,floor($YPos)+5-floor($TextHeight/2),$C_TextColor,$this->FontName,$ValueSem);
- }
+ }
+ if ( $XMax < $XPos || $XMax == NULL ) { $XMax = $XPos; }
+
+ // Se izpis skale na desni (pri semanticnem diferencialu)
+ if(isset($DataDescription["Right"]) && $RightScale){
+ $this->drawLine($this->GArea_X2,floor($YPos),$this->GArea_X2+5,floor($YPos),$R,$G,$B);
+
+ //izpisemo v 2 vrsticah
+ if($roundText == 40 && $ValueSem2 != ''){
+ $XPos = $this->GArea_Y2+floor($this->FontSize*2);
+ imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X2+$this->FontSize,floor($YPos)-(2*floor($this->FontSize/8)),$C_TextColor,$this->FontName,$ValueSem);
+ imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X2+$this->FontSize,floor($YPos)+$TextHeight+(3*floor($this->FontSize/8)),$C_TextColor,$this->FontName,$ValueSem2);
+ }
+ else{
+ imagettftext($this->Picture,$this->FontSize,$Angle,$this->GArea_X2+$this->FontSize,floor($YPos)+5-floor($TextHeight/2),$C_TextColor,$this->FontName,$ValueSem);
+ }
}
}
-
+
$YPos = $YPos + $this->DivisionWidth;
$ID++;
}
-
- if($RightScale)
- $this->drawLine($this->GArea_X2,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
+
+ if($RightScale)
+ $this->drawLine($this->GArea_X2,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
- /* Write the X Axis caption if set */
+ /* Write the X Axis caption if set */
if ( isset($DataDescription["Axis"]["Y"]) )
- {
+ {
$Position = imageftbbox($this->FontSize,0,$this->FontName,$DataDescription["Axis"]["Y"]);
- $TextWidth = abs($Position[2])+abs($Position[0]);
- $TextLeft = $this->GArea_X1 - ($TextWidth/2);
-
+ $TextWidth = abs($Position[2])+abs($Position[0]);
+ $TextLeft = $this->GArea_X1 - ($TextWidth/2);
+
imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$this->FontSize+12,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
}
- }
-
-
+ }
+
+
/* Compute and draw the scale */
function drawHorGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
{
/* Draw mosaic */
if ( $Mosaic )
- {
- $LayerWidth = $this->GArea_Y2-$this->GArea_Y1;
+ {
+ $LayerWidth = $this->GArea_Y2-$this->GArea_Y1;
$LayerHeight = $this->GArea_X2-$this->GArea_X1;
$this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
@@ -677,54 +682,54 @@ class MyHorBar extends pChart
imagecolortransparent($this->Layers[0],$C_White);
$C_Rectangle =$this->AllocateColor($this->Layers[0],250,250,250);
- $XPos = $LayerHeight;
- $LastX = $XPos;
+ $XPos = $LayerHeight;
+ $LastX = $XPos;
for($i=0;$i<=$this->DivisionCount;$i++)
- {
- $LastX = $XPos;
+ {
+ $LastX = $XPos;
$XPos = $XPos - $this->DivisionHeight;
-
+
if ( $XPos <= 0 ) { $XPos = 1; }
if ( $i % 2 == 0 )
- {
+ {
imagefilledrectangle($this->Layers[0],$XPos,1,$LastX,$LayerWidth-1,$C_Rectangle);
}
}
imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
imagedestroy($this->Layers[0]);
- }
-
- /* Vertical lines */
+ }
+
+ /* Vertical lines */
$XPos = $this->GArea_X2 - $this->DivisionHeight;
for($i=1;$i<=$this->DivisionCount;$i++)
- {
+ {
if ( $XPos > $this->GArea_X1 && $XPos < $this->GArea_X2 )
- $this->drawDottedLine($XPos,$this->GArea_Y1,$XPos,$this->GArea_Y2,$LineWidth,$R,$G,$B);
+ $this->drawDottedLine($XPos,$this->GArea_Y1,$XPos,$this->GArea_Y2,$LineWidth,$R,$G,$B);
$XPos = $XPos - $this->DivisionHeight;
}
-
+
/* Horizontal lines */
if ( $this->GAreaYOffset == 0 )
- { $YPos = $this->GArea_Y1 + $this->DivisionWidth + $this->GAreaYOffset;
+ { $YPos = $this->GArea_Y1 + $this->DivisionWidth + $this->GAreaYOffset;
$ColCount = $this->DataCount-2; }
else
- { $YPos = $this->GArea_Y1 + $this->GAreaYOffset;
- //$ColCount = floor( ($this->GArea_X2 - $this->GArea_X1) / $this->DivisionWidth );
- $ColCount = $this->DataCount;
+ { $YPos = $this->GArea_Y1 + $this->GAreaYOffset;
+ //$ColCount = floor( ($this->GArea_X2 - $this->GArea_X1) / $this->DivisionWidth );
+ $ColCount = $this->DataCount;
}
for($i=1;$i<=$ColCount;$i++)
- {
+ {
if ( $YPos > $this->GArea_Y1 && $YPos < $this->GArea_Y2 )
- $this->drawDottedLine($this->GArea_X1,floor($YPos),$this->GArea_X2,floor($YPos),$LineWidth,$R,$G,$B);
-
+ $this->drawDottedLine($this->GArea_X1,floor($YPos),$this->GArea_X2,floor($YPos),$LineWidth,$R,$G,$B);
+
$YPos = $YPos + $this->DivisionWidth;
}
- }
-
-
+ }
+
+
/* Compute and draw the scale */
function drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnBottom=FALSE,$TickWidth=4,$FreeText=NULL,$Angle=0)
{
@@ -732,43 +737,43 @@ class MyHorBar extends pChart
if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
- $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
+ $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
$X = $this->GArea_X1 + ($Value - $this->VMin) * $this->DivisionRatio;
-
+
if ( $X <= $this->GArea_X1 || $X >= $this->GArea_X2 )
return(-1);
- if ( $TickWidth == 0 )
+ if ( $TickWidth == 0 )
$this->drawLine($X,$this->GArea_Y1,$X,$this->GArea_Y2,$R,$G,$B);
- else
+ else
$this->drawDottedLine($X,$this->GArea_Y1,$X,$this->GArea_Y2,$TickWidth,$R,$G,$B);
if ( $ShowLabel )
- {
+ {
if ( $FreeText == NULL )
- { $Label = $Value; } else { $Label = $FreeText; }
-
+ { $Label = $Value; } else { $Label = $FreeText; }
+
$Position = imageftbbox($this->FontSize,$Angle,$this->FontName,$Label);
- $TextWidth = abs($Position[2])-abs($Position[0]);
+ $TextWidth = abs($Position[2])-abs($Position[0]);
$TextLeft = abs($Position[3])-abs($Position[1]);
-
+
if ( $ShowOnBottom )
imagettftext($this->Picture,$this->FontSize,$Angle,$X+9,$this->GArea_Y2,$C_TextColor,$this->FontName,$Label);
else
imagettftext($this->Picture,$this->FontSize,$Angle,$X+9,$this->GArea_Y1+$TextLeft,$C_TextColor,$this->FontName,$Label);
}
- }
-
- /* zaokrozimo stevilo $number na $toNearest */
- function roundToNearest($number, $toNearest) {
-
- $retval = 0;
- $mod = $number % $toNearest;
-
- $retval = ($mod > 0) ? $number + ( $toNearest - $mod ) : $number;
-
- return $retval;
- }
-
- }
-?>
+ }
+
+ /* zaokrozimo stevilo $number na $toNearest */
+ function roundToNearest($number, $toNearest) {
+
+ $retval = 0;
+ $mod = $number % $toNearest;
+
+ $retval = ($mod > 0) ? $number + ( $toNearest - $mod ) : $number;
+
+ return $retval;
+ }
+
+ }
+?>
diff --git a/admin/survey/pChart/classes/class.pChart.php b/admin/survey/pChart/classes/class.pChart.php
index af3c0a8..36929f6 100644
--- a/admin/survey/pChart/classes/class.pChart.php
+++ b/admin/survey/pChart/classes/class.pChart.php
@@ -412,8 +412,8 @@
{
if (isset($DataDescription["Values"][0]))
{
- $this->VMin = $Data[0][$DataDescription["Values"][0]];
- $this->VMax = $Data[0][$DataDescription["Values"][0]];
+ $this->VMin = (isset($Data[0][$DataDescription["Values"][0]])?$Data[0][$DataDescription["Values"][0]]:0);
+ $this->VMax = (isset($Data[0][$DataDescription["Values"][0]])?$Data[0][$DataDescription["Values"][0]]:0);
}
else { $this->VMin = 2147483647; $this->VMax = -2147483647; }
@@ -1500,9 +1500,9 @@
$C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
$C_ShadowColor =$this->AllocateColor($this->Picture,0,0,0);
if ( $Shadow )
- imagettftext($this->Picture,$this->FontSize,$Angle,$X+1,$Y+1,$C_ShadowColor,$this->FontName,$Text);
+ imagettftext($this->Picture,$this->FontSize,$Angle,round($X)+1,round($Y)+1,$C_ShadowColor,$this->FontName,$Text);
- imagettftext($this->Picture,$this->FontSize,$Angle,$X,$Y,$C_TextColor,$this->FontName,$Text);
+ imagettftext($this->Picture,$this->FontSize,$Angle,round($X),round($Y),$C_TextColor,$this->FontName,$Text);
}
/* Compute and draw the scale */
@@ -3540,17 +3540,17 @@
for($i=0;$i<=90;$i=$i+$Step)
{
- $Xi1 = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius;
- $Yi1 = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius;
+ $Xi1 = round(cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius);
+ $Yi1 = round(sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius);
- $Xi2 = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius;
- $Yi2 = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius;
+ $Xi2 = round(cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius);
+ $Yi2 = round(sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius);
- $Xi3 = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius;
- $Yi3 = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius;
+ $Xi3 = round(cos(($i)*3.1418/180) * $Radius + $X2 - $Radius);
+ $Yi3 = round(sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius);
- $Xi4 = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius;
- $Yi4 = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius;
+ $Xi4 = round(cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius);
+ $Yi4 = round(sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius);
imageline($this->Picture,$Xi1,$Yi1,$X1+$Radius,$Yi1,$C_Rectangle);
imageline($this->Picture,$X2-$Radius,$Yi2,$Xi2,$Yi2,$C_Rectangle);
@@ -3856,7 +3856,7 @@
if ( $Alpha == 100 )
{
$C_Aliased = $this->AllocateColor($this->Picture,$R,$G,$B);
- imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
+ imagesetpixel($this->Picture,round($X),round($Y),$C_Aliased);
}
else
$this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
@@ -3888,7 +3888,7 @@
if ( $Alpha == 100 )
{
$C_Aliased = $this->AllocateColor($this->Picture,$R,$G,$B);
- imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
+ imagesetpixel($this->Picture,round($X),round($Y),$C_Aliased);
}
else
$this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
@@ -3909,13 +3909,14 @@
if (!isset($DataDescription["Description"]))
{
$this->Errors[] = "[Warning] ".$FunctionName." - Series descriptions are not set.";
+ if(isset($DataDescription["Values"]))
foreach($DataDescription["Values"] as $key => $Value)
{
$DataDescription["Description"][$Value] = $Value;
}
}
- if (count($DataDescription["Description"]) < count($DataDescription["Values"]))
+ if (isset($DataDescription["Values"])&&count($DataDescription["Description"]) < count($DataDescription["Values"]))
{
$this->Errors[] = "[Warning] ".$FunctionName." - Some series descriptions are not set.";
foreach($DataDescription["Values"] as $key => $Value)
@@ -3943,7 +3944,7 @@
}
}
- if ( max($DataSummary) == 0 )
+ if ( count($DataSummary)==0||max($DataSummary) == 0 )
$this->Errors[] = "[Warning] ".$FunctionName." - No data set.";
foreach($DataSummary as $key => $Value)
diff --git a/admin/survey/pChart/classes/class.pData.php b/admin/survey/pChart/classes/class.pData.php
index c6be3ff..768bea8 100644
--- a/admin/survey/pChart/classes/class.pData.php
+++ b/admin/survey/pChart/classes/class.pData.php
@@ -132,7 +132,7 @@
for($i=0;$i<=count($this->Data);$i++)
{ if(isset($this->Data[$i][$Serie])) { $ID = $i+1; } }
- if ( count($Value) == 1 )
+ if ( is_integer($Value) || (is_countable($Value) && count($Value) == 1) )
{
$this->Data[$ID][$Serie] = $Value;
if ( $Description != "" )
@@ -140,7 +140,7 @@
elseif (!isset($this->Data[$ID]["Name"]))
$this->Data[$ID]["Name"] = $ID;
}
- elseif( count($Value) > 1 )
+ elseif( is_countable($Value) && count($Value) > 1 )
{
foreach($Value as $key => $Val)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 13:21:44 +0100