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

Add lookahead padding to the plan time axis #3419

Merged
merged 49 commits into from
Mar 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
10611a0
(WIP) Adds Plan view and visualization of activities on different rows
shefalijoshi Aug 12, 2020
c385c17
Updates to show activities in the right rows
shefalijoshi Aug 12, 2020
38636f0
Improve algorithm to get activityRow for next activity
shefalijoshi Aug 13, 2020
aeab502
When activities have names that are longer than their width, show the…
shefalijoshi Aug 13, 2020
f2d57ab
Remove Activity component as we don't need it right now
shefalijoshi Aug 13, 2020
0e51987
Use canvas to draw activities instead of svg for performance
shefalijoshi Aug 14, 2020
8c72cdd
Retain SVG version if needed
shefalijoshi Aug 14, 2020
fbc049f
Include text when calculating overlap
shefalijoshi Aug 17, 2020
621c25d
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Aug 19, 2020
336090e
Fix padding, text positioning
shefalijoshi Aug 24, 2020
62f7afe
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Aug 31, 2020
0493be1
Add colors for activities
shefalijoshi Aug 31, 2020
e3e2bb8
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Sep 3, 2020
cef8ebe
Fixed bug - Rectangle was shrinking as time passed
shefalijoshi Sep 3, 2020
92b2544
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Sep 15, 2020
c2527c7
Adds performance activities
shefalijoshi Sep 15, 2020
ed6af1d
[WIP] Refactoring code to be more readable
shefalijoshi Sep 16, 2020
97bc8ac
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Sep 22, 2020
89ab312
Fix issues with activity layout
shefalijoshi Sep 23, 2020
5c07017
Adds draft for groups
shefalijoshi Sep 23, 2020
af5f4da
Adds x-offset for groups
shefalijoshi Sep 23, 2020
4e47dd5
Draw a "now" marker for the canvas
shefalijoshi Sep 23, 2020
58bb7e5
Fix formatting for the timeline
shefalijoshi Sep 23, 2020
c5d974f
Adds now line for the timeline
shefalijoshi Sep 24, 2020
2c24de9
Add ability to upload a plan json file.
shefalijoshi Sep 28, 2020
43ff12d
Add tests for the Plan view
shefalijoshi Sep 30, 2020
83adf7c
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Sep 30, 2020
6a613de
Fix issue with File Type checking
shefalijoshi Sep 30, 2020
c0f89f0
Refactor code to be more readable
shefalijoshi Oct 1, 2020
e5c2f3c
Merge branch 'master' into timeviews/plan
shefalijoshi Oct 1, 2020
20c35e1
Fix tests that are failing on circleCI
shefalijoshi Oct 2, 2020
fd18ca4
Merge branch 'timeviews/plan' of https://github.com/nasa/openmct into…
shefalijoshi Oct 2, 2020
7f8e0b8
Fix icon for timeline view
shefalijoshi Oct 2, 2020
c7dc027
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Oct 5, 2020
22e5a5f
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Oct 5, 2020
28394d8
Update activities json to use UTC instead of timestamp
shefalijoshi Oct 5, 2020
958c875
Merge branch 'master' into timeviews/plan
shefalijoshi Oct 5, 2020
ed5316b
Merge branch 'master' into timeviews/plan
akhenry Nov 19, 2020
93d7c03
Merge branch 'master' into timeviews/plan
akhenry Nov 20, 2020
645fcd5
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Feb 1, 2021
4c1496e
Address review comments - add 50% padding to plans
shefalijoshi Feb 1, 2021
6ce45be
Delete activities.json sample
shefalijoshi Feb 1, 2021
27d2c18
Merge branch 'master' into timeviews/plan
shefalijoshi Feb 12, 2021
d676747
Merge branch 'master' into timeviews/plan
shefalijoshi Feb 12, 2021
4b5a5ea
Merge branch 'master' into timeviews/plan
shefalijoshi Feb 12, 2021
ac7c806
Merge branch 'master' into timeviews/plan
akhenry Feb 17, 2021
6e1f774
Merge branch 'master' of https://github.com/nasa/openmct into timevie…
shefalijoshi Feb 26, 2021
9183220
Adds 50% padding to the viewBounds.
shefalijoshi Feb 26, 2021
dde3600
Merge branch 'master' into timeviews/plan
akhenry Mar 29, 2021
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
5 changes: 5 additions & 0 deletions src/plugins/plan/Plan.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ export default {
},
updateViewBounds() {
this.viewBounds = this.openmct.time.bounds();
//Add a 50% padding to the end bounds to look ahead
let timespan = (this.viewBounds.end - this.viewBounds.start);
let padding = timespan / 2;
this.viewBounds.end = this.viewBounds.end + padding;

if (this.timeSystem === undefined) {
this.timeSystem = this.openmct.time.timeSystem();
}
Expand Down
Empty file removed src/plugins/timeline/Plan.vue
Empty file.