Skip to content

Small LineChart improvements: Allow invalid Y values, fix Line.setXXX() #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moritzboth wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Small LineChart improvements: Allow invalid Y values, fix Line.setXXX() #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
767f47e
allow invalid Y values in LineChart (Float.NaN) resulting in interrupted
moritzboth Jun 7, 2016
ede55de
setCubic(false) no longer resets square mode
moritzboth Jun 8, 2016
0048aa3
allow line interruptions (Float.NaN) for square lines, too. Note: For
moritzboth Jun 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hellocharts-library/src/lecho/lib/hellocharts/model/Line.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public boolean isCubic() {

public Line setCubic(boolean isCubic) {
this.isCubic = isCubic;
if (isSquare)
if (isSquare && isCubic)
setSquare(false);
return this;
}
Expand All @@ -236,7 +236,7 @@ public boolean isSquare() {

public Line setSquare(boolean isSquare) {
this.isSquare = isSquare;
if (isCubic)
if (isCubic && isSquare)
setCubic(false);
return this;
}
Expand Down
28 changes: 18 additions & 10 deletions hellocharts-library/src/lecho/lib/hellocharts/renderer/LineChartRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,15 +215,21 @@ private void drawPath(Canvas canvas, final Line line) {
prepareLinePaint(line);

int valueIndex = 0;
boolean invalidYValue = false;
for (PointValue pointValue : line.getValues()) {

final float rawX = computator.computeRawX(pointValue.getX());
final float rawY = computator.computeRawY(pointValue.getY());

if (valueIndex == 0) {
path.moveTo(rawX, rawY);
} else {
path.lineTo(rawX, rawY);
if (Float.isNaN(rawY))
invalidYValue = true;
else {
if (valueIndex == 0 || invalidYValue) {
path.moveTo(rawX, rawY);
} else {
path.lineTo(rawX, rawY);
}
invalidYValue = false;
}

++valueIndex;
Expand All @@ -243,17 +249,19 @@ private void drawSquarePath(Canvas canvas, final Line line) {
prepareLinePaint(line);

int valueIndex = 0;
float previousRawY = 0;
float previousRawY = Float.NaN;
for (PointValue pointValue : line.getValues()) {

final float rawX = computator.computeRawX(pointValue.getX());
final float rawY = computator.computeRawY(pointValue.getY());

if (valueIndex == 0) {
path.moveTo(rawX, rawY);
} else {
path.lineTo(rawX, previousRawY);
path.lineTo(rawX, rawY);
if (! Float.isNaN(rawY)) {
if (Float.isNaN(previousRawY)) {
path.moveTo(rawX, rawY);
} else {
path.lineTo(rawX, previousRawY);
path.lineTo(rawX, rawY);
}
}

previousRawY = rawY;
Expand Down