From f258f50b76aff9561021d0ab19820ef2f84435f2 Mon Sep 17 00:00:00 2001 From: Alex Chi Z Date: Fri, 7 Jul 2023 12:03:10 -0400 Subject: [PATCH] pagectl: separate xy margin for draw timeline Signed-off-by: Alex Chi Z --- pageserver/ctl/src/draw_timeline_dir.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pageserver/ctl/src/draw_timeline_dir.rs b/pageserver/ctl/src/draw_timeline_dir.rs index bfde5ba054..43e0c4422c 100644 --- a/pageserver/ctl/src/draw_timeline_dir.rs +++ b/pageserver/ctl/src/draw_timeline_dir.rs @@ -117,7 +117,8 @@ pub fn main() -> Result<()> { let mut lsn_diff = (lsn_end - lsn_start) as f32; let mut fill = Fill::None; - let mut margin = 0.05 * lsn_diff; // Height-dependent margin to disambiguate overlapping deltas + let mut ymargin = 0.05 * lsn_diff; // Height-dependent margin to disambiguate overlapping deltas + let xmargin = 0.05; // Height-dependent margin to disambiguate overlapping deltas let mut lsn_offset = 0.0; // Fill in and thicken rectangle if it's an @@ -128,7 +129,7 @@ pub fn main() -> Result<()> { num_images += 1; lsn_diff = 0.3; lsn_offset = -lsn_diff / 2.0; - margin = 0.05; + ymargin = 0.05; fill = Fill::Color(rgb(0, 0, 0)); } Ordering::Greater => panic!("Invalid lsn range {}-{}", lsn_start, lsn_end), @@ -137,10 +138,10 @@ pub fn main() -> Result<()> { println!( " {}", rectangle( - key_start as f32 + stretch * margin, - stretch * (lsn_max as f32 - (lsn_end as f32 - margin - lsn_offset)), - key_diff as f32 - stretch * 2.0 * margin, - stretch * (lsn_diff - 2.0 * margin) + key_start as f32 + stretch * xmargin, + stretch * (lsn_max as f32 - (lsn_end as f32 - ymargin - lsn_offset)), + key_diff as f32 - stretch * 2.0 * xmargin, + stretch * (lsn_diff - 2.0 * ymargin) ) .fill(fill) .stroke(Stroke::Color(rgb(0, 0, 0), 0.1))