ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 01:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Time Conductor] Change method name

Browse Source 
Prefer simpler method names for public API.
This commit is contained in:
Victor Woeltjen 2015-09-24 17:05:08 -07:00
parent 4ced6c44a6
commit ff1fd26efc
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform/features/conductor/src/ConductorRepresenter.js
View File

@ -73,7 +73,7 @@ define(
repScope.$broadcast('telemetry:query:bounds', bounds( repScope.$broadcast('telemetry:query:bounds', bounds(
conductor.queryStart(), conductor.queryStart(),
conductor.queryEnd(), conductor.queryEnd(),
conductor.activeDomain() conductor.domain()
)); ));
} }
@ -83,16 +83,16 @@ define(
repScope.$broadcast('telemetry:display:bounds', bounds( repScope.$broadcast('telemetry:display:bounds', bounds(
conductor.displayStart(), conductor.displayStart(),
conductor.displayEnd(), conductor.displayEnd(),
conductor.activeDomain() conductor.domain()
)); ));
} }
function updateDomain(value) { function updateDomain(value) {
conductor.activeDomain(value); conductor.domain(value);
repScope.$broadcast('telemetry:display:bounds', bounds( repScope.$broadcast('telemetry:display:bounds', bounds(
conductor.displayStart(), conductor.displayStart(),
conductor.displayEnd(), conductor.displayEnd(),
conductor.activeDomain() conductor.domain()
)); ));
} }
@ -111,7 +111,7 @@ define(
}; };
conductorScope.ngModel.options = conductorScope.ngModel.options =
conductor.domainOptions().map(makeOption); conductor.domainOptions().map(makeOption);
conductorScope.ngModel.domain = conductor.activeDomain(); conductorScope.ngModel.domain = conductor.domain();
conductorScope conductorScope
.$watch('ngModel.conductor.outer.start', updateConductorOuter); .$watch('ngModel.conductor.outer.start', updateConductorOuter);

2
platform/features/conductor/src/ConductorTelemetryDecorator.js
View File

@ -72,7 +72,7 @@ define(
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(); domain = conductor.domain();
function amendRequest(request) { function amendRequest(request) {
request = request || {}; request = request || {};

2
platform/features/conductor/src/ConductorTelemetrySeries.js
View File

@ -39,7 +39,7 @@ define(
*/ */
function ConductorTelemetrySeries(series, conductor) { function ConductorTelemetrySeries(series, conductor) {
var max = series.getPointCount() - 1, var max = series.getPointCount() - 1,
domain = conductor.activeDomain(); domain = conductor.domain();
function binSearch(min, max, value) { function binSearch(min, max, value) {
var mid = Math.floor((min + max) / 2); var mid = Math.floor((min + max) / 2);

4
platform/features/conductor/src/TimeConductor.js
View File

@ -44,7 +44,7 @@ define(
this.inner = { start: start, end: end }; this.inner = { start: start, end: end };
this.outer = { start: start, end: end }; this.outer = { start: start, end: end };
this.domains = domains; this.domains = domains;
this.domain = domains[0].key; this.activeDomain = domains[0].key;
} }
/** /**
@ -110,7 +110,7 @@ define(
* @param {string} [key] the key identifying the domain choice * @param {string} [key] the key identifying the domain choice
* @returns {TelemetryDomain} the active telemetry domain * @returns {TelemetryDomain} the active telemetry domain
*/ */
TimeConductor.prototype.activeDomain = function (key) { TimeConductor.prototype.domain = function (key) {
function matchesKey(domain) { function matchesKey(domain) {
return domain.key === key; return domain.key === key;
} }