jess
/
EIS-BLE-S3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wire peak markers into VoltammogramPlot with color-coded rendering and labels

This commit is contained in:
jess 2026-04-02 18:13:44 -07:00
parent e5fe1c9229
commit 30cd80d03b
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cue/src/plot.rs
View File

@ -3,6 +3,7 @@ use iced::{Color, Point, Rectangle, Renderer, Theme};
use iced::mouse; use iced::mouse;
use crate::app::Message; use crate::app::Message;
use crate::lsv_analysis::{LsvPeak, PeakKind};
use crate::protocol::{AmpPoint, ClPoint, EisPoint, LsvPoint}; use crate::protocol::{AmpPoint, ClPoint, EisPoint, LsvPoint};
const MARGIN_L: f32 = 55.0; const MARGIN_L: f32 = 55.0;
@ -823,6 +824,7 @@ pub struct VoltammogramState {
pub struct VoltammogramPlot<'a> { pub struct VoltammogramPlot<'a> {
pub points: &'a [LsvPoint], pub points: &'a [LsvPoint],
pub reference: Option<&'a [LsvPoint]>, pub reference: Option<&'a [LsvPoint]>,
pub peaks: &'a [LsvPeak],
} }
impl VoltammogramPlot<'_> { impl VoltammogramPlot<'_> {
@ -983,6 +985,24 @@ impl<'a> canvas::Program<Message> for VoltammogramPlot<'a> {
draw_polyline(&mut frame, &pts, COL_LSV, 2.0); draw_polyline(&mut frame, &pts, COL_LSV, 2.0);
draw_dots(&mut frame, &pts, COL_LSV, 2.5); draw_dots(&mut frame, &pts, COL_LSV, 2.5);
for peak in self.peaks {
let px = lerp(peak.v_mv, xv.lo, xv.hi, xl, xr);
let py = lerp(peak.i_ua, yv.hi, yv.lo, yt, yb);
if !px.is_finite() || !py.is_finite() { continue; }
let col = match peak.kind {
PeakKind::FreeCl => COL_CL_FREE,
PeakKind::TotalCl => COL_CL_TOTAL,
PeakKind::Crossover => COL_FIT_PT,
};
frame.fill(&Path::circle(Point::new(px, py), 5.0), col);
let label = match peak.kind {
PeakKind::FreeCl => format!("Free {:.0}mV {:.2}uA", peak.v_mv, peak.i_ua),
PeakKind::TotalCl => format!("Total {:.0}mV {:.2}uA", peak.v_mv, peak.i_ua),
PeakKind::Crossover => format!("X-over {:.0}mV", peak.v_mv),
};
dt(&mut frame, Point::new(px - 20.0, py + 8.0), &label, col, 10.0);
}
if let Some(pos) = cursor.position_in(bounds) { if let Some(pos) = cursor.position_in(bounds) {
if pos.x >= xl && pos.x <= xr && pos.y >= yt && pos.y <= yb { if pos.x >= xl && pos.x <= xr && pos.y >= yt && pos.y <= yb {
let v = lerp(pos.x, xl, xr, xv.lo, xv.hi); let v = lerp(pos.x, xl, xr, xv.lo, xv.hi);