Commit Graph

598 Commits

Author SHA1 Message Date
Victor Woeltjen
41a013d198 [Fixed Position] Add button to show/hide telemetry name
Add button to show/hide name of telemetry elements in
fixed position view, WTD-881.
2015-02-23 19:25:33 -08:00
Victor Woeltjen
1c69d1f2da [Fixed Position] Add text, image properties
Add buttons for text, image properties to the Fixed Position
toolbar, WTD-881.
2015-02-23 19:16:09 -08:00
Victor Woeltjen
0030efc29e [Forms] Implement DialogButtonController
Implement controller for dialog buttons sufficient to satisfy
spec; these will be used to launch dialogs to collect user input
for Image Properties et al to complete toolbar for Fixed Position
view, WTD-881.
2015-02-23 19:06:09 -08:00
Victor Woeltjen
3e95a96c69 [Forms] Add dialog button spec
Add spec for a button which should show a dialog for
input on a single value, to support Image properties
in Fixed Position view, WTD-881.
2015-02-23 18:52:53 -08:00
Victor Woeltjen
0b2cd52433 [Fixed Position] Add image proxy
Add selection proxy for image elements to support image URL
dialog, WTD-881.
2015-02-23 18:28:30 -08:00
Victor Woeltjen
894a5b8f89 [Fixed Position] Add text color property
Add a property to the Fixed Position toolbar to set text
color, WTD-881.
2015-02-23 18:17:24 -08:00
Victor Woeltjen
13793e221e [Fixed Position] Add stroke property
Add stroke property to Fixed Position toolbar for
borders, line color. WTD-881.
2015-02-23 18:05:37 -08:00
Victor Woeltjen
6068f0f9c2 [Forms] Add ColorController spec
Add spec for ColorController, introduced to support color
selection in the Fixed Position toolbar, WTD-881
2015-02-23 17:06:27 -08:00
Victor Woeltjen
00f85447a2 [Fixed Position] Add color chooser
Add color picker for fill color, WTD-881
2015-02-23 16:47:52 -08:00
Victor Woeltjen
6c7dfb878b [Edit] Avoid rebuilding toolbar on edit
Avoid rebuilding the toolbar in Edit mode whenever
any change occurs to avoid losing the binding to the
current selection state; needed for color picker to
work properly for WTD-881.
2015-02-23 15:57:45 -08:00
Victor Woeltjen
f894233182 [Edit] Default to inclusive mode
Default to inclusive mode in Edit mode toolbar;
simplifies adding additional toolbar elements for
Fixed Position view, WTD-881.
2015-02-23 15:13:46 -08:00
bwyu
e2588e27cc Merge remote-tracking branch 'origin/open877' into open-master 2015-02-23 15:08:41 -08:00
Victor Woeltjen
46c8a456b7 [Fixed Position] Begin adding color chooser
Begin adding choice of fill colors for box/text/telemetry
elements in a fixed position view, WTD-881.
2015-02-23 14:52:19 -08:00
Victor Woeltjen
c183f08886 [Edit] Fix state-watching
Repair/simplify state-watching in representer for toolbar
in edit mode; avoids issue where destroy calls detach
watches for state change in toolbar prematurely. WTD-881.
2015-02-23 14:51:17 -08:00
bwyu
343e7aab3e Merge remote-tracking branch 'origin/open889' into open-master 2015-02-23 13:02:36 -08:00
Victor Woeltjen
182d02599d [Fixed Position] Add fill properties
Add 'fill' properties, to allow specifying background
color in Fixed Position view. WTD-881.
2015-02-23 10:48:44 -08:00
Victor Woeltjen
53aabd5743 [Fixed Position] Add ordering control
Add order control for elements in a fixed position view,
WTD-881.
2015-02-23 10:33:27 -08:00
Victor Woeltjen
0de06b0594 [Fixed Position] Specify glyph for Add
Specify glyph for the Add button in the Fixed Position
view's toolbar, WTD-880.
2015-02-20 16:30:00 -08:00
Victor Woeltjen
a2295e8416 [Fixed Position] Add JSDoc
Add clarifying comments to different elements proxies, WTD-880.
2015-02-20 16:26:10 -08:00
Victor Woeltjen
d75f9e51ac [Fixed Position] Add tests for new classes
Add test cases for new classes introduced to support
Add options in the Fixed Position toolbar, WTD-880.
2015-02-20 16:18:19 -08:00
Victor Woeltjen
e50e57b0be [Fixed Position] Add tests for FixedController
Add tests for FixedController and FixedProxy which reflect
added/changed behavior for Add button, WTD-880.
2015-02-20 15:59:22 -08:00
Victor Woeltjen
6814567116 [Fixed Position] Update failing specs
Update existing tests to account for changes from WTD-880.
2015-02-20 15:53:41 -08:00
Victor Woeltjen
84e90f6ad1 [Fixed Position] Select newly-created elements
When elements are added to a fixed position view, select them
immediately. WTD-880.
2015-02-20 15:47:07 -08:00
Victor Woeltjen
668a1e4534 [Fixed Position] Add empty specs
Add empty specs for classes introduced in support of
Add menu options for fixed position view, WTD-880.
2015-02-20 15:29:37 -08:00
Victor Woeltjen
f9043fdb7d [Fixed Position] Allow straight lines
Pad width/height to give enough space to draw straight
lines; fix usage of background for boxes. WTD-880.
2015-02-20 15:25:27 -08:00
Victor Woeltjen
2c0180ebda [Fixed Position] Draw line as SVG
Draw line elements as SVG, WTD-880.
2015-02-20 15:06:33 -08:00
Victor Woeltjen
638a7c8609 [Fixed Position] Add dialog for text
Add dialog for text elements in fixed position view;
tweak styling on some other element types. WTD-880.
2015-02-20 12:57:15 -08:00
Victor Woeltjen
f5b6be9b5d [Fixed Position] Add Image Properties dialog
Add Image Properties dialog, for when a new image element
is created. WTD-880.
2015-02-20 12:28:52 -08:00
Victor Woeltjen
a947ff1274 [Fixed Position] Add element factory
Add element factory, which will take on responsibility
for populating initial states of elements and (if necessary)
prompting for user input. WTD-880.
2015-02-20 12:21:28 -08:00
Victor Woeltjen
f1a8e84a93 [Fixed Position] Allow adding elements
Allow adding of elements (without any element-specific
properties beyond type.) WTD-880.
2015-02-20 11:53:50 -08:00
Victor Woeltjen
6fca03521b [Fixed Position] Add initial element templates
Add element templates for fixed position elements introduced
via the Add button, WTD-880.
2015-02-20 11:39:29 -08:00
Victor Woeltjen
2be58579dc [Fixed Position] Add 'Add' menu button
Add UI for the Add button in fixed position view,
WTD-880.
2015-02-20 11:30:04 -08:00
Victor Woeltjen
1015e97b3e [Fixed Position] Add tests for FixedController
Add additional test cases for controller for Fixed Position
view to meet code coverage after changes for WTD-879.
2015-02-19 16:24:45 -08:00
Victor Woeltjen
3cfcd027e0 [Fixed Position] Fill in specs for selection proxies
Fill in specs for fixed position views selection proxies,
WTD-879.
2015-02-19 13:29:43 -08:00
Victor Woeltjen
7882dd1401 [Fixed Position] Add spec for selection
Add spec for selection manager for layout and fixed position
views, WTD-879.
2015-02-19 13:06:55 -08:00
Victor Woeltjen
8c653d39d7 [Edit] Update specs
Update specs for toolbars in Edit mode to reflect
changes for WTD-879.
2015-02-19 12:44:00 -08:00
Victor Woeltjen
280c854658 [Fixed Position] Update drop gesture spec
Update drop gesture spec for changes made for WTD-879
2015-02-19 12:34:22 -08:00
Victor Woeltjen
14cbb9fb40 [Fixed Position] Add placeholder specs
Add placeholder specs for classes added to support
selection of elements in a fixed position view,
WTD-879.
2015-02-19 12:21:39 -08:00
Victor Woeltjen
7498e340d6 [Fixed Position] Rename accessor
Rename utility function used by fixed position elements
to be more accurate. WTD-879.
2015-02-19 12:10:43 -08:00
bwyu
b29d3a148f Merge remote-tracking branch 'origin/open829' into open-master 2015-02-19 11:08:05 -08:00
Victor Woeltjen
83872946bf [Fixed Position] Fix grid size spec
Fix spec which ensures that FixedController correctly
populates background grid based on user-defined grid
size, after changes for WTD-879.
2015-02-19 10:22:12 -08:00
Victor Woeltjen
9a50f6d84d [Fixed Position] Fix globals
Fix globals to pass JSLint check in command line build. WTD-879.
2015-02-19 09:37:02 -08:00
Victor Woeltjen
5df41966a4 [Fixed Position] Disable failing specs
Disable failing specs after significant rewrite of
FixedController to handle element selection, WTD-879.
2015-02-19 09:13:45 -08:00
Victor Woeltjen
81159a8801 [Telemetry] Update subscription spec
Update spec for TelemetrySubscription to account for the fact
that it initially calls back when the set of telemetry objects
is available (which supports views such as Fixed Position
which want to defer all telemetry-handling responsibility to
the subscription.) WTD-879.
2015-02-19 09:11:59 -08:00
Victor Woeltjen
035b2e36c3 [Telemetry] Fire callback when objects are available
Fire callback from telemetry subscriber when the set of
object references changes. This allows views which use
the subscriber to register one callback, while still
ensuring that they are notified when there is new
information to show. Supports fixed position view, WTD-879.
2015-02-18 20:37:23 -08:00
Victor Woeltjen
7bd41a9f80 [Fixed Position] Allow dragging of elements
Restore dragging behavior to elements in a fixed position
view, WTD-879.
2015-02-18 20:29:54 -08:00
Victor Woeltjen
5680710c06 [Fixed Position] Implement remove
Implement remove button for selected elements in fixed
position view. WTD-879.
2015-02-18 20:12:55 -08:00
Victor Woeltjen
f66fb0a32d [Fixed Position] Add remove button
Add a 'remove' button when elements are selected in
fixed position view, WTD-879.
2015-02-18 19:56:54 -08:00
Victor Woeltjen
a4dd730764 [Fixed Position] Allow select/deselect
Allow select/deselect of individual elements in fixed position
view, WTD-879.
2015-02-18 19:51:42 -08:00
Victor Woeltjen
cd98fd475d [Fixed Position] Begin using proxies
Begin using proxies for elements in fixed position view,
WTD-879.
2015-02-18 19:41:27 -08:00
Victor Woeltjen
f24f62dedc [Fixed Position] Begin adding element proxy classes
Begin adding proxy classes to allow the toolbar to interact with
elements in a fixed position view, WTD-879.
2015-02-18 19:26:06 -08:00
Victor Woeltjen
466a169562 [Fixed Position] Continue refactoring controller
Continue refactoring Fixed Position controller for
selection support, WTD-879.
2015-02-18 15:11:52 -08:00
Victor Woeltjen
bf36141e91 [Fixed Position] Begin refactoring controller
Begin refactoring Fixed Position controller to facilitate
selection support, as well as multiple types of elements;
WTD-879.
2015-02-18 13:50:25 -08:00
Victor Woeltjen
8662689974 [Fixed Position] Begin breaking apart template
Begin breaking apart template to allow multiple
types of fixed position elements, WTD-879.
2015-02-18 13:19:59 -08:00
Victor Woeltjen
97b844563d [Fixed Position] Add proxy object
Add proxy object to represent the selection of the fixed position
view itself, WTD-879.
2015-02-18 09:03:50 -08:00
Victor Woeltjen
4be2a3f1cd [Fixed Position] Add selection manager
Add utility class so that layouts/fixed position views
can track their current selection state more simply.
WTD-879.
2015-02-18 08:55:58 -08:00
Victor Woeltjen
7a680873e3 [Fixed Position] Begin adding placeholder toolbar
Begin adding placeholder toolbar for fixed position view,
WTD-879.
2015-02-17 16:29:42 -08:00
Victor Woeltjen
db2f2eb098 [Fixed Position] Improve button support
Improve button support from toolbars by adding a click
function when generating structures for mct-toolbar based
on view definitions. WTD-879.
2015-02-17 16:29:15 -08:00
Victor Woeltjen
7fced99390 [Fixed Position] Add placeholder toolbar definition
Add a mostly-empty toolbar definition to Fixed Position view,
WTD-879.
2015-02-17 16:15:25 -08:00
Victor Woeltjen
98caa31d7b Merge branch 'open877' into open879
Merge fixed position view work and general toolbar
work to begin adding toolbars for fixed position view,
WTD-879."

