Commit Graph

656 Commits

Author SHA1 Message Date
Victor Woeltjen
e3b191b5dc [Time Controller] Update failing specs
Update failing specs to reflect support for time conductor,
WTD-1515
2015-09-09 16:52:46 -07:00
Victor Woeltjen
a4dda695dd [Time Controller] Get conductor working with fixed pos.
WTD-1515
2015-09-09 16:46:00 -07:00
Victor Woeltjen
fdbc91131b [Time Controller] Update bundle definition
...for Fixed Position view to reflect changes to dependencies,
WTD-1515.
2015-09-08 17:18:39 -07:00
Victor Woeltjen
d2dfec3ce7 [Time Controller] Simplify retrieval of datum objects
...for historical data. Supports WTD-1515
2015-09-08 17:03:58 -07:00
Victor Woeltjen
760f4b818f [Time Conductor] Update fixed position from history
WTD-1515
2015-09-08 16:53:06 -07:00
Victor Woeltjen
c026bfa17d [Time Conductor] Begin adding support to fixed position
Begin adding support for universal time controller to
fixed position view, WTD-1515.
2015-09-08 16:37:10 -07:00
Victor Woeltjen
4d276888e1 [Plot] Update failining spec
WTD-1515
2015-09-04 15:53:55 -07:00
Victor Woeltjen
142af3db77 [Time Controller] Add JSDoc
WTD-1515
2015-09-04 15:51:46 -07:00
Victor Woeltjen
b66759e519 [Plot] Initially establish bounds
Initially establish domain bounds with time controller,
WTD-1515
2015-09-04 15:31:47 -07:00
Victor Woeltjen
600ff1a3ee [Plot] Requery on event
Requery on a query change event from a time conductor,
WTD-1515
2015-09-04 15:07:46 -07:00
Victor Woeltjen
d158aa6028 [Plot] Follow time conductor more smoothly
WTD-1515
2015-09-04 14:04:09 -07:00
Victor Woeltjen
c2985d61b7 [Plot] Follow universal time controller
Follow displayable area of universal time controller,
WTD-1515
2015-09-04 13:57:26 -07:00
Victor Woeltjen
3ce40ab870 [Time Controller] Fix capability decoration
WTD-1515
2015-09-04 13:02:36 -07:00
Victor Woeltjen
01a6d2e6a7 [Time Controller] Test ConductorRepresenter
WTD-1515
2015-09-04 12:44:49 -07:00
Victor Woeltjen
af462ff3ee [Time Controller] Begin adding mocks
Begin adding/configuring mocks to support testing
ConductorRepresenter, WTD-1515
2015-09-04 12:12:21 -07:00
Victor Woeltjen
5c1d209eff [Time Controller] Simplify ConductorRepresenter
WTD-1515
2015-09-04 11:53:51 -07:00
Victor Woeltjen
8a76c3a425 [Time Controller] Test conductor's telemetry capability
WTD-1515
2015-09-04 10:57:50 -07:00
Victor Woeltjen
9ccd0b9188 [Time Conductor] Test capability decorator
WTD-1515
2015-09-04 10:47:38 -07:00
Victor Woeltjen
f83588d980 [Time Controller] Begin adding test cases
WTD-1515
2015-09-04 10:32:01 -07:00
Victor Woeltjen
a481b377cb [Time Conductor] Add terminology note to readme
WTD-1515
2015-09-04 10:24:18 -07:00
Victor Woeltjen
35ff4efbca [Time Conductor] Add placeholder specs
Add empty specs for classes related to time conductor, WTD-1515
2015-09-04 09:44:08 -07:00
Victor Woeltjen
436e010738 [Time Conductor] Broadcast changes
WTD-1515
2015-09-03 15:59:46 -07:00
Victor Woeltjen
bf4765fcb6 [Time Controller] Bind displayed control to state
Bind changes to the displayed time controller to
changes to the underlying state of the time conductor,
WTD-1515.
2015-09-03 15:13:03 -07:00
Victor Woeltjen
dbfb8b9861 [Time Controller] Add capability decorator
WTD-1515
2015-09-03 14:58:49 -07:00
Victor Woeltjen
681cd0bb9c [Time Controller] Add conductor service
WTD-1515.
2015-09-03 14:53:23 -07:00
Victor Woeltjen
b668fb58fb [Time Controller] Show only outermost controller
WTD-1515
2015-09-03 11:44:11 -07:00
Victor Woeltjen
f74da6b935 [Time Controller] Add overflow hidden
Add overflow: hidden so that time controller does not exceed
edges of the screen. WTD-1515
2015-09-03 11:40:40 -07:00
Victor Woeltjen
e4dec21ceb [Time Controller] Add telemetry capability wrapper
WTD-1515
2015-09-03 11:38:06 -07:00
Charles Hacskaylo
bb1a02c8bd [Frontend] Significant re-factoring of CSS and markup
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
2015-09-02 18:02:58 -07:00
Victor Woeltjen
e873389655 [Conductor] Add time conductor widget
Add widget for the time conductor using a representer,
WTD-1515.
2015-09-02 15:57:52 -07:00
Charles Hacskaylo
5a991076ea [Frontend] CSS and markup tweaks to enable flex layout
open #93
Layout frame and imagery markup modified;
2015-08-31 12:34:34 -07:00
Shivam Dave
def5e17bb8 [Mobile] Merge
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
2015-08-26 14:07:52 -07:00
Charles Hacskaylo
e96d3e3738 [Mobile] IN PROGRESS: Significant redo of object-header
open #74
Added .bar .l-flex using display: flex in object header;
2015-08-24 12:22:08 -07:00
Victor Woeltjen
6aaa887e65 [Imagery] Start off with empty timestamp
Show nothing in the timestamp area when there is no
data yet available for image telemetry, WTD-1170.
2015-08-24 09:39:42 -07:00
Pete Richards
3a050cc5b8 [Style] space after operator 2015-08-24 09:03:31 -07:00
Charles Hacskaylo
ee608cc4a4 [Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
2015-08-21 15:09:23 -07:00
Victor Woeltjen
7fe866060b [Code Style] Use prototypes in forms bundle
WTD-1482.
2015-08-14 13:44:08 -07:00
Victor Woeltjen
6302eee17e [Code Style] Use prototypes in Scrolling List bundle
WTD-1482.
2015-08-13 12:35:48 -07:00
Victor Woeltjen
820c15d74c [Code Style] Use prototypes in Plot bundle
WTD-1482.
2015-08-13 12:12:15 -07:00
Victor Woeltjen
aefad6fdd3 [Code Style] Continue refactor of Plot bundle
Continue refactoring Plot bundle to use prototypes,
WTD-1482
2015-08-13 10:26:04 -07:00
Victor Woeltjen
18bc7d3637 [Code Style] Begin using prototypes in Plot bundle
WTD-1482
2015-08-12 14:49:03 -07:00
Victor Woeltjen
175490e1f7 [Code Style] Use prototypes in Web Page bundle
WTD-1482
2015-08-12 14:32:05 -07:00
Victor Woeltjen
ed53808556 [Code Style] Use prototypes in Layout bundle
WTD-1482
2015-08-12 13:45:48 -07:00
Victor Woeltjen
a9e2d48036 [Code Style] Use prototypes in Imagery bundle
WTD-1482
2015-08-12 09:57:05 -07:00
Victor Woeltjen
d701567b70 [Code Style] Use prototypes for Events bundle
WTD-1482
2015-08-11 16:01:16 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs
WTD-1482.
2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references
WTD-1482
2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
Victor Woeltjen
2ca3c6ea93 [Layout] Use consistent whitespace
Use consistent whitespace in array literals, WTD-1424.
2015-08-04 10:00:44 -07:00
Victor Woeltjen
a4c704a5a2 [Layout] Ensure minimum frame size
Ensure default frame size in a layout is not small,
even if the grid size for the layout is very small.
WTD-1424.
2015-08-03 12:18:49 -07:00
Victor Woeltjen
deed95d8d1 [Plot] Don't allocate charts for empty plots
Don't allocate WebGL charts for empty plots, WTD-1444.
2015-07-17 09:13:20 -07:00
Victor Woeltjen
e400f211c4 Merge remote-tracking branch 'nasa/open1404' into open1427
Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html
2015-07-15 13:45:37 -07:00
Charles Hacskaylo
af2ca49b23 [Frontend] Added top right resize corner
WTD-1404
WTD-1376
2015-06-30 09:27:56 -07:00
Victor Woeltjen
5f80fcabc6 [Imagery] Clear background image
Clear background image on change, WTD-1407.
2015-06-29 18:49:36 -07:00
Victor Woeltjen
397a545482 [Plot] Expand range to give margin for points
Expand range to give some margin for points near the edge,
WTD-1406.
2015-06-29 18:08:03 -07:00
Victor Woeltjen
fa8095d5bc Merge branch 'open-master' into open1317limits2
WTD-1405

Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html
2015-06-29 17:30:33 -07:00
Victor Woeltjen
0b4aa730f4 Merge pull request #30 from slhale/open26
[Events] Create tests for real time version
2015-06-29 15:42:33 -07:00
Victor Woeltjen
87f982b03e Merge remote-tracking branch 'nasa/open-master' into open-master 2015-06-29 15:10:02 -07:00
Victor Woeltjen
29283e4fb5 Merge branch 'open1233' into open-master 2015-06-29 15:09:40 -07:00
larkin
cc64412d78 Merge remote-tracking branch 'origin/open1344' into open-1348 2015-06-29 14:58:27 -07:00
larkin
52cf918d08 Merge remote-tracking branch 'origin/open1317' into open-1346 2015-06-29 14:44:24 -07:00
Sarah Hale
2ab3932ce1 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 14:43:19 -07:00
Sarah Hale
f816b5018a [Events] Style
Removed unused variables. #26.
2015-06-29 13:15:56 -07:00
Victor Woeltjen
ebbac233aa Merge branch 'open1373' into open-master 2015-06-29 13:15:43 -07:00
Sarah Hale
b91b197f5b [Events] Comments
Removed todo comment. #26.
2015-06-29 13:14:51 -07:00
Sarah Hale
14694c675b [Events] All tests work
All of the tests for the RT Events are working. #26.
2015-06-29 13:13:05 -07:00
Sarah Hale
56c3e72d32 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 13:10:46 -07:00
Sarah Hale
6616dedf63 [Events] Controller test correction
Test for the RT Event List controller now
actually works. #26.
2015-06-29 13:09:15 -07:00
larkin
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338
Resolve merge conflicts due to whitespace changes.
2015-06-29 12:08:16 -07:00
larkin
84345caf7d [Style] Convert tabs to spaces 2015-06-29 11:51:28 -07:00
Sarah Hale
4c6b3c7a13 [Events] Policy test correction
The view policy test for real time Messages
actually now works. #26.
2015-06-29 09:56:59 -07:00
Sarah Hale
d120c8b139 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 09:10:23 -07:00
Victor Woeltjen
762f4d59fc [Layout] Disallow folders
Disallow layouts in folders, WTD-1373.
2015-06-27 12:43:32 -07:00
Sarah Hale
4e03d7b29b [Events] RT Messages policy test
The view policy test for real time Messages
now works. #26.
2015-06-26 15:17:17 -07:00
larkin
d729cfcd3e Merge remote-tracking branch 'origin/open1329' into open1343 2015-06-26 15:13:21 -07:00
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
Sarah Hale
41e75d7494 [Events] EventListController test
Test for the Event List controller now works. #26.
2015-06-26 14:59:04 -07:00
Sarah Hale
95f9d783d3 [Events] Column tests working
Tests for the domain and range columns now work
for the real time event list. #26.
2015-06-26 14:23:41 -07:00
Victor Woeltjen
286ac5628b [Drag-Drop] Check for default prevented correctly
Check for defaultPrevented property instead of trying
to check nonexistent method isDefaultPrevented(); for
WTD-1354 in the context of WTD-1233.
2015-06-26 11:53:45 -07:00
Victor Woeltjen
f681d07643 Merge branch 'open-master' into open1233 2015-06-26 11:50:48 -07:00
Sarah Hale
750d3f473e [Events] Starting tests
Starting to write tests for the real
time messages view. #26.
2015-06-25 15:04:53 -07:00
Sarah Hale
bf8b0bae03 Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 14:51:18 -07:00
Sarah Hale
42361aff25 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-25 14:50:32 -07:00
Sarah Hale
c98a381a42 [Events] Created RT Messages
Created a real-time version of the Messages view called
RT Messages.
Additionally, fixed the MessagesViewPolicy test. #18.
2015-06-25 14:36:14 -07:00
Victor Woeltjen
510597a51a [Scrolling List] Show limits in RT scrolling list
Show limits in a real-time scrolling list view,
WTD-1317.
2015-06-25 12:56:22 -07:00
Victor Woeltjen
dddc2f976e Merge branch 'open1223' into open1317limits
Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html
2015-06-25 12:48:02 -07:00
Victor Woeltjen
e17b6c5a92 Merge branch 'open-master' into open1317limits 2015-06-25 12:45:03 -07:00
Victor Woeltjen
bd5ba48270 Merge remote-tracking branch 'github/master' into open-master 2015-06-25 12:05:34 -07:00
Victor Woeltjen
3df12788f9 Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 11:53:13 -07:00
Charles Hacskaylo
685e384858 [Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
2015-06-25 11:46:15 -07:00
Victor Woeltjen
61fe77cc17 [Drag-Drop] Add test cases
Add test cases for avoiding redundant drop handling,
WTD-1233.
2015-06-25 11:35:18 -07:00
Victor Woeltjen
6f3d6ec12f [Drag-Drop] Prevent redundant drops
Mark default as prevented and check for prevention of
default when handling mctDrop events (which allow
views to follow up on drop gestures by positioning
objects within themselves) avoiding redundant drops
into embedded views. WTD-1233.
2015-06-25 11:27:58 -07:00
larkin
a3f3f5bb27 Merge remote-tracking branch 'origin/open1170' into open-1318 2015-06-25 11:06:44 -07:00
Victor Woeltjen
482f355a08 [Fixed Controller] Stop tracking bounds
Stop tracking size of a fixed position view; no longer
necessary now that background grid is handled by CSS.
Change made in the context of WTD-1344.
2015-06-25 11:00:15 -07:00
Victor Woeltjen
9e55befb2a [Fixed Controller] Add test cases
Add test cases for updating position of elements in
a fixed position view, WTD-1344.
2015-06-25 10:58:01 -07:00
Victor Woeltjen
4279c9e4bf [Fixed Position] Remove obsolete cell styles
Remove obsolete cell style calculations; background
grid is handled by CSS now. Changed in the context of
WTD-1344.
2015-06-25 10:48:49 -07:00
Victor Woeltjen
791504584d [Fixed Position] Update positions when grid size changes
Update positions of elements in a fixed position
view when grid size changes (e.g. when switching
from one domain object to another.) WTD-1344.
2015-06-25 10:45:50 -07:00
Victor Woeltjen
70f5a001ee Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 10:06:18 -07:00
Sarah Hale
c6405c50df Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 10:00:21 -07:00
Sarah Hale
1961ba20c0 Fixing merge
Re-added the tests.
2015-06-25 09:59:52 -07:00
Sarah Hale
288692f57c Fixing merge
Re-added the event list controller.
2015-06-25 09:57:43 -07:00
Sarah Hale
a993ee6126 Fixing conflicts 2015-06-25 09:48:09 -07:00
Sarah Hale
163b210fbb [Events] Real-time telemetry version
Creating an additional event list which can handle real
time data, not historical data. #18.
2015-06-25 09:39:29 -07:00
Sarah Hale
f6298c162c [Events] Real-time telemetry version
Creating an additional event list which can handle real
time data, not historical data. #18.
2015-06-25 09:27:24 -07:00
Victor Woeltjen
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
Victor Woeltjen
40957b1c29 [Scrolling List] Enforce row count
WTD-1317
2015-06-25 08:50:44 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341
WTD-1341
2015-06-24 18:55:15 -07:00
Victor Woeltjen
a7c09f8c79 [Scrolling List] Add realtime scrolling list
Add realtime scrolling list view, for compatibility
with realtime-only data. WTD-1317.
2015-06-24 18:10:59 -07:00
Sarah Hale
d2fe71d82b [Events] Fixed tabs
Removed tabs from EventListController and replaced
with spaces. #18.
2015-06-24 17:08:03 -07:00
Sarah Hale
203de023d2 [Events] More general view policy
The Messages view policy now will allow any object
that has a telemetry type of string to have access
to the Messages view, not just Event List
Generators. (The test for this still does not work
though.) #18.
2015-06-24 17:05:14 -07:00
Sarah Hale
10e47e6f48 [Events] Fixed comments
Fixed comments to refer to event lists
correctly. #18.
2015-06-24 13:14:19 -07:00
Victor Woeltjen
bcfe80fbdc [Plot] Handle changes to telemetry objects
Handle changes to the set of visible telemetry objects
in a plot; addresses WTD-619, which is related to WTD-1329.
2015-06-24 12:54:49 -07:00
Sarah Hale
adc4a1b828 [Events] Tweaked tests
Changed some test names to be more descriptive.
Moved the policy test to another folder.
Blanket coverage now works. #18.
2015-06-24 12:11:04 -07:00
Charles Hacskaylo
fdfa35d1da [Frontend] New symbols font and CSS adjustments
WTD-980
WTD-396
Changed glyph for stacked plots;
Normalized button line-heights and size of required symbol;
Updated symbol art in symbols font;
Restored mistakenly removed "menu" gesture to grid-item;
2015-06-24 11:42:29 -07:00
Sarah Hale
ff8e6f40bb [Events] More style
Edited comments to clarify the sources of
files. #18.
2015-06-24 11:32:13 -07:00
Sarah Hale
e7ce0f2ded Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-24 11:26:52 -07:00
Sarah Hale
ebfb4cd055 [Events] Removed mct-data-table test
Removed the test for MCTDataTable because it
is a directive. #18.
2015-06-24 11:20:38 -07:00
Sarah Hale
86240a337f [Events] Controller and populator tests
Created tests for EventListController and
EventListPopulator. #18.
2015-06-24 11:17:30 -07:00
Sarah Hale
54cf5a2c59 [Events] Changed where row reversal happens
Changed where in the code the row are reveresd
(wrt scrolling lists) so that the most recent
messages are on the bottom. The rows are now in
the correct order from getRows, rather then
updateRows. #18.
2015-06-24 11:16:03 -07:00
Sarah Hale
e7598adcee [Events] View policy test
Created a test for the MessagesViewPolicy. #18.
2015-06-24 10:40:03 -07:00
Sarah Hale
ba1f86da25 [Events] Restricted when view avaliable
Created a new policy to only allow the Messages view
to be avaliable for Event Message Generators. #18.
2015-06-24 10:15:09 -07:00
Sanderfer
f617a01a4d Ticket WTD-1315
Merge branch 'open-master' into open475
2015-06-24 09:56:08 -07:00
Sarah Hale
2a9aa7ee2f [Events] Beginning test setup
The files needed to write the tests are in place. #18.
2015-06-23 15:54:48 -07:00
Sarah Hale
567ccf0454 [Events] More style
Removed part of comment. #18.
2015-06-23 15:42:22 -07:00
Sarah Hale
5d2afac83b [Events] Window injected with Angular
Used  provided by angular to better follow
style guidelines, as well as for utility in testing
later. #18.
2015-06-23 15:40:12 -07:00
Sarah Hale
5da210d350 [Events] More style compliance
More small changes for style. #18.
2015-06-23 15:09:34 -07:00
Sarah Hale
7d3c2b7243 [Events] Style compliance
Made some small changes to keep up with
the style standards. #18.
2015-06-23 14:47:21 -07:00
Victor Woeltjen
d1dc2da4c8 [Plot] Remove unused function
Remove unused function related to enforcing fixed duration
in plots, WTD-1273.
2015-06-23 14:40:32 -07:00
Sarah Hale
c4006646f8 [Events] More generalized data format
Made the EventListController use domain and range types, rather
than severity, domain, and event message. This allows it to be
more generalized, which should be helpful with different data
formats later on. #18.
2015-06-23 14:21:11 -07:00
Victor Woeltjen
d6a31dcef3 [Plot] Update failing specs
Update failing specs for changes related to fixed duration
plots, WTD-1273.
2015-06-23 14:17:28 -07:00
Victor Woeltjen
e5b0af47e1 Merge branch 'open-master' into open1273
Merge latest from master branch into topic branch
for WTD-1273.
2015-06-23 14:06:42 -07:00
Victor Woeltjen
065a5a6fbf [Limits] Disable failing specs
Disable specs which are failing after changes to support
limits, WTD-1223.
2015-06-23 13:43:00 -07:00
Sarah Hale
9609987562 [Events] Scrollbar moves with data
The scroll position now moves down when a new row is added
to the data table. This means that when the scroll position
is at the bottom, it will stay there, even with new updates
adding onto the botton. #18.
2015-06-23 13:33:09 -07:00
Victor Woeltjen
a4ea0dd047 Merge branch 'open-master' into open1223
Merge latest from master branch into topic branch for
WTD-1223
2015-06-23 13:29:47 -07:00
Sarah Hale
fdab799e5b [Events] Changed directive variables
Changed scrollDirection to ascendingScroll, which acts like
a boolean. Now there is proper communication between the
html and the directive itself. #18.
2015-06-23 12:40:50 -07:00
Sarah Hale
3337777fea [Events] Changed file structure
Changed file structure to include a separate
directives directory. #18.
2015-06-23 11:48:08 -07:00
Sarah Hale
a5d5fa0796 [Events] Table height detection
Created an mct-data-table directive. We are able to detect changes in
the height of the table now, which will be used to determine
any corresponding scrolling. #18.
2015-06-23 11:37:57 -07:00
Victor Woeltjen
e516d886a6 [Plot] Treat any modifier key as pan
Treat any modifier key as a pan gesture when click-dragging in
a plot; this is more resilient to cross-platform nuances.
WTD-1273.
2015-06-22 18:12:25 -07:00
Sarah Hale
7be7844824 [Events] Reversed viewing order
When viewing an event message generator new messages are now added to the
bottom of the display, rather than being added to the top and pushing
the other messages down by one. #18.
2015-06-22 13:40:55 -07:00
Sarah Hale
0feb3b0462 Merge branch 'open18' of https://github.com/slhale/openmctweb into open18 2015-06-22 12:37:15 -07:00
Sanderfer
7493f76d06 Merge branch 'open-master' into open1313 2015-06-22 10:11:00 -07:00
Victor Woeltjen
7f7759f72c Merge branch 'open-master' into open1223 2015-06-20 15:36:21 -07:00
Victor Woeltjen
8199d1d9d9 [Plot] Use mct-drag from plot
Use mct-drag from plot such that we are able to handle
mouse events which leave the plot area for marquee zoom
and pan. WTD-1273.
2015-06-20 11:47:10 -07:00
Victor Woeltjen
bc7342b127 [Plot] Make plot fixed duration a global default
WTD-1273.
2015-06-20 11:30:20 -07:00
Victor Woeltjen
f3cbcf0abe [Plot] Update ticks during pan
WTD-1273.
2015-06-20 11:21:55 -07:00
Victor Woeltjen
53f712b506 [Plot] Pan with alt-key
While alt is held, treat drag gestures in a plot area
as a pan, WTD-1273.
2015-06-20 11:19:56 -07:00
Victor Woeltjen
215d3ffd72 [Plot] Tweak fixed-duration code
Tweak fixed-duration code such that data is not
lost; WTD-1273.
2015-06-20 10:39:35 -07:00
Victor Woeltjen
fbf682d5fa [Plot] Support fixed duration
Support a fixed duration for plots, WTD-1273.
2015-06-20 10:28:49 -07:00
Victor Woeltjen
5ca954deaf [Plot] Test fallback on webglcontextlost
Add test case to verify that fallback occurs when a
WebGL context is lost, WTD-475.
2015-06-19 16:14:49 -07:00
Victor Woeltjen
a82fea2166 Merge pull request #5 from nasa/open1202
[Plot] Improve plotting performance
2015-06-19 16:05:18 -07:00
Victor Woeltjen
b6fdf4d6ab [Plot] Fall back from WebGL on context loss
When a WebGL context is loss, fall back to displaying
plots using regular canvas 2d API. WTD-475.
2015-06-19 16:02:52 -07:00
Victor Woeltjen
dac44623ee [Plot] Begin adding WebGL fallback
Begin adding code to handle case where WebGL context
is lost, WTD-475.
2015-06-19 15:47:22 -07:00
Charles Hacskaylo
ae7dae011b [Dev/Frontend] New example event generator and event view
WTD-1304
github open18
New example generator;
New temporary view: features/events;
Updated scss and css;
2015-06-19 15:29:06 -07:00
Victor Woeltjen
4bc41e8aab Merge remote-tracking branch 'nasa/open1223' into open1223
Conflicts:
	platform/features/plot/res/templates/plot.html
2015-06-19 14:50:00 -07:00
Victor Woeltjen
3b62add011 Merge branch 'open-master' into open1223
Conflicts:
	platform/features/plot/res/templates/plot.html
2015-06-19 13:34:21 -07:00
Victor Woeltjen
b879de1a33 Merge branch 'open-master' into open1182 2015-06-19 12:22:05 -07:00
Victor Woeltjen
8d80a2aee1 Merge branch 'open-master' into open1182 2015-06-18 18:23:19 -07:00
Victor Woeltjen
00229f01b1 [Plot] Test plot view policy
Test plot view policy, added in conjunction with image
telemetry; WTD-1170.
2015-06-18 17:11:11 -07:00
Victor Woeltjen
85e3101d08 [Plot] Expose plot view policy
Expose policy which suppresses image telemetry (and other
non-numeric telemetry) in plots. WTD-1170.
2015-06-18 17:00:20 -07:00
Victor Woeltjen
983a9a2f07 Merge remote-tracking branch 'nasa/open1170' into open1170 2015-06-18 16:58:44 -07:00
Victor Woeltjen
66b143c9d7 [Plot] Suppress plot for non-numeric telemetry
Avoids plot views becoming erroneously available for image
telemetry, WTD-1170.
2015-06-18 16:58:29 -07:00
Victor Woeltjen
51bd205502 [Imagery] Be flexible about format
Accept either image or imageUrl as format for image telemetry,
WTD-1170.
2015-06-18 16:53:52 -07:00
Charles Hacskaylo
ab81c9070e [Frontend] Remove static-markup file
WTD-1170
2015-06-18 10:09:17 -07:00
Charles Hacskaylo
69f4b4975e Merge branch 'open-master' into open1170b
Conflicts:
	platform/commonUI/general/res/sass/plots.scss
	platform/commonUI/inspect/src/InfoConstants.js
	platform/features/imagery/src/policies/ImageryViewPolicy.js
	platform/features/static-markup/res/markup.html
2015-06-18 09:55:26 -07:00
Victor Woeltjen
897433f717 [Imagery] Test ImageryController
WTD-1170.
2015-06-17 21:15:17 -07:00
Victor Woeltjen
ba88281bd0 [Imagery] Test mct-background-image
WTD-1170.
2015-06-17 20:51:41 -07:00
Victor Woeltjen
c41db4f22b [Imagery] Test policy
Test policy which restricts the Imagery view to domain objects which
have image telemetry. WTD-1170.
2015-06-17 20:41:40 -07:00
Victor Woeltjen
8aa25a929a [Imagery] Add skeleton specs
Add skeleton specs for the Imagery view of telemetry,
WTD-1170.
2015-06-17 20:35:17 -07:00
Victor Woeltjen
2690a8b8e2 [Imagery] Add JSDoc
Add JSDoc to classes implementing the Imagery view, WTD-1170.
2015-06-17 20:31:47 -07:00
Victor Woeltjen
12954f8fc3 [Imagery] Add open-in-new-tab button
Add button to open current telemetry image in a new tab,
WTD-1282 (in the context of WTD-1170.)
2015-06-17 20:21:53 -07:00
Victor Woeltjen
5a4a912f79 [Imagery] Only display images when loaded
Wait until image telemetry is completely loaded before
displaying it, WTD-1170.
2015-06-17 20:12:04 -07:00
Charles Hacskaylo
70e1a8ad9e [Frontend] Mods to layout element drag handles and editing behavior
WTD-951
layout.html:
Added classes to and removed inline styles from drag handles,
Removed edge handles, leaving corner handles in NW, SW and SE only;
Added hover classes to display corner handles while editing;
Modified z-indexing to allow view switcher to be accessed while editing;
2015-06-16 12:40:48 -07:00
Charles Hacskaylo
a984e60ca5 [Frontend] Mods to layout element editing handles
WTD-951
In-progress checkin
2015-06-16 10:48:31 -07:00
Victor Woeltjen
9051a7114c [Plot] Remove OOB glow
Remove glow for out-of-bounds data from plot; WTD-1255,
in the context of work in progress on WTD-1223.
2015-06-15 17:37:31 -07:00
Victor Woeltjen
f6eb9904ff Merge remote-tracking branch 'nasa/open839' into open839 2015-06-15 16:48:33 -07:00
Victor Woeltjen
d03cab21b2 Merge remote-tracking branch 'nasa/open949' into open839 2015-06-15 16:47:58 -07:00
Charles Hacskaylo
d8a66b426f [Merge] Merging open-master in; resolved conflicts 2015-06-15 16:47:23 -07:00
Charles Hacskaylo
6e7203a49f [Merge] Cherrypick 2 from warp1220
WTD-1220
2015-06-15 15:45:40 -07:00
Charles Hacskaylo
5193c62233 [Merge] Cherrypick 1 from warp1220
WTD-1220
2015-06-15 15:44:09 -07:00
Charles Hacskaylo
7c7b79e151 [Config] Changed priority from mandatory to preferred
WTD-949
2015-06-12 19:00:55 -07:00
Charles Hacskaylo
8f153d4e75 [Fronted] Significant refactoring of mixins for containers and buttons
WTD-839
Removal of 'icon-btn' class from *.html;
Cleanup of markup in switcher.html;
'name' span is now hidden when switcher is within frame;
Commented out unused css classes in _controls.scss,
Normalization of markup in object header when in main view and framed objects;
Icon sizing fixed in menus and switcher control;
Tightened up spacing in menus;
2015-06-12 11:44:09 -07:00
Charles Hacskaylo
af0c2e7827 [Fronted] Significant refactoring of mixins for containers and buttons
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Cleanup of markup to remove 'icon' class from invoke-menu elements;
2015-06-12 10:00:51 -07:00
Victor Woeltjen
e70ceb12d7 [Imagery] Begin adding mct-image
Begin adding directive to preload images before displaying
them, to avoid flashing of imagery as it arrives. WTD-1170.
2015-06-11 14:12:36 -07:00
Charles Hacskaylo
0b8d5ceb86 [Fronted] Significant refactoring of btn classes
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Moved btn styles from _controls.scss to _buttons.scss;
Markup cleaned up with css classing simplified;
2015-06-10 17:23:08 -07:00
Victor Woeltjen
500d88b5a1 [Plot] Update spec
Update spec for PlotController to account for usage of the
throttle service, WTD-1202.
2015-06-10 17:02:16 -07:00
Victor Woeltjen
35b5fbefd0 [Plot] Throttle updates
Throttle plot updates to subplots; WTD-1202.
2015-06-10 16:54:01 -07:00
Charles Hacskaylo
5219105887 [Config] Modified priority to make plot the default view
WTD-949
Plot is now the default view when browsing objects,
or in-frame in Display Layouts;
2015-06-10 15:31:37 -07:00
Victor Woeltjen
b9ea876101 [Imagery] Allow pausing imagery
WTD-1170.
2015-06-09 16:56:47 -07:00
Victor Woeltjen
ee542293b9 [Imagery] Display image updates
WTD-1170.
2015-06-09 16:31:51 -07:00
Victor Woeltjen
277533b4bf [Imagery] Begin adding controller
Begin adding controller for Imagery view, WTD-1170.
2015-06-09 16:07:17 -07:00
Victor Woeltjen
627fa267f4 [Imagery] Add imagery view bundle
Add a bundle which contains view for image telemetry.
Template is a placeholder; view is restricted by policy
to telemetry-providing domain objects which actually have
image telemetry. WTD-1170.
2015-06-09 15:40:42 -07:00
Victor Woeltjen
de3c6e4543 [Fixed Position] Show limits in fixed position
Show limits in fixed position view, WTD-1223.
2015-06-09 10:18:28 -07:00
Victor Woeltjen
51852e1322 [Limits] Use datum for limits in scrolling list view
Utilize 'datum' API when displaying limits in a scrolling list
view, WTD-1223.
2015-06-09 10:07:00 -07:00
Victor Woeltjen
35b5b29d03 [Limits] Use datum for scrolling list
Use notion of a datum from scrolling list view when
evaluating limits, WTD-1223.
2015-06-08 15:34:17 -07:00
Victor Woeltjen
2a4bf7b95a [Limits] Use datum for plots
Use datum for limits in a plot, WTD-1223.
2015-06-08 15:33:41 -07:00
Charles Hacskaylo
1587e66d9e [Frontend] Added local zoom/reset controls
WTD-1222
Refactored scss in plots-main slightly;
Removed unused sass/plots.scss;
2015-06-08 15:24:17 -07:00
Charles Hacskaylo
03252aac1b [Frontend] Ported over all /platform changes from warp1222
WTD-1222
2015-06-08 13:50:54 -07:00
Charles Hacskaylo
b18159b8e1 Merging in latest from ue-frontend 2015-06-08 13:45:31 -07:00
Victor Woeltjen
4ab36bd421 [Limits] Show limits from scrolling list view
WTD-1223.
2015-06-08 11:57:05 -07:00
Victor Woeltjen
f4adc6a889 Merge branch 'open-master' into open1223
Merge in latest from master branch into topic branch for
limits, WTD-1223.

Conflicts:
	platform/commonUI/general/res/css/forms.css
	platform/commonUI/general/res/css/plots.css
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/css/tree.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	platform/commonUI/general/res/sass/plots/_plots-main.scss
	platform/features/scrolling/res/templates/scrolling.html
2015-06-08 10:23:36 -07:00
Victor Woeltjen
88f938b1b6 [Limits] Begin using limits from scrolling list view
WTD-1223.
2015-06-05 17:59:58 -07:00
Victor Woeltjen
dc6c43a4cd [Limits] Display limit state in legend of plot
WTD-1223.
2015-06-05 17:15:02 -07:00
Victor Woeltjen
9a3ccc3295 [Limits] Merge in latest from platform
Merge in latest changes to platform to begin implementing
limits, WTD-1223.
2015-06-05 16:28:29 -07:00
Charles Hacskaylo
6fe6aacc38 Added open source comment 2015-06-03 10:25:37 -07:00
Charles Hacskaylo
b022babedb Adding static-markup bundle. 2015-06-03 10:23:49 -07:00
Victor Woeltjen
a18a7c9960 [Layout] Fix comment
Change inaccurate comment based on feedback from code
review for WTD-1182.
2015-06-03 07:49:11 -07:00
Charles Hacskaylo
6104201d89 [Frontend] Markup and CSS for revised scrolling tabular view
WTD-1217
2015-06-02 17:45:39 -07:00
Victor Woeltjen
9b6d8cf1ec [Representation] Minimize scope reuse
When switching among domain objects and/or views, avoid
reusing the same information is scope. The wrong information
in scope can cause various failures in views, such as WTD-1182.
2015-05-20 16:26:53 -07:00
Victor Woeltjen
f74199e60f [Layout] Add check to view in frame
Add check to template for views in frame to avoid populating
frame prematurely; WTD-1182.
2015-05-20 14:02:56 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
Charles Hacskaylo
58bd4240f1 [Frontend] Merging warp1172 platform changes in
WTD-1172
(cherry picked from commit 219ffb4d59d4cc4a0172ba351af0e2b5d672d4b2)

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
	platform/commonUI/general/res/sass/_fixed-position.scss
	warp/telemetry/src/autoflow/AutoflowTableLinker.js

Manually deleted AutoflowTableLinker.js
2015-05-07 13:10:04 -07:00
Charles Hacskaylo
2d13745823 [Frontend] Added CSS and markup for stale; cleanup
WTD-1172
Added stale CSS in _data-status.scss;
Added pulse animation in _effects.scss, not used;
Removed temp-limits directory and files;
Sanding and refining of limits styles and in .tabular;
2015-05-06 19:30:36 -07:00
Charles Hacskaylo
db74e2f84a [Frontend] CSS hooks for staleness
WTD-1172
New .scss file for staleness
Added CSS hooks in templates for staleness
2015-05-06 17:36:55 -07:00
Charles Hacskaylo
f114f742c4 [Frontend] Tweaks to markup and CSS
WTD-1172
scrolling.html markup and CSS hooks;
added comments to change points;
CSS tweaking;
2015-05-06 16:55:25 -07:00
Charles Hacskaylo
c8d06cb32a [Frontend] Limits added to fixed position view
WTD-1172
2015-05-06 11:20:09 -07:00
Charles Hacskaylo
4b774f7b12 [Frontend] Clean up
WTD-1172
Moved HTML limits markup out of plot.html and into temp-limits/.../examples.html
2015-05-06 10:34:16 -07:00
Charles Hacskaylo
39c8f0ab00 [Frontend] Plot limits and out-of-bounds indicators
WTD-1172
Markup and CSS for plots;
Example ng-class added to plot.html for legend items;
Markup added to plot.html for OOB indicators;
2015-05-06 10:21:29 -07:00
Charles Hacskaylo
fbaa0ff1e0 [Frontend] In-progress markup and CSS for limits
WTD-1172
Plot limits so far
2015-05-04 16:50:11 -07:00
Victor Woeltjen
2cba0234c5 [Pages] Add comments
Add comments to controller for Page objects in preparation
for integration, WTD-1158.
2015-04-29 15:05:46 -07:00
Victor Woeltjen
b2cd74e629 Merge branch 'open-master' into open1158 2015-04-29 15:02:57 -07:00
Charles Hacskaylo
babe420f26 [Frontend] CSS and markup for iframe
WTD-1150
WTD-1145
CSS and markup to cause iframes to layout properly without double scroll bars
2015-04-28 14:49:08 -07:00
Charles Hacskaylo
582a236d8a [Frontend] Fixes, glyph and description updates
WTD-1150
WTD-1145
Fixed incorrect references to iFrameController to EmbeddedPageController;
Added new glyph for Page;
Renamed Page to Web Page;
2015-04-28 14:28:17 -07:00
Victor Woeltjen
cab259415d [Pages] Test controller
Test controller for WTD-1145.
2015-04-27 14:58:32 -07:00
Victor Woeltjen
012fad6984 [Pages] Validate input
Valid URL input for Pages, WTD-1145.
2015-04-27 14:50:14 -07:00
Victor Woeltjen
01e2840aae [Pages] Move page plugin into platform
Move Page plugin from prototype location into
platform, WTD-1145.
2015-04-27 14:46:33 -07:00
Victor Woeltjen
186ae05686 [Plot] Add test case
Add test case which exercises handling of historical telemetry,
WTD-806.
2015-04-20 17:04:34 -07:00
Victor Woeltjen
6400a670fa [Plot] Update plot with historical data
Trigger update of displayed plot data when new historical
data becomes available, WTD-806.
2015-04-20 17:00:30 -07:00
Victor Woeltjen
4d288950fd [Plot] Add test cases
Add test cases for plot line management, WTD-806.
2015-04-20 14:31:29 -07:00
Victor Woeltjen
e21cbbe2c6 [Plot] Add test cases
WTD-806
2015-04-20 11:00:54 -07:00
Victor Woeltjen
ffcd91f88d [Plot] Add test cases
Add test cases to spec for PlotUpdater to reflect changes
for merging streaming and historical data. WTD-806.
2015-04-17 16:55:49 -07:00
Victor Woeltjen
74b9d68dc8 [Plot] Update failing specs
Update failing specs after changes for WTD-806.
2015-04-17 16:42:15 -07:00
Victor Woeltjen
955c4209f0 [Plot] Add placeholder specs
Add placeholder specs for new scripts introduced to support
merging real-time and historical telemetry, WTD-806.
2015-04-17 15:11:22 -07:00
Victor Woeltjen
62958280b7 [Plot] Avoid clearing domain offset
Avoid clearing domain offset unnecessarily by fixing
variable reference; WTD-806.
2015-04-17 15:05:56 -07:00
Victor Woeltjen
8ba9c0553a [Plot] Begin integrating with telemetry handler
Miscellaneous tweaks and fixes to begin showing merged
real-time and historical telemetry, WTD-806.
2015-04-17 14:53:21 -07:00
Victor Woeltjen
5cc89e7983 [Plot] Update PlotController
Update plot controller to request historical telemetry,
WTD-806.
2015-04-17 14:09:39 -07:00
Victor Woeltjen
9f390de213 [Plot] Add clarifying comments
Add clarifying comments to PlotLine, added to simplify merging
of real-time with historical data, WTD-806.
2015-04-17 14:04:46 -07:00
Victor Woeltjen
7370b1a87f [Plot] Use new API from PlotUpdater
Use PlotLine and PlotLineBuffer from PlotUpdater, to enable
merging of real-time and historical telemetry. WTD-806.
2015-04-17 14:00:00 -07:00
Victor Woeltjen
4d34f19aa2 [Plot] Complete coverage of PlotLineBuffer
WTD-806.
2015-04-17 12:26:44 -07:00
Victor Woeltjen
6551e9212d [Plot] Fix insertion in PlotLineBuffer
WTD-806.
2015-04-17 12:13:17 -07:00
Victor Woeltjen
b20643018a [Plot] Complete PlotLineBuffer
Complete implementation of PlotLineBuffer, which is responsible
for managing the displayable buffer for an individual plot line.
WTD-806.
2015-04-17 12:06:44 -07:00
Victor Woeltjen
15b1c824e3 [Plot] Begin separating out plot line handling
Begin separating out plot line buffer from the rest of plot;
managing this buffer separately will aid in merging realtime
and hsitorical data, WTD-806.
2015-04-17 11:35:24 -07:00
Victor Woeltjen
9215eb1427 [Plot] Begin updating plot
Begin updating plot to merge realtime and historical
telemetry, WTD-806.
2015-04-16 16:48:03 -07:00
Victor Woeltjen
03e1633a22 [Timeline] Track realtime index in updater
Track realtime index in PlotUpdater to facilitate prepending of
historical data portion on-demand, WTD-806.
2015-04-16 16:41:09 -07:00
Victor Woeltjen
f6df73c11b Merge branch 'open-master' into open962
Merge in latest from open-master into topic branch
for WTD-962
2015-04-10 17:30:03 -07:00
Victor Woeltjen
9e4611bcfd [Containment] Fix bundle
Fix dependencies in containment bundle to allow loading,
WTD-962.
2015-04-07 21:03:36 -07:00
Victor Woeltjen
c10253c01d [Plot] Add note about test priority
WTD-1070.
2015-04-06 14:30:13 -07:00
Victor Woeltjen
e01c45df2e [Plot] Test 2D chart drawing
Test drawing using fallback canvas 2D API, WTD-1070.
2015-04-06 14:27:43 -07:00
Victor Woeltjen
3db8c1a32d [Plot] Try multiple chart options
Choose among multiple chart options, WTD-1070.
2015-04-06 14:15:34 -07:00
Victor Woeltjen
eba980c720 [Plot] Implement canvas 2d methods
Implement methods in 2D canvas to support fallback when
WebGL is unavailable, WTD-1070.
2015-04-06 13:56:27 -07:00
Victor Woeltjen
0626a6080e [Plot] Add 2d chart
Add skeleton class for implementation of charting
functionality which uses canvas' 2D API for rendering,
WTD-1070.
2015-04-06 13:49:13 -07:00