ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 15:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,254 Commits 989 Branches 212 Tags 191 MiB
8ed9f51008
Commit Graph

908 Commits

Author SHA1 Message Date
Victor Woeltjen
cdac0ad67f [Timeline] Add test cases for CSV Export 2016-03-07 16:17:19 -08:00
Victor Woeltjen
5d771edcf7 [Timeline] Begin testing CSV Export 2016-03-07 16:13:23 -08:00
Victor Woeltjen
c4f1c4ad1f [Timeline] Show progress notification during export 2016-03-07 16:09:23 -08:00
Victor Woeltjen
14b8e02f27 [Timeline] Format exported start/end times 2016-03-07 16:02:33 -08:00
Victor Woeltjen
b383921f2a [Timeline] Export start/end to CSV 2016-03-07 16:00:13 -08:00
Victor Woeltjen
b7a44a7557 Merge branch 'master' into warp135b 2016-03-07 15:21:28 -08:00
Victor Woeltjen
d6ec7e9ab8 [Build] Remove unused variables from specs 
...to satisfy JSHint.
 2016-03-04 12:56:14 -08:00
Victor Woeltjen
f34ef8c4c8 [Build] Add global declarations to mocks 2016-03-04 11:53:08 -08:00
Victor Woeltjen
65095d18f2 [Build] Remove partial global declarations 2016-03-04 11:43:55 -08:00
Victor Woeltjen
a1a7b2b8ce [Build] Remove unused variables 
...to satisfy JSHint
 2016-03-04 11:41:48 -08:00
Victor Woeltjen
c00d77dcb1 [Build] Relocate operators 
...in multi-line expressions, to satisfy JSHint.
 2016-03-04 11:02:57 -08:00
Victor Woeltjen
72ef134750 [Build] Move operators to satisfy JSHint 2016-03-04 10:55:30 -08:00
Victor Woeltjen
2dabe0d3c4 [Build] Add curly braces around if block 
...to satisfy JSHint
 2016-03-04 10:51:08 -08:00
Victor Woeltjen
dda0628621 [Build] Clarify expressions 
...to satisfy JSHint.
 2016-03-04 10:49:22 -08:00
Victor Woeltjen
ac5ac8d34e [Build] Remove boilerplate from scripts 
No longer necessary after JSHint configuration.
 2016-03-04 10:46:38 -08:00
Henry
f653362247 Fixed issue with non-named columns 2016-03-03 10:12:25 -08:00
Henry
b63b7b1e5d [Tables] #670 Addressed issues from code review 2016-03-03 09:26:12 -08:00
Henry
55e00baeaf [Table] #670 Addressed comments from code review 2016-03-02 21:40:56 -08:00
Henry
b9a7ee423a Merge branch 'master' into open670_master 2016-03-01 12:56:08 -08:00
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
721557b814 [Templates] Exercise selection method 
...add to TimelineSwimlanePopulator to reflect changes to
time at which selection object may become available as
a consequence to changes in the way templates are normally
loaded. #673
 2016-02-26 16:29:06 -08:00
Victor Woeltjen
70ed16491a [Templates] Change watch order 
...to work around order-sensitive test case
 2016-02-26 16:26:31 -08:00
Victor Woeltjen
3a6e0be2d7 [Templates] Update FixedController spec 
...to reflect changes to how selection object is obtained,
which in turn reflects change to using templates obtained
via RequireJS text plugin, instead of loading by URL.
 2016-02-26 16:19:14 -08:00
Victor Woeltjen
fe419714f5 [Templates] Check for availability of timespan 
...as ordering changes due to change from templateUrl to template
may mean this is not available when first initialized.
 2016-02-26 15:50:07 -08:00
Victor Woeltjen
f3fd2e67fc [Templates] Watch for selection object 
...from Timeline, to ensure toolbar appears etc.
Reflects changes to ordering triggered by use of
template instead of templateUrl
 2016-02-26 15:49:21 -08:00
Victor Woeltjen
931fa77cbe [Templates] Handle deferred selection availability 
Loading templates via RequireJS text plugin means they are
immediately available; appears to have caused a change in
ordering wherein controllers for views may be initialized
before representers have installed things like selection
state. As such, need to watch for changes instead of simply
checking for a selection object when the controller is
initialized.
 2016-02-26 15:37:19 -08:00
