Call super.resetSubscription() method after changing topics

Gold872 · Dec 3, 2023 · 096ee73 · 096ee73
1 parent 58b5518
commit 096ee73
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 28 deletions.
diff --git a/lib/widgets/nt4_widgets/multi-topic/combo_box_chooser.dart b/lib/widgets/nt4_widgets/multi-topic/combo_box_chooser.dart
@@ -52,14 +52,14 @@ class ComboBoxChooser extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     optionsTopicName = '$topic/options';
     selectedTopicName = '$topic/selected';
     activeTopicName = '$topic/active';
     defaultTopicName = '$topic/default';
 
     selectedTopic = null;
+
+    super.resetSubscription();
   }
 
   void publishSelectedValue(String? selected) {

diff --git a/lib/widgets/nt4_widgets/multi-topic/command_scheduler.dart b/lib/widgets/nt4_widgets/multi-topic/command_scheduler.dart
@@ -43,13 +43,13 @@ class CommandSchedulerWidget extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     namesTopicName = '$topic/Names';
     idsTopicName = '$topic/Ids';
     cancelTopicName = '$topic/Cancel';
 
     cancelTopic = null;
+
+    super.resetSubscription();
   }
 
   void cancelCommand(int id) {

diff --git a/lib/widgets/nt4_widgets/multi-topic/command_widget.dart b/lib/widgets/nt4_widgets/multi-topic/command_widget.dart
@@ -39,12 +39,12 @@ class CommandWidget extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     runningTopicName = '$topic/running';
     nameTopicName = '$topic/.name';
 
     runningTopic = null;
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/multi-topic/differential_drive.dart b/lib/widgets/nt4_widgets/multi-topic/differential_drive.dart
@@ -54,8 +54,6 @@ class DifferentialDrive extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     leftSpeedTopicName = '$topic/Left Motor Speed';
     rightSpeedTopicName = '$topic/Right Motor Speed';
 
@@ -67,6 +65,8 @@ class DifferentialDrive extends StatelessWidget with NT4Widget {
 
     rightSpeedPreviousValue = 0.0;
     rightSpeedCurrentValue = 0.0;
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/multi-topic/encoder_widget.dart b/lib/widgets/nt4_widgets/multi-topic/encoder_widget.dart
@@ -36,10 +36,10 @@ class EncoderWidget extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     distanceTopic = '$topic/Distance';
     speedTopic = '$topic/Speed';
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/multi-topic/field_widget.dart b/lib/widgets/nt4_widgets/multi-topic/field_widget.dart
@@ -81,10 +81,10 @@ class FieldWidget extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     robotTopicName = '$topic/Robot';
     otherObjectTopics.clear();
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/multi-topic/fms_info.dart b/lib/widgets/nt4_widgets/multi-topic/fms_info.dart
@@ -54,15 +54,15 @@ class FMSInfo extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     eventNameTopic = '$topic/EventName';
     controlDataTopic = '$topic/FMSControlData';
     allianceTopic = '$topic/IsRedAlliance';
     matchNumberTopic = '$topic/MatchNumber';
     matchTypeTopic = '$topic/MatchType';
     replayNumberTopic = '$topic/ReplayNumber';
     stationNumberTopic = '$topic/StationNumber';
+
+    super.resetSubscription();
   }
 
   String _getMatchTypeString(int matchType) {

diff --git a/lib/widgets/nt4_widgets/multi-topic/network_alerts.dart b/lib/widgets/nt4_widgets/multi-topic/network_alerts.dart
@@ -38,11 +38,11 @@ class NetworkAlerts extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     errorsTopicName = '$topic/errors';
     warningsTopicName = '$topic/warnings';
     infosTopicName = '$topic/infos';
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/multi-topic/pid_controller.dart b/lib/widgets/nt4_widgets/multi-topic/pid_controller.dart
@@ -66,8 +66,6 @@ class PIDControllerWidget extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     kpTopicName = '$topic/p';
     kiTopicName = '$topic/i';
     kdTopicName = '$topic/d';
@@ -77,6 +75,8 @@ class PIDControllerWidget extends StatelessWidget with NT4Widget {
     kiTopic = null;
     kdTopic = null;
     setpointTopic = null;
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/multi-topic/power_distribution.dart b/lib/widgets/nt4_widgets/multi-topic/power_distribution.dart
@@ -46,8 +46,6 @@ class PowerDistribution extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     channelTopics.clear();
 
     for (int channel = 0; channel <= numberOfChannels; channel++) {
@@ -56,6 +54,8 @@ class PowerDistribution extends StatelessWidget with NT4Widget {
 
     voltageTopic = '$topic/Voltage';
     currentTopic = '$topic/TotalCurrent';
+
+    super.resetSubscription();
   }
 
   Widget _getChannelsColumn(BuildContext context, int start, int end) {

diff --git a/lib/widgets/nt4_widgets/multi-topic/split_button_chooser.dart b/lib/widgets/nt4_widgets/multi-topic/split_button_chooser.dart
@@ -50,14 +50,14 @@ class SplitButtonChooser extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     optionsTopicName = '$topic/options';
     selectedTopicName = '$topic/selected';
     activeTopicName = '$topic/active';
     defaultTopicName = '$topic/default';
 
     selectedTopic = null;
+
+    super.resetSubscription();
   }
 
   void publishSelectedValue(String? selected) {

diff --git a/lib/widgets/nt4_widgets/multi-topic/subsystem_widget.dart b/lib/widgets/nt4_widgets/multi-topic/subsystem_widget.dart
@@ -37,10 +37,10 @@ class SubsystemWidget extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     defaultCommandTopic = '$topic/.default';
     currentCommandTopic = '$topic/.command';
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/multi-topic/swerve_drive.dart b/lib/widgets/nt4_widgets/multi-topic/swerve_drive.dart
@@ -71,8 +71,6 @@ class SwerveDriveWidget extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     frontLeftAngleTopic = '$topic/Front Left Angle';
     frontLeftVelocityTopic = '$topic/Front Left Velocity';
 
@@ -86,6 +84,8 @@ class SwerveDriveWidget extends StatelessWidget with NT4Widget {
     backRightVelocityTopic = '$topic/Back Right Velocity';
 
     robotAngleTopic = '$topic/Robot Angle';
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/multi-topic/three_axis_accelerometer.dart b/lib/widgets/nt4_widgets/multi-topic/three_axis_accelerometer.dart
@@ -40,11 +40,11 @@ class ThreeAxisAccelerometer extends StatelessWidget with NT4Widget {
 
   @override
   void resetSubscription() {
-    super.resetSubscription();
-
     xTopic = '$topic/X';
     yTopic = '$topic/Y';
     zTopic = '$topic/Z';
+
+    super.resetSubscription();
   }
 
   @override

diff --git a/lib/widgets/nt4_widgets/nt4_widget.dart b/lib/widgets/nt4_widgets/nt4_widget.dart
@@ -108,6 +108,8 @@ mixin NT4Widget on StatelessWidget {
       subscription = nt4Connection.subscribe(topic, period);
 
       nt4Topic = null;
+
+      refresh();
       return;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,6 +108,8 @@ mixin NT4Widget on StatelessWidget { @@
           subscription = nt4Connection.subscribe(topic, period);
           nt4Topic = null;
+          refresh();
           return;
         }
@@ Expand Down @@