Fixed drawBarChart in case maxVal=1 (added the line x=1 to vertical g… #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bigxoma
reviewed
Jan 30, 2019
src/tFPDF/GraphicReportPDF.php
Outdated
| if ($i === 0) { | ||
| $this->setDrawColor($red, $green, $blue); | ||
| } else { | ||
| $this->setDrawColor(200,200,200); | ||
| } | ||
| $xpos = $XDiag + $stepValue * $i; | ||
| $this->Line($xpos, $YDiag - (($i === 0) ? 5 : 0), $xpos, $YDiag + $hDiag); | ||
| $val = $i === 0 ? 0 : pow(10, $i); | ||
| $val = $i === 0 ? 0 : pow(10, $i-1); |
bigxoma
reviewed
Jan 30, 2019
src/tFPDF/GraphicReportPDF.php
Outdated
| @@ -606,21 +606,21 @@ private function setLegends($data) { | |||
| private function barChartDrawScales($XDiag, $YDiag, $hDiag, $margin, $maxGrid, $stepValue) { | |||
| list($red, $green, $blue) = self::COLOR_BLACK; | |||
| $this->SetLineWidth(0.1); | |||
| for ($i = 0; $i <= $maxGrid; $i++ ) { | |||
| for ($i = 0; $i <= $maxGrid+1; $i++ ) { | |||
bigxoma
reviewed
Jan 30, 2019
src/tFPDF/GraphicReportPDF.php
Outdated
| $ypos = $YDiag + $hDiag - $margin + 5; | ||
| $this->Text($xpos, $ypos, $val); | ||
| } | ||
| $this->SetLineWidth(0.2); | ||
| $this->setDrawColor($red, $green, $blue); | ||
| $this->Line($XDiag, $YDiag + $hDiag - $margin + 2, $XDiag + $stepValue * $maxGrid + 5, $YDiag + $hDiag - $margin + 2); | ||
| $this->Line($XDiag, $YDiag + $hDiag - $margin + 2, $XDiag + $stepValue * ($maxGrid+1) + 5, $YDiag + $hDiag - $margin + 2); |
bigxoma
reviewed
Jan 30, 2019
src/tFPDF/GraphicReportPDF.php
Outdated
| @@ -968,7 +965,7 @@ private function calculateDataForBarDiagram($h, $barChartData, $maxVal, $nbDiv): | |||
| $valIndRepere = ceil($maxVal / $nbDiv); | |||
| $maxVal = $valIndRepere * $nbDiv; | |||
| $lRepere = floor($lDiag / $nbDiv); | |||
| $pxDecade = floor($lDiag / $maxGrid); | |||
| $pxDecade = floor($lDiag / ($maxGrid+1)); | |||
bigxoma
approved these changes
Jan 30, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added the line x=1 to vertical grid lines (x=0, x=10, x=100, ...).
Fixed drawBarChart in case maxVal=1: now maximum x on chart is 1 (it was 10).