Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 188 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
bca5eb0
[Time Conductor] #933 Initial markup
akhenry Jul 7, 2016
58ed500
Time sync via conductor
akhenry Jul 7, 2016
e230b92
Fixed bug with date selector having to be clicked twice
akhenry Jul 8, 2016
32f7bc8
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 8, 2016
cf83040
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 8, 2016
4e7b69c
Enabled fixed and real-time modes
akhenry Jul 8, 2016
0a0bc55
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 9, 2016
5cc81ba
[Time Conductor] Added mode class to time conductor
akhenry Jul 11, 2016
7b19f91
[Frontend] Merge latest from open933
charlesh88 Jul 11, 2016
788483e
[Frontend] Styling of Time Conductor v2
charlesh88 Jul 11, 2016
7b7b21d
[Frontend] Styling of Time Conductor v2
charlesh88 Jul 11, 2016
0017b77
Merged markup changes
akhenry Jul 11, 2016
11caa83
Updated modes
akhenry Jul 11, 2016
84b7a9d
Merge remote-tracking branch 'origin/open933' into open933-frontend
charlesh88 Jul 11, 2016
bf0e85a
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 11, 2016
585da38
Fixed some merge issues
akhenry Jul 11, 2016
64ce8a2
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 11, 2016
2056d87
Merge branch 'open933-frontend' into open933
akhenry Jul 11, 2016
0884169
Added duration
akhenry Jul 12, 2016
97f3fd5
Changed default duration to fifteen minutes
akhenry Jul 12, 2016
fd29473
Support resize
akhenry Jul 12, 2016
5238aa2
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 13, 2016
06af84c
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 13, 2016
fcfda50
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 13, 2016
14463d3
Added end delta
akhenry Jul 14, 2016
33b2225
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 14, 2016
8214c8e
Merge open933 latest, resolve conflicts
charlesh88 Jul 14, 2016
e193e3d
Merge open933 latest, resolve conflicts
charlesh88 Jul 14, 2016
8b694ef
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 14, 2016
2baca65
Refactoring
akhenry Jul 14, 2016
2f9fbfe
More refactoring
akhenry Jul 14, 2016
8c5538e
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 14, 2016
3798283
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 14, 2016
671e301
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 14, 2016
b3a4f52
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 15, 2016
43a804e
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 15, 2016
4087b9c
[Frontend] Styling for Time Conductor v2
charlesh88 Jul 15, 2016
0af49ef
Refactored out modes, time systems, etc.
akhenry Jul 18, 2016
334ca64
Merged open933-frontend
akhenry Jul 18, 2016
15a608a
Populate format in input fields
akhenry Jul 19, 2016
f641edb
[Frontend] Renew support for Time Conductor v1
charlesh88 Jul 20, 2016
2a19394
Added compatibility layer to support existing plots and historical ta…
akhenry Jul 20, 2016
ea1defa
[Frontend] Renew support for Time Conductor v1
charlesh88 Jul 20, 2016
e6d8944
Modified main.js
akhenry Jul 20, 2016
2124fe0
[Frontend] Renew support for Time Conductor v1
charlesh88 Jul 20, 2016
ff16784
[Frontend] Time Conductor v2 styling
charlesh88 Jul 20, 2016
b392633
[Frontend] Time Conductor v2 styling
charlesh88 Jul 20, 2016
da7c636
[Frontend] Time Conductor v2 styling
charlesh88 Jul 21, 2016
a10ded2
Merge remote-tracking branch 'origin/open933' into open933-frontend-b
charlesh88 Jul 21, 2016
c2c8e16
Added scale sensitive formatting to UTCTimeFormat
akhenry Jul 22, 2016
19fd63b
Merge branch 'open933-frontend-b' into open933
akhenry Jul 22, 2016
a4f6f6f
Added license
akhenry Jul 25, 2016
1b7fc57
Added status support to plots
akhenry Jul 25, 2016
5b2eb72
[Time Conductor] Addressed documentation issues
akhenry Jul 26, 2016
aa4a5e5
Improved support from plot
akhenry Jul 26, 2016
c1bbc4f
Code cleanup
akhenry Jul 27, 2016
8e59072
Removed LAD and Realtime modes
akhenry Jul 27, 2016
7af2212
Prevent tabbing into end bounds when not in fixed mode
akhenry Jul 27, 2016
523d674
[Frontend] Added support for thematic styling of Time Conductor v2
charlesh88 Aug 1, 2016
482fcbf
Refactored bundle
akhenry Aug 1, 2016
142ee2f
Added LocalTimeSystem and merged latest styles
akhenry Aug 1, 2016
ce5d0ef
Merged stylesheet changes
akhenry Aug 1, 2016
762f43f
[Frontend] Styling TC unsynced elements
charlesh88 Aug 1, 2016
579c6b6
[Frontend] Styling TC unsynced elements
charlesh88 Aug 1, 2016
9b58aa0
[TCv2] Add conductorService for compatibility
Aug 2, 2016
a75ea67
Format updates when time system selected
akhenry Aug 2, 2016
c699cb8
Merge remote-tracking branch 'origin/master' into open933-c
charlesh88 Aug 2, 2016
fcd7ab9
Merge branch 'open933' of https://github.com/nasa/openmctweb into ope…
akhenry Aug 2, 2016
753bd97
Merge remote-tracking branch 'origin/master' into open933-c
charlesh88 Aug 2, 2016
121ab41
Apply formatting, filter modes by tick source availability
akhenry Aug 2, 2016
c5c45f0
[Frontend] Update TC2 markup and sass
charlesh88 Aug 2, 2016
573f1f9
[Frontend] Hide zoom slider control
charlesh88 Aug 2, 2016
ca5206d
[Frontend] Fixing issues with theme coloring
charlesh88 Aug 2, 2016
1173828
[Frontend] Styling for unsynced elements
charlesh88 Aug 2, 2016
4cd579d
Pass numerical value to format functions
akhenry Aug 2, 2016
1eea5ce
merged from master
akhenry Aug 2, 2016
34c62ba
Time Conductor in edit mode
akhenry Aug 2, 2016
b9c4110
Time Conductor state retained on navigation
akhenry Aug 3, 2016
6501e2e
Added isUTCBased to TimeSystem interface
akhenry Aug 3, 2016
9007522
[TCv2] get conductor without service
Aug 3, 2016
f844495
Support deltaFormat on timeSystems
akhenry Aug 4, 2016
f4e1879
stop listening to tick source on time system change
akhenry Aug 4, 2016
9a72c96
[TCv2] different defaults by mode
Aug 4, 2016
579233a
Fixed delta format issue on navigation
akhenry Aug 4, 2016
f96f78f
Select appropriate tick source based on mode
akhenry Aug 4, 2016
6b482d4
Merged mode-specific defaults, with some refactoring
akhenry Aug 4, 2016
25b9f37
Fixed loss of time system options on navigation
akhenry Aug 4, 2016
f3fd386
Retain time system on mode change
akhenry Aug 4, 2016
0e0ad64
Fixed issue with wrong deltas being applied
akhenry Aug 4, 2016
af7954c
Trigger digests when bounds are set
Aug 5, 2016
46e644e
Use key to retrieve default
Aug 5, 2016
7557a86
Merge branch 'master' into open933
akhenry Aug 5, 2016
62ee7e5
[Frontend] Fix for collapse Inspector button
charlesh88 Aug 8, 2016
ae39343
[Frontend] Fix for bad fix
charlesh88 Aug 8, 2016
4ae6da0
[Frontend] Data viz in Time Conductor smaller
charlesh88 Aug 10, 2016
4cf6126
Refactoring based on feedback
akhenry Aug 11, 2016
c6eaa3d
[Time Conductor] Adding tests and fixing failing ones. #933
akhenry Aug 24, 2016
7af5875
[Time Conductor] #933 Fixed code style errors
akhenry Sep 6, 2016
d37dd52
Merge branch 'master' into open933
akhenry Sep 6, 2016
fbab890
[Time Conductor] Switched conductor to mct-include rather than mct-re…
akhenry Sep 7, 2016
e639e05
[Time Conductor] Fixing bugs found in smoke testing. Fixes #933
akhenry Sep 9, 2016
9a06325
Merge branch 'master' into open933
akhenry Sep 12, 2016
d1960b2
[Time Conductor] Resolved merge conflicts
akhenry Sep 12, 2016
a1331b7
Merge branch 'master' into open933
akhenry Sep 12, 2016
11e0603
Merge branch 'master' into open933
akhenry Sep 13, 2016
9e85341
[Frontend] Fixed color for TC clock hands
charlesh88 Sep 14, 2016
2df1e2b
[Frontend] Styling for TC's TOI element
charlesh88 Sep 15, 2016
f912b9e
[Frontend] Styling for TC's TOI element
charlesh88 Sep 15, 2016
98e67f8
[Frontend] Styling for TC's TOI element
charlesh88 Sep 15, 2016
35872e2
[Frontend] Styling for TC's TOI element
charlesh88 Sep 15, 2016
9e2debf
[Frontend] Styling for TC's TOI element
charlesh88 Sep 15, 2016
2c81b72
[Frontend] Styling for TOI element in plots
charlesh88 Sep 15, 2016
92a80c3
[Time Conductor] Added pan to Time Conductor
akhenry Sep 12, 2016
41a160f
Merge branch 'master' into open1182
akhenry Sep 16, 2016
2c7ae95
Merge branch 'open1182' into open1193
charlesh88 Sep 16, 2016
27e6caf
[Frontend] Styling for TOI element in plots
charlesh88 Sep 17, 2016
c0a96b3
[Frontend] Styling for TOI element in TC
charlesh88 Sep 22, 2016
904d56a
[Time Conductor] #933 Clean up time conductor listeners on scope dest…
akhenry Sep 22, 2016
8eb7585
[README] Warn about root installation issues
VWoeltjen Aug 29, 2016
2e81550
Revert "[Build] Check dependencies for vulnerabilities"
VWoeltjen Sep 14, 2016
d77922d
Revert "[proxyUrl] pass URL parameters to proxied URL"
larkin Sep 15, 2016
7fcafb6
[Time Conductor] Added pan to Time Conductor
akhenry Sep 12, 2016
98122cc
[Time Conductor] Added Zoom
akhenry Sep 20, 2016
1a93ba2
[Frontend] Styling for TOI element in TC
charlesh88 Sep 22, 2016
49ee5cb
[Time Conductor] Destroy listeners in ConductorAxisController
akhenry Sep 22, 2016
1c3bd69
[Frontend] Styling for TOI element, some refactoring
charlesh88 Sep 22, 2016
adbcc40
[Frontend] Styling for TOI element
charlesh88 Sep 22, 2016
3c95c09
[Time Conductor] Refactored out use of angular event bus in favor of …
akhenry Sep 23, 2016
0cf4c92
[Frontend] Styling for TOI element in tables
charlesh88 Sep 23, 2016
bb2ae2f
[Frontend] Styling for TOI element
charlesh88 Sep 23, 2016
2db4aa6
[Time Conductor] Added zoom level label
akhenry Sep 23, 2016
99253a5
[Frontend] Styling for TOI element
charlesh88 Sep 28, 2016
22da348
[Frontend] Styling for TOI element
charlesh88 Sep 29, 2016
5babf72
[Time Conductor] Tweaked the break points for zoom level indicator
akhenry Sep 29, 2016
5cd0c8a
[Time Conductor] merged from open1182
akhenry Sep 30, 2016
d3bf6c5
[Frontend] Styling for TOI element
charlesh88 Oct 3, 2016
1650aae
[Frontend] Styling for TOI element
charlesh88 Oct 3, 2016
0ed0a48
[Frontend] Styling for TOI element
charlesh88 Oct 4, 2016
47a0aba
[Frontend] TOI sass and markup sanding
charlesh88 Oct 5, 2016
430645b
TOI working in time conductor
akhenry Oct 5, 2016
f1d2072
Added license information
akhenry Oct 5, 2016
3e9c0eb
Merged from master to resolve build issues
akhenry Oct 5, 2016
dfbbc3b
alt-click to select TOI from table
akhenry Oct 6, 2016
51a9557
[Time Conductor] Refactored time of interest as optional generic beha…
akhenry Oct 7, 2016
07140b1
Merge branch 'master' into open933
akhenry Oct 7, 2016
b384e84
Merge branch 'open933' into open1182
akhenry Oct 7, 2016
b995a8b
Merged from open1182
akhenry Oct 7, 2016
70c4ce2
Added support for clicking row to set TOI
akhenry Oct 8, 2016
02c543f
Fixed zoom in real-time mode
akhenry Oct 11, 2016
3910437
Merged changes to zoom
akhenry Oct 11, 2016
8b2047c
Fixed issue with setting deltas
akhenry Oct 11, 2016
938bf3c
Merge branch 'open1182' into open1193
akhenry Oct 11, 2016
086307b
Fixed scrolling behavior with TOI
akhenry Oct 12, 2016
3f0eb0b
[Frontend] New glyphs for use by TOI
charlesh88 Oct 13, 2016
42acf92
[Frontend] Adding resync and dedicated unpin buttons
charlesh88 Oct 13, 2016
1a53430
[Frontend] Refactor TOI element
charlesh88 Oct 13, 2016
6042e4a
[Frontend] Styling for TOI element
charlesh88 Oct 13, 2016
b7e8a1b
[Frontend] Styling for TOI element
charlesh88 Oct 13, 2016
271c788
[Frontend] TOI in tables
charlesh88 Oct 14, 2016
07a4e26
[Frontend] TOI finalizing
charlesh88 Oct 14, 2016
8f67cbd
[Frontend] Fixed cursor: grab on Time Conductor
charlesh88 Oct 14, 2016
660757f
Added TimeOfInterestController
akhenry Oct 14, 2016
6bea6b3
Merge branch 'open1193' of https://github.com/nasa/openmctweb into op…
akhenry Oct 14, 2016
7a09bc1
Migrated TOI functionality to common controller
akhenry Oct 17, 2016
dadca62
Positioning of TOI in tables and plots
akhenry Oct 17, 2016
86b51f6
[Frontend] Small refactor for mct-include
charlesh88 Oct 18, 2016
9f3ec3b
Fixed issue with scrolling to row after bounds change
akhenry Oct 18, 2016
2256447
Merge branch 'open1193' of https://github.com/nasa/openmctweb into op…
akhenry Oct 18, 2016
d12ae77
Further TOI improvements
akhenry Oct 19, 2016
b56ab0a
[Time Conductor] Implement default sort, fix unpredictable positionin…
akhenry Oct 19, 2016
843c678
In process of merging
akhenry Oct 21, 2016
482eb4a
[Time Conductor] Using new API
akhenry Oct 22, 2016
029d2b3
[Examples] Simplified MSL example, fixed object tree not loading by d…
akhenry Oct 20, 2016
f580661
[Time Conductor] support TOI from real-time tables
akhenry Oct 22, 2016
49e600d
[Time Conductor] Fixed zoom slider behavior
akhenry Oct 22, 2016
a942541
[Time Conductor] Fixed memory leak due to listeners not being deregis…
akhenry Oct 24, 2016
93735bc
Removed bundle definition of MctAxisController
akhenry Oct 24, 2016
8e76ebb
Removed debugging code
akhenry Oct 25, 2016
c3322e3
Added tests for MctTableController
akhenry Oct 26, 2016
dfed0a0
Added ConductorAxisController tests
akhenry Oct 27, 2016
b0901e8
Added tests for ConductorAxisController and TimeConductor
akhenry Oct 27, 2016
7cc008e
Added tests for tables, TOI controller
akhenry Oct 28, 2016
099c56c
Fixed failing tests
akhenry Oct 28, 2016
d0906ba
Fixed TOI not showing
akhenry Nov 4, 2016
fc36674
Updated wording of docs
akhenry Nov 9, 2016
a9ec8db
Merge branch 'master' into open1193
akhenry Nov 9, 2016
db6386e
Removed redundant ConductorService
akhenry Nov 9, 2016
31308b1
[Time Conductor] Addressed code review comments. Fixes #1287
akhenry Nov 22, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/generator/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ define([
"source": "generator",
"domains": [
{
"key": "time",
"key": "utc",
"name": "Time"
},
{
Expand Down
2 changes: 1 addition & 1 deletion example/msl/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ define([
"domains": [
{
"name": "Time",
"key": "timestamp",
"key": "utc",
"format": "utc"
}
]
Expand Down
39 changes: 39 additions & 0 deletions platform/commonUI/formats/src/UTCTimeFormat.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,45 @@ define([
})[0][0];
}

/**
* Returns a description of the current range of the time conductor's
* bounds.
* @param timeRange
* @returns {*}
*/
UTCTimeFormat.prototype.timeUnits = function (timeRange) {
var momentified = moment.duration(timeRange);

return [
["Decades", function (r) {
return r.years() > 15;
}],
["Years", function (r) {
return r.years() > 1;
}],
["Months", function (r) {
return r.years() === 1 || r.months() > 1;
}],
["Days", function (r) {
return r.months() === 1 || r.days() > 1;
}],
["Hours", function (r) {
return r.days() === 1 || r.hours() > 1;
}],
["Minutes", function (r) {
return r.hours() === 1 || r.minutes() > 1;
}],
["Seconds", function (r) {
return r.minutes() === 1 || r.seconds() > 1;
}],
["Milliseconds", function (r) {
return true;
}]
].filter(function (row) {
return row[1](momentified);
})[0][0];
};

/**
*
* @param value
Expand Down
21 changes: 21 additions & 0 deletions platform/commonUI/formats/src/UTCTimeFormatSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,26 @@ define([
expect(format.format(APRIL, scale)).toBe("April");
expect(format.format(TWENTY_SIXTEEN, scale)).toBe("2016");
});

it("Returns appropriate time units for a given time span", function () {
var ONE_DAY = 1000 * 60 * 60 * 24;
var FIVE_DAYS = 5 * ONE_DAY;
var FIVE_MONTHS = 60 * ONE_DAY;

var ONE_YEAR = 365 * ONE_DAY;
var SEVEN_YEARS = 7 * ONE_YEAR;
var TWO_DECADES = 20 * ONE_YEAR;

//A span of one day should show a zoom label of "Hours"
expect(format.timeUnits(ONE_DAY)).toEqual("Hours");
//Multiple days should display "Days"
expect(format.timeUnits(FIVE_DAYS)).toEqual("Days");
expect(format.timeUnits(FIVE_MONTHS)).toEqual("Days");
//A span of one year should show a zoom level of "Months".
// Multiple years will show "Years"
expect(format.timeUnits(ONE_YEAR)).toEqual("Months");
expect(format.timeUnits(SEVEN_YEARS)).toEqual("Years");
expect(format.timeUnits(TWO_DECADES)).toEqual("Decades");
});
});
});
Loading