joshua/neat-charts
1
0
Fork 0
mirror of https://github.com/seigler/neat-charts synced 2025-07-27 09:26:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: avoid overlapping x-axis labels

Browse source
This commit is contained in:
Joshua Seigler 2017-03-07 02:43:36 -05:00
parent 2a050c2b71
commit 6824969071
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/NeatCharts/NeatChart.php
View file

@ -141,7 +141,7 @@ namespace NeatCharts {
'days' => [24 * 60 * 60, 'M j'], 'days' => [24 * 60 * 60, 'M j'],
'years' => [365 * 24 * 60 * 60, 'Y'] 'years' => [365 * 24 * 60 * 60, 'Y']
]; ];
$numXLabels = 1 + round($this->width / $this->options['fontSize'] / 10); $numXLabels = round($this->width / $this->options['fontSize'] / 12);
$scale = 'years'; $scale = 'years';
$xLabelFormat = $timeIntervals[$scale][1]; $xLabelFormat = $timeIntervals[$scale][1];
foreach ($timeIntervals as $period => $duration) { foreach ($timeIntervals as $period => $duration) {
@ -161,7 +161,15 @@ namespace NeatCharts {
$labelXCoord = $this->transformX($labelX); $labelXCoord = $this->transformX($labelX);
$gridLines .= 'M'.$labelXCoord.' 0 '.$labelXCoord.' '.$this->height.' '; $gridLines .= 'M'.$labelXCoord.' 0 '.$labelXCoord.' '.$this->height.' ';
$xLabelAlignment = ($this->width - $labelXCoord > $this->options['fontSize'] * 2 ? ($labelXCoord > $this->options['fontSize'] * 2 ? 'middle' : 'start') : 'end'); $xLabelAlignment = ($this->width - $labelXCoord > $this->options['fontSize'] * 2 ? ($labelXCoord > $this->options['fontSize'] * 2 ? 'middle' : 'start') : 'end');
$gridText .= '<text text-anchor="'.$xLabelAlignment.'" y="'.($this->height + $this->options['fontSize']).'" x="'.$labelXCoord.'">'.date($xLabelFormat, $labelX).'</text><!--'.$labelX.'-->'; if ($this->width - $labelXCoord > $this->options['fontSize'] * 2) {
if ($labelXCoord > $this->options['fontSize'] * 2) {
$gridText .= '<text text-anchor="middle" y="'.($this->height + $this->options['fontSize']).'" x="'.$labelXCoord.'">'.date($xLabelFormat, $labelX).'</text>';
} else {
$gridText .= '<text text-anchor="start" y="'.($this->height + $this->options['fontSize']).'" x="0">'.date($xLabelFormat, $labelX).'</text>';
};
} else {
$gridText .= '<text text-anchor="end" y="'.($this->height + $this->options['fontSize']).'" x="'.$this->width.'">'.date($xLabelFormat, $labelX).'</text>';
}
} }
} }