Victor Woeltjen
19b442cc0b [Templates] Require data table templates 
...via text plugin
 2016-02-26 15:02:04 -08:00
Victor Woeltjen
bf1fa0ac4c [Templates] Include templates using text plugin 
Resolves #673
 2016-02-26 13:07:50 -08:00
Henry
f04c3692c1 [Table] #670 Name column only prepended if multiple objects 2016-02-26 11:22:16 -08:00
Henry
ffa497f22f [Table] #670 Added new view type 'table' 2016-02-26 11:09:51 -08:00
Henry
aabeb72203 [Plots] #638 Fixed failing test 2016-02-23 15:22:21 -08:00
Pete Richards
fcdf89a4ee Merge branch 'master' into open638_rebase 2016-02-23 10:56:13 -08:00
Pete Richards
9b3c8dce25 [SCSS] Remove old references to compass 
Remove any old references to compass.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:22:44 -08:00
Pete Richards
0a71835687 [Build] Switch compass to bourbon 
Change mixin library to bourbon.  Significantly reduces sass build time.

https://github.com/nasa/openmctweb/issues/698
 2016-02-22 18:02:16 -08:00
Pete Richards
ed09214f59 [Build] Save stylesheets to proper location 
Updates the stylesheet task to output CSS in the correct locations. Remove
config.rb for running compass manually, and remove compiled css files from
project.  Add a .gitignore to ensure they don't get included accidentally.

Add a gulp task for running the development server and watching for scss
changes at the same time.

resolves https://github.com/nasa/openmctweb/issues/238
 2016-02-19 13:26:20 -08:00
Henry
7d0de68db9 [Plot] #638 Changed plot series to an array 2016-02-10 20:27:04 -08:00
Victor Woeltjen
5306e96374 Merge pull request #668 from nasa/open659 
[New Edit Mode] #659 Fix to timelines
 2016-02-10 17:02:28 -08:00
Henry
10e0acddb3 [New Edit Mode] #659 Fix to prevent multi-composition with same object, fix to prevent composition of object with self 2016-02-10 16:43:08 -08:00
Charles Hacskaylo
ceee7e0da9 [Frontend] Fixed CSS issue with Timeline label elements 
open #659
CSS for .rep-object-label modified; Added CSS class
to tabular-swimlane-cols-tree.html markup;
Also cleaned up .s-status-pending styles for related
label elements;
 2016-02-10 16:38:39 -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
Victor Woeltjen
273cf1c14f [Timeline] Fix columns exported 2016-02-08 18:07:03 -08:00
Henry
be031285b9 Added form-level change event 2016-02-08 17:46:21 -08:00
Victor Woeltjen
b42ccebd5a [Timeline] Fix imports, dependencies 
Fix imports and dependencies needed by Export Timeline as CSV
 2016-02-08 17:42:26 -08:00
Victor Woeltjen
a444fc01ad [Timeline] Fix column module definitions 2016-02-08 17:34:10 -08:00
Victor Woeltjen
a126e43286 [Timelines] Handle columns during CSV export 2016-02-08 16:11:00 -08:00
Victor Woeltjen
4adb075a2b [Timelines] Separate out timeline traversal 
...from rest of CSV export.
 2016-02-08 13:59:34 -08:00
Victor Woeltjen
d8b1e570d9 [CSV Export] Begin implementing 
Begin implementing initial step, wherein timelines composition
is traversed to build up a list of objects to export.
 2016-02-08 13:36:25 -08:00
Victor Woeltjen
5033e2cdbb [Timeline] Begin adding Export as CSV 
Sketch in solution for
https://developer.nasa.gov/mct/warp/issues/135
 2016-02-08 13:04:41 -08:00
Victor Woeltjen
0a5097a945 Merge pull request #642 from nasa/open460 
[Build] Move to npm-based build
 2016-02-08 12:21:01 -08:00
Victor Woeltjen
b0e4947bf0 Merge pull request #500 from nasa/open480 
[New Edit Mode] Adding sub objects to Timelines
 2016-02-08 11:59:54 -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
Henry
abf5f22155 [Plots] #638 added onchange handling in order to synchronize forms with domain object model. 
Fixed failing test

