alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Time Conductor] Rename TimeConductorController

Browse Source 
Rename TimeConductorController to TimeRangeController, to
reflect that this is intended to serve as a more general
control. Additionally, stop using arrays for inner and
outer bounds and instead use explicit start/end properties,
for clarity. WTD-1515
This commit is contained in:
Victor Woeltjen
2015-09-10 10:54:44 -07:00
parent 4c79c9a1b1
commit 78fae345da
4 changed files with 87 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,37 +60,44 @@ define(
this.$compile = $compile;
}
// Combine start/end times into a single object
function bounds(start, end) {
return { start: start, end: end };
}
// Update the time conductor from the scope
function wireScope(conductor, conductorScope, repScope) {
function updateConductorOuter() {
conductor.queryStart(conductorScope.conductor.outer[0]);
conductor.queryEnd(conductorScope.conductor.outer[1]);
repScope.$broadcast('telemetry:query:bounds', {
start: conductor.queryStart(),
end: conductor.queryEnd()
});
conductor.queryStart(conductorScope.conductor.outer.start);
conductor.queryEnd(conductorScope.conductor.outer.end);
repScope.$broadcast(
'telemetry:query:bounds',
bounds(conductor.queryStart(), conductor.queryEnd())
);
}
function updateConductorInner() {
conductor.displayStart(conductorScope.conductor.inner[0]);
conductor.displayEnd(conductorScope.conductor.inner[1]);
repScope.$broadcast('telemetry:display:bounds', {
start: conductor.displayStart(),
end: conductor.displayEnd()
});
conductor.displayStart(conductorScope.conductor.inner.start);
conductor.displayEnd(conductorScope.conductor.inner.end);
repScope.$broadcast(
'telemetry:display:bounds',
bounds(conductor.displayStart(), conductor.displayEnd())
);
}
conductorScope.conductor = {
outer: [ conductor.queryStart(), conductor.queryEnd() ],
inner: [ conductor.displayStart(), conductor.displayEnd() ]
outer: bounds(conductor.queryStart(), conductor.queryEnd()),
inner: bounds(conductor.displayStart(), conductor.displayEnd())
};
conductorScope.$watch('conductor.outer[0]', updateConductorOuter);
conductorScope.$watch('conductor.outer[1]', updateConductorOuter);
conductorScope.$watch('conductor.inner[0]', updateConductorInner);
conductorScope.$watch('conductor.inner[1]', updateConductorInner);
conductorScope
.$watch('conductor.outer.start', updateConductorOuter);
conductorScope
.$watch('conductor.outer.end', updateConductorOuter);
conductorScope
.$watch('conductor.inner.start', updateConductorInner);
conductorScope
.$watch('conductor.inner.end', updateConductorInner);
repScope.$on('telemetry:view', updateConductorInner);
}