[Time Conductor] Conductor pan, zoom, and time of interest #1287

akhenry · 2016-10-24T22:38:35Z

Ok, I think this is good to go.There is minimal TOI support in old plots with known issues. Don't want to invest time in properly supporting old plots. I could also be persuaded to remove support from old plots, if we decide that no support is better than partial support.

Changes

Added Time of Interest to time conductor, tables, and old plots. TOI can be set from time conductor and tables by alt+clicking
Added a zoom slider to the time conductor. Zoom slider will only appear if zoom defaults defined on time system. See

openmct/platform/features/conductor-v2/utcTimeSystem/src/UTCTimeSystem.js

Line 77 in a9ec8db

zoom: {min: FIFTY_YEARS, max: ONE_MINUTE}

Supporting zoom level labels is optional, and requires a change to the associate time format. A new 'timeUnits' method is needed on the time format class. eg. https://github.com/nasa/openmct/blob/open1193/platform/commonUI/formats/src/UTCTimeFormat.js#L104
Added pan to the time conductor. The time scale can now be dragged left or right to adjust the time bounds. In the case of both zoom and pan, the time conductor UI adjusts in real time while dragging, but bounds changes are not propagated to views until the mouse is released.

Author Checklist

Changes address original issue? Y
Unit tests included and/or updated with changes? Y
Command line build passes? Y
Changes have been smoke-tested? Y

Fixes #993 In-progress; class renaming continued, cleanups in markup file, in-page styles ported to scss

Fixes #993 In-progress; Create menu refactoring and new mini Create menu

Fixes #993 In-progress; mode menu names and descriptors modified, markup cleaned up

Fixes #933 Resolve conflicts in mode-menu.html, mode-selector.html, time-conductor.html; apply tweaks, language, etc.

Fixes #933 Tweaks to language

Fixes #933 Tweaks to language; tweak to class name in markup

Fixes #933 Conflicts: platform/features/conductor-v2/src/TimeConductorController.js

Fixes #933 Renamed main class; removed unused <style> defs

Fixes #933 Color adjusts, mini super-menu size and font tweaks, glyphs added to selector, SVG style fixes in progress

Fixes #933 In-progress; fixed SVG text color

Fixes #933 In-progress: fixed SVG text color, field styling for fixed vs. real-time, markup cleanup

Fixes #933 In-progress: color tweaks, bar sizing, field widths

Fixes #933 In-progress: restructured markup to move modeModel farther out; animated icon

Fixes #933 Fair amount of manual fixing in time-conductor.html

Fixes #933 In-progress: color/size tweaks, fixes for espresso theme

akhenry · 2016-11-09T19:46:11Z

@larkin assigned this to you as you're most familiar with the TC now, so the delta should be easier to review. It's a lot to review, again, so if you want to hand this off to @VWoeltjen that's also fine.

akhenry · 2016-11-09T19:57:32Z