Added tests

jslint errors

Minor refactoring of layout bundle

revert layout/bundle.json
 2016-02-04 14:26:21 -08:00
Charles Hacskaylo
371669fbce [Frontend] Mods in progress to form layout 
open #638
Major progress on form-row markup and CSS when
in Inspector 'part' context; General fixes cleanups
to custom checkbox/radio CSS;
 2016-02-04 14:23:29 -08:00
Charles Hacskaylo
68f3cd087d [Frontend] Mods in progress to form layout 
open #638
In progress;
 2016-02-04 14:23:29 -08:00
Charles Hacskaylo
115ffe7963 [Frontend] Fixes to scrolling and layout in Inspector 
open #638
In progress;
 2016-02-04 14:23:29 -08:00
Henry
e3a0cae5fd [Plot] #638 Fleshing out form structures 2016-02-04 14:23:29 -08:00
Henry
6fb6761abf [Plots] #638 New plot display options 2016-02-04 14:23:28 -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
ddb5837145 Merge branch 'master' into open460 2016-01-29 11:44:38 -08:00
Victor Woeltjen
967f8c9151 [Build] Update remaining library references 2016-01-28 11:25:44 -08:00
Victor Woeltjen
84ecfd3527 [Build] Remove remaining files in libs 2016-01-28 11:21:08 -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
Henry
cd2b19eb1e [New Edit Mode] Fixed failing tests, and added new test in CreateWizard 
[New Edit Mode] #480 fixed JSLint errors

[New Edit Mode] #480 do not show locator for sub objects

[New Edit Mode] Modified persistence in SaveAction

Removed redundant variable

Fixed Failing Test

Fixed JSLint errors

Improved some documentation
 2016-01-21 12:01:38 -08:00
Henry
c65096f166 [New Edit Mode] Added AddAction, modified EditableDomainObject to properly wrap inherited functions, added new EditableInstantiationCapability 2016-01-20 18:49:39 -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
193c7e3db2 [New Edit Mode] Fixed failing Time Conductor Test 2016-01-14 19:57:06 -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
3f5a8cb2be [New Edit Mode] Disabled time conductor tests which are failing 2016-01-14 16:12:44 -08:00
Henry
d78bd9fd51 Merged from master 2016-01-14 15:16:02 -08:00
Henry
826d39a749 [New Edit Mode] Fixed logic in EditActionPolicy to use positive logic 2016-01-14 15:02:22 -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
Victor Woeltjen
69c5b110bf [API Refactor] Move out non-global require config 2016-01-13 12:41:15 -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
Charles Hacskaylo
898dd557e5 [Frontend] Refactor to use s-status-editing instead of ng-class 
open #468
Remove ng-class statements in favor of upstream .s-status-editing;
Restructure CSS accordingly;
NOTE: because edit.html has NOT been changed,
changes here will cause old edit mode to no longer display properly.
Don't integrate this CSS with old edit mode!
 2016-01-08 16:11:00 -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
Henry
a6ecda9cab Resolved conflict 2016-01-06 14:06:28 -08:00
Henry
b20488e77d Merged conflict 2016-01-06 14:05:40 -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
9b63a63efc Merge pull request #379 from nasa/open1337 
[Limits] Add test cases for limits
 2015-12-30 10:11:27 -08:00
Victor Woeltjen
2358541d91 [Time Conductor] Update RangeColumn spec 
Update RangeColumn spec. Changes appear to have been related
to limits (WTD-1337), but making changes in the context of
updating tests for time conductor,
https://github.com/nasa/openmctweb/issues/116
 2015-12-30 10:10:23 -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
Victor Woeltjen
c436bcce0a [Time Conductor] Test updated fixed position behavior 
Verify interactions from FixedControllers on events
issued by the time conductor.
 2015-12-30 09:29:24 -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
Charles Hacskaylo
33b1c1689c [Frontend] Added classes for no-collapse indicator 
open #304
Added classes string and related classes to ClockIndicator;
 2015-12-11 15:49:50 -08:00
Henry
39b3e6c4a9 [Edit Mode] Limit context menu options available for objects in edit mode 
[Edit Mode] Edit mode on objects that do not have a view supporting editing should edit properties instead. #320
 2015-12-09 18:14:17 -08:00
