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.

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

Development #260

Merged
merged 17 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
## 1.0.4

**Features**

- Add Custom Track Labels to Radial Gauge

**Fixes**

- Fixed needle-gap issue in Radial Gauge

## 1.0.3

**Fixes**

- Fixed Drawing of `Pointer` over `valueBar`


## 1.0.2

**Features**
Expand Down
39 changes: 38 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ This will add a line like this to your package's pubspec.yaml (and run an implic

```dart
dependencies:
geekyants_flutter_gauges: 1.0.1
geekyants_flutter_gauges: 1.0.4
```

## Usage
Expand All @@ -77,6 +77,8 @@ import 'package:geekyants_flutter_gauges/geekyants_flutter_gauges.dart';

Use it as below

# Linear Gauge usage

```dart
class _MyGaugeExampleState extends State<MyGaugeExample> {
@override
Expand All @@ -94,6 +96,31 @@ class _MyGaugeExampleState extends State<MyGaugeExample> {
}
```

# Radial Gauge usage

```dart
class _MyGaugeExampleState extends State<MyGaugeExample> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Center(
child: RadialGauge(
track: RadialTrack(
start: 0,
end: 100,
),
needlePointer: [
NeedlePointer(
value: 30,
),
],
),
)
);
}
}
```

## Linear Gauge

### **Gauge Orientation**:
Expand Down Expand Up @@ -167,6 +194,12 @@ Default **`endAngle`**`: 210°

<p align='center'><img src="https://raw.githubusercontent.com/GeekyAnts/GaugesFlutter/main/example/screens/radial-angles.png" alt="radial-angels" height=440></p>

#### Custom Track Labels

The labels displayed on the RadialGauge track can easily be formated to your need.

<p align='center'><img src="example/screens/radial-custom-track-label.png" alt="radial-gauge-custom-track-label" height=440></p>

#### **Radii Customization**

`radiusFactor` can be used to size the adjust the scaling factor of the radius and change the radius of the gauge accordingly.
Expand Down Expand Up @@ -224,3 +257,7 @@ In the Radial Gauge, the `NeedlePointer` and `RadialShapePointer` can be set to
## Credits

Made with ❤️ by <a href="https://geekyants.com/" ><img src="https://s3.ap-southeast-1.amazonaws.com/cdn.elitmus.com/sy0zfezmfdovlb4vaz6siv1l7g30" height="17"/></a>

```

```
14 changes: 3 additions & 11 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,12 @@ class _RadialGaugeExampleState extends State<RadialGaugeExample> {
backgroundColor: Colors.white,
body: RadialGauge(
track: RadialTrack(
color: Colors.grey,
start: 0,
end: 100,
trackStyle: TrackStyle(
showLastLabel: false,
secondaryRulerColor: Colors.grey,
secondaryRulerPerInterval: 3)),
start: 0,
end: 100,
),
needlePointer: [
NeedlePointer(
value: 30,
color: Colors.red,
tailColor: Colors.black,
tailRadius: 0,
needleStyle: NeedleStyle.flatNeedle,
),
],
),
Expand Down
32 changes: 32 additions & 0 deletions example/lib/radial_gauge_custom_label.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import 'package:flutter/material.dart';
import 'package:geekyants_flutter_gauges/geekyants_flutter_gauges.dart';

///
/// The following code is a Simple Example of [RadialGauge] Widget with custom track labels.
///
class RadialGaugeCustomLabel extends StatefulWidget {
const RadialGaugeCustomLabel({super.key});

@override
State<RadialGaugeCustomLabel> createState() => _RadialGaugeCustomLabelState();
}

class _RadialGaugeCustomLabelState extends State<RadialGaugeCustomLabel> {
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.white,
body: RadialGauge(
track: RadialTrack(
color: Colors.grey,
start: 0,
end: 100,
trackLabelFormater: (double value) => "${value.round()}€",
trackStyle: const TrackStyle(
showFirstLabel: false,
showLastLabel: false,
)),
),
);
}
}
2 changes: 1 addition & 1 deletion example/macos/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
33CC10EC2044A3C60003C045 = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1430"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
80 changes: 52 additions & 28 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ packages:
dependency: transitive
description:
name: collection
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.17.2"
version: "1.18.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
url: "https://pub.dev"
source: hosted
version: "1.0.5"
version: "1.0.8"
fake_async:
dependency: transitive
description:
Expand All @@ -66,10 +66,10 @@ packages:
dependency: "direct dev"
description:
name: flutter_lints
sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "2.0.3"
flutter_test:
dependency: "direct dev"
description: flutter
Expand All @@ -81,47 +81,71 @@ packages:
path: ".."
relative: true
source: path
version: "1.0.2"
version: "1.0.3"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
name: lints
sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
url: "https://pub.dev"
source: hosted
version: "2.0.1"
version: "2.1.1"
matcher:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.11.0"
path:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -139,18 +163,18 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
Expand All @@ -171,10 +195,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
url: "https://pub.dev"
source: hosted
version: "0.6.0"
version: "0.6.1"
vector_math:
dependency: transitive
description:
Expand All @@ -183,14 +207,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
vm_service:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
version: "13.0.0"
sdks:
dart: ">=3.1.0-185.0.dev <4.0.0"
dart: ">=3.2.0-0 <4.0.0"
flutter: ">=1.17.0"
Binary file added example/screens/radial-custom-track-label.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions lib/src/radial_gauge/pointer/needle_pointer_painter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ class RenderNeedlePointer extends RenderBox {

final needlePaint = Paint()
..color = _color
..style = PaintingStyle.fill
..strokeWidth = strokeWidth
..shader = gradient.createShader(
Rect.fromPoints(
Expand Down
13 changes: 6 additions & 7 deletions lib/src/radial_gauge/radial_gauge_container_painter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ class RenderRadialGaugeContainer extends RenderBox {
..strokeWidth = getRadialGauge.track.trackStyle.secondaryRulersWidth!
..style = PaintingStyle.stroke;

final trackLabelFormater = getRadialGauge.track.trackLabelFormater ??
(double value) => ((value * 10).round() / 10).toString();

// Loop to draw the Rulers and Labels
for (int i = 0; i <= numParts; i++) {
double rulerOffset = getRadialGauge.track.trackStyle.rulersOffset ?? 0;
Expand Down Expand Up @@ -111,13 +114,10 @@ class RenderRadialGaugeContainer extends RenderBox {
final TextPainter textPainter =
TextPainter(textDirection: TextDirection.ltr);

const String labelFormat = '%d';
final double langle =
startAngle + i * partAngle; // the angle of the current ruler
// the y coordinate of the label
final String label = labelFormat.replaceAll(
'%d', ((langle - startAngle) * 180 / pi).round().toString());
double l = double.parse(label);
double l = (langle - startAngle) * 180 / pi;
double sAngle = _radialGauge.track.startAngle;
double eAngle = _radialGauge.track.endAngle;

Expand All @@ -126,11 +126,10 @@ class RenderRadialGaugeContainer extends RenderBox {
double end = _radialGauge.track.end;
double valueRange = (end - start);

double exactValue =
start + double.parse(((l / range) * valueRange).toStringAsFixed(2));
double exactValue = start + ((l / range) * valueRange);
Color textColor = Colors.black;
textPainter.text = TextSpan(
text: exactValue.toString(),
text: trackLabelFormater(exactValue),
style: getRadialGauge.track.trackStyle.labelStyle ??
TextStyle(color: textColor, fontWeight: FontWeight.bold));
textPainter.layout();
Expand Down
Loading
Loading