diff options
| author | ClementTsang <clementjhtsang@gmail.com> | 2020-01-21 22:59:42 -0500 |
|---|---|---|
| committer | ClementTsang <clementjhtsang@gmail.com> | 2020-01-21 22:59:42 -0500 |
| commit | 0fdab76cf5df3c874e27ab7d89cb6f16865023c1 (patch) | |
| tree | 2de93dc0eb22a18673ae4311a741b00c31bbfa31 /src | |
| parent | 840b0cccc8549efd7ffb6ddde8bb5d2319fe6665 (diff) | |
Tweaked network graph generation a bit to match master
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/data_collection.rs | 11 | ||||
| -rw-r--r-- | src/canvas.rs | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/app/data_collection.rs b/src/app/data_collection.rs index 5042c6d6..8d3c4dbe 100644 --- a/src/app/data_collection.rs +++ b/src/app/data_collection.rs @@ -119,11 +119,14 @@ impl DataState { let mut new_joining_points = Vec::new(); - for idx in 0..100 { + let num_points = 50; + for idx in (0..num_points).rev() { new_joining_points.push(network::NetworkJoinPoint { - rx: prev_data.0.rx as f64 + rx_diff / 100.0 * idx as f64, - tx: prev_data.0.tx as f64 + tx_diff / 100.0 * idx as f64, - time_offset_milliseconds: time_gap / 100.0 * (100 - idx) as f64, + rx: prev_data.0.rx as f64 + + rx_diff / num_points as f64 * (num_points - idx) as f64, + tx: prev_data.0.tx as f64 + + tx_diff / num_points as f64 * (num_points - idx) as f64, + time_offset_milliseconds: time_gap / num_points as f64 * idx as f64, }); } Some(new_joining_points) diff --git a/src/canvas.rs b/src/canvas.rs index 4d087b9e..3734573e 100644 --- a/src/canvas.rs +++ b/src/canvas.rs @@ -131,11 +131,11 @@ fn gen_n_colours(num_to_gen: i32) -> Vec<Color> { // Generate colours let mut colour_vec: Vec<Color> = vec![ - Color::LightCyan, - Color::LightYellow, Color::Red, - Color::Green, + Color::LightYellow, Color::LightMagenta, + Color::LightCyan, + Color::Green, ]; let mut h: f32 = 0.4; // We don't need random colours... right? |