Victor Woeltjen
8077cdb834 [Clocks/Timers] Make $scope available 
...to methods of TimerController
 2015-12-09 12:41:29 -08:00
Victor Woeltjen
7871af07c4 [Clocks/Timers] Fix parent constructor invocations 2015-12-09 12:40:21 -08:00
Victor Woeltjen
714ae3b9dc [Clocks/Timers] Update remaining classes 
Complete code style changes for Clocks/Timers.
 2015-12-09 12:39:01 -08:00
Victor Woeltjen
27fa56d838 [Clocks/Timers] Update code style for controllers 2015-12-09 12:33:11 -08:00
Victor Woeltjen
e30a82432d [Clocks/Timers] Update code style for actions 
https://github.com/nasa/openmctweb/issues/209
 2015-12-09 12:17:32 -08:00
Henry
49579378dd [New Edit Mode] Fixed positioning of dropped objects #386 2015-12-09 09:51:00 -08:00
Henry
b5c741c911 Merge branch 'master' into open199 2015-12-08 15:42:37 -08:00
Victor Woeltjen
038322e9aa [Layout] Update raw positions on drop 
When handling a drop into the layout, store the panel's
new position to the LayoutController's internal table of
raw positions (in addition to writing it to the configuration.)

Avoids https://github.com/nasa/openmctweb/issues/384
 2015-12-08 15:08:30 -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
33c372765f [Limits] Test limit usage from Fixed Position 
WTD-1337
 2015-12-07 12:33:29 -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
6fb6f54cfa Fixed objects being dropped twice in fixed layout 2015-11-27 15:21:24 -08:00
Victor Woeltjen
3fd4304de1 Merge pull request #345 from nasa/open32 
[Layout] Layout rebuilds after resize/reposition #32
 2015-11-27 09:59:01 -08:00
Henry
db7224486c [Layout] Layout rebuilds after resize/reposition - Fixed potential race condition #32 2015-11-25 19:11:29 -08:00
Henry
6d0f3c7faa [Layout] Layout rebuilds after resize/reposition #32 
Refactored layoutPanels method

Fixed JSLint errors

fixed failing tests
 2015-11-25 15:30:33 -08:00
Henry
988323bdbd merged Open32 2015-11-25 14:59:47 -08:00
Henry
268a2c2427 Merged from master 2015-11-25 09:04:11 -08:00
Henry
c84de00e80 [Layout] Layout rebuilds after resize/reposition #32 2015-11-24 21:51:10 -08:00
Victor Woeltjen
096fee8b6d Merge remote-tracking branch 'github/master' into open208b 
Conflicts:
	platform/commonUI/themes/espresso/res/css/theme-espresso.css
	platform/commonUI/themes/snow/res/css/theme-snow.css
 2015-11-21 06:42:45 -08:00
Victor Woeltjen
0635e7c38e [Timeline] Disambiguate datetime control 
Timeline uses a custom date-time control on creation;
use a distinct key for this to avoid a naming collision
with platform's datetime. Addresses abnormal behavior
identified in nasa/openmctweb#208
 2015-11-20 17:26:43 -08:00
Charles Hacskaylo
fd3059b380 [Frontend] Final cleanups, tweaks; Refactored s-icon-btn 
open #208
Unit tested in both themes;
.s-icon-btn refactored slightly to focus on usage
as an icon-only element, removed overlap designations
with .s-btn in markup;
Colors normalized for theming;
Code cleanup;
 2015-11-20 16:47:04 -08:00
Charles Hacskaylo
5a7349117a [Frontend] Cleanups to Timeline tabular label elements 
open #208
Colors normalized for theming;
 2015-11-20 16:27:26 -08:00
Charles Hacskaylo
50134bbc7f [Frontend] Theming and cleanups in Clocks and Timers 
open #208
Also converted timer to use flexbox layout;
 2015-11-20 16:19:27 -08:00
Charles Hacskaylo
3854df27d8 [Frontend] Styling on Timeline zoom buttons 
open #208
Fixed in both themes;
 2015-11-20 15:42:08 -08:00
Charles Hacskaylo
fc53dbd8a4 [Frontend] Themes added to Timelines 
open #208
Espresso and Snow now supported; bulk of
work done except for minor cleanups, like zoom
buttons; Dragging not working currently in Timelines;
 2015-11-20 15:23:08 -08:00
