Commit Graph

193 Commits

Author SHA1 Message Date
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
larkin
a3f3f5bb27 Merge remote-tracking branch 'origin/open1170' into open-1318 2015-06-25 11:06:44 -07:00
Victor Woeltjen
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -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
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
Sanderfer
f617a01a4d Ticket WTD-1315
Merge branch 'open-master' into open475
2015-06-24 09:56:08 -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
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
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
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
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
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
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
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
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
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
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
2a4bf7b95a [Limits] Use datum for plots
Use datum for limits in a plot, WTD-1223.
2015-06-08 15:33:41 -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
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
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
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
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
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
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
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
bwyu
7c4cbb3107 Merge remote-tracking branch 'origin/open852' into open-master 2015-02-11 15:39:23 -08:00
bwyu
471e86bd6d Merge remote-tracking branch 'origin/open840' into open-master 2015-02-11 13:19:07 -08:00
Victor Woeltjen
7c5c96ff1d [Plot] Use GL-reported buffer size
Use the buffer width/height reported by WebGL when
configuring the viewport to ensure that data aligns
correctly to canvas size when drawn. WTD-852.
2015-02-09 16:10:20 -08:00
Victor Woeltjen
790397ae0f [Plot] Add test for buffer size
Add test case for usage of drawing buffer size as
reported by WebGL (instead of assuming we always got
the full size we requested.) WTD-852.
2015-02-09 16:07:05 -08:00
bwyu
61bb85df58 Merge remote-tracking branch 'origin/open751' into open-master 2015-02-06 18:08:12 -08:00
Victor Woeltjen
f78226bc69 [Plot] Unsubscribe on destroy
Unsubscribe when a plot view is destroyed; this avoids resource
leaks which cause WTD-840.
2015-02-05 17:37:47 -08:00
Victor Woeltjen
63345bbd3b [Plot] Add test for resource release
Add test to detect plot failing to release its subscriptions,
which causes WTD-840.
2015-02-05 17:34:37 -08:00
Victor Woeltjen
4ac25ab093 Merge branch 'open751' into open840
Merge in necessary changes to reproduce WTD-840 in order to
address WTD-840
2015-02-05 17:23:06 -08:00
bwyu
def47addb3 Merge remote-tracking branch 'origin/open734' into open-master 2015-02-04 12:24:23 -08:00
Victor Woeltjen
494cce9b2f [Plot] Complete specs for plot updater
Complete specs for plot updater; particularly, address
case (and fix bug in case) where maximum buffer size
has been hit. WTD-751.
2015-02-03 10:35:03 -08:00
Victor Woeltjen
ed0e0709c5 [Plot] Spec for plot updater
Spec for plot updater, added for WTD-751.
2015-02-02 18:14:08 -08:00
Victor Woeltjen
2ea4e7a47a [Plot] Update plot controller spec
Update plot controller spec to reflect changes introduced
for WTD-751 and WTD-784.
2015-02-02 16:17:17 -08:00
Victor Woeltjen
e6f1328d9d [Plot] Update specs
Update specs with minor changes related to using
telemetrySubscriber to populate plot with streaming
data, WTD-751 and WTD-784.
2015-02-02 15:44:36 -08:00
Victor Woeltjen
757665683e [Plot] Use a lossless subscription
Utilize lossless subscription to ensure that points are not
overwritten before being plotted from live telemetry.
WTD-784.
2015-01-30 15:36:57 -08:00
Victor Woeltjen
b1485e716c [Plot] Fix disappearing plot bug
Fix buffer resize operation as plots fill, WTD-782.
2015-01-30 12:28:39 -08:00
Victor Woeltjen
4fb750c0e0 [Plot] Update/suppress specs
Update specs and suppress failures; intermediate commit
for updates to plot for WTD-751.
2015-01-29 12:34:58 -08:00
Victor Woeltjen
a0137b341e [Plot] Fix bug for panels
Fix bug wherein number of points-to-plot is misreported
with multiple traces in a plot; clean up on modifications
to plot to self-cache streaming telemetry, to remove
other cache, WTD-751.
2015-01-29 12:27:04 -08:00
Victor Woeltjen
230ba3eb5c [Plot] Add comments
Add comments to plot code introduced to handle
subscribed telemetry only, to work around removal
of the cache to reduce memory usage, WTD-751.
2015-01-29 12:10:00 -08:00
Victor Woeltjen
5e2e0b4116 [Plot] Fix wiring on plot updater
Fix usages of the plot updater, introduced to track real-time
telemetry to remove the need to cache values elsewhere. This
allows memory usage to be decreased for WTD-751.
2015-01-29 11:22:31 -08:00
Victor Woeltjen
57f20ba110 [Plot] Amend plot updater
Amend plot updater to correctly expose information for real-time
plotting without history, allowing removal of cache to free
memory; WTD-751.
2015-01-29 11:19:22 -08:00
Victor Woeltjen
b615a3c888 [Plot] Wire in updater
Wire in updater for use in plots (to cache values at
the plot level, allowing removal of a global cache to
reduce memory consumption for WTD-751.)
2015-01-29 09:51:18 -08:00
Victor Woeltjen
f3900cdd2a [Plot] Add PlotUpdater
Add PlotUpdater, which will track streaming data from within
the plot. Allows removal of the cache for WTD-751.
2015-01-29 09:05:40 -08:00
Victor Woeltjen
a0f216764b [Plot] Cancel interval correctly
Fix approach used for interval cancellation associated
with resource leak closing for WTD-717; this avoids the
exception observed in WTD-750.
2015-01-28 15:53:13 -08:00
Victor Woeltjen
b915a90305 [Views] Fix glyphs
Use correct glyphs for Plot, Scrolling, and Items views.
WTD-734.
2015-01-27 14:50:45 -08:00
Victor Woeltjen
6947e0aa42 [Performance] Update specs
Add tests to verify that directives stop polling after their
scope is destroyed (to prevent resource leaks); those changes
address resource leaks identified in the context of WTD-717.
2015-01-27 08:50:11 -08:00
Victor Woeltjen
5ee872713f [Performance] Release interval from mct-chart
Stop checking for size changes after scope is destroyed
in mct-chart; part of ongoing resolution of resource leaks
which may contribute to WTD-717.
2015-01-26 17:56:52 -08:00
Victor Woeltjen
0ef6c59643 [Plot] Add a key to view definition
Add a value for key to the definition of Plot view;
this avoids defaulting to Plot as a view for all
objects, WTD-628.
2015-01-06 10:03:24 -08:00
Victor Woeltjen
78b636dafe [Telemetry] Update plot specs
Update plot specs to reflect refactoring out of formatter
for telemetry values, WTD-599.
2014-12-24 12:17:05 -08:00