Show formatted number in the error indicator painter

imaNNeo · Jan 10, 2025 · 5a0fbfe · 5a0fbfe
1 parent 867d89b
commit 5a0fbfe
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/lib/src/chart/base/axis_chart/axis_chart_data.dart b/lib/src/chart/base/axis_chart/axis_chart_data.dart
@@ -5,6 +5,7 @@ import 'package:equatable/equatable.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:fl_chart/src/chart/base/axis_chart/axis_chart_painter.dart';
 import 'package:fl_chart/src/utils/lerp.dart';
+import 'package:fl_chart/src/utils/utils.dart';
 import 'package:flutter/material.dart' hide Image;
 
 /// This is the base class for axis base charts data
@@ -1731,6 +1732,7 @@ abstract class FlSpotErrorRangePainter with EquatableMixin {
     Offset offsetInCanvas,
     FlSpot origin,
     Rect errorRelativeRect,
+    AxisChartData axisChartData,
   );
 }
 
@@ -1773,6 +1775,7 @@ class FlSimpleErrorPainter extends FlSpotErrorRangePainter with EquatableMixin {
     Offset offsetInCanvas,
     FlSpot origin,
     Rect errorRelativeRect,
+    AxisChartData axisChartData,
   ) {
     final rect = errorRelativeRect.shift(offsetInCanvas);
     final hasVerticalError = errorRelativeRect.height != 0;
@@ -1790,7 +1793,11 @@ class FlSimpleErrorPainter extends FlSpotErrorRangePainter with EquatableMixin {
           rect: rect,
           isHorizontal: false,
           isLower: true,
-          text: (origin.y - origin.yError!.lowerBy).toString(),
+          text: Utils().formatNumber(
+            axisChartData.minY,
+            axisChartData.maxY,
+            origin.y - origin.yError!.lowerBy,
+          ),
           textStyle: errorTextStyle,
         );
 
@@ -1800,7 +1807,11 @@ class FlSimpleErrorPainter extends FlSpotErrorRangePainter with EquatableMixin {
           rect: rect,
           isHorizontal: false,
           isLower: false,
-          text: (origin.y + origin.yError!.upperBy).toString(),
+          text: Utils().formatNumber(
+            axisChartData.minY,
+            axisChartData.maxY,
+            origin.y + origin.yError!.upperBy,
+          ),
           textStyle: errorTextStyle,
         );
       }
@@ -1821,7 +1832,11 @@ class FlSimpleErrorPainter extends FlSpotErrorRangePainter with EquatableMixin {
           rect: rect,
           isHorizontal: true,
           isLower: true,
-          text: (origin.x - origin.xError!.lowerBy).toString(),
+          text: Utils().formatNumber(
+            axisChartData.minX,
+            axisChartData.maxX,
+            origin.x - origin.xError!.lowerBy,
+          ),
           textStyle: errorTextStyle,
         );
 
@@ -1831,7 +1846,11 @@ class FlSimpleErrorPainter extends FlSpotErrorRangePainter with EquatableMixin {
           rect: rect,
           isHorizontal: true,
           isLower: false,
-          text: (origin.x + origin.xError!.upperBy).toString(),
+          text: Utils().formatNumber(
+            axisChartData.minX,
+            axisChartData.maxX,
+            origin.x + origin.xError!.upperBy,
+          ),
           textStyle: errorTextStyle,
         );
       }

diff --git a/lib/src/chart/line_chart/line_chart_painter.dart b/lib/src/chart/line_chart/line_chart_painter.dart
@@ -427,6 +427,7 @@ class LineChartPainter extends AxisChartPainter<LineChartData> {
           spot,
           Offset(x, y),
           relativeErrorPixelsRect,
+          holder.data,
         );
       }
     }

diff --git a/lib/src/utils/canvas_wrapper.dart b/lib/src/utils/canvas_wrapper.dart
@@ -124,8 +124,9 @@ class CanvasWrapper {
     FlSpot origin,
     Offset offset,
     Rect errorRelativeRect,
+    AxisChartData axisData,
   ) {
-    painter.draw(canvas, offset, origin, errorRelativeRect);
+    painter.draw(canvas, offset, origin, errorRelativeRect, axisData);
   }
 
   /// Handles performing multiple draw actions rotated.
-Original file line number
+Diff line change
@@ Expand Up @@
               spot,
               Offset(x, y),
               relativeErrorPixelsRect,
+              holder.data,
             );
           }
         }
@@ Expand Down @@