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

Allow dragging time cursor in plots #2115

Merged
merged 2 commits into from
May 17, 2023
+28 −3
Merged

Allow dragging time cursor in plots #2115

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f16a0c
Allow dragging time cursor in plots
emilk May 15, 2023
5d63090
Merge branch 'main' into emilk/drag-plot-time-marker
emilk May 16, 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
31 changes: 28 additions & 3 deletions crates/re_viewer/src/ui/view_time_series/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub(crate) fn view_time_series(
let egui::plot::PlotResponse {
inner: time_x,
response,
transform: _,
transform,
} = plot.show(ui, |plot_ui| {
if plot_ui.plot_secondary_clicked() {
let timeline = ctx.rec_cfg.time_ctrl.timeline();
Expand Down Expand Up @@ -130,8 +130,33 @@ pub(crate) fn view_time_series(
});

if let Some(time_x) = time_x {
// TODO(emilk): allow interacting with the timeline (may require `egui::Plot` to return the `plot_from_screen` transform)
let stroke = ui.visuals().widgets.inactive.fg_stroke;
let interact_radius = ui.style().interaction.resize_grab_radius_side;
let line_rect = egui::Rect::from_x_y_ranges(time_x..=time_x, response.rect.y_range())
.expand(interact_radius);

let time_drag_id = ui.id().with("time_drag");
let response = ui
.interact(line_rect, time_drag_id, egui::Sense::drag())
.on_hover_and_drag_cursor(egui::CursorIcon::ResizeHorizontal);

if response.dragged() {
if let Some(pointer_pos) = ui.input(|i| i.pointer.hover_pos()) {
let time =
time_offset + transform.value_from_position(pointer_pos).x.round() as i64;

let time_ctrl = &mut ctx.rec_cfg.time_ctrl;
time_ctrl.set_time(time);
time_ctrl.pause();
}
}

let stroke = if response.dragged() {
ui.style().visuals.widgets.active.fg_stroke
} else if response.hovered() {
ui.style().visuals.widgets.hovered.fg_stroke
} else {
ui.visuals().widgets.inactive.fg_stroke
};
crate::ui::time_panel::paint_time_cursor(
ui.painter(),
time_x,
Expand Down