From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <yew-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 18F3B1FF195
for <inbox@lore.proxmox.com>; Fri, 30 May 2025 14:22:20 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 0D0522E72C;
Fri, 30 May 2025 14:22:36 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: yew-devel@lists.proxmox.com
Date: Fri, 30 May 2025 14:22:02 +0200
Message-Id: <20250530122202.2779300-21-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250530122202.2779300-1-d.csapak@proxmox.com>
References: <20250530122202.2779300-1-d.csapak@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.022 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [yew-devel] [PATCH yew-comp 20/20] rrd: refactor the cross position
calculation
X-BeenThere: yew-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Yew framework devel list at Proxmox <yew-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/yew-devel>,
<mailto:yew-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/yew-devel/>
List-Post: <mailto:yew-devel@lists.proxmox.com>
List-Help: <mailto:yew-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/yew-devel>,
<mailto:yew-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Yew framework devel list at Proxmox <yew-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: yew-devel-bounces@lists.proxmox.com
Sender: "yew-devel" <yew-devel-bounces@lists.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