ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 07:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Tables] Added timeouts to yield control to ui thread. Fixes #972

Browse Source
This commit is contained in:
Henry 2016-05-26 16:46:06 -07:00
parent dc577d4c24
commit d8a097a95a
3 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/table/bundle.js
View File

@ -109,7 +109,7 @@ define([
{
"key": "HistoricalTableController",
"implementation": HistoricalTableController,
"depends": ["$scope", "telemetryHandler", "telemetryFormatter"]
"depends": ["$scope", "telemetryHandler", "telemetryFormatter", "$timeout", "$q"]
},
{
"key": "RealtimeTableController",

2
platform/features/table/res/templates/historical-table.html
View File

@ -1,4 +1,4 @@
<div ng-controller="HistoricalTableController">
<div ng-controller="HistoricalTableController" ng-class="{'loading': loading}">
<mct-table
headers="headers"
rows="rows"

58
platform/features/table/src/controllers/HistoricalTableController.js
View File

@ -35,12 +35,47 @@ define(
* @param telemetryFormatter
* @constructor
*/
function HistoricalTableController($scope, telemetryHandler, telemetryFormatter) {
function HistoricalTableController($scope, telemetryHandler, telemetryFormatter, $timeout, $q) {
this.$timeout = $timeout;
this.$q = $q;
TableController.call(this, $scope, telemetryHandler, telemetryFormatter);
$scope.loading = true;
}
HistoricalTableController.prototype = Object.create(TableController.prototype);
function fastPromise(value) {
if (value && value.then) {
return value;
} else {
return {
then: function (callback) {
return fastPromise(callback(value));
}
};
}
}
/**
* @private
*/
HistoricalTableController.prototype.yieldingLoop = function (index, max, forEach, yieldAfter) {
var self = this;
if (index < max) {
forEach(index);
if (index % yieldAfter === 0) {
return this.$timeout(function () {
return self.yieldingLoop(++index, max, forEach, yieldAfter);
});
} else {
return self.yieldingLoop(++index, max, forEach, yieldAfter);
}
} else {
return this.$q.when(undefined);
}
};
/**
* Populates historical data on scope when it becomes available from
* the telemetry API
@ -49,18 +84,27 @@ define(
var rowData = [],
self = this;
this.handle.getTelemetryObjects().forEach(function (telemetryObject) {
this.$scope.loading = true;
function processTelemetryObject(telemetryObject) {
var series = self.handle.getSeries(telemetryObject) || {},
pointCount = series.getPointCount ? series.getPointCount() : 0,
i = 0;
for (; i < pointCount; i++) {
return self.yieldingLoop(i, pointCount, function (index) {
rowData.push(self.table.getRowValues(telemetryObject,
self.handle.makeDatum(telemetryObject, series, i)));
}
});
self.handle.makeDatum(telemetryObject, series, index)));
}, 1000);
}
this.$scope.rows = rowData;
this.handle.getTelemetryObjects().reduce(function (promise, telemetryObject) {
return promise.then(function () {
return processTelemetryObject(telemetryObject);
});
}, self.$q.when(undefined)).then(function () {
self.$scope.rows = rowData;
self.$scope.loading = false;
});
};
return HistoricalTableController;