From 223add6b436756254f4729f4cad4b7b18ddc2a83 Mon Sep 17 00:00:00 2001 From: Michael Yu <64374317+itsmichaelyu@users.noreply.github.com> Date: Sat, 25 Mar 2023 22:04:16 -0400 Subject: [PATCH 1/3] added some units --- lib/widgets/dialogs/settings_dialog.dart | 4 ++-- lib/widgets/path_editor/cards/waypoint_card.dart | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/widgets/dialogs/settings_dialog.dart b/lib/widgets/dialogs/settings_dialog.dart index 75499c51..480454ff 100644 --- a/lib/widgets/dialogs/settings_dialog.dart +++ b/lib/widgets/dialogs/settings_dialog.dart @@ -78,7 +78,7 @@ class _SettingsDialogState extends State { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: [ - const Text('Robot Size:'), + const Text('Robot Size (meters):'), const SizedBox(height: 4), Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -659,4 +659,4 @@ class _SettingsDialogState extends State { }, ); } -} +} \ No newline at end of file diff --git a/lib/widgets/path_editor/cards/waypoint_card.dart b/lib/widgets/path_editor/cards/waypoint_card.dart index 40f4e7e7..49122193 100644 --- a/lib/widgets/path_editor/cards/waypoint_card.dart +++ b/lib/widgets/path_editor/cards/waypoint_card.dart @@ -175,7 +175,7 @@ class _WaypointCardState extends State { _buildTextField( context, _getController(widget.waypoint!.getXPos().toStringAsFixed(2)), - 'X Position', + 'X Position (m)', width: 105, onSubmitted: (val) { if (val != null) { @@ -192,7 +192,7 @@ class _WaypointCardState extends State { _buildTextField( context, _getController(widget.waypoint!.getYPos().toStringAsFixed(2)), - 'Y Position', + 'Y Position (m)', width: 105, onSubmitted: (val) { if (val != null) { @@ -218,7 +218,7 @@ class _WaypointCardState extends State { context, _getController( widget.waypoint!.getHeadingDegrees().toStringAsFixed(2)), - 'Heading', + 'Heading (deg)', width: 105, onSubmitted: (val) { if (val != null) { @@ -237,7 +237,7 @@ class _WaypointCardState extends State { ? _getController('') : _getController( widget.waypoint!.velOverride!.toStringAsFixed(2)), - 'Vel Override', + 'V Override', enabled: !widget.waypoint!.isReversal, width: 105, onSubmitted: (val) { @@ -259,7 +259,7 @@ class _WaypointCardState extends State { !widget.holonomicEnabled || widget.waypoint!.holonomicAngle == null ? _getController('') : _getController(widget.waypoint!.holonomicAngle!.toStringAsFixed(2)), - 'Holonomic Rotation', + 'Holonomic Rotation (deg)', enabled: widget.holonomicEnabled, onSubmitted: (val) { if (val != null || @@ -395,4 +395,4 @@ class _WaypointCardState extends State { ..selection = TextSelection.fromPosition(TextPosition(offset: text.length)); } -} +} \ No newline at end of file From f4edae58105af0303789cd3045e2952405a6e2df Mon Sep 17 00:00:00 2001 From: Michael Yu <64374317+itsmichaelyu@users.noreply.github.com> Date: Mon, 27 Mar 2023 10:01:14 -0400 Subject: [PATCH 2/3] Changing back to Vel Override --- lib/widgets/path_editor/cards/waypoint_card.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/widgets/path_editor/cards/waypoint_card.dart b/lib/widgets/path_editor/cards/waypoint_card.dart index 49122193..259aa9b5 100644 --- a/lib/widgets/path_editor/cards/waypoint_card.dart +++ b/lib/widgets/path_editor/cards/waypoint_card.dart @@ -237,7 +237,7 @@ class _WaypointCardState extends State { ? _getController('') : _getController( widget.waypoint!.velOverride!.toStringAsFixed(2)), - 'V Override', + 'Vel Override', enabled: !widget.waypoint!.isReversal, width: 105, onSubmitted: (val) { From b68b59d203df2d53c6ded0d9557df8cc093cccb1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 14:09:57 +0000 Subject: [PATCH 3/3] Apply formatting changes --- lib/widgets/dialogs/settings_dialog.dart | 2 +- lib/widgets/path_editor/cards/waypoint_card.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/widgets/dialogs/settings_dialog.dart b/lib/widgets/dialogs/settings_dialog.dart index 480454ff..8f9a3f8c 100644 --- a/lib/widgets/dialogs/settings_dialog.dart +++ b/lib/widgets/dialogs/settings_dialog.dart @@ -659,4 +659,4 @@ class _SettingsDialogState extends State { }, ); } -} \ No newline at end of file +} diff --git a/lib/widgets/path_editor/cards/waypoint_card.dart b/lib/widgets/path_editor/cards/waypoint_card.dart index 259aa9b5..92907e43 100644 --- a/lib/widgets/path_editor/cards/waypoint_card.dart +++ b/lib/widgets/path_editor/cards/waypoint_card.dart @@ -395,4 +395,4 @@ class _WaypointCardState extends State { ..selection = TextSelection.fromPosition(TextPosition(offset: text.length)); } -} \ No newline at end of file +}