ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-29 09:28:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,496 Commits 988 Branches 212 Tags 191 MiB
a1331b7bb3
Commit Graph

283 Commits

Author SHA1 Message Date
Pete Richards
d176797307 [Style] Add missing semicolon 2016-03-01 10:59:23 -08:00
Pete Richards
96d9f8c194 [Templates] load plot templates with require 
Load templates with requirejs.

https://github.com/nasa/openmctweb/issues/673
 2016-03-01 10:52:07 -08:00
Pete Richards
748673f99b Merge branch 'master' into open638_rebase 2016-03-01 10:48:53 -08:00
Victor Woeltjen
bf1fa0ac4c [Templates] Include templates using text plugin 
Resolves #673
 2016-02-26 13:07:50 -08:00
Henry
aabeb72203 [Plots] #638 Fixed failing test 2016-02-23 15:22:21 -08:00
Henry
7d0de68db9 [Plot] #638 Changed plot series to an array 2016-02-10 20:27:04 -08:00
Henry
24c750b41e [Plot] Fixed jsLint, removed onchange 
Removed ngChange from mct-control

Removed ng-change
 2016-02-09 21:19:47 -08:00
Henry
ab1c79f25d [Plot] Switched to $watchCollection on form model 2016-02-09 20:52:47 -08:00
Henry
645bd5743f [Plots] #638 Addressing feedback from code review 
[Plots] #638 Fixing failing tests

[Plot] Changed PlotOptionsController to prototype form

Fixed spacing

Fixed jslint issue
 2016-02-08 23:36:45 -08:00
Henry
be031285b9 Added form-level change event 2016-02-08 17:46:21 -08:00
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
aebae27391 [Tests] Remove suite.json files 
Remove obsolete suite.json files; #482
 2016-02-02 09:35:50 -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
032b2542f0 Merged from Master 2016-01-14 17:23:53 -08:00
Henry
3e7eb11d84 Regenerated bundles 2016-01-14 17:08:19 -08:00
Henry
d78bd9fd51 Merged from master 2016-01-14 15:16:02 -08:00
akhenry
88f8925d17 Merge pull request #469 from nasa/open450b 
[API Refactor] Imperatively register bundles
 2016-01-14 09:41:04 -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
8c325eb1b1 [Frontend] Mods to allow plot tick labels to ellipsis to left 
open #337
Still fixing code due to circleci fail in pull request;
 2016-01-13 10:11:14 -08:00
Charles Hacskaylo
5e628b1a25 [Frontend] Mods to allow plot tick labels to ellipsis to left 
open #337
Still fixing code due to circleci fail in pull request;
 2016-01-13 10:05:30 -08:00
Charles Hacskaylo
f8114ba6b6 [Frontend] Mods to allow plot tick labels to ellipsis to left 
open #337
Fixing code due to circleci fail in pull request;
 2016-01-12 18:23:30 -08:00
Charles Hacskaylo
a10f895904 [Frontend] Mods to allow plot tick labels to ellipsis to left 
open #337
Fixing code due to circleci fail in pull request;
 2016-01-12 18:20:52 -08:00
Charles Hacskaylo
9b59fd7eae [Frontend] Mods to allow plot tick labels to ellipsis to left 
open #337
Tick label strings are now reversed in their char order in
PlotTickGenerator.js, then reversed again via CSS in
_plots-main.scss. This forces the browser to clip the label
at the left 'start' side, rather than the end, resulting in
the least significant portion of the label getting clipped.
 2016-01-12 18:04:09 -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
Charles Hacskaylo
4f7ca98b60 Merge branch 'master' into nem468a. 
Many tweaks to fix some issues with tree, labels and Inspector.

Conflicts:
	platform/commonUI/edit/res/templates/elements.html
	platform/commonUI/general/res/sass/search/_search.scss
	platform/commonUI/general/res/sass/tree/_tree.scss
	platform/commonUI/general/res/templates/object-inspector.html
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
	platform/search/res/templates/search.html
 2016-01-11 13:29:26 -08:00