Conflicts:
	platform/commonUI/edit/res/templates/edit-object.html
2015-02-17 15:58:36 -08:00
Victor Woeltjen
3916968544 [Edit] Add EditToolbarRepresenter spec
Add tests for representer which mediates between view's
selection and toolbar contents, WTD-878.
2015-02-17 15:47:18 -08:00
Victor Woeltjen
48754c78bf [Edit] Wire in toolbar representer
Wire in representer for handling toolbars in Edit mode,
and add some clarifying documentation. WTD-878.
2015-02-17 15:30:23 -08:00
Victor Woeltjen
023c12ec3b [Edit] Add toolbar representer
Add a representer to handle exposing toolbars for views in
edit mode. WTD-878.
2015-02-17 14:31:02 -08:00
Victor Woeltjen
5dc72b15c2 [Edit] Implement EditToolbar
Implement EditToolbar (sufficient to satisfy spec) which will
construct an mct-toolbar-friendly form structure based on both
the current selection and the view's defined toolbar structure.
WTD-878.
2015-02-17 13:47:14 -08:00
Victor Woeltjen
8f14f4e5eb [Edit] Add spec for toolbar
Add spec for class that will convert toolbar definition
provided by views to suitable input for mct-toolbar, WTD-878.
2015-02-17 12:58:36 -08:00
Victor Woeltjen
ab546c9541 [Edit] Document toolbar behavior
Document how toolbars may be described by a view such
that Edit mode will populate the actual displayed
toolbar, WTD-878.
2015-02-17 12:19:35 -08:00
Victor Woeltjen
0510705f3a [Representation] Update docs
Update documentation to reflect that an event is broadcast
when drops occur. WTD-877.
2015-02-17 10:56:38 -08:00
Victor Woeltjen
156f053421 [Fixed Position] Add specs for drop
Add specs related to positioning of objects based on
drop position, WTD-877.
2015-02-17 10:50:02 -08:00
Victor Woeltjen
553101100b [Fixed Position] Refresh subscriptions
Refresh subscriptions when composition changes, such as due to
a drag-drop addition of an element to the view. WTD-877.
2015-02-17 10:34:13 -08:00
Victor Woeltjen
136dddab86 [Fixed Position] Position elements where dropped
Position elements where they are dropped in Fixed Position
view, WTD-877
2015-02-17 10:27:37 -08:00
Victor Woeltjen
ef4ed50605 [Layout] Separate out handleDrop
Separate drop-handling into a non-anonymous function in
LayoutController to satisfy code style guidelines;
WTD-877.
2015-02-17 10:25:31 -08:00
Victor Woeltjen
01d953bf45 [Layout] Position frames on drop
Position frames within a layout based on the position
where they were dropped into the layout, WTD-877.
2015-02-17 10:23:10 -08:00
Victor Woeltjen
e158f2811c [Views] Wire in drop gesture
Support drop gesture from fixed position view and from
layout view, WTD-877.
2015-02-17 10:03:48 -08:00
Victor Woeltjen
4190941bfb [Views] Broadcast event on drop
Broadcast an event when drag-drop domain object composition
occurs, such that the view in question may utilize the drop
coordinates (e.g. to position elements in a layout or fixed
position view.) WTD-877.
2015-02-17 10:01:27 -08:00
Victor Woeltjen
8d6b218646 [Fixed Position] Add initial spec
Add initial spec for FixedController to satisfy minimum
coverage requirements, in preparation for review. WTD-889.
2015-02-17 09:03:23 -08:00
Victor Woeltjen
c2b1775d75 [Fixed Position] Free up resources
Free up resources when a fixed position view is destroyed,
WTD-889.
2015-02-17 08:35:32 -08:00
Victor Woeltjen
71a132d374 [Fixed Position] Improve doc of FixedController
Improve documentation for Fixed Position controller, WTD-889.
2015-02-17 08:32:35 -08:00
Victor Woeltjen
abe4be9238 [Fixed Position] Remove unused representer
Remove unused representer for view toolbars; clean up for
WTD-889.
2015-02-17 08:30:42 -08:00
Victor Woeltjen
c6064dfe6c Merge branch 'open615' into open889
Merge in work-in-progress for WTD-615 (Fixed Position View)
into topic branch for WTD-889 (a sub-issue of WTD-615, which
has been broken down into discrete chunks to support
development.

Conflicts:
	platform/telemetry/src/TelemetrySubscription.js
2015-02-17 08:26:34 -08:00
Victor Woeltjen
e9dbc3d71f [About] Change version text
Change version text to just say Version instead of
Open MCT Web, WTD-829.
2015-02-12 16:51:24 -08:00
Victor Woeltjen
3cb0f3fa7f [Tests] Add tests for persistence cache
Add test cases for persistence cache to improve overall
test coverage, WTD-672.
2015-02-12 16:34:19 -08:00
Victor Woeltjen
e073ca5145 Merge remote-tracking branch 'nasa/open763' into open796
Merge CSS fix for dialog overlay, WTD-796
2015-02-12 15:31:30 -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
bwyu
85cfc00ad2 Merge remote-tracking branch 'origin/open793' into open-master 2015-02-10 17:22:26 -08:00
bwyu
78d8068789 Merge remote-tracking branch 'origin/open791' into open-master 2015-02-10 11:01:00 -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
2bbe845f18 Merge remote-tracking branch 'origin/open812' into open-master 2015-02-09 14:29:29 -08:00
bwyu
61bb85df58 Merge remote-tracking branch 'origin/open751' into open-master 2015-02-06 18:08:12 -08:00
bwyu
19bcfef123 Merge remote-tracking branch 'origin/open747' into open-master 2015-02-06 16:45:49 -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
26cd5b3e24 Merge remote-tracking branch 'origin/open660' into open-master 2015-02-04 16:31:27 -08:00
bwyu
4f17071c85 Merge remote-tracking branch 'origin/open669' into open-master 2015-02-04 13:05:30 -08:00
bwyu
def47addb3 Merge remote-tracking branch 'origin/open734' into open-master 2015-02-04 12:24:23 -08:00
bwyu
eb65f549a5 Merge remote-tracking branch 'origin/open719' into open-master 2015-02-04 11:00:47 -08:00
Victor Woeltjen
c0163d2d60 [Logging] Wire in log levels
Wire in log levels to allow specifying as a query string
parameter; defaults to logging only warnings and above,
for WTD-793.
2015-02-03 18:42:30 -08:00
Victor Woeltjen
6dd8a4ccca [Logging] Implement log levels
Implement suppression of logging below specific levels,
for WTD-793.
2015-02-03 18:01:29 -08:00