Skip to content
Open
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
8 changes: 8 additions & 0 deletions lib/src/radial_gauge/radial_gauge.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class RadialGauge extends StatefulWidget {
this.shapePointer = const [],
this.needlePointer = const [],
this.widgetPointer = const [],
this.strokeCap = StrokeCap.round,
// List<RadialTrack>? track,
}) : super(key: key);

Expand Down Expand Up @@ -173,6 +174,13 @@ class RadialGauge extends StatefulWidget {
///
final List<RadialValueBar>? valueBar;

///
/// The stroke cap of the radial gauge container.
///
/// Defaults to StrokeCap.round.
///
final StrokeCap strokeCap;

@override
State<RadialGauge> createState() => _RadialGaugeState();
}
Expand Down
4 changes: 2 additions & 2 deletions lib/src/radial_gauge/radial_gauge_container_painter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@ class RenderRadialGaugeContainer extends RenderBox {
// double radialOffset = getRadialGauge.valueBar!.first.radialOffset;

double partAngle = arcLength / numParts; // angle of each part in radians
double radius = (shortestSide / 2 - thickness) *
double radius = (shortestSide / 2.0 - thickness / 2.0) *
getRadialGauge.radiusFactor; // radius of the arc

final center = offset;

final Paint containerPaint = Paint()
..color = getRadialGauge.track.color
..strokeCap = StrokeCap.round
..strokeCap = getRadialGauge.strokeCap
..strokeWidth = thickness
..style = PaintingStyle.stroke;

Expand Down
10 changes: 9 additions & 1 deletion lib/src/radial_gauge/valuebar/radial_value_bar.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:geekyants_flutter_gauges/geekyants_flutter_gauges.dart';
import 'package:geekyants_flutter_gauges/src/radial_gauge/valuebar/radial_value_bar_painter.dart';

import '../radial_gauge.dart';
import '../radial_gauge_state.dart';

Expand Down Expand Up @@ -36,6 +37,7 @@ class RadialValueBar extends LeafRenderObjectWidget {
this.valueBarThickness = 10,
this.gradient,
this.radialOffset = 0,
this.strokeCap = StrokeCap.round,
}) : super(key: key);

/// [value] denotes the value of the value bar.
Expand Down Expand Up @@ -123,6 +125,10 @@ class RadialValueBar extends LeafRenderObjectWidget {
///
final LinearGradient? gradient;

/// [strokeCap] denotes the stroke cap of the value bar.
///
final StrokeCap strokeCap;

@override
RenderObject createRenderObject(BuildContext context) {
final RadialGaugeState scope = RadialGaugeState.of(context);
Expand All @@ -133,6 +139,7 @@ class RadialValueBar extends LeafRenderObjectWidget {
gradient: gradient ?? LinearGradient(colors: [color, color]),
radialOffset: radialOffset,
valueBarThickness: valueBarThickness,
strokeCap: strokeCap,
radialGauge: scope.rGauge,
);
}
Expand All @@ -147,6 +154,7 @@ class RadialValueBar extends LeafRenderObjectWidget {
..setRadialOffset = radialOffset
..setLinearGradient = gradient ?? LinearGradient(colors: [color, color])
..setValueBarThickness = valueBarThickness
..setRadialGauge = scope.rGauge;
..setRadialGauge = scope.rGauge
..setStrokeCap = strokeCap;
}
}
16 changes: 14 additions & 2 deletions lib/src/radial_gauge/valuebar/radial_value_bar_painter.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import 'dart:math';

import 'package:flutter/rendering.dart';

import '../../../geekyants_flutter_gauges.dart';

class RenderRadialValueBar extends RenderBox {
Expand All @@ -11,12 +13,14 @@ class RenderRadialValueBar extends RenderBox {
required double valueBarThickness,
required RadialGauge radialGauge,
required double radialOffset,
required StrokeCap strokeCap,
}) : _value = value,
_color = color,
_gradient = gradient!,
_radialOffset = radialOffset,
_radialGauge = radialGauge,
_valueBarThickness = valueBarThickness,
_strokeCap = strokeCap,
super();

RadialGauge get getRadialGauge => _radialGauge!;
Expand Down Expand Up @@ -59,6 +63,14 @@ class RenderRadialValueBar extends RenderBox {
markNeedsPaint();
}

StrokeCap get getStrokeCap => _strokeCap;
StrokeCap _strokeCap;
set setStrokeCap(StrokeCap strokeCap) {
if (_strokeCap == strokeCap) return;
_strokeCap = strokeCap;
markNeedsPaint();
}

LinearGradient get getLinearGradient => _gradient;
LinearGradient _gradient;
set setLinearGradient(LinearGradient linearGradient) {
Expand Down Expand Up @@ -107,7 +119,7 @@ class RenderRadialValueBar extends RenderBox {

final Paint containerPaint = Paint()
..color = _color
..strokeCap = StrokeCap.round
..strokeCap = _strokeCap
..strokeWidth = _valueBarThickness
..shader = gradient.createShader(
Rect.fromCircle(center: center, radius: size.shortestSide / 2.0))
Expand All @@ -116,7 +128,7 @@ class RenderRadialValueBar extends RenderBox {
double arcLength = endAngle - startAngle;
double shortestSide = size.shortestSide;
double radius = (shortestSide / 2.0 -
getRadialGauge.track.thickness -
getRadialGauge.track.thickness / 2.0 -
getRadialOffset) *
getRadialGauge.radiusFactor;

Expand Down