mirror of
https://github.com/nasa/openmct.git
synced 2025-05-06 10:38:23 +00:00
[Sinewave] Get rid of broken format
Not sure what the Delta value was intended to display, but the format wasn't working as expected (as far as I can tell), so removed it for simplicity.
This commit is contained in:
parent
00bebbc66f
commit
7706109c81
@ -1,67 +0,0 @@
|
|||||||
/*****************************************************************************
|
|
||||||
* Open MCT, Copyright (c) 2014-2017, United States Government
|
|
||||||
* as represented by the Administrator of the National Aeronautics and Space
|
|
||||||
* Administration. All rights reserved.
|
|
||||||
*
|
|
||||||
* Open MCT is licensed under the Apache License, Version 2.0 (the
|
|
||||||
* "License"); you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0.
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
* License for the specific language governing permissions and limitations
|
|
||||||
* under the License.
|
|
||||||
*
|
|
||||||
* Open MCT includes source code licensed under additional open source
|
|
||||||
* licenses. See the Open Source Licenses file (LICENSES.md) included with
|
|
||||||
* this source code distribution or the Licensing information page available
|
|
||||||
* at runtime from the About dialog for additional information.
|
|
||||||
*****************************************************************************/
|
|
||||||
/*global define*/
|
|
||||||
|
|
||||||
define(
|
|
||||||
['./SinewaveConstants', 'moment'],
|
|
||||||
function (SinewaveConstants, moment) {
|
|
||||||
|
|
||||||
var START_TIME = SinewaveConstants.START_TIME,
|
|
||||||
FORMAT_REGEX = /^-?\d+:\d+:\d+$/,
|
|
||||||
SECOND = 1000,
|
|
||||||
MINUTE = SECOND * 60,
|
|
||||||
HOUR = MINUTE * 60;
|
|
||||||
|
|
||||||
function SinewaveDeltaFormat() {
|
|
||||||
}
|
|
||||||
|
|
||||||
function twoDigit(v) {
|
|
||||||
return v >= 10 ? String(v) : ('0' + v);
|
|
||||||
}
|
|
||||||
|
|
||||||
SinewaveDeltaFormat.prototype.format = function (value) {
|
|
||||||
var delta = Math.abs(value - START_TIME),
|
|
||||||
negative = value < START_TIME,
|
|
||||||
seconds = Math.floor(delta / SECOND) % 60,
|
|
||||||
minutes = Math.floor(delta / MINUTE) % 60,
|
|
||||||
hours = Math.floor(delta / HOUR);
|
|
||||||
return (negative ? "-" : "") +
|
|
||||||
[ hours, minutes, seconds ].map(twoDigit).join(":");
|
|
||||||
};
|
|
||||||
|
|
||||||
SinewaveDeltaFormat.prototype.validate = function (text) {
|
|
||||||
return FORMAT_REGEX.test(text);
|
|
||||||
};
|
|
||||||
|
|
||||||
SinewaveDeltaFormat.prototype.parse = function (text) {
|
|
||||||
var negative = text[0] === "-",
|
|
||||||
parts = text.replace("-", "").split(":");
|
|
||||||
return [ HOUR, MINUTE, SECOND ].map(function (sz, i) {
|
|
||||||
return parseInt(parts[i], 10) * sz;
|
|
||||||
}).reduce(function (a, b) {
|
|
||||||
return a + b;
|
|
||||||
}, 0) * (negative ? -1 : 1) + START_TIME;
|
|
||||||
};
|
|
||||||
|
|
||||||
return SinewaveDeltaFormat;
|
|
||||||
}
|
|
||||||
);
|
|
@ -64,7 +64,6 @@
|
|||||||
data: {
|
data: {
|
||||||
utc: nextStep,
|
utc: nextStep,
|
||||||
yesterday: nextStep - 60*60*24*1000,
|
yesterday: nextStep - 60*60*24*1000,
|
||||||
delta: 60*60*24*1000,
|
|
||||||
sin: sin(nextStep, data.period, data.amplitude, data.offset),
|
sin: sin(nextStep, data.period, data.amplitude, data.offset),
|
||||||
cos: cos(nextStep, data.period, data.amplitude, data.offset)
|
cos: cos(nextStep, data.period, data.amplitude, data.offset)
|
||||||
}
|
}
|
||||||
@ -108,7 +107,6 @@
|
|||||||
data.push({
|
data.push({
|
||||||
utc: nextStep,
|
utc: nextStep,
|
||||||
yesterday: nextStep - 60*60*24*1000,
|
yesterday: nextStep - 60*60*24*1000,
|
||||||
delta: 60*60*24*1000,
|
|
||||||
sin: sin(nextStep, period, amplitude, offset),
|
sin: sin(nextStep, period, amplitude, offset),
|
||||||
cos: cos(nextStep, period, amplitude, offset)
|
cos: cos(nextStep, period, amplitude, offset)
|
||||||
});
|
});
|
||||||
|
@ -23,12 +23,10 @@
|
|||||||
|
|
||||||
define([
|
define([
|
||||||
"./GeneratorProvider",
|
"./GeneratorProvider",
|
||||||
"./SinewaveLimitCapability",
|
"./SinewaveLimitCapability"
|
||||||
"./SinewaveDeltaFormat"
|
|
||||||
], function (
|
], function (
|
||||||
GeneratorProvider,
|
GeneratorProvider,
|
||||||
SinewaveLimitCapability,
|
SinewaveLimitCapability
|
||||||
SinewaveDeltaFormat
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
var legacyExtensions = {
|
var legacyExtensions = {
|
||||||
@ -38,12 +36,6 @@ define([
|
|||||||
"implementation": SinewaveLimitCapability
|
"implementation": SinewaveLimitCapability
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"formats": [
|
|
||||||
{
|
|
||||||
"key": "example.delta",
|
|
||||||
"implementation": SinewaveDeltaFormat
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"constants": [
|
"constants": [
|
||||||
{
|
{
|
||||||
"key": "TIME_CONDUCTOR_DOMAINS",
|
"key": "TIME_CONDUCTOR_DOMAINS",
|
||||||
@ -152,14 +144,6 @@ define([
|
|||||||
domain: 2
|
domain: 2
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
key: "delta",
|
|
||||||
name: "Delta",
|
|
||||||
format: "example.delta",
|
|
||||||
hints: {
|
|
||||||
domain: 3
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
key: "sin",
|
key: "sin",
|
||||||
name: "Sine",
|
name: "Sine",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user