Victor Woeltjen
0036974c60 Merge remote-tracking branch 'github/master' into open450b 
Merge latest from master branch to reconcile conflicts
for https://github.com/nasa/openmctweb/pull/469

Conflicts:
	platform/commonUI/general/bundle.json
 2016-01-08 15:36:10 -08:00
Victor Woeltjen
cec197f888 [API Refactor] Remove bundle.json files 2016-01-08 15:32:18 -08:00
Victor Woeltjen
de53247d56 [API] Convert JSON bundles to imperative form 2016-01-07 15:08:08 -08:00
Victor Woeltjen
a49deb5ab1 Merge remote-tracking branch 'github/master' into open116 
Merge in latest from master into topic branch for
https://github.com/nasa/openmctweb/issues/116

Conflicts:
	platform/features/layout/test/FixedControllerSpec.js
	platform/features/plot/test/PlotControllerSpec.js
 2015-12-30 10:15:05 -08:00
Victor Woeltjen
38b5756d8d [Time Conductor] Verify plot bounds retention 
Verify that the domain axis of a plot retains bounds from
the time conductor, instead of doing its default behavior
of fitting to the data.
 2015-12-30 10:04:04 -08:00
Henry
cf73f3a0c4 Moved gesture from individual views up to browse-object.html for now to resolve #423 2015-12-11 16:42:05 -08:00
Henry
49579378dd [New Edit Mode] Fixed positioning of dropped objects #386 2015-12-09 09:51:00 -08:00
Henry
18607e9404 Merged from Master 2015-12-07 20:42:09 -08:00
Victor Woeltjen
258c5d95e6 [Limits] Test PlotLimitTracker 2015-12-07 12:58:56 -08:00
Victor Woeltjen
30a8ba5c11 [Limits] Test limit usage in PlotController 
WTD-1337
 2015-12-07 12:45:40 -08:00
Victor Woeltjen
49e51d0a62 [Performance] Update mct-chart spec 2015-12-03 13:39:37 -08:00
Victor Woeltjen
0f56fd2561 [Performance] Only invoke apply on size changes 
...as detected from mct-chart.
 2015-12-03 13:28:32 -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
Henry
30e6980dc6 Merge branch 'master' into open199 2015-11-19 14:29:32 -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
Victor Woeltjen
93d969ad67 [Plot] Add tests 
...to verify that data is requeried when user changes
domain or range selection.
 2015-11-10 16:17:43 -08:00
Victor Woeltjen
b30e72081c [Plot] Update domain format 
...on change in user's domain selection.
 2015-11-10 16:12:16 -08:00
Victor Woeltjen
d60bf94501 [Plot] Remove unnecessary fallback 2015-11-10 16:03:42 -08:00
Victor Woeltjen
ae7a1618e8 [Plot] Listen for domain/range changes 
nasa/openmctweb#218
 2015-11-10 15:16:47 -08:00
Victor Woeltjen
ac529be55c [Time Conductor] Don't emit view event 
Don't emit an event when plot is instantiated; this is no
longer needed, as time conductor broadcasts its bounds
whenever views change.
 2015-11-03 17:01:22 -08:00
Victor Woeltjen
0541f6edfa [Time Conductor] Add JSDoc to plot 
Add JSDoc to scripts/methods added to the Plot plug-in to support
integration of custom formats for timestamps.
 2015-10-28 08:47:04 -07:00
Victor Woeltjen
15a5c593fa [Time Conductor] Add spec for formatter 
Add spec to telemetryFormatter wrapper used by plot to isolate
changes to domain/range formats.
 2015-10-27 17:25:08 -07:00
Victor Woeltjen
55745d281f [Time Conductor] Update PlotAxis spec 
...to reflect ability to change domain selection without
reinstantiation, supporting integration of domain-driven
formatting of X axis values in a plot.
 2015-10-27 16:18:13 -07:00
