Semi-improved performance of widget streams

Gold872 · Feb 25, 2024 · cb1b575 · cb1b575
1 parent b47cc9f
commit cb1b575
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/lib/services/nt4_client.dart b/lib/services/nt4_client.dart
@@ -76,12 +76,14 @@ class NT4Subscription {
   }
 
   Stream<Object?> periodicStream({bool yieldAll = true}) async* {
+    final Duration delayTime =
+        Duration(microseconds: (options.periodicRateSeconds * 1e6).round());
+
     yield currentValue;
     Object? lastYielded = currentValue;
 
     while (true) {
-      await Future.delayed(
-          Duration(microseconds: (options.periodicRateSeconds * 1e6).round()));
+      await Future.delayed(delayTime);
 
       if (lastYielded != currentValue || yieldAll) {
         yield currentValue;

diff --git a/lib/widgets/nt_widgets/multi-topic/field_widget.dart b/lib/widgets/nt_widgets/multi-topic/field_widget.dart
@@ -315,6 +315,12 @@ class FieldWidgetModel extends NTWidgetModel {
 
   @override
   Stream<Object> get multiTopicPeriodicStream async* {
+    final Duration delayTime = Duration(
+        microseconds: ((subscription?.options.periodicRateSeconds ??
+                    Settings.defaultPeriod) *
+                1e6)
+            .round());
+
     yield Object();
 
     int previousHash = Object.hashAll(getCurrentData());
@@ -329,11 +335,7 @@ class FieldWidgetModel extends NTWidgetModel {
         yield Object();
       }
 
-      await Future.delayed(Duration(
-          milliseconds: ((subscription?.options.periodicRateSeconds ??
-                      Settings.defaultPeriod) *
-                  1000)
-              .round()));
+      await Future.delayed(delayTime);
     }
   }
 

diff --git a/lib/widgets/nt_widgets/nt_widget.dart b/lib/widgets/nt_widgets/nt_widget.dart
@@ -193,6 +193,12 @@ class NTWidgetModel extends ChangeNotifier {
   }
 
   Stream<Object> get multiTopicPeriodicStream async* {
+    final Duration delayTime = Duration(
+        microseconds: ((subscription?.options.periodicRateSeconds ??
+                    Settings.defaultPeriod) *
+                1e6)
+            .round());
+
     int previousHash = Object.hashAll(getCurrentData());
 
     while (true) {
@@ -203,11 +209,7 @@ class NTWidgetModel extends ChangeNotifier {
         previousHash = currentHash;
       }
 
-      await Future.delayed(Duration(
-          milliseconds: ((subscription?.options.periodicRateSeconds ??
-                      Settings.defaultPeriod) *
-                  1000)
-              .round()));
+      await Future.delayed(delayTime);
     }
   }
 

diff --git a/lib/widgets/nt_widgets/single_topic/text_display.dart b/lib/widgets/nt_widgets/single_topic/text_display.dart
@@ -139,10 +139,9 @@ class TextDisplay extends NTWidget {
       stream: model.subscription?.periodicStream(),
       initialData: ntConnection.getLastAnnouncedValue(model.topic),
       builder: (context, snapshot) {
-        Object data = snapshot.data ?? Object();
+        Object? data = snapshot.data;
 
-        if (data.toString() != model.previousValue.toString() &&
-            !data.isExactType<Object>()) {
+        if (data?.toString() != model.previousValue?.toString() && data != null) {
           // Needed to prevent errors
           Future(() async {
             model.controller.text = data.toString();

diff --git a/lib/widgets/tab_grid.dart b/lib/widgets/tab_grid.dart
@@ -697,9 +697,9 @@ class TabGrid extends StatelessWidget {
     Widget getWidgetFromModel(WidgetContainerModel model) {
       if (model is NTWidgetContainerModel) {
         return ChangeNotifierProvider<NTWidgetContainerModel>.value(
-          key: model.key,
           value: model,
           child: DraggableNTWidgetContainer(
+            key: model.key,
             tabGrid: this,
             onUpdate: _ntContainerOnUpdate,
             onDragBegin: _ntContainerOnDragBegin,
@@ -711,9 +711,9 @@ class TabGrid extends StatelessWidget {
         );
       } else if (model is ListLayoutModel) {
         return ChangeNotifierProvider<ListLayoutModel>.value(
-          key: model.key,
           value: model,
           child: DraggableListLayout(
+            key: model.key,
             tabGrid: this,
             onUpdate: _layoutContainerOnUpdate,
             onDragBegin: _layoutContainerOnDragBegin,