removed the timeConductor service from the conductor bundle, and the conductorService from the compatibility bundle. Actually not sure what the latter was doing in there, it served no purpose. If any of the VISTA components are relying on either of these services (I'm thinking especially of the timeConductor one, they will need to get the conductor instance via other means. I'd suggest just passing in the openmct api object which is what I've done. An alternative is to define a new timeConductor service that just exposes openmct.conductor.

larkin · 2016-11-17T19:16:39Z

platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js

+    function ($) {
+
+        /**
+         * The mct-conductor-axis renders a horizontal axis with regular


Looks like this comment is a leftover from copy/pasting.

larkin · 2016-11-17T19:17:01Z

platform/features/conductor-v2/conductor/src/ui/ConductorAxisController.js

+        var PADDING = 1;
+
+        /**
+         * The mct-conductor-axis renders a horizontal axis with regular


outdated comment

larkin · 2016-11-17T19:19:42Z

platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js

+         * Set time of interest
+         * @param e The angular $event object
+         */
+        ConductorTOIController.prototype.click = function (e) {


Would it be clearer to name this function based on what it does rather than the event it is following?

larkin · 2016-11-17T19:19:59Z

platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js

+            }
+        };
+
+        ConductorTOIController.prototype.changeTimeOfInterest = function () {


no JSDoc, minimally should tag method as private.

larkin · 2016-11-17T19:20:07Z

platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js

+
+        }
+
+        ConductorTOIController.prototype.destroy = function () {


larkin

@akhenry lots of missing jsdoc and some unimplemented tests, sending back to you to address.

larkin · 2016-11-17T19:20:34Z

platform/features/conductor-v2/conductor/src/ui/ConductorTOIControllerSpec.js

+    var mockConductorViewService;
+
+    describe("The ConductorTOIController", function () {
+        mockConductor = jasmine.createSpyObj("conductor", [


Incomplete tests for this controller.

Indeed, whoops!

larkin · 2016-11-17T19:21:02Z

platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js

+            this.conductorViewService.off('pan-stop', this.onPanStop);
+        };
+
+        TimeConductorController.prototype.changeBounds = function (bounds) {


larkin · 2016-11-17T19:21:22Z

platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js

@@ -137,23 +176,26 @@ define(
                });
        };

-        /**
-         * @private
-         */
        TimeConductorController.prototype.setFormFromDeltas = function (deltas) {


missing jsdoc

larkin · 2016-11-17T19:21:33Z

platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js

+            }
+        };
+
+        TimeConductorController.prototype.onZoomStop = function () {


larkin · 2016-11-17T19:21:41Z

platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js

+            this.$scope.boundsModel.end = bounds.end;
+        };
+
+        TimeConductorController.prototype.onPanStop = function () {


larkin · 2016-11-17T19:21:58Z

platform/features/conductor-v2/conductor/src/ui/TimeConductorControllerSpec.js

+                expect(controller.$scope.boundsModel.end).not.toBe(testBounds.end);
+
+                // use registered CB instead
+                // controller.onPan(testBounds);


commented code? remove?

larkin · 2016-11-17T19:22:35Z

platform/features/conductor-v2/conductor/src/ui/TimeConductorMode.js

-                    //Calculate the previous raw end value (without delta)
-                    oldEnd = oldEnd - this.dlts.end;
+                var bounds = this.calculateBoundsFromDeltas(deltas);
+                this.dlts = deltas;


is there any reason we can't just call this "deltas" instead of abbreviating it?

Because of the deltas method on the prototype. I'll rename it something less rubbish though.

larkin · 2016-11-17T19:23:05Z

platform/features/conductor-v2/conductor/src/ui/TimeOfInterestController.js

+    function ($) {
+
+        /**
+         * The mct-conductor-axis renders a horizontal axis with regular


Outdated jsdoc (copypaste?)

larkin · 2016-11-17T19:23:35Z

platform/features/conductor-v2/conductor/src/ui/TimeOfInterestController.js

+
+define(
+    ["zepto"],
+    function ($) {


Looks like zepto is unused here.

larkin · 2016-11-17T19:23:50Z

platform/features/conductor-v2/conductor/src/ui/TimeOfInterestController.js

+            $scope.$on('$destroy', this.destroy);
+        }
+
+        TimeOfInterestController.prototype.changeTimeOfInterest = function (toi) {


missing JSDoc all over

akhenry · 2016-11-22T17:25:42Z

@larkin addressed review comments, thanks.

@charlesh88 some glyph related conflicts. What's the best approach here?

larkin · 2016-11-25T22:52:04Z

I can resolve the icomoon conflicts-- resolved conflicts in the icomoon json file, change some ids (as two icons were created in different branches), uploaded to icomoon, generated new font files & json, and copied them back into project.

There is a small conflict with icon-refresh-- it was updated in master recently and also in this branch months ago.

Master:

Pull Request:

It looks like the refresh icon in master is not properly centered, but the refresh icon in this branch is. I believe the refresh icon in this branch is "more correct" than the version in master and will keep it. @charlesh88 can you confirm?

larkin · 2016-11-25T23:06:36Z

Squash-merged and pushing results in 79b4f9a.

Reviewer Checklist

Changes appear to address issue? Y
Appropriate unit tests included? Y
Code style and in-line documentation are appropriate? Y
Commit messages meet standards? Y

akhenry and others added 30 commits July 7, 2016 09:47

[Time Conductor] #933 Initial markup

bca5eb0

Time sync via conductor

58ed500

Fixed bug with date selector having to be clicked twice

e230b92

[Frontend] Styling for Time Conductor v2

32f7bc8

Fixes #993 In-progress; class renaming continued, cleanups in markup file, in-page styles ported to scss

[Frontend] Styling for Time Conductor v2

cf83040

Fixes #993 In-progress; Create menu refactoring and new mini Create menu

Enabled fixed and real-time modes

4e7b69c

[Frontend] Styling for Time Conductor v2

0a0bc55

Fixes #993 In-progress; mode menu names and descriptors modified, markup cleaned up

[Time Conductor] Added mode class to time conductor

5cc81ba

[Frontend] Merge latest from open933

7b19f91

Fixes #933 Resolve conflicts in mode-menu.html, mode-selector.html, time-conductor.html; apply tweaks, language, etc.

[Frontend] Styling of Time Conductor v2

788483e

Fixes #933 Tweaks to language

[Frontend] Styling of Time Conductor v2

7b7b21d

Fixes #933 Tweaks to language; tweak to class name in markup

Merged markup changes

0017b77

Updated modes

11caa83

Merge remote-tracking branch 'origin/open933' into open933-frontend

84b7a9d

Fixes #933 Conflicts: platform/features/conductor-v2/src/TimeConductorController.js

[Frontend] Styling for Time Conductor v2

bf0e85a

Fixes #933 Renamed main class; removed unused <style> defs

Fixed some merge issues

585da38

[Frontend] Styling for Time Conductor v2

64ce8a2

Fixes #933 Color adjusts, mini super-menu size and font tweaks, glyphs added to selector, SVG style fixes in progress

Merge branch 'open933-frontend' into open933

2056d87

Added duration

0884169

Changed default duration to fifteen minutes

97f3fd5

Support resize

fd29473

[Frontend] Styling for Time Conductor v2

5238aa2

Fixes #933 In-progress; fixed SVG text color

[Frontend] Styling for Time Conductor v2

06af84c

Fixes #933 In-progress: fixed SVG text color, field styling for fixed vs. real-time, markup cleanup

[Frontend] Styling for Time Conductor v2

fcfda50

Fixes #933 In-progress: color tweaks, bar sizing, field widths

Added end delta

14463d3

[Frontend] Styling for Time Conductor v2

33b2225

Fixes #933 In-progress: restructured markup to move modeModel farther out; animated icon

Merge open933 latest, resolve conflicts

8214c8e

Fixes #933 Fair amount of manual fixing in time-conductor.html

Merge open933 latest, resolve conflicts

e193e3d

Fixes #933 Fair amount of manual fixing in time-conductor.html

[Frontend] Styling for Time Conductor v2

8b694ef

Fixes #933 In-progress: color/size tweaks, fixes for espresso theme

Refactoring

2baca65

akhenry added 3 commits November 4, 2016 10:48

Fixed TOI not showing

d0906ba

Updated wording of docs

fc36674

Merge branch 'master' into open1193

a9ec8db

akhenry assigned larkin Nov 9, 2016

Removed redundant ConductorService

db6386e

akhenry force-pushed the open1193 branch from fc79eeb to db6386e Compare November 9, 2016 21:07

akhenry mentioned this pull request Nov 14, 2016

[Time Conductor] Persist Time Conductor state in URL #1325

Merged

larkin reviewed Nov 17, 2016

View reviewed changes

larkin suggested changes Nov 17, 2016

View reviewed changes

larkin assigned akhenry Nov 17, 2016

larkin added this to the Roddenberry milestone Nov 17, 2016

larkin removed their assignment Nov 17, 2016

akhenry added a commit that referenced this pull request Nov 22, 2016

[Time Conductor] Addressed code review comments. Fixes #1287

82bfe2e

[Time Conductor] Addressed code review comments. Fixes #1287

31308b1

akhenry force-pushed the open1193 branch from 82bfe2e to 31308b1 Compare November 22, 2016 17:21

akhenry mentioned this pull request Nov 25, 2016

[API] TimeConductor API not mapped to internal time conductor #1333

Closed

larkin approved these changes Nov 25, 2016

View reviewed changes

larkin assigned larkin and unassigned akhenry Nov 25, 2016

larkin closed this in 79b4f9a Nov 25, 2016

larkin deleted the open1193 branch November 25, 2016 23:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Time Conductor] Conductor pan, zoom, and time of interest #1287

[Time Conductor] Conductor pan, zoom, and time of interest #1287

akhenry commented Oct 24, 2016 •

edited

Loading

akhenry commented Nov 9, 2016

akhenry commented Nov 9, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin left a comment

larkin Nov 17, 2016

akhenry Nov 22, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

akhenry Nov 22, 2016 •

edited

Loading

larkin Nov 17, 2016

larkin Nov 17, 2016

larkin Nov 17, 2016

akhenry commented Nov 22, 2016

larkin commented Nov 25, 2016

larkin commented Nov 25, 2016

[Time Conductor] Conductor pan, zoom, and time of interest #1287

[Time Conductor] Conductor pan, zoom, and time of interest #1287

Conversation

akhenry commented Oct 24, 2016 • edited Loading

Changes

Author Checklist

akhenry commented Nov 9, 2016

akhenry commented Nov 9, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

larkin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akhenry Nov 22, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akhenry commented Nov 22, 2016

larkin commented Nov 25, 2016

larkin commented Nov 25, 2016

Reviewer Checklist

akhenry commented Oct 24, 2016 •

edited

Loading

akhenry Nov 22, 2016 •

edited

Loading