ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 14:32:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,311 Commits 989 Branches 212 Tags 191 MiB
845b9a2faa
Commit Graph

405 Commits

Author SHA1 Message Date
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