Victor Woeltjen
bd8bbc6e8f [Time Conductor] Update PlotController spec 
...and add check to updateValues in PlotController, to reflect
changes made to restore support for domain switching.
 2015-10-27 15:52:11 -07:00
Victor Woeltjen
5ff2e6b652 [Time Conductor] Simplify passing in of axis type 
...in PlotAxis. Also avoids triggering failures of existing tests.
 2015-10-27 15:39:20 -07:00
Victor Woeltjen
9723c65016 [Time Conductor] Retain domain selection in plot 
Avoid various cases where domain selection is temporarily
overwritten due to transient plot state (e.g. because no
telemetry metadata is yet available due to asynchronous
retrieval of delegates.)
 2015-10-27 12:09:54 -07:00
Victor Woeltjen
7bd0e279b0 Merge remote-tracking branch 'github/master' into open182 
Merge latest from master branch into topic branch for
nasa/openmctweb#182
 2015-10-27 11:49:36 -07:00
Victor Woeltjen
caee1f520f [Time Conductor] Remove unused watches from plot 2015-10-27 11:46:41 -07:00
Victor Woeltjen
b375ede217 [Time Conductor] Recognize domain changes in plot 2015-10-27 11:39:23 -07:00
Victor Woeltjen
0bd1d53d25 [Time Conductor] Update plot to support different formats 
...for telemetry domain values.
 2015-10-27 11:22:19 -07:00
Victor Woeltjen
29bdc9d574 [Plot] Ignore empty lines 
Ignore empty lines (plot lines with no data) when determining
domain extrema; avoids failure to draw multiple plot lines in
a telemetry panel, nasa/openmctweb#150.
 2015-10-23 13:22:19 -07:00
Victor Woeltjen
b48a07cd3e Merge pull request #168 from nasa/mct80 
[Plot] Dates show 1970 when there is no data
 2015-10-09 13:40:04 -07:00
Victor Woeltjen
5f7c8ccadb Merge remote-tracking branch 'github/master' into open117b 2015-10-09 09:35:07 -07:00
Victor Woeltjen
8cba321886 [Plot] Move throttling out of plot 
Move throttling associated with display bounds changes out
of Plot.
 2015-10-02 16:11:12 -07:00
Henry
3cf62ded08 Plot axes do not show labels when no data 
Added semicolon

Added test for hasDomainData()

Added test for negative case on domain data check

Removed label test due to mocked telemetry formatter

Uncommented test commented by accident

Removed extra space
 2015-10-01 16:35:14 -07:00
Henry
a4f3e0d776 Plot domain labels showing 1970 if no data 2015-09-29 15:28:55 -07: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
Victor Woeltjen
6bd8e7a47c Merge remote-tracking branch 'github/master' into open1515 2015-09-24 11:17:13 -07:00
Charles Hacskaylo
9811443c71 Merge branch 'master' into open117 2015-09-23 15:54:48 -07:00
Victor Woeltjen
de71bde62f [Test Conductor] Add test case for requery 
WTD-1515
 2015-09-16 17:00:56 -07:00
Victor Woeltjen
190f5fd0ea [Time Conductor] Update failing specs 
WTD-1515
 2015-09-16 15:23:08 -07:00
Victor Woeltjen
fcd073c010 [Time Conductor] Tweak plot requery 
Tweak approach to requerying in plot, and track
pending state so there is a visual indication
that plotted data may be incomplete during
panning with time conductor. WTD-1515
 2015-09-16 11:05:41 -07:00
Victor Woeltjen
2a14cf2dfc [Time Controller] Only listen for display-bounds changes 
...from plot. WTD-1515
 2015-09-11 11:31:12 -07:00
Victor Woeltjen
4d276888e1 [Plot] Update failining spec 
WTD-1515
 2015-09-04 15:53:55 -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
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
Pete Richards
3a050cc5b8 [Style] space after operator 2015-08-24 09:03:31 -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
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
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
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
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
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
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