ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-30 09:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,418 Commits 988 Branches 212 Tags 191 MiB
24c750b41e
Commit Graph

48 Commits

Author SHA1 Message Date
Henry
9371fcbc4c [Plot] #638 Added a new plot options example bundle and rebased 
Fixed jsdoc

Fixed incorrect memberof declaration

Corrected memberof statement
 2016-02-04 15:17:07 -08:00
Victor Woeltjen
dbf196e014 Merge remote-tracking branch 'github/master' into open477 
Resolve conflicts to complete merge of #477

Conflicts:
	platform/commonUI/general/bundle.json
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2016-01-27 12:53:46 -08:00
Pete Richards
be7827d6f8 Merge remote-tracking branch 'open/open445' into open-master 2016-01-22 11:47:05 -08:00
Victor Woeltjen
c2207fe7ce [Plot] Use reverse filter for range ticks too 2016-01-15 13:14:33 -08:00
Victor Woeltjen
a94e99af70 [Plot] Use reverse filter for plot ticks 
...to remove CSS-related reversal from scripts
 2016-01-15 13:09:05 -08:00
Henry
d78bd9fd51 Merged from master 2016-01-14 15:16:02 -08:00
Charles Hacskaylo
442229fd42 Merge branch 'master' of https://github.com/nasa/openmctweb into open445 
Conflicts:
	platform/features/plot/res/templates/plot.html
 2016-01-13 16:01:02 -08:00
Charles Hacskaylo
a7a707595c [Frontend] Fixes to CSS for Chrome Linux 
open #445
Mods and simplifications to wait-spinner classes;
Simplification and cleanup in plot.html to use loading
class instead of hide/show DOM element;
 2016-01-13 13:54:00 -08:00
Charles Hacskaylo
8dd36d426c [Frontend] Refactoring local controls hide and show 
open #342
Now using CSS hover on pertinent plot areas;
Refining of select styling, tweaks for Firefox Linux;
Tweaks to local-control positioning in plots;
Changed *-options controls to use length > 1
instead of > 0;
 2016-01-12 15:54:56 -08:00
Henry
268a2c2427 Merged from master 2015-11-25 09:04:11 -08:00
Charles Hacskaylo
32815d8427 [Frontend] Markup and CSS fixes 
open #251
Fixed markup and CSS to remove erroneously
applied "select" class;
Modified .select to not use overflow: hidden;
Better positioning for *-options elements;
 2015-11-19 18:50:10 -08:00
Charles Hacskaylo
1058648e76 [Frontend] Fixed plot display 
open #199
open #293
Added .abs to plot.html to allow plot
to layout properly when viewed in
main view area;
Removed .test class from time-controller;
 2015-11-12 09:06:17 -08:00
Charles Hacskaylo
1d83516982 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Significant re-org in menus.scss continued:
Refactored s-menu to s-menu-btn;
moved look-related style def's into .s-menu;
.menu now extends .s-menu;
 2015-09-24 15:38:52 -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
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
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
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
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
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
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
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
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
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
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
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
662412a31d [Plot] Avoid displaying bad labels 
Avoid displaying bad labels for tick marks, or in the
coordinates shown on hover. Done in the context of
refactoring to support WTD-625.
 2014-12-12 15:07:06 -08:00
Victor Woeltjen
06036ce8b3 [Plot] Restore range tick marks 
Restore range tick marks; these were lost in refactoring
to support multiple subplots-per-view due to a missed
occurrence of an out-of-date interface usage. WTD-625.
 2014-12-11 19:36:01 -08:00
Victor Woeltjen
188e98a78b [Plot] Update stacked plots immediately 
When changes to pan-zoom bounds are made in one
subplot, this will effect the pan-zoom bounds of
other subplots. Ensure this occurs immediately.
WTD-625.
 2014-12-11 19:33:09 -08:00
Victor Woeltjen
9344809998 [Plot] Restrict hover coordinates 
Only show hover coordinates in a stacked plot for
the plot which the user is specifically hovering
over. WTD-625.
 2014-12-11 17:09:08 -08:00
Victor Woeltjen
1b6ce10dd9 [Plot] Change style when stacked 
Change plot style when in stacked plot mode, such that
plots stack as expected. (Without this change, the
gl-plot class's height of 100% will cause all plots to
fill the full vertical space, effectively acting
overlaid.) WTD-625.
 2014-12-11 17:02:07 -08:00
Victor Woeltjen
784b2b6186 [Plot] Begin refactoring for stacked plots 
Begin refactoring Plot view to support stacked plots;
separate out behavior which needs to occur per-plot
from area which should occur per-view, and add a
handler for the Overlay mode. WTD-625.
 2014-12-10 19:51:27 -08:00
Victor Woeltjen
1c3d2d923f [Plot] Add notion of subplots to template 
Add notion of subplots to the plot template; these
are elements within a stacked plot. WTD-625.
 2014-12-10 18:55:47 -08:00
Victor Woeltjen
01f1a92d09 [Plot] Get/set from overlay switcher 
Get/set mode from the plot mode switcher; only show
the switcher if there is more than one mode available
(which should only occur when there is more than one
telemetry object in the plot.) WTD-625.
 2014-12-10 18:38:42 -08:00
Victor Woeltjen
3a0e80d360 [Plot] Add switcher for Stacked/Overlaid 
Add switcher to handle changing between Stacked and Overlaid
plots. WTD-625.
 2014-12-10 18:29:18 -08:00
Victor Woeltjen
e1298db760 [Plot] Separate out plot axis 
Separate plot axis (as prepared for the plot's
Angular template) into its own script. WTD-533
 2014-12-01 16:35:38 -08:00
Victor Woeltjen
f3b83e0db7 [Plot] Icons for plot controls 
Add icons for plot pan/zoom controls, to step
back through or undo pan/zoom states. WTD-533.
 2014-12-01 13:04:24 -08:00
Victor Woeltjen
b556b5e4f2 [Plot] Bring in scripts from sandbox branch 
Bring in scripts for plotting from the sandbox
branch to begin transitioning/integrating plot
view. WTD-533.
 2014-12-01 09:41:39 -08:00