ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-11 06:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Timeline] Convert SOC to use percentages

Browse Source 
Also includes updated validation params which allow for floats to a maximum
of 100 as well as a percentage sign which is later removed.
This commit is contained in:
David Hudson 2016-09-20 17:40:08 +09:00
parent d913798d5b
commit 943e2ebe14
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/features/timeline/bundle.js
View File

@ -184,14 +184,14 @@ define([
"pattern": "^-?\\d+(\\.\\d*)?$" "pattern": "^-?\\d+(\\.\\d*)?$"
}, },
{ {
"name": "Battery Starting SOC", "name": "Battery starting SOC (%)",
"control": "textfield", "control": "textfield",
"required": false, "required": false,
"conversion": "number", "conversion": "number",
"property": [ "property": [
"startingSOC" "startingSOC"
], ],
"pattern": "^-?\\d+(\\.\\d*)?$" "pattern": "^([0-9](\\.\\d*)?|[1-9][0-9](\\.\\d*)?|100)%?$"
} }
], ],
"model": { "model": {

4
platform/features/timeline/src/capabilities/GraphCapability.js
View File

@ -55,12 +55,14 @@ define(
if (domainObject.getModel().type === 'timeline' && if (domainObject.getModel().type === 'timeline' &&
result.power && result.power &&
domainObject.getModel().capacity > 0) { domainObject.getModel().capacity > 0) {
domainObject.getModel().startingSOC =
parseFloat(domainObject.getModel().startingSOC) || 100;
result.battery = new CumulativeGraph( result.battery = new CumulativeGraph(
result.power, result.power,
0, 0,
domainObject.getModel().capacity, // Watts domainObject.getModel().capacity, // Watts
domainObject.getModel().startingSOC, (domainObject.getModel().startingSOC/100)*domainObject.getModel().capacity,
1 / 3600000 // millis-to-hour (since units are watt-hours) 1 / 3600000 // millis-to-hour (since units are watt-hours)
); );
} }