Commit Graph

329 Commits

Author SHA1 Message Date
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
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
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
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
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
Charles Hacskaylo
8018c8f42e [Frontend] Sanding and polishing on common front-end elements
WTD-1048
Originally did a lot of this work in warp1048 by mistake
This commit pulls in all /platform-only changes from that branch
Mods are mostly related to WTD-1046 specifically, but also touch toolbar and buttons
2015-03-20 16:37:42 -07:00
Victor Woeltjen
3fe651b6ce [Layout] Remove selector
Remove panel selector from Layout's Create menu; this was added
erroneously in a previous commit. Changed in the context of
WTD-922.
2015-03-18 10:52:52 -07:00
bwyu
8673e2045e Merge remote-tracking branch 'origin/open987' into open-master 2015-03-16 10:28:55 -07:00
bwyu
c2d7996785 Merge remote-tracking branch 'origin/open929' into open-master 2015-03-13 16:21:08 -07:00
bwyu
1e6142ad45 WTD-842: Fixing mouse click in a plot area gets interpreted as a marquee zoom with an extent of zero. 2015-03-13 15:26:08 -07:00
Charles Hacskaylo
cc181dbdc9 [Frontend] Form and form control enhancements
WTD-1002
Added Angular hooks to allow form elements to have JSON defined CSS classes
Form element cleanups
2015-03-10 22:36:35 -07:00
Victor Woeltjen
1efe80f12b [Forms] Hide filter in selector
Hide filter shown in selector control, added for
WTD-987.
2015-03-10 07:34:43 -07:00
Charles Hacskaylo
68c3ec7194 [Frontend] Removed preferred size form section
WTD-1002
WTD-495
2015-03-09 11:06:20 -07:00
Charles Hacskaylo
c640d6238b [Frontend] Markup and CSS mods to fix click area in btn-menu objects
WTD-1002
WTD-942
Mods to markup and CSS to make click-area of menu buttons occupy full area of button
2015-03-06 10:55:40 -08:00
Victor Woeltjen
5ab2ceb333 Merge branch 'open940b' into open929
Merge in Fixed Position updates to reconcile conflicts
related to generalization of selection mechanism, WTD-929.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/test/FixedControllerSpec.js
2015-03-04 15:09:46 -08:00
Victor Woeltjen
93debb4abe Merge branch 'open-master' into open940b
Merge in latest from open-master into topic branch for
WTD-940, merge of fixed position look-and-feel updates.

Conflicts:
	platform/features/layout/src/FixedController.js
	platform/features/layout/src/elements/ElementFactory.js
2015-03-04 14:52:01 -08:00
Victor Woeltjen
73eabe938a [Fixed Position] Wrap mct-include is div
Wrap mct-include in a div which gets position/style information
to position elements in a fixed position view; part of
recommended updates for WTD-894.
2015-03-04 14:46:28 -08:00
Victor Woeltjen
ee59056625 [Fixed Layout] Update tests
Update tests to reflect changes from WTD-894.
2015-03-04 14:46:16 -08:00
Charles Hacskaylo
679e56d231 [Frontend] Tweaks and minor mods
WTD-894
Changed image CSS from contain to cover
Modded default colors for text and telemetry elements to visibility;
Moved click handler position in menu-button.html for better clickability;

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-03-04 14:45:24 -08:00
Victor Woeltjen
3ce1064c4e [Fixed Position] Expose view proxy
Expose view proxy as selection state from the Fixed Position
controller, to make Add button available under generalized
selection mechanism, WTD-929.
2015-03-03 18:52:13 -08:00
Victor Woeltjen
6364296967 [Fixed Position] Remove obsolete script
Remove obsolete script for selection management in
Fixed Position view; this has been generalized to
become part of Edit mode. WTD-929.
2015-03-03 18:48:53 -08:00
Victor Woeltjen
948b661fe7 [Fixed Position] Update specs
Update specs to reflect usage of generalized selection
mechanism, WTD-929.
2015-03-03 18:47:44 -08:00
Victor Woeltjen
ea37c636ee [Fixed Position] Use updated selection mechanism
Use updated, more general approach to handling selections.
WTD-929.
2015-03-03 18:35:28 -08:00
Charles Hacskaylo
424d60440c [Frontend] Delivery checkin: final tweaks to CSS
WTD-894
CSS tweaks to allow box-sizing to be applied to elements within mct-include containers;
CSS cleanups
2015-02-25 18:41:00 -08:00
Charles Hacskaylo
a0f31132e3 [Frontend] In-progress checkin: color palette SASS
WTD-847
Significant markup and CSS for color palette support;
2015-02-25 18:17:11 -08:00
Charles Hacskaylo
bdd070e12f [Frontend] In-progress checkin: added new symbols for Fixed Position view
WTD-894
New symbols in wtdsymbols font;
Updated layout/bundle.json to use new glyphs;
2015-02-25 16:44:11 -08:00
Charles Hacskaylo
7d03bc4de9 [Frontend] In-progress checkin: migrating style tags to classes, other
WTD-894
Significant migration of inline styles to CSS classes;
Changed telemetry component so that when title is hidden, telem element can take up 100% of the element width;
Static text elements now show scrollbars on overflow;
Added padding and box-sizing to text elements - this is throwing off the selected control because of the offset and should be fixed;
2015-02-25 15:53:02 -08:00
Charles Hacskaylo
fa4cfc4961 [Frontend] In-progress checkin:
WTD-894
Added scss file for fixed position styles;
Mods in progress to fixed.html to remove inline styling and change grid method to background gradient approach;
2015-02-25 11:08:52 -08:00
Victor Woeltjen
52811787ac [Fixed Position] Update FixedController spec
Update FixedController spec to include test for updating
set of elements in configuration based on changes to
composition, WTD-883.
2015-02-24 14:33:11 -08:00
Victor Woeltjen
07fc65ed5b [Fixed Position] Remove old elements
Remove elements from view configuration after they have been
removed from composition, WTD-883.
2015-02-24 14:32:39 -08:00
Victor Woeltjen
6d709a6851 [Fixed Position] Ensure default positions
Ensure all elements in a fixed position view's composition
are shown in view, WTD-883.
2015-02-24 14:15:58 -08:00
Victor Woeltjen
be3a31324d [Fixed Position] Change class based on selection state
Change classes for all non-selected objects when an object is
selected, WTD-882.
2015-02-24 12:13:27 -08:00