Stop refreshing frames if all scales are paused

nagix · Oct 2, 2018 · d76c0d6 · d76c0d6
1 parent bc7edde
commit d76c0d6
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 46 deletions.
diff --git a/src/plugins/plugin.streaming.js b/src/plugins/plugin.streaming.js
@@ -91,27 +91,30 @@ export default function(Chart) {
 
 	function startFrameRefreshTimer(chart) {
 		var streaming = chart.streaming;
-		var lastDrawn = 0;
-		var frameRefresh = function() {
-			var frameRate = chart.options.plugins.streaming.frameRate;
-			var frameDuration = 1000 / (Math.max(frameRate, 0) || 30);
-			var now = Date.now();
-
-			if (lastDrawn + frameDuration <= now) {
-				// Draw only when animation is inactive
-				if (!chart.animating && !chart.tooltip._start) {
-					chart.draw();
-				}
-				generateMouseMoveEvent(chart);
-				lastDrawn += frameDuration;
+
+		if (!streaming.frameRequestID) {
+			var lastDrawn = 0;
+			var frameRefresh = function() {
+				var frameRate = chart.options.plugins.streaming.frameRate;
+				var frameDuration = 1000 / (Math.max(frameRate, 0) || 30);
+				var now = Date.now();
+
 				if (lastDrawn + frameDuration <= now) {
-					lastDrawn = now;
+					// Draw only when animation is inactive
+					if (!chart.animating && !chart.tooltip._start) {
+						chart.draw();
+					}
+					generateMouseMoveEvent(chart);
+					lastDrawn += frameDuration;
+					if (lastDrawn + frameDuration <= now) {
+						lastDrawn = now;
+					}
 				}
-			}
-			streaming.frameRequestID = helpers.requestAnimFrame.call(window, frameRefresh);
-		};
+				streaming.frameRequestID = helpers.requestAnimFrame.call(window, frameRefresh);
+			};
 
-		streaming.frameRequestID = helpers.requestAnimFrame.call(window, frameRefresh);
+			streaming.frameRequestID = helpers.requestAnimFrame.call(window, frameRefresh);
+		}
 	}
 
 	function stopFrameRefreshTimer(chart) {
@@ -160,6 +163,22 @@ export default function(Chart) {
 			return true;
 		},
 
+		afterUpdate: function(chart, options) {
+			var pause = true;
+
+			// if all scales are paused, stop refreshing frames
+			helpers.each(chart.scales, function(scale) {
+				if (scale instanceof realTimeScale) {
+					pause &= helpers.valueOrDefault(scale.options.realtime.pause, options.pause);
+				}
+			});
+			if (pause) {
+				stopFrameRefreshTimer(chart);
+			} else {
+				startFrameRefreshTimer(chart);
+			}
+		},
+
 		beforeDatasetDraw: function(chart, args) {
 			var meta = args.meta;
 			var chartArea = chart.chartArea;

diff --git a/src/plugins/plugin.zoom.js b/src/plugins/plugin.zoom.js
@@ -36,9 +36,8 @@ export default function(Chart) {
 	}
 
 	function zoomRealTimeScale(scale, zoom, center, zoomOptions) {
-		var options = scale.options;
-		var realtimeOpts = options.realtime = options.realtime;
-		var streamingOpts = scale.chart.options.plugins.streaming || {};
+		var realtimeOpts = scale.options.realtime;
+		var streamingOpts = scale.chart.options.plugins.streaming;
 		var duration = helpers.valueOrDefault(realtimeOpts.duration, streamingOpts.duration);
 		var delay = helpers.valueOrDefault(realtimeOpts.delay, streamingOpts.delay);
 		var newDuration = duration * (2 - zoom);
@@ -59,9 +58,8 @@ export default function(Chart) {
 	}
 
 	function panRealTimeScale(scale, delta, panOptions) {
-		var options = scale.options;
-		var realtimeOpts = options.realtime = options.realtime;
-		var streamingOpts = scale.chart.options.plugins.streaming || {};
+		var realtimeOpts = scale.options.realtime;
+		var streamingOpts = scale.chart.options.plugins.streaming;
 		var delay = helpers.valueOrDefault(realtimeOpts.delay, streamingOpts.delay);
 		var newDelay = delay + (scale.getValueForPixel(delta) - scale.getValueForPixel(0));
 

diff --git a/src/scales/scale.realtime.js b/src/scales/scale.realtime.js
@@ -298,7 +298,7 @@ export default function(Chart, moment) {
 
 	function resolveOption(scale, key) {
 		var realtimeOpts = scale.options.realtime;
-		var streamingOpts = scale.chart.options.plugins.streaming || {};
+		var streamingOpts = scale.chart.options.plugins.streaming;
 		return helpers.valueOrDefault(realtimeOpts[key], streamingOpts[key]);
 	}
 
@@ -505,13 +505,16 @@ export default function(Chart, moment) {
 
 	function startFrameRefreshTimer(scale) {
 		var realtime = scale.realtime;
-		var frameRefresh = function() {
-			scroll(scale);
-			realtime.frameRequestID = helpers.requestAnimFrame.call(window, frameRefresh);
-		};
 
-		realtime.head = Date.now();
-		realtime.frameRequestID = helpers.requestAnimFrame.call(window, frameRefresh);
+		if (!realtime.frameRequestID) {
+			var frameRefresh = function() {
+				scroll(scale);
+				realtime.frameRequestID = helpers.requestAnimFrame.call(window, frameRefresh);
+			};
+
+			realtime.head = Date.now();
+			realtime.frameRequestID = helpers.requestAnimFrame.call(window, frameRefresh);
+		}
 	}
 
 	function stopFrameRefreshTimer(scale) {
@@ -537,12 +540,11 @@ export default function(Chart, moment) {
 	var RealTimeScale = TimeScale.extend({
 		initialize: function() {
 			var me = this;
-			var chart = me.chart;
 
 			TimeScale.prototype.initialize.apply(me, arguments);
 
 			// For backwards compatibility
-			if (me.options.type === 'time' && !chart.options.plugins.streaming) {
+			if (me.options.type === 'time' && !me.chart.options.plugins.streaming) {
 				return;
 			}
 
@@ -554,23 +556,16 @@ export default function(Chart, moment) {
 
 		update: function() {
 			var me = this;
-			var options = me.options;
-			var chart = me.chart;
 
 			// For backwards compatibility
-			if (options.type === 'time' && !chart.options.plugins.streaming) {
+			if (me.options.type === 'time' && !me.chart.options.plugins.streaming) {
 				return TimeScale.prototype.update.apply(me, arguments);
 			}
 
-			var frameRequestID = me.realtime.frameRequestID;
-			var pause = resolveOption(me, 'pause');
-
-			if (!frameRequestID && !pause) {
-				startFrameRefreshTimer(me);
-			} else if (frameRequestID && pause) {
+			if (resolveOption(me, 'pause')) {
 				stopFrameRefreshTimer(me);
-			}
-			if (!pause) {
+			} else {
+				startFrameRefreshTimer(me);
 				me.realtime.head = Date.now();
 			}
 
@@ -580,10 +575,9 @@ export default function(Chart, moment) {
 		buildTicks: function() {
 			var me = this;
 			var options = me.options;
-			var chart = me.chart;
 
 			// For backwards compatibility
-			if (options.type === 'time' && !chart.options.plugins.streaming) {
+			if (options.type === 'time' && !me.chart.options.plugins.streaming) {
 				return TimeScale.prototype.buildTicks.apply(me, arguments);
 			}