ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 13:43:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Time Conductor] Simplify passing in of axis type

Browse Source 
...in PlotAxis. Also avoids triggering failures of existing tests.
This commit is contained in:
Victor Woeltjen 2015-10-27 15:39:20 -07:00
parent f30a2dd791
commit 5ff2e6b652
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/features/plot/src/PlotController.js
View File

@ -233,8 +233,8 @@ define(
// Initialize axes; will get repopulated when telemetry // Initialize axes; will get repopulated when telemetry
// metadata becomes available. // metadata becomes available.
$scope.axes = [ $scope.axes = [
new PlotAxis("domain", [], AXIS_DEFAULTS[0]), new PlotAxis("domains", [], AXIS_DEFAULTS[0]),
new PlotAxis("range", [], AXIS_DEFAULTS[1]) new PlotAxis("ranges", [], AXIS_DEFAULTS[1])
]; ];
// Subscribe to telemetry when a domain object becomes available // Subscribe to telemetry when a domain object becomes available

2
platform/features/plot/src/elements/PlotAxis.js
View File

@ -87,7 +87,7 @@ define(
} }
metadatas.forEach(function (m) { metadatas.forEach(function (m) {
(m[axisType + 's'] || []).forEach(function (option) { (m[axisType] || []).forEach(function (option) {
var key = option.key; var key = option.key;
if (!optionKeys[key] && !newOptions[key]) { if (!optionKeys[key] && !newOptions[key]) {
toAdd.push(option); toAdd.push(option);

2
platform/features/plot/test/elements/PlotAxisSpec.js
View File

@ -80,4 +80,4 @@ define(
}); });
} }
); );