Skip to content

Fix qlog-dancer wasm chart coordinate types #2522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
snvtac wants to merge 1 commit into
base: master
Choose a base branch
from
+112 −24
Open

Fix qlog-dancer wasm chart coordinate types #2522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
136 changes: 112 additions & 24 deletions qlog-dancer/src/web.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ use crate::datastore::VantagePoint;

use plotters::chart::ChartContext;
use plotters::coord::types::RangedCoordf32;
use plotters::coord::types::RangedCoordf64;
use plotters::coord::types::RangedCoordu64;
use plotters::prelude::Cartesian2d;
use plotters_canvas::CanvasBackend;
Expand Down Expand Up @@ -168,6 +169,64 @@ impl<T, U> ChartInfo<T, U> {
}
}

pub fn with_f64_u64(
chart: &ChartContext<
CanvasBackend,
Cartesian2d<RangedCoordf64, RangedCoordu64>,
>,
) -> ChartInfo<f64, u64> {
let plotting_area = chart.plotting_area();
let pixel_range = plotting_area.get_pixel_range();

let chart_bounds = ChartBounds {
left: pixel_range.0.start,
top: pixel_range.1.start,
width: pixel_range.0.end - pixel_range.0.start,
height: pixel_range.1.end - pixel_range.1.start,
};

let plot_ranges = PlotRanges {
x_min: chart.x_range().start,
x_max: chart.x_range().end,
y_min: chart.y_range().start,
y_max: chart.y_range().end,
};

ChartInfo {
chart_bounds,
plot_ranges,
}
}

pub fn with_f64_f32(
chart: &ChartContext<
CanvasBackend,
Cartesian2d<RangedCoordf64, RangedCoordf32>,
>,
) -> ChartInfo<f64, f32> {
let plotting_area = chart.plotting_area();
let pixel_range = plotting_area.get_pixel_range();

let chart_bounds = ChartBounds {
left: pixel_range.0.start,
top: pixel_range.1.start,
width: pixel_range.0.end - pixel_range.0.start,
height: pixel_range.1.end - pixel_range.1.start,
};

let plot_ranges = PlotRanges {
x_min: chart.x_range().start,
x_max: chart.x_range().end,
y_min: chart.y_range().start,
y_max: chart.y_range().end,
};

ChartInfo {
chart_bounds,
plot_ranges,
}
}

pub fn with_u64_f32(
chart: &ChartContext<
CanvasBackend,
Expand Down Expand Up @@ -196,6 +255,35 @@ impl<T, U> ChartInfo<T, U> {
plot_ranges,
}
}

pub fn with_u64_f64(
chart: &ChartContext<
CanvasBackend,
Cartesian2d<RangedCoordu64, RangedCoordf64>,
>,
) -> ChartInfo<u64, f64> {
let plotting_area = chart.plotting_area();
let pixel_range = plotting_area.get_pixel_range();

let chart_bounds = ChartBounds {
left: pixel_range.0.start,
top: pixel_range.1.start,
width: pixel_range.0.end - pixel_range.0.start,
height: pixel_range.1.end - pixel_range.1.start,
};

let plot_ranges = PlotRanges {
x_min: chart.x_range().start,
x_max: chart.x_range().end,
y_min: chart.y_range().start,
y_max: chart.y_range().end,
};

ChartInfo {
chart_bounds,
plot_ranges,
}
}
}

impl<T, U> Into<JsValue> for ChartInfo<T, U>
Expand Down Expand Up @@ -249,15 +337,15 @@ pub struct QlogDancerWeb {
log_info: Option<Vec<u8>>,
qlog_events: Vec<qlog::reader::Event>,

mp_chart_info: Option<ChartInfo<f32, u64>>,
cc_chart_info: Option<ChartInfo<f32, u64>>,
rtt_chart_info: Option<ChartInfo<f32, f32>>,
fc_chart_info: Option<ChartInfo<f32, u64>>,
mp_chart_info: Option<ChartInfo<f64, u64>>,
cc_chart_info: Option<ChartInfo<f64, u64>>,
rtt_chart_info: Option<ChartInfo<f64, f32>>,
fc_chart_info: Option<ChartInfo<f64, u64>>,
pkt_rx_chart_info: Option<ChartInfo<f32, u64>>,
pkt_tx_chart_info: Option<ChartInfo<f32, u64>>,
pkt_tx_counts_chart_info: Option<ChartInfo<f32, u64>>,
pkt_tx_delta_chart_info: Option<ChartInfo<u64, f32>>,
pkt_tx_pacing_chart_info: Option<ChartInfo<f32, u64>>,
pkt_tx_chart_info: Option<ChartInfo<f64, u64>>,
pkt_tx_counts_chart_info: Option<ChartInfo<f64, u64>>,
pkt_tx_delta_chart_info: Option<ChartInfo<u64, f64>>,
pkt_tx_pacing_chart_info: Option<ChartInfo<f64, u64>>,
}

