[Example] Add units to MSL example. Recreates functionality from the old live demo

This commit is contained in:
Henry 2017-04-27 19:02:35 -07:00
parent 1d7d963a4f
commit 69b06364eb
2 changed files with 20 additions and 10 deletions

View File

@ -1,9 +1,9 @@
/***************************************************************************** /*****************************************************************************
* Open MCT, Copyright (c) 2014-2017, United States Government * Open MCT Web, Copyright (c) 2014-2015, United States Government
* as represented by the Administrator of the National Aeronautics and Space * as represented by the Administrator of the National Aeronautics and Space
* Administration. All rights reserved. * Administration. All rights reserved.
* *
* Open MCT is licensed under the Apache License, Version 2.0 (the * Open MCT Web is licensed under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. * "License"); you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0. * http://www.apache.org/licenses/LICENSE-2.0.
@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations * License for the specific language governing permissions and limitations
* under the License. * under the License.
* *
* Open MCT includes source code licensed under additional open source * Open MCT Web includes source code licensed under additional open source
* licenses. See the Open Source Licenses file (LICENSES.md) included with * licenses. See the Open Source Licenses file (LICENSES.md) included with
* this source code distribution or the Licensing information page available * this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
@ -44,31 +44,31 @@ define(
{ {
"name": "Min. Air Temperature", "name": "Min. Air Temperature",
"identifier": "min_temp", "identifier": "min_temp",
"units": "degrees", "units": "Degrees (C)",
"type": "float" "type": "float"
}, },
{ {
"name": "Max. Air Temperature", "name": "Max. Air Temperature",
"identifier": "max_temp", "identifier": "max_temp",
"units": "degrees", "units": "Degrees (C)",
"type": "float" "type": "float"
}, },
{ {
"name": "Atmospheric Pressure", "name": "Atmospheric Pressure",
"identifier": "pressure", "identifier": "pressure",
"units": "pascals", "units": "Millibars",
"type": "float" "type": "float"
}, },
{ {
"name": "Min. Ground Temperature", "name": "Min. Ground Temperature",
"identifier": "min_gts_temp", "identifier": "min_gts_temp",
"units": "degrees", "units": "Degrees (C)",
"type": "float" "type": "float"
}, },
{ {
"name": "Max. Ground Temperature", "name": "Max. Ground Temperature",
"identifier": "max_gts_temp", "identifier": "max_gts_temp",
"units": "degrees", "units": "Degrees (C)",
"type": "float" "type": "float"
} }
] ]

View File

@ -48,6 +48,13 @@ define(
this.$http = $http; this.$http = $http;
this.$log = $log; this.$log = $log;
this.promise = undefined; this.promise = undefined;
this.dataTransforms = {
//Convert from pascals to millibars
'pressure': function pascalsToMillibars(pascals) {
return pascals / 100;
}
};
} }
/** /**
@ -65,6 +72,8 @@ define(
var self = this, var self = this,
id = request.key; id = request.key;
var dataTransforms = this.dataTransforms;
function processResponse(response){ function processResponse(response){
var data = []; var data = [];
/* /*
@ -75,13 +84,14 @@ define(
* Check that valid data exists * Check that valid data exists
*/ */
if (!isNaN(solData[id])) { if (!isNaN(solData[id])) {
var dataTransform = dataTransforms[id];
/* /*
* Append each data point to the array of values * Append each data point to the array of values
* for this data point property (min. temp, etc). * for this data point property (min. temp, etc).
*/ */
data.unshift({ data.unshift({
date: Date.parse(solData[TERRESTRIAL_DATE]), date: Date.parse(solData[TERRESTRIAL_DATE]),
value: solData[id] value: dataTransform ? dataTransform(solData[id]) : solData[id]
}); });
} }
}); });