Correct indent (spaces instead of tabs)
This commit is contained in:
@@ -70,8 +70,8 @@ abstract class PMA_pChart_chart extends PMA_chart
|
||||
// as in CSS (top, right, bottom, left)
|
||||
$this->setAreaMargins(array(20, 20, 40, 60));
|
||||
|
||||
// Get color settings from theme
|
||||
$this->settings = array_merge($this->settings,$GLOBALS['cfg']['chartColor']);
|
||||
// Get color settings from theme
|
||||
$this->settings = array_merge($this->settings,$GLOBALS['cfg']['chartColor']);
|
||||
}
|
||||
|
||||
protected function init()
|
||||
@@ -133,15 +133,15 @@ abstract class PMA_pChart_chart extends PMA_chart
|
||||
*/
|
||||
protected function drawCommon()
|
||||
{
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getBgColor(RED),
|
||||
$this->getBgColor(GREEN),
|
||||
$this->getBgColor(BLUE),
|
||||
// With a gradientIntensity of 0 the background does't draw, oddly
|
||||
($this->settings['gradientIntensity']==0)?1:$this->settings['gradientIntensity'],TARGET_BACKGROUND);
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getBgColor(RED),
|
||||
$this->getBgColor(GREEN),
|
||||
$this->getBgColor(BLUE),
|
||||
// With a gradientIntensity of 0 the background does't draw, oddly
|
||||
($this->settings['gradientIntensity']==0)?1:$this->settings['gradientIntensity'],TARGET_BACKGROUND);
|
||||
|
||||
if(is_string($this->settings['border']))
|
||||
$this->chart->addBorder(1,$this->getBorderColor(RED),$this->getBorderColor(GREEN),$this->getBorderColor(BLUE));
|
||||
if(is_string($this->settings['border']))
|
||||
$this->chart->addBorder(1,$this->getBorderColor(RED),$this->getBorderColor(GREEN),$this->getBorderColor(BLUE));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -202,19 +202,19 @@ abstract class PMA_pChart_chart extends PMA_chart
|
||||
TRUE,0,2,TRUE
|
||||
);
|
||||
|
||||
if($this->settings['gradientIntensity']>0)
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE),
|
||||
$this->settings['gradientIntensity']
|
||||
);
|
||||
else
|
||||
$this->chart->drawGraphArea(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE)
|
||||
);
|
||||
if($this->settings['gradientIntensity']>0)
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE),
|
||||
$this->settings['gradientIntensity']
|
||||
);
|
||||
else
|
||||
$this->chart->drawGraphArea(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE)
|
||||
);
|
||||
|
||||
$this->chart->drawGrid(
|
||||
4,
|
||||
@@ -393,10 +393,10 @@ abstract class PMA_pChart_chart extends PMA_chart
|
||||
return $this->hexStrToDecComp($this->settings['titleBgColor'], $component);
|
||||
}
|
||||
|
||||
protected function getBorderColor($component)
|
||||
{
|
||||
return $this->hexStrToDecComp($this->settings['border'], $component);
|
||||
}
|
||||
protected function getBorderColor($component)
|
||||
{
|
||||
return $this->hexStrToDecComp($this->settings['border'], $component);
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
@@ -58,19 +58,19 @@ class PMA_pChart_multi_radar extends PMA_pChart_multi
|
||||
FALSE
|
||||
);
|
||||
|
||||
if($this->settings['gradientIntensity']>0)
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE),
|
||||
$this->settings['gradientIntensity']
|
||||
);
|
||||
else
|
||||
$this->chart->drawGraphArea(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE)
|
||||
);
|
||||
if($this->settings['gradientIntensity']>0)
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE),
|
||||
$this->settings['gradientIntensity']
|
||||
);
|
||||
else
|
||||
$this->chart->drawGraphArea(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -48,19 +48,19 @@ class PMA_pChart_Pie extends PMA_pChart_multi
|
||||
FALSE
|
||||
);
|
||||
|
||||
if($this->settings['gradientIntensity']>0)
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE),
|
||||
$this->settings['gradientIntensity']
|
||||
);
|
||||
else
|
||||
$this->chart->drawGraphArea(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE)
|
||||
);
|
||||
if($this->settings['gradientIntensity']>0)
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE),
|
||||
$this->settings['gradientIntensity']
|
||||
);
|
||||
else
|
||||
$this->chart->drawGraphArea(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
|
@@ -49,19 +49,19 @@ class PMA_pChart_single_radar extends PMA_pChart_single
|
||||
FALSE
|
||||
);
|
||||
|
||||
if($this->settings['gradientIntensity']>0)
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE),
|
||||
$this->settings['gradientIntensity']
|
||||
);
|
||||
else
|
||||
$this->chart->drawGraphArea(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE)
|
||||
);
|
||||
if($this->settings['gradientIntensity']>0)
|
||||
$this->chart->drawGraphAreaGradient(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE),
|
||||
$this->settings['gradientIntensity']
|
||||
);
|
||||
else
|
||||
$this->chart->drawGraphArea(
|
||||
$this->getGraphAreaGradientColor(RED),
|
||||
$this->getGraphAreaGradientColor(GREEN),
|
||||
$this->getGraphAreaGradientColor(BLUE)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
|
@@ -116,23 +116,23 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array(
|
||||
*/
|
||||
|
||||
$GLOBALS['cfg']['chartColor'] = array(
|
||||
'gradientIntensity' => 0,
|
||||
// The style of the chart title.
|
||||
'titleColor' => '#000000',
|
||||
'titleBgColor' => $GLOBALS['cfg']['ThBackground'],
|
||||
// Chart border (0 for no border)
|
||||
'border' => '#CCCCCC',
|
||||
// Chart background color.
|
||||
'bgColor' => $GLOBALS['cfg']['BgTwo'],
|
||||
// when graph area gradient is used, this is the color of the graph
|
||||
// area border
|
||||
'graphAreaColor' => '#D5D9DD',
|
||||
// the background color of the inner graph area
|
||||
'graphAreaGradientColor'=> $GLOBALS['cfg']['BgOne'],
|
||||
// the color of the grid lines in the graph area
|
||||
'gridColor' => '#E6E6E6',
|
||||
// the color of the scale and the labels
|
||||
'scaleColor' => '#D5D9DD',
|
||||
'gradientIntensity' => 0,
|
||||
// The style of the chart title.
|
||||
'titleColor' => '#000000',
|
||||
'titleBgColor' => $GLOBALS['cfg']['ThBackground'],
|
||||
// Chart border (0 for no border)
|
||||
'border' => '#CCCCCC',
|
||||
// Chart background color.
|
||||
'bgColor' => $GLOBALS['cfg']['BgTwo'],
|
||||
// when graph area gradient is used, this is the color of the graph
|
||||
// area border
|
||||
'graphAreaColor' => '#D5D9DD',
|
||||
// the background color of the inner graph area
|
||||
'graphAreaGradientColor' => $GLOBALS['cfg']['BgOne'],
|
||||
// the color of the grid lines in the graph area
|
||||
'gridColor' => '#E6E6E6',
|
||||
// the color of the scale and the labels
|
||||
'scaleColor' => '#D5D9DD',
|
||||
);
|
||||
|
||||
?>
|
||||
|
@@ -118,23 +118,23 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array(
|
||||
*/
|
||||
|
||||
$GLOBALS['cfg']['chartColor'] = array(
|
||||
'gradientIntensity' => 50,
|
||||
// The style of the chart title.
|
||||
'titleColor' => '#000000',
|
||||
'titleBgColor' => '#E5E5E5',
|
||||
// Chart border (0 for no border)
|
||||
'border' => '#CCCCCC',
|
||||
// Chart background color.
|
||||
'bgColor' => '#FBFBFB',
|
||||
// when graph area gradient is used, this is the color of the graph
|
||||
// area border
|
||||
'graphAreaColor' => '#D5D9DD',
|
||||
// the background color of the graph area
|
||||
'graphAreaGradientColor'=> $GLOBALS['cfg']['BgTwo'],
|
||||
// the color of the grid lines in the graph area
|
||||
'gridColor' => '#E6E6E6',
|
||||
// the color of the scale and the labels
|
||||
'scaleColor' => '#D5D9DD',
|
||||
'gradientIntensity' => 50,
|
||||
// The style of the chart title.
|
||||
'titleColor' => '#000000',
|
||||
'titleBgColor' => '#E5E5E5',
|
||||
// Chart border (0 for no border)
|
||||
'border' => '#CCCCCC',
|
||||
// Chart background color.
|
||||
'bgColor' => '#FBFBFB',
|
||||
// when graph area gradient is used, this is the color of the graph
|
||||
// area border
|
||||
'graphAreaColor' => '#D5D9DD',
|
||||
// the background color of the graph area
|
||||
'graphAreaGradientColor' => $GLOBALS['cfg']['BgTwo'],
|
||||
// the color of the grid lines in the graph area
|
||||
'gridColor' => '#E6E6E6',
|
||||
// the color of the scale and the labels
|
||||
'scaleColor' => '#D5D9DD',
|
||||
|
||||
);
|
||||
|
||||
|
Reference in New Issue
Block a user