Charles Hacskaylo
de59f191b8 [Frontend] Relocating files 
open #208
Moving initial files into new positions, based
on Victor's work in #242;
 2015-11-20 09:14:07 -08:00
Charles Hacskaylo
3d3b250536 Merge remote-tracking branch 'github/master' into open208 2015-11-20 08:38:19 -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
akhenry
4de7b7dfb5 Merge pull request #288 from nasa/open218 
[Plot] Support domain/range switching
 2015-11-18 11:54:13 -08:00
Henry
b27b60aedc Merge branch 'master' into open199 2015-11-17 14:30:57 -08:00
akhenry
b7eb9491cb Merge pull request #275 from nasa/open271 
[Layout] Enforce minimum size on drop
 2015-11-12 16:10:50 -08:00
Charles Hacskaylo
1ceb6d2d96 [Frontend] Fixed scrolling view 
open #199
open #293
open #201
Removed fixed-header class from table markup;
(cherry picked from commit 6c4bdca)
 2015-11-12 13:24:28 -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
6d2fe9d7eb [Frontend] Misc CSS and markup updates, converting to flex 
open #199
IN-PROGRESS
IMPORTANT: plots are not laying out correctly,
need to figure out why
 2015-11-10 18:33:58 -08:00
Charles Hacskaylo
08ecf00916 [Frontend] Misc CSS updates to clean up layout 
open #199
IN-PROGRESS
Testing with Time Controller visible;
 2015-11-10 17:14:12 -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
Charles Hacskaylo
608df8f7b8 Merging in latest github master; resolved conflicts 2015-11-10 16:13:46 -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
Charles Hacskaylo
d6d95fed19 [Code style] Cleaned out comments 
open #250
open #274
scss, html scoured for commented
dead code, leftover TO-DOs and
other unnecessary comments;
 2015-11-10 15:12:09 -08:00
Victor Woeltjen
fdf6148811 [Layout] Enforce minimum size on drop 
Addresses nasa/openmctweb#271, ensuring frames in a layout
are not too tiny to use, even if the grid size is small.
 2015-11-09 17:58:20 -08:00
Charles Hacskaylo
4e79de6156 [Frontend] Apply flex layout to object header elements 
open #250
open #260
vista#132
Major refactoring to markup and CSS to apply
flex layout strategy to object headers;
Flex necessary to fix 'overflow: hidden' setting
applied in open90 to object-browse-bar that
was preventing the view switcher menu from
appearing;
Browse, edit, mobile, frames in layouts, etc. all
visually checked in a first go round;
Mobile classes tweaked to fix left and right
margin problems resulting from open90 changes;
z-indexing of Inspector pane and splitters changed
to allow primary pane elements to overflow beneath
when primary pane width is severely constrained;
 2015-11-06 17:42:54 -08:00
Pete Richards
639546bf86 Merge remote-tracking branch 'github-open/open229b' into open-master 2015-11-06 09:54:42 -08:00
akhenry
92cf86837b Merge pull request #207 from nasa/open1239 
[Plugins] Bring over Timeline, Clocks/Timers
 2015-11-05 13:42:32 -08:00
Victor Woeltjen
5274923c49 [Licenses] Add license headers 
...to sources for Clocks/Timers and Timelines, as noted in
review nasa/openmctweb#207
 2015-11-05 12:45:51 -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
99376391a9 Merge remote-tracking branch 'github/master' into open229b 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
 2015-11-03 16:58:40 -08:00
Charles Hacskaylo
7cd255670e [Frontend] Committing removed files 
open #208
 2015-11-03 14:59:41 -08:00
Charles Hacskaylo
eabde6b2d0 [Frontend] Integrate Timeline into open; themes 
open #208
Copied SASS styles from /warp and created
new platform/features/timeline/themes/espresso;
Styling looks complete, but Timeline itself has
functional issues;
TO-DO: remove styles from /warp/.../sass/ as needed;
 2015-11-03 14:58:58 -08:00
Charles Hacskaylo
37f466705a [Frontend] IN-PROGRESS stubbing in files ported from /warp 
open #208
Moving files from /warp; stuff will NOT compile
at this point;
 2015-11-02 18:22:13 -08:00
