From: Dominik Csapak <d.csapak@proxmox.com>
To: yew-devel@lists.proxmox.com
Subject: [yew-devel] [PATCH yew-comp 20/20] rrd: refactor the cross position calculation
Date: Fri, 30 May 2025 14:22:02 +0200 [thread overview]
Message-ID: <20250530122202.2779300-21-d.csapak@proxmox.com> (raw)
In-Reply-To: <20250530122202.2779300-1-d.csapak@proxmox.com>
makes the view method a bit easier to read.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/rrd/graph.rs | 85 ++++++++++++++++++++++++++----------------------
1 file changed, 47 insertions(+), 38 deletions(-)
diff --git a/src/rrd/graph.rs b/src/rrd/graph.rs
index 5ffc29d..4c43039 100644
--- a/src/rrd/graph.rs
+++ b/src/rrd/graph.rs
@@ -302,51 +302,25 @@ impl PwtRRDGraph {
}
}
+ // draw cross and data circles
if let Some((x, y)) = self.cross_pos {
- let idx = self.offset_to_time_index(x, data0);
-
- if let Some(t) = data0.get(idx) {
- if let Some(v) = data1.get(idx) {
- if v.is_finite() {
- let px = self.graph_space.compute_x(*t) as f32;
- let py = self.graph_space.compute_y(*v) as f32;
- children.push(
- Circle::new()
- .key("selection-circle1")
- .class("pwt-rrd-selected-datapoint")
- .position(px, py)
- .r(5)
- .into(),
- );
- }
- }
- if let Some(v) = data2.get(idx) {
- if v.is_finite() {
- let px = self.graph_space.compute_x(*t) as f32;
- let py = self.graph_space.compute_y(*v) as f32;
- children.push(
- Circle::new()
- .key("selection-circle2")
- .class("pwt-rrd-selected-datapoint")
- .position(px, py)
- .r(5)
- .into(),
- );
- }
- }
+ let (path, circles) = self.get_cross_positions(data0, &[data1, data2], x, y);
+ for (idx, (px, py)) in circles.into_iter().enumerate() {
+ children.push(
+ Circle::new()
+ .key(format!("selection-circle{idx}"))
+ .class("pwt-rrd-selected-datapoint")
+ .position(px, py)
+ .r(5)
+ .into(),
+ );
}
- let (min_y, _) = self.graph_space.get_y_range(CoordinateRange::InsideBorder);
- let (min_x, max_x) = self.graph_space.get_x_range(CoordinateRange::InsideBorder);
-
- let x = x.max(min_x as i32).min(max_x as i32);
- let y = y.min(min_y as i32);
-
children.push(
Path::new()
.key("cross")
.class("pwt-rrd-cross")
- .d(format!("M {x} 0 L {x} {min_y} M {min_x} {y} L {max_x} {y}"))
+ .d(path)
.into(),
);
}
@@ -405,6 +379,41 @@ impl PwtRRDGraph {
)
}
+ // returns the path for the cross and the positions of the circles for the series data points
+ fn get_cross_positions(
+ &self,
+ data0: &[i64],
+ series: &[&[f64]],
+ x: i32,
+ y: i32,
+ ) -> (String, Vec<(f32, f32)>) {
+ let idx = self.offset_to_time_index(x, data0);
+
+ let mut children = Vec::new();
+
+ if let Some(t) = data0.get(idx) {
+ for data in series {
+ if let Some(v) = data.get(idx) {
+ if v.is_finite() {
+ let px = self.graph_space.compute_x(*t) as f32;
+ let py = self.graph_space.compute_y(*v) as f32;
+ children.push((px, py));
+ }
+ }
+ }
+ }
+
+ let (min_y, _) = self.graph_space.get_y_range(CoordinateRange::InsideBorder);
+ let (min_x, max_x) = self.graph_space.get_x_range(CoordinateRange::InsideBorder);
+
+ let x = x.max(min_x as i32).min(max_x as i32);
+ let y = y.min(min_y as i32);
+
+ let path = format!("M {x} 0 L {x} {min_y} M {min_x} {y} L {max_x} {y}");
+
+ (path, children)
+ }
+
fn offset_to_time_index(&self, x: i32, data0: &[i64]) -> usize {
let t = self.graph_space.original_x(x as f64);
let start_index = data0.partition_point(|&x| x < t);
--
2.39.5
_______________________________________________
yew-devel mailing list
yew-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/yew-devel
prev parent reply other threads:[~2025-05-30 12:22 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-30 12:21 [yew-devel] [PATCH yew-comp 00/20] refactor and improve rrd graph code Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 01/20] remove old rrd uplot code Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 02/20] rrd: refactor code for compute_min_max Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 03/20] rrd: move into own module Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 04/20] rrd: move unit calculation to " Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 05/20] rrd: units: add tests Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 06/20] rrd: units: simplify calculations for get_grid_unit_base Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 07/20] rrd: remove unnecessary `no_data` field Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 08/20] rrd: align tooltip directly to pointer position Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 09/20] rrd: use 'cross_pos' state instead of 'draw_cross' Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 10/20] rrd: give all elements in svg keys Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 11/20] rrd: simplify toggle Msg Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 12/20] rrd: remove wrongly annotated lifetime Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 13/20] rrd: refactor series related struct and functions into own module Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 14/20] rrd: clamp view range when time_data changes Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 15/20] rrd: refactor grid data computation Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 16/20] rrd: introduce GraphSpace struct and use it to precalculate graph data Dominik Csapak
2025-05-30 12:21 ` [yew-devel] [PATCH yew-comp 17/20] rrd: precalculate the grid line and label positions Dominik Csapak
2025-05-30 12:22 ` [yew-devel] [PATCH yew-comp 18/20] rrd: calculate series svg data only when necessary Dominik Csapak
2025-05-30 12:22 ` [yew-devel] [PATCH yew-comp 19/20] rrd: refactor selection rectangle calculation Dominik Csapak
2025-05-30 12:22 ` Dominik Csapak [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250530122202.2779300-21-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=yew-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal