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

Remove slider divisions and add text field for all sliders #846

Merged
merged 2 commits into from
Oct 9, 2024
+630 −185
Merged

Remove slider divisions and add text field for all sliders #846

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8f978c
Remove slider divisions and add text field for all sliders
mjansen4857 Oct 9, 2024
1a6bcc8
ugh
mjansen4857 Oct 9, 2024
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
Next Next commit
Remove slider divisions and add text field for all sliders
@mjansen4857
mjansen4857 committed Oct 9, 2024
commit d8f978c3d4fe1bf1dfeb5ecf394d092488b5bfc3
199 changes: 137 additions & 62 deletions lib/widgets/editor/tree_widgets/constraint_zones_tree.dart
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:pathplanner/path/constraints_zone.dart';
import 'package:pathplanner/path/pathplanner_path.dart';
import 'package:pathplanner/path/waypoint.dart';
import 'package:pathplanner/util/wpimath/math_util.dart';
import 'package:pathplanner/widgets/editor/tree_widgets/item_count.dart';
import 'package:pathplanner/widgets/editor/tree_widgets/tree_card_node.dart';
import 'package:pathplanner/widgets/number_text_field.dart';
@@ -319,69 +320,143 @@ class _ConstraintZonesTreeState extends State<ConstraintZonesTree> {
),
),
const SizedBox(height: 12),
Slider(
value: constraintZones[zoneIdx].minWaypointRelativePos.toDouble(),
secondaryTrackValue:
constraintZones[zoneIdx].maxWaypointRelativePos.toDouble(),
min: 0.0,
max: waypoints.length - 1.0,
divisions: (waypoints.length - 1) * 20,
label: constraintZones[zoneIdx]
.minWaypointRelativePos
.toStringAsFixed(2),
onChangeStart: (value) {
_sliderChangeStart = value;
},
onChangeEnd: (value) {
widget.undoStack.add(Change(
_sliderChangeStart,
() {
constraintZones[zoneIdx].minWaypointRelativePos = value;
widget.onPathChanged?.call();
},
(oldValue) {
constraintZones[zoneIdx].minWaypointRelativePos = oldValue;
widget.onPathChanged?.call();
},
));
},
onChanged: (value) {
if (value <= constraintZones[zoneIdx].maxWaypointRelativePos) {
constraintZones[zoneIdx].minWaypointRelativePos = value;
widget.onPathChangedNoSim?.call();
}
},
Row(
children: [
Expanded(
child: Slider(
value:
constraintZones[zoneIdx].minWaypointRelativePos.toDouble(),
secondaryTrackValue:
constraintZones[zoneIdx].maxWaypointRelativePos.toDouble(),
min: 0.0,
max: waypoints.length - 1.0,
label: constraintZones[zoneIdx]
.minWaypointRelativePos
.toStringAsFixed(2),
onChangeStart: (value) {
_sliderChangeStart = value;
},
onChangeEnd: (value) {
widget.undoStack.add(Change(
_sliderChangeStart,
() {
constraintZones[zoneIdx].minWaypointRelativePos = value;
widget.onPathChanged?.call();
},
(oldValue) {
constraintZones[zoneIdx].minWaypointRelativePos =
oldValue;
widget.onPathChanged?.call();
},
));
},
onChanged: (value) {
if (value <=
constraintZones[zoneIdx].maxWaypointRelativePos) {
constraintZones[zoneIdx].minWaypointRelativePos = value;
widget.onPathChangedNoSim?.call();
}
},
),
),
SizedBox(
width: 75,
child: NumberTextField(
initialValue: constraintZones[zoneIdx].minWaypointRelativePos,
precision: 2,
label: 'Start Pos',
onSubmitted: (value) {
if (value != null) {
final maxVal =
constraintZones[zoneIdx].maxWaypointRelativePos;
final val = MathUtil.clamp(value, 0.0, maxVal);
widget.undoStack.add(Change(
constraintZones[zoneIdx].minWaypointRelativePos,
() {
constraintZones[zoneIdx].minWaypointRelativePos = val;
widget.onPathChanged?.call();
},
(oldValue) {
constraintZones[zoneIdx].minWaypointRelativePos =
oldValue;
widget.onPathChanged?.call();
},
));
}
},
),
),
const SizedBox(width: 4),
],
),
Slider(
value: constraintZones[zoneIdx].maxWaypointRelativePos.toDouble(),
min: 0.0,
max: waypoints.length - 1.0,
divisions: (waypoints.length - 1) * 20,
label: constraintZones[zoneIdx]
.maxWaypointRelativePos
.toStringAsFixed(2),
onChangeStart: (value) {
_sliderChangeStart = value;
},
onChangeEnd: (value) {
widget.undoStack.add(Change(
_sliderChangeStart,
() {
constraintZones[zoneIdx].maxWaypointRelativePos = value;
widget.onPathChanged?.call();
},
(oldValue) {
constraintZones[zoneIdx].maxWaypointRelativePos = oldValue;
widget.onPathChanged?.call();
},
));
},
onChanged: (value) {
if (value >= constraintZones[zoneIdx].minWaypointRelativePos) {
constraintZones[zoneIdx].maxWaypointRelativePos = value;
widget.onPathChangedNoSim?.call();
}
},
const SizedBox(height: 8),
Row(
children: [
Expanded(
child: Slider(
value:
constraintZones[zoneIdx].maxWaypointRelativePos.toDouble(),
min: 0.0,
max: waypoints.length - 1.0,
label: constraintZones[zoneIdx]
.maxWaypointRelativePos
.toStringAsFixed(2),
onChangeStart: (value) {
_sliderChangeStart = value;
},
onChangeEnd: (value) {
widget.undoStack.add(Change(
_sliderChangeStart,
() {
constraintZones[zoneIdx].maxWaypointRelativePos = value;
widget.onPathChanged?.call();
},
(oldValue) {
constraintZones[zoneIdx].maxWaypointRelativePos =
oldValue;
widget.onPathChanged?.call();
},
));
},
onChanged: (value) {
if (value >=
constraintZones[zoneIdx].minWaypointRelativePos) {
constraintZones[zoneIdx].maxWaypointRelativePos = value;
widget.onPathChangedNoSim?.call();
}
},
),
),
SizedBox(
width: 75,
child: NumberTextField(
initialValue: constraintZones[zoneIdx].maxWaypointRelativePos,
precision: 2,
label: 'End Pos',
onSubmitted: (value) {
if (value != null) {
final minVal =
constraintZones[zoneIdx].minWaypointRelativePos;
final val =
MathUtil.clamp(value, minVal, waypoints.length - 1);
widget.undoStack.add(Change(
constraintZones[zoneIdx].maxWaypointRelativePos,
() {
constraintZones[zoneIdx].maxWaypointRelativePos = val;
widget.onPathChanged?.call();
},
(oldValue) {
constraintZones[zoneIdx].maxWaypointRelativePos =
oldValue;
widget.onPathChanged?.call();
},
));
}
},
),
),
const SizedBox(width: 4),
],
),
],
);
Loading