Victor Woeltjen
8d65335786 [Time Conductor] Remove check for domain existence 2015-11-02 12:31:40 -08:00
Victor Woeltjen
f7f6b8d612 [Time Conductor] Don't broadcast on telemetry:view 
Instead, use delay from throttling initial bounds broadcast to
avoid broadcasting bounds prematurely.
 2015-10-30 14:59:32 -07:00
Victor Woeltjen
e4a14b7603 [Time Conductor] Consistently throttle broadcast 
Consistently throttle broadcast of bounds to minimize redundant
broadcasts, nasa/openmctweb#229
 2015-10-30 14:56:52 -07:00
Victor Woeltjen
5a1d774b47 [Time Conductor] Rename default domain 
To UTC, instead of just Time.
 2015-10-30 13:05:37 -07:00
Victor Woeltjen
101e3bb346 [Time Conductor] Remove checks for undefined domain 
Per code review, nasa/openmctweb#204
 2015-10-30 13:04:29 -07: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
2ee53b17db [Time Conductor] Update ConductorTelemetryDecorator spec 
...to reflect that TimeConductor exposes whole domain metadata, not
just key.
 2015-10-27 15:46:21 -07:00
Victor Woeltjen
60e97eb94a [Time Conductor] Update ConductorRepresenter spec 
...to reflect that TimeConductor exposes whole domain metadata, not
just key.
 2015-10-27 15:43:31 -07:00
Victor Woeltjen
ce5a650d8c [Time Conductor] Update TimeConductor spec 
...to reflect that whole domain metadata, not just key, is exposed.
 2015-10-27 15:40:34 -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
e5ebbdaf7f [Time Conductor] Use domain formats in scrolling list 2015-10-27 12:37:53 -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
2056f3aed0 [Time Conductor] Update property name 
Renamed system to format per code review feedback,
nasa/openmctweb#204
 2015-10-27 10:00:35 -07:00
Victor Woeltjen
ddb567aeb5 [Clocks/Timers] Declare dependency of moment-duration-format 
...to ensure that moment is loaded first, such that
the plugin can correctly install itself.
nasa/openmctweb#204
 2015-10-23 15:46:47 -07:00
Victor Woeltjen
fffe07e7e6 [Timeline] Remove namespacing from specs 2015-10-23 14:06:55 -07:00
Victor Woeltjen
26db524f0e [Timelines] Rename bundle 2015-10-23 13:57:15 -07:00
Victor Woeltjen
4fcef33c58 [Timelines] De-namespace timeline's DateTimeController 2015-10-23 13:56:34 -07:00
Victor Woeltjen
dc9369c0f1 [Timelines] Remove namespacing from controllers 
WTD-1239
 2015-10-23 13:54:19 -07:00
Victor Woeltjen
c5b786e5e0 [Timeline] De-namespace capabilities 
WTD-1239.
 2015-10-23 13:52:48 -07:00
Victor Woeltjen
3e0534c4c3 [Timeline] Update namespacing in templates 
WTD-1239
 2015-10-23 13:49:46 -07:00
Victor Woeltjen
19ad4c8174 [Timelines] Change namespacing for directives 
WTD-1239
 2015-10-23 13:48:07 -07:00
Victor Woeltjen
8159c365b5 [Timeline] Remove namespacing from README 
WTD-1239
 2015-10-23 13:45:54 -07:00
Victor Woeltjen
307047d3ac [Clocks/Timers] Remove namespacing from specs 
WTD-1239
 2015-10-23 13:44:39 -07:00
Victor Woeltjen
83f135e48c Merge remote-tracking branch 'github/master' into open1239 2015-10-23 13:39:09 -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
e8d7093eb5 [Time Conductor] Use time systems from time conductor 2015-10-22 13:07:04 -07:00
Andrew Henry
92573b817f Added drag to enable edit mode 2015-10-20 21:03:36 -07:00
Charles Hacskaylo
9cc0c0b06f [Frontend] Polishing of styles for time-controller 
open #179
open #180
Font-size normalized for time-controller and domain selector;
Layout of object-holder and time-controller fixed;
 2015-10-14 10:25:05 -07:00
