2016-01-15 01:08:19 +00:00
|
|
|
/*****************************************************************************
|
2016-07-12 23:21:58 +00:00
|
|
|
* Open MCT, Copyright (c) 2014-2016, United States Government
|
2016-01-15 01:08:19 +00:00
|
|
|
* as represented by the Administrator of the National Aeronautics and Space
|
|
|
|
* Administration. All rights reserved.
|
|
|
|
*
|
2016-07-12 23:21:58 +00:00
|
|
|
* Open MCT is licensed under the Apache License, Version 2.0 (the
|
2016-01-15 01:08:19 +00:00
|
|
|
* "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.
|
|
|
|
*
|
2016-07-12 23:21:58 +00:00
|
|
|
* Open MCT includes source code licensed under additional open source
|
2016-01-15 01:08:19 +00:00
|
|
|
* 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([
|
|
|
|
"./src/SinewaveTelemetryProvider",
|
|
|
|
"./src/SinewaveLimitCapability",
|
|
|
|
"./src/SinewaveDeltaFormat",
|
|
|
|
'legacyRegistry'
|
|
|
|
], function (
|
|
|
|
SinewaveTelemetryProvider,
|
|
|
|
SinewaveLimitCapability,
|
|
|
|
SinewaveDeltaFormat,
|
|
|
|
legacyRegistry
|
|
|
|
) {
|
|
|
|
"use strict";
|
|
|
|
|
|
|
|
legacyRegistry.register("example/generator", {
|
|
|
|
"name": "Sine Wave Generator",
|
2016-03-24 02:04:32 +00:00
|
|
|
"description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
|
2016-01-15 01:08:19 +00:00
|
|
|
"extensions": {
|
|
|
|
"components": [
|
|
|
|
{
|
|
|
|
"implementation": SinewaveTelemetryProvider,
|
|
|
|
"type": "provider",
|
|
|
|
"provides": "telemetryService",
|
|
|
|
"depends": [
|
|
|
|
"$q",
|
|
|
|
"$timeout"
|
|
|
|
]
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"capabilities": [
|
|
|
|
{
|
|
|
|
"key": "limit",
|
|
|
|
"implementation": SinewaveLimitCapability
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"formats": [
|
|
|
|
{
|
|
|
|
"key": "example.delta",
|
|
|
|
"implementation": SinewaveDeltaFormat
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"constants": [
|
|
|
|
{
|
|
|
|
"key": "TIME_CONDUCTOR_DOMAINS",
|
|
|
|
"value": [
|
|
|
|
{
|
|
|
|
"key": "time",
|
|
|
|
"name": "Time"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"key": "yesterday",
|
|
|
|
"name": "Yesterday"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"key": "delta",
|
|
|
|
"name": "Delta",
|
|
|
|
"format": "example.delta"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"priority": -1
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"types": [
|
|
|
|
{
|
|
|
|
"key": "generator",
|
|
|
|
"name": "Sine Wave Generator",
|
2017-02-15 23:02:39 +00:00
|
|
|
"cssClass": "icon-telemetry",
|
2016-03-24 02:04:32 +00:00
|
|
|
"description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
|
2016-03-24 19:05:10 +00:00
|
|
|
"priority": 10,
|
2016-01-15 01:08:19 +00:00
|
|
|
"features": "creation",
|
|
|
|
"model": {
|
|
|
|
"telemetry": {
|
2016-12-14 23:02:53 +00:00
|
|
|
"period": 10,
|
|
|
|
"amplitude": 1,
|
|
|
|
"offset": 0,
|
|
|
|
"dataRateInHz": 1
|
2016-01-15 01:08:19 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
"telemetry": {
|
|
|
|
"source": "generator",
|
|
|
|
"domains": [
|
|
|
|
{
|
Squash-merge open1193 into master.
Closes https://github.com/nasa/openmct/pull/1287.
Squashed commit of the following:
commit af9ba3095859684cb2465f1d5222a14db231fdb7
Merge: c98286d 31308b1
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Nov 25 14:57:32 2016 -0800
Merge branch 'open1193' into open1287-integration
Resolve conflicts in glyph files as documented in pull request:
https://github.com/nasa/openmct/pull/1287#issuecomment-263030180
Closes https://github.com/nasa/openmct/pull/1287
commit 31308b1076493a4053311f1952eabef37b9dee39
Author: Andrew Henry <andrew.k.henry@nasa.gov>
Date: Tue Nov 22 17:08:10 2016 +0000
[Time Conductor] Addressed code review comments. Fixes #1287
commit db6386e21cd45622987a09b8adf2dfa0e534b562
Author: Henry <akhenry@gmail.com>
Date: Wed Nov 9 11:52:39 2016 -0800
Removed redundant ConductorService
commit a9ec8db8c6d05975a75e5e30810c3ee0d3a5f990
Merge: fc36674 dfa4591
Author: Henry <akhenry@gmail.com>
Date: Wed Nov 9 08:23:07 2016 -0800
Merge branch 'master' into open1193
commit fc36674b5ce8ed8b422053b936862fc255621d65
Author: Henry <akhenry@gmail.com>
Date: Wed Nov 9 08:23:01 2016 -0800
Updated wording of docs
commit d0906baccfd2b33c9cf198799be3786fc9221018
Author: Henry <akhenry@gmail.com>
Date: Fri Nov 4 10:48:05 2016 -0700
Fixed TOI not showing
commit 099c56c40722dddb85da2ed576ab704f61ae8220
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 28 16:46:06 2016 -0700
Fixed failing tests
commit 7cc008ed0104bd02717db87b46b2d9235f0c8c8e
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 28 10:28:41 2016 -0700
Added tests for tables, TOI controller
commit b0901e83cb63198a400b15e19c45200c7d6c6a96
Author: Henry <akhenry@gmail.com>
Date: Thu Oct 27 10:42:31 2016 -0700
Added tests for ConductorAxisController and TimeConductor
commit dfed0a0783ec2e0056c5acf627dec583b4ad3b29
Author: Henry <akhenry@gmail.com>
Date: Wed Oct 26 18:07:50 2016 -0700
Added ConductorAxisController tests
commit c3322e3847ccbbbf087f9b20132ca1959548e220
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 25 20:54:24 2016 -0700
Added tests for MctTableController
commit 8e76ebb5a83f6686b668cfc04711df6406d4cd38
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 25 15:48:15 2016 -0700
Removed debugging code
commit 93735bc40468bbb28a2e911c0bec9e8ef71a92e0
Author: Henry <akhenry@gmail.com>
Date: Mon Oct 24 15:13:45 2016 -0700
Removed bundle definition of MctAxisController
Documenting code
commit a942541724600a58b140042798afd0776955381d
Author: Henry <akhenry@gmail.com>
Date: Sun Oct 23 19:54:01 2016 -0700
[Time Conductor] Fixed memory leak due to listeners not being deregistered
commit 49e600dcc95d56b400585a7c3ea7ec0f327528e3
Author: Henry <akhenry@gmail.com>
Date: Sat Oct 22 16:47:11 2016 -0700
[Time Conductor] Fixed zoom slider behavior
commit f5806613b9287534383569195e87a8e4b90b6905
Author: Henry <akhenry@gmail.com>
Date: Sat Oct 22 14:46:14 2016 -0700
[Time Conductor] support TOI from real-time tables
commit 029d2b305834c3c5f6f17e37d7a1eb507c04e1ca
Author: Henry <akhenry@gmail.com>
Date: Thu Oct 20 14:32:34 2016 -0700
[Examples] Simplified MSL example, fixed object tree not loading by default, renamed. Fixes #1256. Fixes #1255
commit 482eb4a5e874b0249ec248decf4828d55058cabc
Author: Henry <akhenry@gmail.com>
Date: Sat Oct 22 13:09:05 2016 -0700
[Time Conductor] Using new API
commit 843c678b0bad5cfa9dd3f28222bb72b17fc317be
Merge: b56ab0a 08ca765
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 21 10:21:22 2016 -0700
In process of merging
commit b56ab0aac2202cae27b2a26844e5c042d0d4bbdd
Author: Henry <akhenry@gmail.com>
Date: Wed Oct 19 16:30:26 2016 -0700
[Time Conductor] Implement default sort, fix unpredictable positioning using % left, set TOI on conductor init. #1193
commit d12ae77d951dd6ce47da0042aa431934b5ee3367
Author: Henry <akhenry@gmail.com>
Date: Wed Oct 19 11:29:42 2016 -0700
Further TOI improvements
commit 22564473b51b82d441b2b440203defe54b372e7c
Merge: 9f3ec3b 86b51f6
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 18 16:32:12 2016 -0700
Merge branch 'open1193' of https://github.com/nasa/openmctweb into open1193
commit 9f3ec3b18f96bc4050ef3e3df718f4b20a1f87ab
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 18 16:31:59 2016 -0700
Fixed issue with scrolling to row after bounds change
commit 86b51f6cde0d47d1d5eae9180fb8677ec907e5ac
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Oct 17 17:19:50 2016 -0700
[Frontend] Small refactor for mct-include
Fixes #933
Fixes #1193
Markup and CSS tweaked to support using mct-include
as the main container for the TOI element; TC, plots
and tables all updated.
commit dadca62955b8a74bf8ae41a534ecdce37edf15e5
Author: Henry <akhenry@gmail.com>
Date: Mon Oct 17 15:54:34 2016 -0700
Positioning of TOI in tables and plots
commit 7a09bc133906b278bb2fa341ab8ae8713af42474
Author: Henry <akhenry@gmail.com>
Date: Mon Oct 17 10:11:59 2016 -0700
Migrated TOI functionality to common controller
commit 6bea6b3bc299d07e572174390364e8f4f9924d97
Merge: 660757f 8f67cbd
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 14 14:38:57 2016 -0700
Merge branch 'open1193' of https://github.com/nasa/openmctweb into open1193
commit 660757fc1c41b8b28da1423d3ed849b074224fe3
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 14 14:38:46 2016 -0700
Added TimeOfInterestController
commit 8f67cbd717ae5cd27098a4e7adf58455b3531d93
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Oct 14 11:33:35 2016 -0700
[Frontend] Fixed cursor: grab on Time Conductor
Fixes #933
Fixes #1193
Moved cursor: grab into mixin; sass cleanups
commit 07a4e26317745cfe4e7a67dbfadda2ea8545f2df
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Oct 14 11:03:23 2016 -0700
[Frontend] TOI finalizing
Fixes #933
Fixes #1193
HTML template cleaned up; checked in snow theme,
theme colors tweaked; padding finalized; now uses
val-to-left instead of -to-right;
commit 271c788f2019dd6dcfd396cb336472a3a664b380
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Oct 14 10:22:26 2016 -0700
[Frontend] TOI in tables
Fixes #933
Fixes #1193
WIP
commit b7e8a1b378a4e56cc8c73a0166a22e02559a7bd2
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Oct 13 15:55:48 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
WIP: Table TOI element in progress
commit 6042e4ad581e07f007091cc198be3672e10e6f92
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Oct 13 13:46:27 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
WIP: plots and TC done, moving on to
tables; moved sass into conductor-v2;
moved constants;
commit 1a534301c5d43b4929809d433e912f6982e99595
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Oct 13 11:42:10 2016 -0700
[Frontend] Refactor TOI element
Fixes #933
Fixes #1193
WIP; TOI as mct-include; layout uses
flex-box; preparing to move TOI sass
into conductor-v2 directory;
commit 42acf9255e7a743772f34605fc95082f5734afcd
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Oct 12 18:34:51 2016 -0700
[Frontend] Adding resync and dedicated unpin buttons
Fixes #933
Fixes #1193
VERY WIP!
commit 3f0eb0b7cb49db558b896a6bb26bbe58d5c3a8d1
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Oct 12 18:33:53 2016 -0700
[Frontend] New glyphs for use by TOI
Fixes #933
Fixes #1193
Symbols font updated
commit 086307ba3aeb5a2394e914b446a78c4e00abb884
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 11 17:16:51 2016 -0700
Fixed scrolling behavior with TOI
commit 938bf3c4dfbe819a04c11a6dbea4cb870d362e83
Merge: 3910437 8b2047c
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 11 13:26:20 2016 -0700
Merge branch 'open1182' into open1193
commit 8b2047ca3270306e0116aa7366572fc0f988dd0e
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 11 13:25:24 2016 -0700
Fixed issue with setting deltas
commit 3910437033c625c0fb79ff2cf89a4f8ad24d0ff1
Merge: 70c4ce2 02c543f
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 11 12:48:37 2016 -0700
Merged changes to zoom
commit 02c543fddc9a6a1f68c9ecaf7d7ec512a12bdd9f
Author: Henry <akhenry@gmail.com>
Date: Tue Oct 11 12:45:18 2016 -0700
Fixed zoom in real-time mode
commit 70c4ce24e488580f3fba4c5db369674acd44b74f
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 7 17:57:14 2016 -0700
Added support for clicking row to set TOI
commit b995a8b87b516bad2541ac4f2f7201c39c4abd2f
Merge: 51a9557 b384e84
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 7 16:11:59 2016 -0700
Merged from open1182
commit b384e8487295696743ea63bba1eae8394c5b8811
Merge: 5babf72 07140b1
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 7 15:02:41 2016 -0700
Merge branch 'open933' into open1182
commit 07140b179f109ff14885e06b085a7fa2f8290135
Merge: 3e9c0eb cbd001e
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 7 14:54:18 2016 -0700
Merge branch 'master' into open933
commit 51a95575f7e2cd2c5a098de990363cee78faf649
Author: Henry <akhenry@gmail.com>
Date: Fri Oct 7 14:51:59 2016 -0700
[Time Conductor] Refactored time of interest as optional generic behavior of MctTable
commit dfbbc3b0c584dcf1bddac977d7ab066ab6cea5c2
Merge: 430645b 47a0aba
Author: Henry <akhenry@gmail.com>
Date: Thu Oct 6 10:23:42 2016 -0700
alt-click to select TOI from table
commit 3e9c0eb7a5aaea1476a6f60122f9717cf801c18b
Merge: f1d2072 8a00181
Author: Henry <akhenry@gmail.com>
Date: Wed Oct 5 12:25:04 2016 -0700
Merged from master to resolve build issues
commit f1d2072bb939a486d731b282fa41e4899bd2d5ed
Author: Henry <akhenry@gmail.com>
Date: Wed Oct 5 11:17:22 2016 -0700
Added license information
commit 430645b1f2e196bd865a369df8c4fee29fd15e7c
Author: Henry <akhenry@gmail.com>
Date: Wed Oct 5 09:04:13 2016 -0700
TOI working in time conductor
commit 47a0aba601ed86636265d793fdd43a6d87006629
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Oct 4 18:12:01 2016 -0700
[Frontend] TOI sass and markup sanding
Fixes #933
Fixes #1193
Color tweaks; Cleanups, commented
code removal, etc.; tightened up
tabular padding and font sizes;
commit 0ed0a48a8c5c7665df9164bee2eb3dad1b28992f
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Oct 4 15:49:18 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
Tabular styling for TOI;
commit 1650aae51891df8296d5a36ad4298b4e7416e933
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Oct 3 15:56:56 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
WIP: Tabular styling for TOI;
TODO: make bottom border work
commit d3bf6c5857493e5de30219c835f214b247fb4338
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Oct 3 15:15:56 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
WIP: Markup and CSS for plots and TC near complete;
TODO: revised styling in tabular views;
commit 5cd0c8a4fa7c72190af437e954cd44a9f8a0bdc0
Author: Henry <akhenry@gmail.com>
Date: Fri Sep 30 12:41:14 2016 -0700
[Time Conductor] merged from open1182
commit 5babf7274d4c7e7a59980218c107b83762b4ad82
Author: Henry <akhenry@gmail.com>
Date: Thu Sep 29 11:21:11 2016 -0700
[Time Conductor] Tweaked the break points for zoom level indicator
commit 22da34870d578bb72290ce1f92c7827da8a61a87
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 29 10:41:21 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
WIP: Markup and CSS revisions for updated UX approach;
TODO: cosmetic CSS
commit 99253a59048e74e5174659d5618990adf3ec5358
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Tue Sep 27 20:42:33 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
WIP: Markup and CSS revisions for updated UX approach
commit 2db4aa6235bb019e3457f35e14cf0784fb5e2606
Author: Henry <akhenry@gmail.com>
Date: Fri Sep 23 13:06:22 2016 -0700
[Time Conductor] Added zoom level label
commit bb2ae2f8d1272bd464ac67cc54ba9d6594d97596
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Fri Sep 23 11:07:06 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
Finalized TOI in plots, table and TC
commit 0cf4c925551f8cb42dc54c1b0206c6c58dd7f962
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 22 19:15:10 2016 -0700
[Frontend] Styling for TOI element in tables
Fixes #933
Fixes #1193
WIP: styling in tabular mostly done, needs more unit testing
TODO: fix hide/show for pinned TOI in plots - don't
show pinned TOI on hover when not .active
commit 3c95c095f195c51fb9df8ad46936f27ba4db0915
Author: Henry <akhenry@gmail.com>
Date: Thu Sep 22 17:22:25 2016 -0700
[Time Conductor] Refactored out use of angular event bus in favor of making TimeConductorViewService an event emitter.
commit adbcc407ef0acc6cbe81e1c8420411ffa6a87d39
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 22 16:06:45 2016 -0700
[Frontend] Styling for TOI element
Fixes #933
Fixes #1193
WIP: TOI in tables
commit 1c3bd69b6628fad915e0df6feef280a9d8c90364
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 22 16:06:16 2016 -0700
[Frontend] Styling for TOI element, some refactoring
Fixes #933
Fixes #1193
Moves some TOI styling into dedicated new scss file;
Enhancements to TOI in plots to bring into parity
with TOI in TC approach;
commit 49ee5cb74b50551822194da52278fafd6701e175
Author: Henry <akhenry@gmail.com>
Date: Thu Sep 22 15:18:48 2016 -0700
[Time Conductor] Destroy listeners in ConductorAxisController
commit 1a93ba2c3d2220c11514d519d47cdbffd35c9460
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 22 15:09:42 2016 -0700
[Frontend] Styling for TOI element in TC
Fixes #933
Fixes #1193
Final for now; both types of TOI added to TC markup;
Hover behavior; constant values in the right places;
commit 98122cc730471a0087729abbd5b03f31b50b2659
Author: Henry <akhenry@gmail.com>
Date: Tue Sep 20 11:40:58 2016 -0700
[Time Conductor] Added Zoom
commit 7fcafb6b58f8e24a0cc30f51392e2e65aea26d27
Author: Henry <akhenry@gmail.com>
Date: Mon Sep 12 16:53:48 2016 -0700
[Time Conductor] Added pan to Time Conductor
commit d77922d66c2a450b00043bd2efc0144cfd9eae92
Author: Pete Richards <pete@pete-richards.com>
Date: Thu Sep 15 09:37:11 2016 -0700
Revert "[proxyUrl] pass URL parameters to proxied URL"
commit 2e81550c8676e6ade2df215110f61ce56ebabae7
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed Sep 14 10:16:33 2016 -0700
Revert "[Build] Check dependencies for vulnerabilities"
commit 8eb7585653f188528a98ee868a556aa6cc5728f2
Author: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Mon Aug 29 10:58:02 2016 -0700
[README] Warn about root installation issues
Mitigates #1151.
commit 904d56a0893fe3cf25f017eacb3670f5087aef22
Author: Henry <akhenry@gmail.com>
Date: Thu Sep 22 13:32:43 2016 -0700
[Time Conductor] #933 Clean up time conductor listeners on scope destruction
commit c0a96b3c5f57c1e0b908214c6d2f9d9863977592
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 22 10:33:05 2016 -0700
[Frontend] Styling for TOI element in TC
Fixes #933
Fixes #1193
WIP, tweaking TOI in TC
commit 27e6caf69b66cb762d19886fd3958432bc1ab81e
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Sep 16 18:51:51 2016 -0700
[Frontend] Styling for TOI element in plots
Fixes #933
Fixes #1193
Relates to #1182
WIP, adding TOI to plot view;
Integrated Andrew's work from #1182;
Significant changes to markup and
additions to plot scss;
commit 2c7ae9510671a8e733f66805aaf0a234fb878bba
Merge: 2c81b72 41a160f
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Sep 16 15:11:25 2016 -0700
Merge branch 'open1182' into open1193
commit 41a160fc4ff6c76f6694de758bae26758a3cac4f
Merge: 92a80c3 156ba83
Author: Henry <akhenry@gmail.com>
Date: Fri Sep 16 14:25:49 2016 -0700
Merge branch 'master' into open1182
commit 92a80c39cbf376c970bd4bd390d936da4ed50bdc
Author: Henry <akhenry@gmail.com>
Date: Mon Sep 12 16:53:48 2016 -0700
[Time Conductor] Added pan to Time Conductor
commit 2c81b72d6015f75b4414affd20a5990851a93868
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 15 16:02:30 2016 -0700
[Frontend] Styling for TOI element in plots
Fixes #933
Fixes #1193
WIP, adding TOI to plot view.
commit 9e2debf80165a41e2b3f87ffab458fa048ad0e82
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 15 15:43:29 2016 -0700
[Frontend] Styling for TC's TOI element
Fixes #933
Fixes #1193
I lied in my last commit - one more
alignment tweak needed. Now I'm done.
commit 35872e284c58a22ac7a93c765784882939d29b9c
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 15 15:40:03 2016 -0700
[Frontend] Styling for TC's TOI element
Fixes #933
Fixes #1193
TOI in TC done for now.
commit 98e67f8dfb9664e81137f77f02fdf703c9a1050f
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu Sep 15 14:55:06 2016 -0700
[Frontend] Styling for TC's TOI element
Fixes #933
Fixes #1193
WIP: adjust spacing;
added pagination buttons
commit f912b9e273bf2bd4bfb714e004950f7f866c9cd5
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Sep 14 18:40:55 2016 -0700
[Frontend] Styling for TC's TOI element
Fixes #933
WIP, TC v2 changes
commit 2df1e2b508774835056965947b74d7a184f99da2
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Sep 14 18:40:29 2016 -0700
[Frontend] Styling for TC's TOI element
Fixes #933
WIP, global changes
commit 9e85341aaa0672a79dbadce74e137e388822de31
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Sep 14 15:16:16 2016 -0700
[Frontend] Fixed color for TC clock hands
Fixes #933
commit 11e06039ec0eb891c91a5ed540824ebdbd2df362
Merge: a1331b7 f732387
Author: Henry <akhenry@gmail.com>
Date: Tue Sep 13 13:25:37 2016 -0700
Merge branch 'master' into open933
commit a1331b7bb3a58b494c9ee6c5d788f65c8135c1b7
Merge: d1960b2 e73bb4f
Author: Henry <akhenry@gmail.com>
Date: Mon Sep 12 15:07:05 2016 -0700
Merge branch 'master' into open933
commit d1960b2f4688c85aa970dd40ff279624ebcbc86a
Author: Henry <akhenry@gmail.com>
Date: Mon Sep 12 14:54:16 2016 -0700
[Time Conductor] Resolved merge conflicts
commit 9a063255333225b96ac458a7fe1bbe76eaf6801a
Merge: e639e05 4c6ca58
Author: Henry <akhenry@gmail.com>
Date: Mon Sep 12 14:39:24 2016 -0700
Merge branch 'master' into open933
commit e639e056ba9c9239d53275b5e9401a21cf63e2b6
Author: Henry <akhenry@gmail.com>
Date: Fri Sep 9 16:39:21 2016 -0700
[Time Conductor] Fixing bugs found in smoke testing. Fixes #933
commit fbab8900816ae5376543e1da4d3f8be22e364eef
Author: Henry <akhenry@gmail.com>
Date: Wed Sep 7 14:29:21 2016 -0700
[Time Conductor] Switched conductor to mct-include rather than mct-representation to avoid warnings
commit d37dd52ee1e8412403c6b13a6b6b5ac69ce67392
Merge: 7af5875 58391de
Author: Henry <akhenry@gmail.com>
Date: Tue Sep 6 16:43:17 2016 -0700
Merge branch 'master' into open933
commit 7af5875dd523b01dc8e205761577d5454ed8751f
Author: Henry <akhenry@gmail.com>
Date: Tue Sep 6 10:04:29 2016 -0700
[Time Conductor] #933 Fixed code style errors
commit c6eaa3d52895dbf9090281c7a870826f00320205
Author: Andrew Henry <andrew.k.henry@nasa.gov>
Date: Wed Aug 24 15:28:19 2016 +0100
[Time Conductor] Adding tests and fixing failing ones. #933
commit 4cf6126d35a64e3027faef3e01a636a7b6b30050
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 10 18:22:30 2016 -0700
Refactoring based on feedback
Refactoring controller
Migrating functions off controller onto service class
Simplified modes
Adding comments
Removed unnecessary validation
Fixing testing issues
commit 4ae6da033404e6cda722142e013afbd56d6643e7
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Tue Aug 9 17:47:31 2016 -0700
[Frontend] Data viz in Time Conductor smaller
Fixes #933
Reduced height of data viz bar in Time Conductor
v2;
commit ae39343b76e27e8c6e2c300f985c2a8c62cb8379
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Aug 8 12:14:20 2016 -0700
[Frontend] Fix for bad fix
Fixes #1112
Put overflow: hidden back at
outer wrapper level (now on .t-object.primary-pane
) which doens't clip the Inspector expand/collapse;
did better unit testing;
commit 62ee7e569b83f5a645010973d67c552cc9131df3
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Aug 8 11:21:01 2016 -0700
[Frontend] Fix for collapse Inspector button
Fixes #1112
Moved min-width and overflow: hidden
to TC-specific elements; removed
overflow: hidden from .primary-pane
commit 7557a86208ab450d0fc7523b107aff8c78595eed
Merge: 46e644e c8931f8
Author: Henry <akhenry@gmail.com>
Date: Fri Aug 5 16:37:36 2016 -0700
Merge branch 'master' into open933
commit 46e644e6dca57935c11f84d1a9893457c307b6a3
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Aug 5 14:44:18 2016 -0700
Use key to retrieve default
commit af7954c5a14cee1ac09c1c825460d1a3f59997c1
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Fri Aug 5 11:24:51 2016 -0700
Trigger digests when bounds are set
commit 0e0ad64830306891ff29a1ba0732cc562e5afb38
Author: Henry <akhenry@gmail.com>
Date: Thu Aug 4 10:41:58 2016 -0700
Fixed issue with wrong deltas being applied
commit f3fd386e3b4cf103613c484a0a16c7bb636ed9f5
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 3 21:03:09 2016 -0700
Retain time system on mode change
commit 25b9f371e2c7f688f4e8b4a8d31f50a458ada4d6
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 3 20:16:03 2016 -0700
Fixed loss of time system options on navigation
commit 6b482d487b521a9fe973b7a155af68749480b8e4
Merge: f96f78f 9a72c96
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 3 19:57:03 2016 -0700
Merged mode-specific defaults, with some refactoring
commit f96f78ff79c84a9897fa59cca99782d9c45c3ea8
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 3 19:34:31 2016 -0700
Select appropriate tick source based on mode
commit 579233ade948f10c24decebb4f8a75a08c8cba51
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 3 18:30:01 2016 -0700
Fixed delta format issue on navigation
commit 9a72c96ea4f5301017b4452e869d98ecc2b24396
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Wed Aug 3 18:06:39 2016 -0700
[TCv2] different defaults by mode
commit f4e1879a2df1949531d05722fd78fd5753c26991
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 3 17:43:07 2016 -0700
stop listening to tick source on time system change
commit f844495cc14c492f04e76f4b93ea18f570811329
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 3 17:40:37 2016 -0700
Support deltaFormat on timeSystems
commit 900752208fc7bad0e83cbebb2a0bf6518276e2f1
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Wed Aug 3 13:05:43 2016 -0700
[TCv2] get conductor without service
commit 6501e2eb5faec22fc70aede5925a32381ba9f6c7
Author: Henry <akhenry@gmail.com>
Date: Wed Aug 3 12:22:13 2016 -0700
Added isUTCBased to TimeSystem interface
commit b9c41107c1ca8edc884b54a89d81406582b88bbd
Author: Henry <akhenry@gmail.com>
Date: Tue Aug 2 22:18:44 2016 -0700
Time Conductor state retained on navigation
commit 34c62ba4058db0085365ce3053481ffa27ea0926
Author: Henry <akhenry@gmail.com>
Date: Tue Aug 2 15:16:35 2016 -0700
Time Conductor in edit mode
commit 1eea5ce4805060e61592e3277dd573ea7e244531
Merge: 4cd579d 1173828
Author: Henry <akhenry@gmail.com>
Date: Mon Aug 1 20:29:50 2016 -0700
merged from master
commit 4cd579d2741ad287c11d367a50d6f8b2f55e05b3
Author: Henry <akhenry@gmail.com>
Date: Mon Aug 1 20:16:46 2016 -0700
Pass numerical value to format functions
commit 11738286df0f885d5a083451321231629a15f27a
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 18:56:33 2016 -0700
[Frontend] Styling for unsynced elements
Fixes #933
commit ca5206d4a0de590a2c64c6265f4b48b0a4b0e259
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 18:55:49 2016 -0700
[Frontend] Fixing issues with theme coloring
Fixes #933
commit 573f1f9f998554c5330b034bab7a65d5c310a1d7
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 18:04:17 2016 -0700
[Frontend] Hide zoom slider control
Fixes #933
Temporarily hiding per request from Andrew
today;
commit c5c45f0a0e9f46ccf3c2ae8bf15b62ab3961294c
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 18:01:28 2016 -0700
[Frontend] Update TC2 markup and sass
Fixes #933
Update markup and sass in TC2 to be in line with
updates from master from #1047 glyphs
to cssclass approach;
commit 121ab413ff91ace1d96d1ad44146348de17b9eee
Author: Henry <akhenry@gmail.com>
Date: Mon Aug 1 17:51:15 2016 -0700
Apply formatting, filter modes by tick source availability
commit 753bd97c8a2e98a6fe654e997ff7b00c94815206
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 17:12:44 2016 -0700
Merge remote-tracking branch 'origin/master' into open933-c
# Conflicts:
# platform/commonUI/edit/res/templates/create/create-menu.html
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
# platform/commonUI/general/res/sass/_archetypes.scss
# platform/commonUI/general/res/sass/_constants.scss
# platform/commonUI/general/res/sass/_icons.scss
# platform/commonUI/general/res/sass/_main.scss
# platform/commonUI/general/res/sass/_mixins.scss
# platform/commonUI/general/res/sass/controls/_buttons.scss
# platform/commonUI/general/res/templates/controls/time-controller.html
# platform/commonUI/themes/snow/res/sass/_constants.scss
commit fcd7ab93e57e14781bd794b2f5c1f1e785475711
Merge: a75ea67 9b58aa0
Author: Henry <akhenry@gmail.com>
Date: Mon Aug 1 17:12:00 2016 -0700
Merge branch 'open933' of https://github.com/nasa/openmctweb into open933
commit c699cb8b4bb442824df4881a7bbbb62e850ee9ae
Merge: 579c6b6 d1e1ba1
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 17:11:37 2016 -0700
Merge remote-tracking branch 'origin/master' into open933-c
# Conflicts:
# platform/commonUI/edit/res/templates/create/create-menu.html
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
# platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
# platform/commonUI/general/res/sass/_archetypes.scss
# platform/commonUI/general/res/sass/_constants.scss
# platform/commonUI/general/res/sass/_icons.scss
# platform/commonUI/general/res/sass/_main.scss
# platform/commonUI/general/res/sass/_mixins.scss
# platform/commonUI/general/res/sass/controls/_buttons.scss
# platform/commonUI/general/res/templates/controls/time-controller.html
# platform/commonUI/themes/snow/res/sass/_constants.scss
commit a75ea67b8ca1c7ddaf3ba6673c2dabdebcaad59a
Author: Henry <akhenry@gmail.com>
Date: Mon Aug 1 17:11:01 2016 -0700
Format updates when time system selected
commit 9b58aa00524302e7738567992f694450c45f7f81
Author: Pete Richards <peter.l.richards@nasa.gov>
Date: Mon Aug 1 17:03:00 2016 -0700
[TCv2] Add conductorService for compatibility
Add conductor service for compatibility with old plugins that depend
on the conductor service.
commit 579c6b6d24f30d91e5d7d4be476d514143c0cc4c
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 16:30:51 2016 -0700
[Frontend] Styling TC unsynced elements
Fixes #933
WIP: Styling for unsynced elements
commit 762f43fa61e641f268ac733e24cb3f103b22ded8
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 16:26:47 2016 -0700
[Frontend] Styling TC unsynced elements
Fixes #933
WIP: Styling for unsynced elements
commit ce5d0ef5bdc59c32d49521f428394d909f28712a
Author: Henry <akhenry@gmail.com>
Date: Mon Aug 1 16:03:27 2016 -0700
Merged stylesheet changes
commit 142ee2f33609b8cb03b1f269f13cc660c3fb9103
Merge: 482fcbf 523d674
Author: Henry <akhenry@gmail.com>
Date: Mon Aug 1 15:44:49 2016 -0700
Added LocalTimeSystem and merged latest styles
commit 482fcbf6eeea3b72f26bff74a5697a5089abb6a1
Author: Henry <akhenry@gmail.com>
Date: Mon Aug 1 15:14:23 2016 -0700
Refactored bundle
commit 523d6743fb99b2a4e2749c28a2fb6feccc9572da
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon Aug 1 12:00:53 2016 -0700
[Frontend] Added support for thematic styling of Time Conductor v2
Fixes #933
Added theme sass files
commit 7af22126d4d77f8c16b1f7921cc4130d676c7c6c
Author: Henry <akhenry@gmail.com>
Date: Wed Jul 27 12:05:03 2016 -0400
Prevent tabbing into end bounds when not in fixed mode
commit 8e5907253761b5e65f940dee7e033141724568cc
Author: Henry <akhenry@gmail.com>
Date: Wed Jul 27 11:55:12 2016 -0400
Removed LAD and Realtime modes
commit c1bbc4f01d0d664f22126cb266d9eb0544864e90
Author: Henry <akhenry@gmail.com>
Date: Wed Jul 27 10:38:04 2016 -0400
Code cleanup
commit aa4a5e56f90ca364688a04f9b0070aa4aba2a51c
Author: Henry <akhenry@gmail.com>
Date: Tue Jul 26 16:55:00 2016 -0400
Improved support from plot
commit 5b2eb72b1603ccd37c4b8a29b8a216b9a20303ef
Author: Henry <akhenry@gmail.com>
Date: Tue Jul 26 08:33:30 2016 -0400
[Time Conductor] Addressed documentation issues
commit 1b7fc57d21f5fbf4a73208743aaf3e484fb535fe
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 25 16:55:27 2016 -0400
Added status support to plots
commit a4f6f6f50bb164b5866b8db76fbec5431a50040c
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 25 12:09:15 2016 -0400
Added license
commit 19fd63b8509d0c0a375970800bb2ccafc8fc6acf
Merge: c2c8e16 a10ded2
Author: Henry <akhenry@gmail.com>
Date: Thu Jul 21 20:06:50 2016 -0700
Merge branch 'open933-frontend-b' into open933
commit c2c8e16453d28b0c103a76e991aae92ec7bc7b31
Author: Henry <akhenry@gmail.com>
Date: Thu Jul 21 20:03:40 2016 -0700
Added scale sensitive formatting to UTCTimeFormat
commit a10ded25b440d317ad3cbb9c17d99dfc0cc5fca1
Merge: da7c636 e6d8944
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 20 18:33:58 2016 -0700
Merge remote-tracking branch 'origin/open933' into open933-frontend-b
# Conflicts:
# platform/features/conductor-v2/res/sass/time-conductor.scss
# platform/features/conductor/res/sass/time-conductor.scss
commit da7c6367243db93b4138e4ecd035bd9801dd2464
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 20 18:22:20 2016 -0700
[Frontend] Time Conductor v2 styling
Fixes #933
Redo TC icon to use font symbol, added
new symbol for brackets to font files; font
anti-aliasing mod for .ui-symbol class;
layout tweaks; mobile tweaks.
commit b392633bc63ac507e5aff1ad24dd2bb928e6484f
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 20 15:48:22 2016 -0700
[Frontend] Time Conductor v2 styling
Fixes #933
WIP: Significant mobile and desktop style tweaks;
moved constants into their own include file;
commit ff1678435eb135c4ef92c7fa9656a679a2c12751
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 20 11:43:40 2016 -0700
[Frontend] Time Conductor v2 styling
Fixes #933
Changed desktop and mobile RT UI to display
end datetime and hide start;
WIP: mobile styling for main UI of TC;
commit 2124fe01e132186d9f1538ee2110328f62e6d590
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 20 10:18:42 2016 -0700
[Frontend] Renew support for Time Conductor v1
Fixes #933
Minor fixes to TCv1 for mobile
commit e6d89445473f799a7176831d0ee47dbb1e63f877
Author: Henry <akhenry@gmail.com>
Date: Tue Jul 19 20:17:06 2016 -0700
Modified main.js
commit ea1defac28800f9b7219b4189cdc332e29f3a4f0
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jul 19 18:33:24 2016 -0700
[Frontend] Renew support for Time Conductor v1
Fixes #933
Time Conductors v1 and v2 now build and load their
own isolated CSS files. All previous styling for TCv1
should be re-enabled. Note that Conductor v2 mobile
is not complete yet.
commit 2a193943346dd921794ba938c510df805dd10ae8
Author: Henry <akhenry@gmail.com>
Date: Tue Jul 19 19:54:52 2016 -0700
Added compatibility layer to support existing plots and historical tables
commit f641edbce712d8a5cbdc31d4a00b7669e557cd5b
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue Jul 19 18:33:24 2016 -0700
[Frontend] Renew support for Time Conductor v1
Fixes #933
Time Conductors v1 and v2 now build and load their
own isolated CSS files. All previous styling for TCv1
should be re-enabled. Note that Conductor v2 mobile
is not complete yet.
commit 15a608a8615713a9261c8173739ef9d515eaa0cc
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 18 18:44:29 2016 -0700
Populate format in input fields
commit 334ca64551568cb5064898cb8556992e83a92767
Merge: 0af49ef 4087b9c
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 18 14:25:02 2016 -0700
Merged open933-frontend
commit 0af49efe06a9d71db3873889b539b9463eff4694
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 18 08:23:27 2016 -0700
Refactored out modes, time systems, etc.
commit 4087b9cdde96a9b115ed8b3889c62c5fa513dbef
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Fri Jul 15 14:39:29 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
WIP: Fixed look for Firefox
commit 43a804eef493a3ffd070ba5c1dba190d08fc7a42
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Jul 15 07:54:32 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
WIP: Added zoom current range indicator;
tweaks to style
commit b3a4f52fe20f6670364284b235d05d23b71329c4
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 14 18:30:49 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
WIP: Adding zoom control with HTML5
input range type; Refactored sass slightly
to move display: inline-block out of mixin
containerBase and into .s-btn.
commit 671e3016d4c2430653ac5aa398332c00637f4df0
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 14 16:40:05 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
New _animations scss include, moved
scss around.
commit 379828315f2f71f3f277c0b710b730d3b0f3bc39
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 14 16:39:27 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
New _animations scss include, moved
scss around.
commit 8c5538ec4d9226c0de08653ab7e856692cbbaacc
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Thu Jul 14 14:58:18 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
"Sticky" clock anim for LAD mode
commit 2f9fbfef7f3fe573d625d4a6fe6120e608788baf
Author: Henry <akhenry@gmail.com>
Date: Wed Jul 13 20:33:47 2016 -0700
More refactoring
commit 2baca659ca6d4e755d8d97caf68e7cabddd315b5
Author: Henry <akhenry@gmail.com>
Date: Wed Jul 13 19:50:58 2016 -0700
Refactoring
commit 8b694ef33748d9b93b44488950fc471a6d8acd41
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 13 19:42:51 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
In-progress: color/size tweaks, fixes for espresso
theme
commit e193e3dfba7e29ce34ac64a2d041451ec6385346
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 13 19:16:27 2016 -0700
Merge open933 latest, resolve conflicts
Fixes #933
Fair amount of manual fixing in time-conductor.html
commit 8214c8e8958ab248f19084bd09d1d2524a9cafd6
Merge: 33b2225 14463d3
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 13 19:16:00 2016 -0700
Merge open933 latest, resolve conflicts
Fixes #933
Fair amount of manual fixing in time-conductor.html
commit 33b2225d107d8351398d40ec4119cf68d3a66e8b
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 13 18:48:17 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
In-progress: restructured markup to move
modeModel farther out; animated icon
commit 14463d39a88907d602a677cf46c0aa779bef353c
Author: Henry <akhenry@gmail.com>
Date: Wed Jul 13 18:17:27 2016 -0700
Added end delta
commit fcfda50e73ff219f81e0b85a7125f9a74ada0652
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 13 15:00:16 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
In-progress: color tweaks, bar sizing,
field widths
commit 06af84c161e9cb311aba072717891cd166722b9a
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 13 13:14:32 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
In-progress: fixed SVG text color, field
styling for fixed vs. real-time, markup cleanup
commit 5238aa2731193859a676c168e78d7cb1f50503e6
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed Jul 13 08:07:59 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
In-progress; fixed SVG text color
commit fd294736642717d869c9d056311880a5d4330673
Author: Henry <akhenry@gmail.com>
Date: Tue Jul 12 15:02:39 2016 -0700
Support resize
commit 97f3fd516b62097cb275f324bcc1972ac4ec716f
Author: Henry <akhenry@gmail.com>
Date: Tue Jul 12 10:14:26 2016 -0700
Changed default duration to fifteen minutes
commit 088416905dc468b9f1dcd5ca40a3c53f02d2edaf
Author: Henry <akhenry@gmail.com>
Date: Tue Jul 12 10:08:08 2016 -0700
Added duration
commit 2056d87453f8b77a4328f1d98ac02aeeab305104
Merge: 585da38 64ce8a2
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 11 14:27:30 2016 -0700
Merge branch 'open933-frontend' into open933
commit 64ce8a2b2a211ce9fbe247c9d1294ce11ada17c2
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jul 11 14:03:41 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
Color adjusts, mini super-menu size
and font tweaks, glyphs added to selector,
SVG style fixes in progress
commit 585da38a168e60d9a78092f081b68024455c66f3
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 11 13:46:46 2016 -0700
Fixed some merge issues
commit bf0e85a94cffb3e104457ca6a73d549cefd6f131
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jul 11 11:35:26 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #933
Renamed main class; removed unused <style>
defs
commit 84b7a9dc2fa232584112ee84113b17e6777f0612
Merge: 7b7b21d 11caa83
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jul 11 11:29:35 2016 -0700
Merge remote-tracking branch 'origin/open933' into open933-frontend
Fixes #933
Conflicts:
platform/features/conductor-v2/src/TimeConductorController.js
commit 11caa8396adee4728b5cbdb39a571fc12c513d13
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 11 11:18:23 2016 -0700
Updated modes
commit 0017b77439fdc4808f7900d0bb6ca00ac9390f32
Merge: 5cc81ba 788483e
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 11 11:06:22 2016 -0700
Merged markup changes
commit 7b7b21d748dce6512e874b0c1734c13e4f087ea9
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jul 11 11:05:47 2016 -0700
[Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language; tweak to class name in markup
commit 788483ec13640f6bc8e38e413d93e607b6fbfb34
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jul 11 10:37:08 2016 -0700
[Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language
commit 7b19f91ce6ab2ef8a355ebb03b608ac0d3cc3e60
Merge: 0a0bc55 4e7b69c
Author: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Mon Jul 11 10:31:14 2016 -0700
[Frontend] Merge latest from open933
Fixes #933
Resolve conflicts in
mode-menu.html, mode-selector.html,
time-conductor.html; apply tweaks, language, etc.
commit 5cc81ba12aaa17c9580645f2413ec2116985ca61
Author: Henry <akhenry@gmail.com>
Date: Mon Jul 11 10:26:34 2016 -0700
[Time Conductor] Added mode class to time conductor
commit 0a0bc55f5fa025c5d303f6c1254c8ed891015e34
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Jul 8 17:11:43 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
commit 4e7b69c4dff54991d95e5e56caf1c8f85b32f524
Author: Henry <akhenry@gmail.com>
Date: Fri Jul 8 16:57:50 2016 -0700
Enabled fixed and real-time modes
commit cf83040c4b45bf817aeb3e239218d374ec04918a
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Jul 8 16:54:49 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
commit 32f7bc86af17ac8fcba700be1e620e2b43b8cb69
Author: Charles Hacskaylo <charlesh88@gmail.com>
Date: Fri Jul 8 16:54:13 2016 -0700
[Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
commit e230b92946aa7bb11832b65d58f447c602747c9f
Author: Henry <akhenry@gmail.com>
Date: Fri Jul 8 15:15:12 2016 -0700
Fixed bug with date selector having to be clicked twice
commit 58ed500ecf33c4348daf117fbba2134d4b51d74f
Author: Henry <akhenry@gmail.com>
Date: Thu Jul 7 16:57:03 2016 -0700
Time sync via conductor
commit bca5eb0fdbca93b9dab7b6e6382521478c50750c
Author: Henry <akhenry@gmail.com>
Date: Thu Jul 7 09:47:46 2016 -0700
[Time Conductor] #933 Initial markup
2016-11-25 23:02:34 +00:00
|
|
|
"key": "utc",
|
2016-01-15 01:08:19 +00:00
|
|
|
"name": "Time"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"key": "yesterday",
|
|
|
|
"name": "Yesterday"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"key": "delta",
|
|
|
|
"name": "Delta",
|
|
|
|
"format": "example.delta"
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"ranges": [
|
|
|
|
{
|
|
|
|
"key": "sin",
|
|
|
|
"name": "Sine"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"key": "cos",
|
|
|
|
"name": "Cosine"
|
|
|
|
}
|
|
|
|
]
|
|
|
|
},
|
|
|
|
"properties": [
|
|
|
|
{
|
|
|
|
"name": "Period",
|
|
|
|
"control": "textfield",
|
2017-02-15 23:02:39 +00:00
|
|
|
"cssClass": "l-input-sm l-numeric",
|
2016-01-15 01:08:19 +00:00
|
|
|
"key": "period",
|
|
|
|
"required": true,
|
|
|
|
"property": [
|
|
|
|
"telemetry",
|
|
|
|
"period"
|
|
|
|
],
|
|
|
|
"pattern": "^\\d*(\\.\\d*)?$"
|
2016-12-14 23:02:53 +00:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"name": "Amplitude",
|
|
|
|
"control": "textfield",
|
2017-02-15 23:02:39 +00:00
|
|
|
"cssClass": "l-input-sm l-numeric",
|
2016-12-14 23:02:53 +00:00
|
|
|
"key": "amplitude",
|
|
|
|
"required": true,
|
|
|
|
"property": [
|
|
|
|
"telemetry",
|
|
|
|
"amplitude"
|
|
|
|
],
|
|
|
|
"pattern": "^\\d*(\\.\\d*)?$"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"name": "Offset",
|
|
|
|
"control": "textfield",
|
2017-02-15 23:02:39 +00:00
|
|
|
"cssClass": "l-input-sm l-numeric",
|
2016-12-14 23:02:53 +00:00
|
|
|
"key": "offset",
|
|
|
|
"required": true,
|
|
|
|
"property": [
|
|
|
|
"telemetry",
|
|
|
|
"offset"
|
|
|
|
],
|
|
|
|
"pattern": "^\\d*(\\.\\d*)?$"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"name": "Data Rate (hz)",
|
|
|
|
"control": "textfield",
|
2017-02-15 23:02:39 +00:00
|
|
|
"cssClass": "l-input-sm l-numeric",
|
2016-12-14 23:02:53 +00:00
|
|
|
"key": "dataRateInHz",
|
|
|
|
"required": true,
|
|
|
|
"property": [
|
|
|
|
"telemetry",
|
|
|
|
"dataRateInHz"
|
|
|
|
],
|
|
|
|
"pattern": "^\\d*(\\.\\d*)?$"
|
2016-01-15 01:08:19 +00:00
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
]
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|