[Time Conductor] Include domain selection in requests

...as well as use as default in a telemetry series.
This commit is contained in:
Victor Woeltjen 2015-09-23 17:14:40 -07:00
parent d238b669a5
commit f182d1f2c4
2 changed files with 5 additions and 1 deletions

View File

@ -71,12 +71,14 @@ define(
ConductorTelemetryDecorator.prototype.amendRequests = function (requests) { ConductorTelemetryDecorator.prototype.amendRequests = function (requests) {
var conductor = this.conductorService.getConductor(), var conductor = this.conductorService.getConductor(),
start = conductor.displayStart(), start = conductor.displayStart(),
end = conductor.displayEnd(); end = conductor.displayEnd(),
domain = conductor.activeDomain();
function amendRequest(request) { function amendRequest(request) {
request = request || {}; request = request || {};
request.start = start; request.start = start;
request.end = end; request.end = end;
request.domain = domain;
return request; return request;
} }

View File

@ -52,6 +52,7 @@ define(
this.startIndex = binSearch(0, max, conductor.displayStart()); this.startIndex = binSearch(0, max, conductor.displayStart());
this.endIndex = binSearch(0, max, conductor.displayEnd()); this.endIndex = binSearch(0, max, conductor.displayEnd());
this.series = series; this.series = series;
this.domain = conductor.activeDomain();
} }
ConductorTelemetrySeries.prototype.getPointCount = function () { ConductorTelemetrySeries.prototype.getPointCount = function () {
@ -59,6 +60,7 @@ define(
}; };
ConductorTelemetrySeries.prototype.getDomainValue = function (i, d) { ConductorTelemetrySeries.prototype.getDomainValue = function (i, d) {
d = d || this.domain;
return this.series.getDomainValue(i + this.startIndex, d); return this.series.getDomainValue(i + this.startIndex, d);
}; };