Skip to content
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

Fix negative values in BarChart #1486

Merged
merged 1 commit into from
Nov 12, 2023
Merged

Fix negative values in BarChart #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## nextVersion
* **FEATURE** (by @Dartek12): Added gradient to [FlLine](https://github.com/imaNNeo/fl_chart/blob/master/repo_files/documentations/base_chart.md#FlLine), #1197
* **BUGFIX** (by @imaNNeo): Fix bar line shadow crash when we have only one (or zero) spot, #1466
* **FEATURE** (by @Dartek12) Added gradient to [FlLine](https://github.com/imaNNeo/fl_chart/blob/master/repo_files/documentations/base_chart.md#FlLine), #1197
* **BUGFIX** (by @imaNNeo) Fix bar line shadow crash when we have only one (or zero) spot, #1466
* **BUGFIX** (by @imaNNeo) Fix having negative `toY` (or positive `fromY`) in BarChart's `minY` and `maxY` calculations, #1470

## 0.64.0
* **BUGFIX** (by @Anas35) Fix Tooltip not displaying when value from BackgroundBarChartRodData is less than zero. #1345.
Expand Down
28 changes: 14 additions & 14 deletions lib/src/chart/bar_chart/bar_chart_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'dart:math';

import 'package:equatable/equatable.dart';
import 'package:fl_chart/src/chart/bar_chart/bar_chart_data.dart';
import 'package:fl_chart/src/utils/list_wrapper.dart';
Expand Down Expand Up @@ -33,28 +35,25 @@ class BarChartHelper {
return BarChartMinMaxAxisValues(0, 0);
}

var maxY = barGroup.barRods[0].toY;
var minY = barGroup.barRods[0].fromY;
var maxY = max(barGroup.barRods[0].fromY, barGroup.barRods[0].toY);
var minY = min(barGroup.barRods[0].fromY, barGroup.barRods[0].toY);

for (var i = 0; i < barGroups.length; i++) {
final barGroup = barGroups[i];
for (var j = 0; j < barGroup.barRods.length; j++) {
final rod = barGroup.barRods[j];

if (rod.toY > maxY) {
maxY = rod.toY;
}

if (rod.backDrawRodData.show && rod.backDrawRodData.toY > maxY) {
maxY = rod.backDrawRodData.toY;
}
maxY = max(maxY, rod.fromY);
minY = min(minY, rod.fromY);

if (rod.fromY < minY) {
minY = rod.fromY;
}
maxY = max(maxY, rod.toY);
minY = min(minY, rod.toY);

if (rod.backDrawRodData.show && rod.backDrawRodData.fromY < minY) {
minY = rod.backDrawRodData.fromY;
if (rod.backDrawRodData.show) {
maxY = max(maxY, rod.backDrawRodData.fromY);
minY = min(minY, rod.backDrawRodData.fromY);
maxY = max(maxY, rod.backDrawRodData.toY);
minY = min(minY, rod.backDrawRodData.toY);
}
}
}
Expand All @@ -68,6 +67,7 @@ class BarChartHelper {
/// Holds minY, and maxY for use in [BarChartData]
class BarChartMinMaxAxisValues with EquatableMixin {
BarChartMinMaxAxisValues(this.minY, this.maxY, {this.readFromCache = false});

final double minY;
final double maxY;
final bool readFromCache;
Expand Down
21 changes: 20 additions & 1 deletion test/chart/bar_chart/bar_chart_helper_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void main() {
),
];
final result = BarChartHelper.calculateMaxAxisValues(barGroups);
expect(result.minY, 0);
expect(result.minY, -40);
expect(result.maxY, 10);
});

Expand All @@ -57,6 +57,25 @@ void main() {
expect(result.maxY, 0);
});

test('Test validity 4', () {
final barGroups = [
barChartGroupData1.copyWith(
barRods: [
BarChartRodData(fromY: 0, toY: -10),
BarChartRodData(fromY: -10, toY: -40),
BarChartRodData(toY: 0),
BarChartRodData(toY: 10),
BarChartRodData(toY: 5),
BarChartRodData(fromY: 10, toY: -50),
BarChartRodData(fromY: 39, toY: -50),
],
),
];
final result = BarChartHelper.calculateMaxAxisValues(barGroups);
expect(result.minY, -50);
expect(result.maxY, 39);
});

test('Test equality', () {
final barGroups = [barChartGroupData1, barChartGroupData2];
final result1 = BarChartHelper.calculateMaxAxisValues(barGroups);
Expand Down
67 changes: 31 additions & 36 deletions test/chart/bar_chart/bar_chart_painter_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ void main() {
28.5,
0,
38.5,
100,
76.923,
const Radius.circular(0.1),
),
),
Expand All @@ -402,9 +402,9 @@ void main() {
results[1]['rRect'] as RRect,
RRect.fromLTRBR(
43.5,
20,
15.384,
54.5,
100,
76.923,
const Radius.circular(0.2),
),
),
Expand All @@ -417,9 +417,9 @@ void main() {
results[2]['rRect'] as RRect,
RRect.fromLTRBR(
59.5,
20,
15.384,
71.5,
100,
76.923,
const Radius.circular(0.3),
),
),
Expand All @@ -434,7 +434,7 @@ void main() {
81.5,
0,
91.5,
100,
76.923,
const Radius.circular(0.4),
),
),
Expand All @@ -445,9 +445,9 @@ void main() {
results[4]['rRect'] as RRect,
RRect.fromLTRBR(
96.5,
20,
15.384,
106.5,
100,
76.923,
const Radius.circular(5),
),
),
Expand All @@ -459,9 +459,9 @@ void main() {
results[5]['rRect'] as RRect,
RRect.fromLTRBR(
116.5,
20,
15.384,
126.5,
100,
76.923,
const Radius.circular(5),
),
),
Expand All @@ -475,7 +475,7 @@ void main() {
116.5,
0,
126.5,
100,
76.923,
const Radius.circular(5),
),
),
Expand All @@ -486,9 +486,9 @@ void main() {
results[7]['rRect'] as RRect,
RRect.fromLTRBR(
131.5,
20,
15.384,
141.5,
100,
76.923,
const Radius.circular(5),
),
),
Expand All @@ -500,9 +500,9 @@ void main() {
results[8]['rRect'] as RRect,
RRect.fromLTRBR(
146.5,
100,
76.923,
156.5,
130,
100,
const Radius.circular(5),
),
),
Expand All @@ -514,9 +514,9 @@ void main() {
results[9]['rRect'] as RRect,
RRect.fromLTRBR(
146.5,
20,
15.384,
156.5,
100,
76.923,
const Radius.circular(5),
),
),
Expand All @@ -527,9 +527,9 @@ void main() {
results[10]['rRect'] as RRect,
RRect.fromLTRBR(
161.5,
20,
15.384,
171.5,
100,
76.923,
const Radius.circular(5),
),
),
Expand Down Expand Up @@ -647,9 +647,9 @@ void main() {
results[0]['rrect'] as RRect,
RRect.fromLTRBR(
84,
76.5,
65,
94,
78.4,
66.666,
const Radius.circular(0.1),
),
),
Expand All @@ -662,9 +662,9 @@ void main() {
results[1]['rrect'] as RRect,
RRect.fromLTRBR(
83.5,
80.4,
68.333,
94.5,
98,
83.333,
const Radius.circular(0.2),
),
),
Expand All @@ -677,9 +677,9 @@ void main() {
results[2]['rrect'] as RRect,
RRect.fromLTRBR(
83,
100,
85,
95,
117.6,
100,
const Radius.circular(0.3),
),
),
Expand All @@ -692,9 +692,9 @@ void main() {
results[3]['rrect'] as RRect,
RRect.fromLTRBR(
106,
39.2,
33.333,
116,
41.2,
35,
const Radius.circular(0.1),
),
),
Expand All @@ -705,9 +705,9 @@ void main() {
results[4]['rrect'] as RRect,
RRect.fromLTRBR(
105.5,
19.6,
16.666,
116.5,
37.3,
31.666,
const Radius.circular(0.2),
),
),
Expand All @@ -721,7 +721,7 @@ void main() {
105,
0,
117,
17.6,
15,
const Radius.circular(0.3),
),
),
Expand Down Expand Up @@ -1674,16 +1674,11 @@ void main() {
null,
);

expect(
painter.handleTouch(const Offset(110.1, 70.2), viewSize, holder),
null,
);

final result1 =
painter.handleTouch(const Offset(89, 38.5), viewSize, holder);
expect(result1!.touchedBarGroupIndex, 0);
expect(result1.touchedRodDataIndex, 0);
expect(result1.touchedStackItemIndex, -1);
expect(result1.touchedStackItemIndex, 0);

final result2 =
painter.handleTouch(const Offset(88.8, 16.5), viewSize, holder);
Expand Down