nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug where GD function was used before the check if GD is available.

Browse Source
This commit is contained in:
Martynas Mickevicius
2010-07-08 11:24:49 +03:00
parent 4d6fd853d3
commit 933238bcfb
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/chart/pma_pchart_chart.php
View File

@@ -38,7 +38,10 @@ abstract class PMA_pChart_Chart extends PMA_Chart
// as in CSS (top, right, bottom, left) // as in CSS (top, right, bottom, left)
$this->setAreaMargins(array(20, 20, 40, 60)); $this->setAreaMargins(array(20, 20, 40, 60));
}
protected function init()
{
// create pChart object // create pChart object
$this->chart = new pChart($this->getWidth(), $this->getHeight()); $this->chart = new pChart($this->getWidth(), $this->getHeight());
@@ -54,6 +57,8 @@ abstract class PMA_pChart_Chart extends PMA_Chart
hexdec(substr($color, 5, 2)) hexdec(substr($color, 5, 2))
); );
} }
$this->chart->setFontProperties($this->getFontPath().'tahoma.ttf', 8);
} }
abstract protected function prepareDataSet(); abstract protected function prepareDataSet();
@@ -74,7 +79,6 @@ abstract class PMA_pChart_Chart extends PMA_Chart
protected function drawCommon() protected function drawCommon()
{ {
$this->chart->setFontProperties($this->getFontPath().'tahoma.ttf', 8);
$this->chart->drawGraphAreaGradient( $this->chart->drawGraphAreaGradient(
$this->getBgColor(RED), $this->getBgColor(RED),
$this->getBgColor(GREEN), $this->getBgColor(GREEN),
@@ -122,14 +126,15 @@ abstract class PMA_pChart_Chart extends PMA_Chart
public function toString() public function toString()
{ {
if (function_exists('gd_info')) { if (function_exists('gd_info')) {
$this->init();
$this->prepareDataSet(); $this->prepareDataSet();
$this->prepareChart(); $this->prepareChart();
$this->render(); $this->render();
return '<img id="pChartPicture1" src="data:image/png;base64,'.$this->imageEncoded.'" />'; return '<img id="chart" src="data:image/png;base64,'.$this->imageEncoded.'" />';
} }
else { else {
return 'Missing GD library.'; return __('GD library needed for chart is missing.');
} }
} }

2
libraries/chart/pma_pchart_single_bar.php
View File

@@ -13,8 +13,6 @@ class PMA_pChart_single_bar extends PMA_pChart_single
{ {
// Draw the bar chart // Draw the bar chart
$this->chart->drawStackedBarGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),70); $this->chart->drawStackedBarGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),70);
//$this->chart->drawLineGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription());
//$this->chart->drawPlotGraph($this->dataSet->GetData(),$this->dataSet->GetDataDescription(),4,2,-1,-1,-1,TRUE);
} }
} }