ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-15 13:48:12 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[Tables] Fixed issue with historical tables composed of multiple objects

Browse Source
This commit is contained in:
Henry
2016-03-13 19:12:55 -07:00
parent 5208631528
commit ea0b86fe72
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
platform/features/table/src/controllers/TelemetryTableController.js
View File

@ -106,6 +106,8 @@ define(
only).
*/
TelemetryTableController.prototype.subscribe = function() {
var self = this;
if (this.handle) {
this.handle.unsubscribe();
}
@ -120,7 +122,22 @@ define(
true // Lossless
);
this.handle.request({}, this.addHistoricalData.bind(this));
function getHistoricalData(){
var rowData = [];
self.handle.getTelemetryObjects().forEach(function(telemetryObject){
var series = self.handle.getSeries(telemetryObject) || {},
pointCount = series.getPointCount ? series.getPointCount() : 0,
i = 0;
for (; i < pointCount; i++) {
rowData.push(self.table.getRowValues(telemetryObject, self.handle.makeDatum(telemetryObject, series, i)));
}
});
self.$scope.rows = rowData;
}
this.handle.request({}).then(getHistoricalData);
this.setup();
};
@ -134,10 +151,8 @@ define(
newRows = [];
for (i=0; i < series.getPointCount(); i++) {
newRows.push(this.table.getRowValues(domainObject, this.handle.makeDatum(domainObject, series, i)));
this.$scope.rows.push(this.table.getRowValues(domainObject, this.handle.makeDatum(domainObject, series, i)));
}
this.$scope.rows = newRows;
};
/**