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.

Sign up for GitHub

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

Feature/972 center time range on span #991

Merged
merged 3 commits into from
Nov 9, 2023
+66 −29
Merged

Feature/972 center time range on span #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf51eb4
add context menu for centering view around selected spans with time p…
duranb Nov 8, 2023
6a14c35
delay context menu for activities to allow selection event to occur f…
duranb Nov 8, 2023
f2942f2
make wording consistent
duranb Nov 9, 2023
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
15 changes: 9 additions & 6 deletions src/components/timeline/LayerActivity.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,12 +331,15 @@
}
const showContextMenu = !!e && isRightClick(e);
if (showContextMenu) {
dispatch('contextMenu', {
e,
layerId: id,
selectedActivityDirectiveId,
selectedSpanId,
});
// delay the context menu a little bit to allow any selection events to occur first
setTimeout(() => {
dispatch('contextMenu', {
e,
layerId: id,
selectedActivityDirectiveId,
selectedSpanId,
});
}, 1);
}
}

Expand Down
80 changes: 57 additions & 23 deletions src/components/timeline/TimelineContextMenu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
let contextMenuComponent: ContextMenu;
let activityDirective: ActivityDirective | null;
let activityDirectiveSpans: Span[] | null = [];
let activityDirectiveStartDate: Date | null = null;
let span: Span | null;

// TODO imports here could be better, should we handle the vertical guide creation in Timeline?
Expand All @@ -53,10 +54,10 @@
span = null;
activityDirectiveSpans = null;

if (selectedActivityDirectiveId !== undefined) {
if (selectedActivityDirectiveId != null) {
activityDirective = activityDirectivesMap[selectedActivityDirectiveId];
activityDirectiveSpans = getAllSpansForActivityDirective(selectedActivityDirectiveId, spansMap, spanUtilityMaps);
} else if (selectedSpanId !== undefined) {
} else if (selectedSpanId != null) {
span = spansMap[selectedSpanId];
}
} else {
Expand Down Expand Up @@ -113,6 +114,18 @@
return new Date(getUnixEpochTimeFromInterval(startYmd, span.start_offset) + duration);
}

function onFocus(duration: number) {
if (xScaleView && contextMenu && span) {
const start = getSpanDate(span);
const end = getSpanDate(span, true);
const newViewTimeRange: TimeRange = {
end: Math.min(end.getTime() + duration, maxTimeRange.end),
start: Math.max(start.getTime() - duration, maxTimeRange.start),
};
dispatch('viewTimeRangeChanged', newViewTimeRange);
}
}

function onZoom(duration: number) {
if (xScaleView && contextMenu) {
const time = activityDirectiveStartDate ? activityDirectiveStartDate : xScaleView.invert(contextMenu.e.offsetX);
Expand Down Expand Up @@ -285,25 +298,46 @@
</ContextMenuItem>
{/if}
<ContextMenuSeparator />
<ContextSubMenuItem
text={`Zoom${activityDirective ? ' around Selected Directive' : ''}`}
parentMenu={contextMenuComponent}
>
<ContextMenuItem on:click={() => onZoomHome()}>Reset Zoom</ContextMenuItem>
<ContextMenuSeparator />
<ContextMenuItem on:click={() => onZoom(TIME_MS.MILLISECOND)}>Millisecond</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MILLISECOND * 10)}>10 Milliseconds</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MILLISECOND * 50)}>50 Milliseconds</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.SECOND)}>Second</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.SECOND * 30)}>30 Seconds</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MINUTE)}>Minute</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MINUTE * 30)}>30 Minutes</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.HOUR)}>Hour</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.HOUR * 12)}>12 Hours</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.DAY)}>Day</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.DAY * 3)}>3 Days</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.DAY * 7)}>Week</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MONTH)}>Month</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.YEAR)}>Year</ContextMenuItem>
</ContextSubMenuItem>
{#if span}
<ContextSubMenuItem text="Zoom around Simulated Activity" parentMenu={contextMenuComponent}>
<ContextMenuItem on:click={() => onZoomHome()}>Reset Zoom</ContextMenuItem>
<ContextMenuSeparator />
<ContextMenuItem on:click={() => onFocus(TIME_MS.MILLISECOND)}>1 Millisecond Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.MILLISECOND * 10)}>10 Millisecond Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.MILLISECOND * 50)}>50 Millisecond Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.SECOND)}>1 Second Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.SECOND * 30)}>30 Second Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.MINUTE)}>1 Minute Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.MINUTE * 30)}>30 Minute Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.HOUR)}>1 Hour Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.HOUR * 12)}>12 Hour Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.DAY)}>1 Day Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.DAY * 3)}>3 Day Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.DAY * 7)}>1 Week Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.MONTH)}>1 Month Padding</ContextMenuItem>
<ContextMenuItem on:click={() => onFocus(TIME_MS.YEAR)}>1 Year Padding</ContextMenuItem>
</ContextSubMenuItem>
{:else}
<ContextSubMenuItem
text={`Zoom${activityDirective ? ' around Activity Directive' : ''}`}
parentMenu={contextMenuComponent}
>
<ContextMenuItem on:click={() => onZoomHome()}>Reset Zoom</ContextMenuItem>
<ContextMenuSeparator />
<ContextMenuItem on:click={() => onZoom(TIME_MS.MILLISECOND)}>1 Millisecond</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MILLISECOND * 10)}>10 Milliseconds</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MILLISECOND * 50)}>50 Milliseconds</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.SECOND)}>1 Second</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.SECOND * 30)}>30 Seconds</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MINUTE)}>1 Minute</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MINUTE * 30)}>30 Minutes</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.HOUR)}>1 Hour</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.HOUR * 12)}>12 Hours</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.DAY)}>1 Day</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.DAY * 3)}>3 Days</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.DAY * 7)}>1 Week</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.MONTH)}>1 Month</ContextMenuItem>
<ContextMenuItem on:click={() => onZoom(TIME_MS.YEAR)}>1 Year</ContextMenuItem>
</ContextSubMenuItem>
{/if}
</ContextMenu>