Pete Richards
c703714cb3 Merge remote-tracking branch 'github-open/open115b' into open-master 2015-10-09 13:50:27 -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
5763511ec8 [Time Conductor] Update specs 
Update specs to reflect merge of latest from master into
topic branch for nasa/openmctweb#115, domain selector.
 2015-10-09 11:17:57 -07:00
Victor Woeltjen
2accf21518 [Time Conductor] Add missing semicolon 
...to pass code style checks.
 2015-10-09 11:08:02 -07:00
Victor Woeltjen
28c42fcd4c [Time Conductor] Fix merge issues 
Fix merge issues not addressed during conflict resolution.
 2015-10-09 11:06:41 -07:00
Victor Woeltjen
1efa97e6f5 Merge remote-tracking branch 'github/master' into open115b 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
 2015-10-09 10:32:43 -07:00
Victor Woeltjen
d8276c532b Merge remote-tracking branch 'github/master' into open115b 
Merge in latest from master into topic branch for
nasa/openmctweb#115

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
	platform/features/conductor/src/ConductorTelemetrySeries.js
	platform/features/conductor/src/TimeConductor.js
	platform/features/conductor/test/ConductorRepresenterSpec.js
	platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
 2015-10-09 10:04:15 -07:00
Victor Woeltjen
5f7c8ccadb Merge remote-tracking branch 'github/master' into open117b 2015-10-09 09:35:07 -07:00
Victor Woeltjen
146e948097 [Time Conductor] Remove telemetry series wrapper 
WTD-1515
 2015-10-02 16:47:13 -07:00
Victor Woeltjen
669b434c36 [Time Conductor] Test broadcast throttling 2015-10-02 16:38:32 -07:00
Victor Woeltjen
431c74ca49 [Time Conductor] Only update bounds when stable 2015-10-02 16:28:58 -07:00
Victor Woeltjen
cd0c0f77cc [Time Conductor] Throttle display bounds broadcasting 2015-10-02 16:20:31 -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
Victor Woeltjen
dd83816035 [Time Conductor] Remove queryStart, queryEnd 
...per feedback from code review, nasa/openmctweb#104
 2015-10-02 16:08:44 -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
333f7cb848 [Frontend] Time controller-related styling 
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
 2015-09-29 08:43:34 -07:00
Victor Woeltjen
00ac249ee2 [Time Conductor] Position domain selector 
nasa/openmtweb#115
 2015-09-25 16:06:11 -07:00
Victor Woeltjen
00aa6821d1 Merge remote-tracking branch 'github/open117' into open115b 2015-09-25 15:31:27 -07:00
Victor Woeltjen
cbaf45afe9 [Time Conductor] Update specs 
nasa/openmctweb#115
 2015-09-25 10:40:19 -07:00
Victor Woeltjen
ff1fd26efc [Time Conductor] Change method name 
Prefer simpler method names for public API.
 2015-09-24 17:09:06 -07:00
Victor Woeltjen
4ced6c44a6 [Time Conductor] Ignore empty series 
...when updating Fixed Position view.
 2015-09-24 17:01:50 -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
0c7de98195 [Time Conductor] Use active domain in binary search 2015-09-24 12:18:47 -07:00
Victor Woeltjen
6bd8e7a47c Merge remote-tracking branch 'github/master' into open1515 2015-09-24 11:17:13 -07:00
Victor Woeltjen
3d8aec2d01 [Time Conductor] Pass domain with events 2015-09-23 17:26:56 -07:00
Victor Woeltjen
f182d1f2c4 [Time Conductor] Include domain selection in requests 
...as well as use as default in a telemetry series.
 2015-09-23 17:14:40 -07:00
Victor Woeltjen
d238b669a5 [Time Conductor] Show domain options 2015-09-23 17:09:38 -07:00
Victor Woeltjen
5d5a7c26c5 [Time Conductor] Maintain domain state 
Maintain domain state in the time conductor; add a default list of
domains to choose from.
 2015-09-23 16:53:12 -07:00