#[wasm_bindgen]
Expand Down Expand Up @@ -404,7 +492,7 @@ impl QlogDancerWeb {
/// canvas_id.
pub fn draw_connection_overview(
&mut self, mp_canvas_id: &str, display_legend: bool,
x_start: Option<f32>, x_end: Option<f32>,
x_start: Option<f64>, x_end: Option<f64>,
) {
if let Some(ss) = &self.ss {
let params = PlotParameters {
Expand All @@ -430,7 +518,7 @@ impl QlogDancerWeb {
plot_main_plot(&params, &self.display_name, ss, &mp_canvas_id);

self.mp_chart_info =
Some(ChartInfo::<f32, u64>::with_f32_u64(&chart));
Some(ChartInfo::<f64, u64>::with_f64_u64(&chart));
}
}

Expand All @@ -439,7 +527,7 @@ impl QlogDancerWeb {
/// Draws the congestion plot into the provided canvas_id.
pub fn draw_cc_plot(
&mut self, cc_canvas_id: &str, display_legend: bool,
x_start: Option<f32>, x_end: Option<f32>,
x_start: Option<f64>, x_end: Option<f64>,
) {
if let Some(ss) = &self.ss {
let params = PlotParameters {
Expand All @@ -464,7 +552,7 @@ impl QlogDancerWeb {
let chart = plot_cc_plot(&params, ss, &self.ds, &cc_canvas_id);

self.cc_chart_info =
Some(ChartInfo::<f32, u64>::with_f32_u64(&chart));
Some(ChartInfo::<f64, u64>::with_f64_u64(&chart));
}
}

Expand All @@ -473,7 +561,7 @@ impl QlogDancerWeb {
/// Draws the rtt plot into the provided canvas_id.
pub fn draw_rtt_plot(
&mut self, rtt_canvas_id: &str, display_legend: bool,
x_start: Option<f32>, x_end: Option<f32>,
x_start: Option<f64>, x_end: Option<f64>,
) {
if let Some(ss) = &self.ss {
let params = PlotParameters {
Expand All @@ -497,7 +585,7 @@ impl QlogDancerWeb {

let chart = plot_rtt_plot(&params, ss, &rtt_canvas_id);
self.rtt_chart_info =
Some(ChartInfo::<f32, f32>::with_f32_f32(&chart));
Some(ChartInfo::<f64, f32>::with_f64_f32(&chart));
}
}

Expand Down Expand Up @@ -536,7 +624,7 @@ impl QlogDancerWeb {
&chart_type,
);
self.fc_chart_info =
Some(ChartInfo::<f32, f32>::with_f32_u64(&chart));
Some(ChartInfo::<f64, u64>::with_f64_u64(&chart));
}
}

Expand Down Expand Up @@ -658,7 +746,7 @@ impl QlogDancerWeb {
/// Draws the packet sent plot into the provided canvas_id.
pub fn draw_packet_sent_plot(
&mut self, pkt_tx_canvas_id: &str, display_legend: bool,
x_start: Option<f32>, x_end: Option<f32>,
x_start: Option<f64>, x_end: Option<f64>,
) {
if let Some(ss) = &self.ss {
let params = PlotParameters {
Expand Down Expand Up @@ -688,15 +776,15 @@ impl QlogDancerWeb {
);

self.pkt_tx_chart_info =
Some(ChartInfo::<f32, u64>::with_f32_u64(&chart));
Some(ChartInfo::<f64, u64>::with_f64_u64(&chart));
}
}

#[wasm_bindgen]
/// Draws the packet sent plot into the provided canvas_id.
pub fn draw_packet_sent_lost_delivered_count_plot(
&mut self, canvas_id: &str, display_legend: bool, x_start: Option<f32>,
x_end: Option<f32>,
&mut self, canvas_id: &str, display_legend: bool, x_start: Option<f64>,
x_end: Option<f64>,
) {
if let Some(ss) = &self.ss {
let params = PlotParameters {
Expand All @@ -723,15 +811,15 @@ impl QlogDancerWeb {
);

self.pkt_tx_counts_chart_info =
Some(ChartInfo::<f32, u64>::with_f32_u64(&chart));
Some(ChartInfo::<f64, u64>::with_f64_u64(&chart));
}
}

#[wasm_bindgen]
/// Draws the packet sent plot into the provided canvas_id.
pub fn draw_packet_sent_delta_plot(
&mut self, pkt_tx_delta_canvas_id: &str, display_legend: bool,
x_start: Option<f32>, x_end: Option<f32>,
x_start: Option<f64>, x_end: Option<f64>,
) {
if let Some(ss) = &self.ss {
let params = PlotParameters {
Expand Down Expand Up @@ -760,15 +848,15 @@ impl QlogDancerWeb {
);

self.pkt_tx_delta_chart_info =
Some(ChartInfo::<f32, u64>::with_u64_f32(&chart));
Some(ChartInfo::<u64, f64>::with_u64_f64(&chart));
}
}

#[wasm_bindgen]
/// Draws the packet sent plot into the provided canvas_id.
pub fn draw_packet_sent_pacing_plot(
&mut self, pkt_tx_pacing_canvas_id: &str, display_legend: bool,
x_start: Option<f32>, x_end: Option<f32>,
x_start: Option<f64>, x_end: Option<f64>,
) {
if let Some(ss) = &self.ss {
let params = PlotParameters {
Expand Down Expand Up @@ -798,7 +886,7 @@ impl QlogDancerWeb {
);

self.pkt_tx_pacing_chart_info =
Some(ChartInfo::<f32, u64>::with_f32_u64(&chart));
Some(ChartInfo::<f64, u64>::with_f64_u64(&chart));
}
}

Expand Down