Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Merging the Limesurvey 1.91+ branch of queXS in to the trunk

Browse Source
This commit is contained in:
azammitdcarf
2011-09-08 01:58:41 +00:00
parent dfa55a3b9e
commit eaa9578ab8
2312 changed files with 811461 additions and 597534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/limesurvey/classes/pchart/pchart/pChart.class
View File

@@ -286,7 +286,7 @@
$buffer = fgets($handle, 4096);
$buffer = str_replace(chr(10),"",$buffer);
$buffer = str_replace(chr(13),"",$buffer);
$Values = split($Delimiter,$buffer);
$Values = explode($Delimiter,$buffer);
if ( count($Values) == 3 )
{
$this->Palette[$ColorID]["R"] = $Values[0];
@@ -963,7 +963,7 @@
$MaxWidth = 0; $MaxHeight = 8;
foreach($DataDescription["Description"] as $Key => $Value)
{
$Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
$Position = @imageftbbox($this->FontSize,0,$this->FontName,$Value);
$TextWidth = $Position[2]-$Position[0];
$TextHeight = $Position[1]-$Position[7];
if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
@@ -990,7 +990,7 @@
$MaxWidth = 0; $MaxHeight = 8;
foreach($DataDescription["Description"] as $Key => $Value)
{
$Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
$Position = @imageftbbox($this->FontSize,0,$this->FontName,$Value);
$TextWidth = $Position[2]-$Position[0];
$TextHeight = $Position[1]-$Position[7];
if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
@@ -1012,9 +1012,9 @@
foreach($DataDescription["Description"] as $Key => $Value)
{
$this->drawFilledRoundedRectangle($XPos+10,$YPos+$YOffset-4,$XPos+14,$YPos+$YOffset-4,2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value);
@imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value);
$Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
$Position = @imageftbbox($this->FontSize,0,$this->FontName,$Value);
$TextHeight = $Position[1]-$Position[7];
$YOffset = $YOffset + $TextHeight + 4;
@@ -1039,7 +1039,7 @@
foreach($Data as $Key => $Value)
{
$Value2 = $Value[$DataDescription["Position"]];
$Position = imageftbbox($this->FontSize,0,$this->FontName,$Value2);
$Position = @imageftbbox($this->FontSize,0,$this->FontName,$Value2);
$TextWidth = $Position[2]-$Position[0];
$TextHeight = $Position[1]-$Position[7];
if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
@@ -1056,11 +1056,11 @@
foreach($Data as $Key => $Value)
{
$Value2 = $Value[$DataDescription["Position"]];
$Position = imageftbbox($this->FontSize,0,$this->FontName,$Value2);
$Position = @imageftbbox($this->FontSize,0,$this->FontName,$Value2);
$TextHeight = $Position[1]-$Position[7];
$this->drawFilledRectangle($XPos+10,$YPos+$YOffset-6,$XPos+14,$YPos+$YOffset-2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value2);
@imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value2);
$YOffset = $YOffset + $TextHeight + 4;
$ID++;
}
@@ -1073,7 +1073,7 @@
if ( $XPos2 != -1 )
{
$Position = imageftbbox($this->FontSize,0,$this->FontName,$Value);
$Position = @imageftbbox($this->FontSize,0,$this->FontName,$Value);
$TextWidth = $Position[2]-$Position[0];
$XPos = floor(( $XPos2 - $XPos - $TextWidth ) / 2 ) + $XPos;
}

2
include/limesurvey/classes/pchart/pchart/pData.class
View File

@@ -124,7 +124,7 @@
$ID = 0;
for($i=0;$i<=count($this->Data);$i++)
{ if(isset($this->Data[$i][$Serie])) { $ID = $i+1; } }
{ if( isset($this->Data[$i]) && isset($this->Data[$i][$Serie])) { $ID = $i+1; } }
if ( count($Value) == 1 )
{