Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion crates/app/src/ui/canvas/cursors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,11 @@ fn point_to_screen(
.figure();
Some(Pos2::new(
to_screen_x(point.x, plot, &figure.x),
to_screen_y(point.y.unwrap_or(point.intensity), plot, &figure.y),
to_screen_y(
point.y.unwrap_or(point.intensity * figure.display_gain),
plot,
&figure.y,
),
))
}

Expand Down
63 changes: 10 additions & 53 deletions crates/app/src/ui/canvas/navigation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ use super::*;
#[path = "navigation_input.rs"]
mod input;
use input::*;
#[path = "navigation_gain.rs"]
mod gain;
use gain::scale_line_intensity;
pub(crate) use gain::{peak_height_label, supports_peak_height};
#[path = "navigation_pointer.rs"]
mod pointer;
pub(crate) use input::{last_wheel_was_trackpad, selected_plot_body, sync_macos_trackpad_gesture};
Expand Down Expand Up @@ -238,8 +242,12 @@ pub(crate) fn handle_navigation(
NavigationInput::WheelZoom(amount) => {
let consumed = match data_target {
Some((id, outer, plot)) => {
if alt && hit_zone(p, outer, plot) == HitZone::Plot {
app.finish_pending_wheel_zoom(now, true);
if hit_zone(p, outer, plot) == HitZone::Plot
&& (alt || supports_peak_height(app, ci, id))
{
if !supports_peak_height(app, ci, id) {
app.finish_pending_wheel_zoom(now, true);
}
adjust_plot_display(app, ci, id, plot, p, amount, now, ui)
} else {
app.finish_pending_wheel_property(now, true);
Expand Down Expand Up @@ -668,57 +676,6 @@ fn step_wheel_property(
.request_repaint_after(std::time::Duration::from_millis(200));
}

#[allow(clippy::too_many_arguments)]
fn scale_line_intensity(
app: &mut PlotiumApp,
canvas: usize,
object: ObjectId,
plot: PlotRect,
pointer: Pos2,
scroll_y: f32,
now: f64,
ui: &Ui,
) -> bool {
let Some(plot_object) = app.doc.canvases[canvas]
.object(object)
.and_then(|object| object.plot())
else {
return false;
};
if plot_object.figure().y.categories.is_some() {
app.session.status =
"This categorical plot has no continuous display-intensity scale.".to_owned();
return true;
}
let before = plot_object.viewport.clone();
let y_axis = plot_object.figure().y.clone();
let view = before.view_y;
let anchor = if view.min <= 0.0 && view.max >= 0.0 {
0.0
} else if y_axis.scale == plotium_figure::AxisScale::Log10 {
(view.min * view.max).sqrt()
} else {
(view.min + view.max) * 0.5
};
let scale = f64::from((-scroll_y * WHEEL_ZOOM_SPEED).exp()).clamp(0.2, 5.0);
zoom_plot_viewport(
app,
canvas,
object,
plot_rect(plot),
plot,
Pos2::new(pointer.x, to_screen_y(anchor, plot, &y_axis)),
scale,
(false, true),
now,
ui,
);
app.session.status =
"Adjusted plot intensity; automatic Y scaling is now off. Double-click Y to reset."
.to_owned();
true
}

/// Zoom a plot's data viewport around the cursor on the requested axes.
/// Coalesces one stream of wheel or pinch events into one undo step.
#[allow(clippy::too_many_arguments)]
Expand Down
110 changes: 110 additions & 0 deletions crates/app/src/ui/canvas/navigation_gain.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
use super::*;

pub(crate) fn peak_height_label(gain: f64) -> String {
if (0.001..1000.0).contains(&gain) {
format!("×{gain:.3}")
} else {
format!("×{gain:.3e}")
}
}

pub(crate) fn supports_peak_height(app: &PlotiumApp, canvas: usize, object: ObjectId) -> bool {
app.doc.canvases[canvas]
.object(object)
.and_then(|object| object.plot())
.is_some_and(|plot| {
!plot
.binding
.coordinates
.as_ref()
.is_some_and(|coordinates| coordinates.transposed)
&& plot.figure().supports_display_gain()
})
}

#[allow(clippy::too_many_arguments)]
pub(super) fn scale_line_intensity(
app: &mut PlotiumApp,
canvas: usize,
object: ObjectId,
plot: PlotRect,
pointer: Pos2,
scroll_y: f32,
now: f64,
ui: &Ui,
) -> bool {
let Some(plot_object) = app.doc.canvases[canvas]
.object(object)
.and_then(|object| object.plot())
else {
return false;
};
if plot_object.figure().y.categories.is_some() {
app.session.status =
"This categorical plot has no continuous display-intensity scale.".to_owned();
return true;
}
if supports_peak_height(app, canvas, object) {
let gain = (plot_object.viewport.display_gain
* f64::from((scroll_y * WHEEL_ZOOM_SPEED).exp()))
.clamp(
plotium_figure::MIN_DISPLAY_GAIN,
plotium_figure::MAX_DISPLAY_GAIN,
);
if let Err(error) = plot_object.figure().check_display_gain(gain) {
app.session.status = format!("Could not adjust peak height: {error}");
return true;
}
if !update_pending_viewport_edit(app, canvas, object, now) {
return false;
}
let plot_object = app.doc.canvases[canvas]
.object_mut(object)
.and_then(|object| object.plot_mut())
.expect("the wheel target was just validated");
// Freeze the drawn window, including any space reserved for a legend.
// Amplification must not trigger an automatic refit or move a baseline.
plot_object.viewport.view_x =
AxisRange::new(plot_object.figure().x.min, plot_object.figure().x.max);
plot_object.viewport.view_y =
AxisRange::new(plot_object.figure().y.min, plot_object.figure().y.max);
plot_object.viewport.auto_y = false;
plot_object.viewport.display_gain = gain;
plot_object.apply_viewport();
app.mark_document_dirty();
app.session.status = format!(
"Peak height {} · baselines fixed · View > Reset Peak Height",
peak_height_label(gain)
);
ui.ctx()
.request_repaint_after(std::time::Duration::from_millis(200));
return true;
}
let before = plot_object.viewport.clone();
let y_axis = plot_object.figure().y.clone();
let view = before.view_y;
let anchor = if view.min <= 0.0 && view.max >= 0.0 {
0.0
} else if y_axis.scale == plotium_figure::AxisScale::Log10 {
(view.min * view.max).sqrt()
} else {
(view.min + view.max) * 0.5
};
let scale = f64::from((-scroll_y * WHEEL_ZOOM_SPEED).exp()).clamp(0.2, 5.0);
zoom_plot_viewport(
app,
canvas,
object,
plot_rect(plot),
plot,
Pos2::new(pointer.x, to_screen_y(anchor, plot, &y_axis)),
scale,
(false, true),
now,
ui,
);
app.session.status =
"Adjusted plot intensity; automatic Y scaling is now off. Double-click Y to reset."
.to_owned();
true
}
Loading
Loading