-
-
+
-
2016-09-15 21:31:30.000Z
+
{{toi.toiText}}
diff --git a/platform/features/conductor-v2/conductor/src/TimeConductor.js b/platform/features/conductor-v2/conductor/src/TimeConductor.js
index 2c2194b5a0..f594083100 100644
--- a/platform/features/conductor-v2/conductor/src/TimeConductor.js
+++ b/platform/features/conductor-v2/conductor/src/TimeConductor.js
@@ -123,6 +123,12 @@ define(['EventEmitter'], function (EventEmitter) {
* @property {TimeConductorBounds} bounds
*/
this.emit('bounds', this.boundsVal);
+
+ // If a bounds change results in a TOI outside of the current
+ // bounds, unset it
+ if (this.toi < newBounds.start || this.toi > newBounds.end) {
+ this.timeOfInterest(undefined);
+ }
}
//Return a copy to prevent direct mutation of time conductor bounds.
return JSON.parse(JSON.stringify(this.boundsVal));
@@ -158,17 +164,21 @@ define(['EventEmitter'], function (EventEmitter) {
/**
* Get or set the Time of Interest. The Time of Interest is the temporal
* focus of the current view. It can be manipulated by the user from the
- * time conductor or from other views.
+ * time conductor or from other views. The time of interest can
+ * effectively be unset by assigning a value of 'undefined'.
* @fires TimeConductor#timeOfInterest
- * @param newTOI
- * @returns {number} the current time of interest
+ * @param {number | undefined} newTOI A new time of interest, represented
+ * as a
+ * number that is valid in the current time system.
+ * @returns {number | undefined} the current time of interest
*/
TimeConductor.prototype.timeOfInterest = function (newTOI) {
if (arguments.length > 0) {
this.toi = newTOI;
/**
- * @event TimeConductor#timeOfInterest The Time of Interest has moved.
- * @property {number} Current time of interest
+ * @event TimeConductor#timeOfInterest The Time of Interest has
+ * changed.
+ * @property {number | undefined} Current time of interest
*/
this.emit('timeOfInterest', this.toi);
}
diff --git a/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js b/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js
index c168acadf6..61ba17cd10 100644
--- a/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js
+++ b/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js
@@ -29,9 +29,11 @@ define(
* labelled 'ticks'. It requires 'start' and 'end' integer values to
* be specified as attributes.
*/
- function ConductorTOIController($scope, conductor, conductorViewService, $timeout) {
+ function ConductorTOIController($scope, conductor, conductorViewService, formatService) {
this.conductor = conductor;
this.conductorViewService = conductorViewService;
+ this.formatService = formatService;
+ this.toiText = undefined;
//Bind all class functions to 'this'
Object.keys(ConductorTOIController.prototype).filter(function (key) {
@@ -43,19 +45,10 @@ define(
this.conductor.on('timeOfInterest', this.changeTimeOfInterest);
this.conductorViewService.on('zoom', this.setOffsetFromBounds);
this.conductorViewService.on('pan', this.setOffsetFromBounds);
-
- this.$timeout = $timeout;
-
- var generateRandomTOI = function () {
- var bounds = conductor.bounds();
- var range = bounds.end - bounds.start;
- var toi = Math.random() * range + bounds.start;
- console.log('calculated random TOI of ' + toi);
- conductor.timeOfInterest(toi);
- //this.timeoutHandle = $timeout(generateRandomTOI, 1000);
- }.bind(this);
-
- //this.timeoutHandle = $timeout(generateRandomTOI, 2000);
+ this.conductor.on('timeSystem', this.changeTimeSystem);
+ if (conductor.timeSystem()) {
+ this.changeTimeSystem(conductor.timeSystem());
+ }
$scope.$on('$destroy', this.destroy);
@@ -63,23 +56,28 @@ define(
ConductorTOIController.prototype.destroy = function () {
this.conductor.off('timeOfInterest', this.setOffsetFromBounds);
+ this.conductor.off('timeSystem', this.changeTimeSystem);
this.conductorViewService.off('zoom', this.setOffsetFromBounds);
this.conductorViewService.off('pan', this.setOffsetFromBounds);
-
- this.$timeout.cancel(this.timeoutHandle);
};
ConductorTOIController.prototype.setOffsetFromBounds = function (bounds) {
var toi = this.conductor.timeOfInterest();
var offset = toi - bounds.start;
- this.left = offset / (bounds.end - bounds.start) * 100;
+ var duration = bounds.end - bounds.start;
+ this.left = offset / duration * 100;
+ this.toiText = this.format.format(toi);
+ };
+
+ ConductorTOIController.prototype.changeTimeSystem = function (timeSystem) {
+ this.format = this.formatService.getFormat(timeSystem.formats()[0]);
};
ConductorTOIController.prototype.changeTimeOfInterest = function () {
var bounds = this.conductor.bounds();
if (bounds) {
this.setOffsetFromBounds(bounds);
- this.pinned = true;
+ this.pinned = this.conductor.timeOfInterest() !== undefined;
}
};
@@ -96,17 +94,8 @@ define(
}
};
- /*
- ConductorTOIController.prototype.zoom = function (bounds) {
- this.changeTOI(bounds)
- };
-
- ConductorTOIController.prototype.pan = function (bounds) {
- this.changeTOI(bounds)
- };*/
-
ConductorTOIController.prototype.resize = function () {
- //Do something
+ //Do something?
};
return ConductorTOIController;
diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html
index d6d9a2d50a..e0dd954d18 100644
--- a/platform/features/plot/res/templates/plot.html
+++ b/platform/features/plot/res/templates/plot.html
@@ -75,15 +75,15 @@
-
+
diff --git a/platform/features/table/bundle.js b/platform/features/table/bundle.js
index 4c7b77b47e..def5e4da62 100644
--- a/platform/features/table/bundle.js
+++ b/platform/features/table/bundle.js
@@ -109,7 +109,7 @@ define([
{
"key": "HistoricalTableController",
"implementation": HistoricalTableController,
- "depends": ["$scope", "telemetryHandler", "telemetryFormatter", "$timeout"]
+ "depends": ["$scope", "telemetryHandler", "telemetryFormatter", "$timeout", "timeConductor"]
},
{
"key": "RealtimeTableController",
diff --git a/platform/features/table/res/templates/historical-table.html b/platform/features/table/res/templates/historical-table.html
index d306601daf..168886e59d 100644
--- a/platform/features/table/res/templates/historical-table.html
+++ b/platform/features/table/res/templates/historical-table.html
@@ -1,9 +1,11 @@
-
+
\ No newline at end of file
diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html
index e3f3b1c009..054ec54e94 100644
--- a/platform/features/table/res/templates/mct-table.html
+++ b/platform/features/table/res/templates/mct-table.html
@@ -49,20 +49,23 @@
+
+
-
-
-
-
+ class="{{visibleRow.contents.cssClass}}"
+ ng-click="table.onRowClick($event, visibleRow.contents)"
+ ng-style="{
+ top: visibleRow.offsetY + 'px',
+ }">
+
+
+
+
diff --git a/platform/features/table/src/controllers/HistoricalTableController.js b/platform/features/table/src/controllers/HistoricalTableController.js
index d8af8060de..90e13db704 100644
--- a/platform/features/table/src/controllers/HistoricalTableController.js
+++ b/platform/features/table/src/controllers/HistoricalTableController.js
@@ -36,7 +36,7 @@ define(
* @param telemetryFormatter
* @constructor
*/
- function HistoricalTableController($scope, telemetryHandler, telemetryFormatter, $timeout) {
+ function HistoricalTableController($scope, telemetryHandler, telemetryFormatter, $timeout, conductor) {
var self = this;
this.$timeout = $timeout;
@@ -49,7 +49,7 @@ define(
}
});
- TableController.call(this, $scope, telemetryHandler, telemetryFormatter);
+ TableController.call(this, $scope, telemetryHandler, telemetryFormatter, conductor);
}
HistoricalTableController.prototype = Object.create(TableController.prototype);
@@ -59,6 +59,7 @@ define(
* @private
*/
HistoricalTableController.prototype.doneProcessing = function (rowData) {
+ //Set table rows to formatted data;
this.$scope.rows = rowData;
this.$scope.loading = false;
};
@@ -109,8 +110,9 @@ define(
//Process rows in a batch with size not exceeding a maximum length
for (; i < end; i++) {
- rowData.push(this.table.getRowValues(telemetryObject,
- this.handle.makeDatum(telemetryObject, series, i)));
+ var datum = this.handle.makeDatum(telemetryObject, series, i);
+ this.data.push(datum);
+ rowData.push(this.table.getRowValues(telemetryObject, datum));
}
//Done processing all rows for this object.
@@ -123,7 +125,7 @@ define(
// before continuing processing
this.timeoutHandle = this.$timeout(this.processTelemetryObjects.bind(this, objects, offset, end, rowData));
};
-
+
/**
* Populates historical data on scope when it becomes available from
* the telemetry API
@@ -132,7 +134,7 @@ define(
if (this.timeoutHandle) {
this.$timeout.cancel(this.timeoutHandle);
}
-
+ this.data = [];
this.timeoutHandle = this.$timeout(this.processTelemetryObjects.bind(this, this.handle.getTelemetryObjects(), 0, 0, []));
};
diff --git a/platform/features/table/src/controllers/MCTTableController.js b/platform/features/table/src/controllers/MCTTableController.js
index bf5ea9218c..3db5d8267a 100644
--- a/platform/features/table/src/controllers/MCTTableController.js
+++ b/platform/features/table/src/controllers/MCTTableController.js
@@ -25,6 +25,13 @@ define(
this.tbody = element.find('tbody');
this.$scope.sizingRow = {};
+ //Bind all class functions to 'this'
+ Object.keys(MCTTableController.prototype).filter(function (key) {
+ return typeof MCTTableController.prototype[key] === 'function';
+ }).forEach(function (key) {
+ this[key] = MCTTableController.prototype[key].bind(this);
+ }.bind(this));
+
this.scrollable.on('scroll', this.onScroll.bind(this));
$scope.visibleRows = [];
@@ -294,37 +301,38 @@ define(
/**
* @private
*/
- MCTTableController.prototype.insertSorted = function (array, element) {
- var index = -1,
- self = this,
- sortKey = this.$scope.sortColumn;
+ MCTTableController.prototype.binarySearch = function (searchArray, searchElement, min, max) {
+ var sampleAt = Math.floor((max - min) / 2) + min;
- function binarySearch(searchArray, searchElement, min, max) {
- var sampleAt = Math.floor((max - min) / 2) + min;
-
- if (max < min) {
- return min; // Element is not in array, min gives direction
- }
-
- switch (self.sortComparator(searchElement[sortKey].text,
- searchArray[sampleAt][sortKey].text)) {
- case -1:
- return binarySearch(searchArray, searchElement, min,
- sampleAt - 1);
- case 0 :
- return sampleAt;
- case 1 :
- return binarySearch(searchArray, searchElement,
- sampleAt + 1, max);
- }
+ if (max < min) {
+ return min; // Element is not in array, min gives direction
}
+ switch (this.sortComparator(searchElement[this.$scope.sortColumn].text,
+ searchArray[sampleAt][this.$scope.sortColumn].text)) {
+ case -1:
+ return this.binarySearch(searchArray, searchElement, min,
+ sampleAt - 1);
+ case 0 :
+ return sampleAt;
+ case 1 :
+ return this.binarySearch(searchArray, searchElement,
+ sampleAt + 1, max);
+ }
+ };
+
+ /**
+ * @private
+ */
+ MCTTableController.prototype.insertSorted = function (array, element) {
+ var index = -1;
+
if (!this.$scope.sortColumn || !this.$scope.sortDirection) {
//No sorting applied, push it on the end.
index = array.length;
} else {
//Sort is enabled, perform binary search to find insertion point
- index = binarySearch(array, element, 0, array.length - 1);
+ index = this.binarySearch(array, element, 0, array.length - 1);
}
if (index === -1) {
array.unshift(element);
@@ -488,6 +496,11 @@ define(
this.resize(newRows).then(this.setVisibleRows.bind(this));
};
+ MCTTableController.prototype.onRowClick = function (event, row) {
+ var index = this.$scope.rows.indexOf(row);
+ this.$scope.onRowClick({event: event, rowIndex:index, sortColumn: this.$scope.sortColumn, sortDirection: this.$scope.sortDirection});
+ };
+
/**
* Applies user defined filters to rows. These filters are based on
* the text entered in the search areas in each column.
diff --git a/platform/features/table/src/controllers/TelemetryTableController.js b/platform/features/table/src/controllers/TelemetryTableController.js
index 1e77e16278..3845026f8e 100644
--- a/platform/features/table/src/controllers/TelemetryTableController.js
+++ b/platform/features/table/src/controllers/TelemetryTableController.js
@@ -26,9 +26,10 @@
*/
define(
[
- '../TableConfiguration'
+ '../TableConfiguration',
+ '../DomainColumn'
],
- function (TableConfiguration) {
+ function (TableConfiguration, DomainColumn) {
/**
* The TableController is responsible for getting data onto the page
@@ -43,7 +44,8 @@ define(
function TelemetryTableController(
$scope,
telemetryHandler,
- telemetryFormatter
+ telemetryFormatter,
+ conductor
) {
var self = this;
@@ -54,6 +56,8 @@ define(
this.table = new TableConfiguration($scope.domainObject,
telemetryFormatter);
this.changeListeners = [];
+ this.conductor = conductor;
+ this.data = [];
$scope.rows = [];
@@ -64,9 +68,27 @@ define(
});
// Unsubscribe when the plot is destroyed
- this.$scope.$on("$destroy", this.destroy.bind(this));
+ this.$scope.$on("$destroy", this.destroy);
}
+ TelemetryTableController.prototype.onRowClick = function (event, rowIndex, sortBy, sortOrder) {
+ var datum = this.data[rowIndex];
+
+ if (event.altKey) {
+ console.log("selected: " + this.$scope.rows[rowIndex]);
+ //Is column one that we can use to set time of interest?
+ var domainColumn = this.table.columns.filter(function (column) {
+ return column instanceof DomainColumn &&
+ column.getTitle() === sortBy;
+ })[0];
+ if (domainColumn) {
+ var timeOfInterest = datum[domainColumn.domainMetadata.key];
+ this.conductor.timeOfInterest(timeOfInterest);
+ }
+ }
+
+ };
+
/**
* @private
*/
@@ -188,6 +210,10 @@ define(
});
};
+ TelemetryTableController.prototype.changeTimeOfInterest = function (toi) {
+
+ }
+
return TelemetryTableController;
}
);
diff --git a/platform/features/table/src/directives/MCTTable.js b/platform/features/table/src/directives/MCTTable.js
index 12407e7598..d138c8ac97 100644
--- a/platform/features/table/src/directives/MCTTable.js
+++ b/platform/features/table/src/directives/MCTTable.js
@@ -88,12 +88,14 @@ define(
'exportService',
MCTTableController
],
+ controllerAs: "table",
scope: {
headers: "=",
rows: "=",
enableFilter: "=?",
enableSort: "=?",
- autoScroll: "=?"
+ autoScroll: "=?",
+ onRowClick: "&"
}
};
}