Victor Woeltjen
0260e6fff4 Merge branch 'open1515' into open115 2015-09-23 16:05:09 -07:00
Charles Hacskaylo
9811443c71 Merge branch 'master' into open117 2015-09-23 15:54:48 -07:00
Victor Woeltjen
056b0c8c5b [Fixed Position] Use spaces instead of tabs 
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
 2015-09-23 12:59:04 -07:00
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Pete Richards
480da3476e Merge branch 'mobile' into mobile-integration 2015-09-22 10:55:43 -07:00
Charles Hacskaylo
65368ed0c3 [Config] Removed non-functional config options from Create dialogs; 
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
 2015-09-18 13:43:29 -07:00
Charles Hacskaylo
f28d2f19d0 [Frontend/PLATFORM] Cherry picking from platform changes in vista65 
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
 2015-09-16 17:17:54 -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
ad29fb0f92 [Time Conductor] Populate FP from historical 
Populate fixed position view from historical
telemetry when first loaded. WTD-1515
 2015-09-16 13:38:47 -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
9ebf157ec0 [Time Conductor] Test telemetry service decorator 
WTD-1515
 2015-09-15 11:18:28 -07:00
Victor Woeltjen
493c63be44 [Time Conductor] Test series wrapping 
WTD-1515
 2015-09-15 10:58:10 -07:00
Victor Woeltjen
f29951140f [Time Conductor] Add license header, JSDoc 
WTD-1515
 2015-09-15 10:22:43 -07:00
Victor Woeltjen
8ce8080253 [Timelines] Begin removing namespacing 
Begin de-namespacing timelines/activities for inclusion
in open source. WTD-1239
 2015-09-15 08:34:15 -07:00
Victor Woeltjen
96f72b3765 [Clocks] Add license, change keys 
Un-namespace keys in clock plugin, and add licensing
info for moment-duration-format. WTD-1239
 2015-09-14 16:52:56 -07:00
Victor Woeltjen
c932e953bc [Plugins] Bring over timeline, clock plugins 
WTD-1239
 2015-09-14 16:45:41 -07:00
Victor Woeltjen
d0478c3433 [Scrolling List] Check for existence of limit 
Check for existence of limit capability while evaluating
limits in a scrolling list view. WTD-1515
 2015-09-14 16:37:29 -07:00
Victor Woeltjen
53369ec0dc [Time Conductor] Avoid searching outside of series 
Don't look up domain values while subsetting a
telemetry series until after checking to ensure
that there is some segment of the series left
to search. WTD-1515
 2015-09-14 16:36:41 -07:00
Victor Woeltjen
de99969f0a [Time Controller] Return range values 
Delegate retrieval of range values appropriately in
conductor-driven telemetry series subset. WTD-1515
 2015-09-14 14:39:19 -07:00
Victor Woeltjen
24449d2dcc [Time Controller] Fix series subsetting 
Fix binary search implementation used to subset
telemetry series for time conductor. WTD-1515
 2015-09-14 11:44:50 -07:00
Victor Woeltjen
f42c5ca1e5 [Time Conductor] Subset to display bounds 
WTD-1515
 2015-09-14 11:25:42 -07:00
Victor Woeltjen
890aafc203 [Time Controller] Filter out realtime updates 
Filter out realtime updates that are outside of the time
controller's range. WTD-1515
 2015-09-14 10:02:59 -07:00
Charles Hacskaylo
3e5d46a62b [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Limits, plots, etc.;
Misc sanding and shimming;
Updated  symbols font to replace missing
Info symbol;
 2015-09-11 16:25:19 -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
62962e119e [Time Controller] Decorate telemetry service 
Decorate telemetry service instead of capability service
to enforce time conductor bounds. WTD-1515.
 2015-09-10 16:17:48 -07:00
Victor Woeltjen
86bb89a162 [Time Controller] Update spec 
Update spec for ConductorRepresenter to reflect changes
to model properties expected by TimeRangeController.
WTD-1515
 2015-09-10 11:31:40 -07:00
Victor Woeltjen
2758250833 [Time Conductor] Fix JSDoc 
Fix copy-paste error. WTD-1515
 2015-09-10 11:27:50 -07:00
Victor Woeltjen
78fae345da [Time Conductor] Rename TimeConductorController 
Rename TimeConductorController to TimeRangeController, to
reflect that this is intended to serve as a more general
control. Additionally, stop using arrays for inner and
outer bounds and instead use explicit start/end properties,
for clarity. WTD-1515
 2015-09-10 10:58:47 -07:00