summaryrefslogtreecommitdiffstats
path: root/src/data_conversion.rs
diff options
context:
space:
mode:
authorClementTsang <cjhtsang@uwaterloo.ca>2020-05-10 17:01:45 -0400
committerClementTsang <cjhtsang@uwaterloo.ca>2020-05-10 17:01:45 -0400
commit56d6771d1bbfb5929c11b55a2704738610c711ac (patch)
treeac69de03890c42d7b78d2d01ae36dbe9d0e66d65 /src/data_conversion.rs
parent90272777f7451c7e16e7d71f44f7c00133626177 (diff)
refactor: re-enable tui-rs linear interpolation
Diffstat (limited to 'src/data_conversion.rs')
-rw-r--r--src/data_conversion.rs57
1 files changed, 6 insertions, 51 deletions
diff --git a/src/data_conversion.rs b/src/data_conversion.rs
index 78fb0e07..31b3ab0e 100644
--- a/src/data_conversion.rs
+++ b/src/data_conversion.rs
@@ -161,17 +161,8 @@ pub fn convert_cpu_data_points(
}
if let Some(cpu_data) = cpu_data_vector.get_mut(itx) {
- // cpu_data.legend_value = format!("{:.0}%", cpu.round());
- // cpu_data.cpu_data.push((-time_from_start, *cpu));
-
- // Delete
- cpu_data.legend_value = format!("{:.0}%", cpu.0.round());
- for &(joiner_offset, joiner_val) in &cpu.1 {
- let offset_time = time_from_start + joiner_offset as f64;
- cpu_data.cpu_data.push((-offset_time, joiner_val));
- }
- cpu_data.cpu_data.push((-time_from_start, cpu.0));
- // to here
+ cpu_data.legend_value = format!("{:.0}%", cpu.round());
+ cpu_data.cpu_data.push((-time_from_start, *cpu));
}
}
@@ -199,17 +190,7 @@ pub fn convert_mem_data_points(
for (time, data) in &current_data.timed_data_vec {
let time_from_start: f64 = (current_time.duration_since(*time).as_millis() as f64).floor();
-
- // result.push((-time_from_start, data.mem_data));
-
- // Delete
- for &(joiner_offset, joiner_val) in &data.mem_data.1 {
- let offset_time = time_from_start + joiner_offset as f64;
- result.push((-offset_time, joiner_val));
- }
- result.push((-time_from_start, data.mem_data.0));
- // to here
-
+ result.push((-time_from_start, data.mem_data));
if *time == current_time {
break;
}
@@ -234,17 +215,7 @@ pub fn convert_swap_data_points(
for (time, data) in &current_data.timed_data_vec {
let time_from_start: f64 = (current_time.duration_since(*time).as_millis() as f64).floor();
- // result.push((-time_from_start, data.swap_data));
-
- // Delete
- for &(joiner_offset, joiner_val) in &data.swap_data.1 {
- let offset_time = time_from_start + joiner_offset as f64;
- result.push((-offset_time, joiner_val));
- }
-
- result.push((-time_from_start, data.swap_data.0));
- // to here
-
+ result.push((-time_from_start, data.swap_data));
if *time == current_time {
break;
}
@@ -307,24 +278,8 @@ pub fn get_rx_tx_data_points(
for (time, data) in &current_data.timed_data_vec {
let time_from_start: f64 = (current_time.duration_since(*time).as_millis() as f64).floor();
- // rx.push((-time_from_start, data.rx_data));
- // tx.push((-time_from_start, data.tx_data));
-
- // Delete
- for &(joiner_offset, joiner_val) in &data.rx_data.1 {
- let offset_time = time_from_start + joiner_offset as f64;
- rx.push((-offset_time, joiner_val));
- }
-
- for &(joiner_offset, joiner_val) in &data.tx_data.1 {
- let offset_time = time_from_start + joiner_offset as f64;
- tx.push((-offset_time, joiner_val));
- }
-
- rx.push((-time_from_start, data.rx_data.0));
- tx.push((-time_from_start, data.tx_data.0));
- // to here
-
+ rx.push((-time_from_start, data.rx_data));
+ tx.push((-time_from_start, data.tx_data));
if *time == current_time {
break;
}