refactor: revert linear interpolation until tui fix comes

1 files changed, 48 insertions, 7 deletions

diff --git a/src/data_conversion.rs b/src/data_conversion.rs
index 70626251..c2492c9d 100644
--- a/src/data_conversion.rs
+++ b/src/data_conversion.rs
@@ -161,8 +161,17 @@ 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));
+                // 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
             }
         }
 
@@ -191,7 +200,15 @@ 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));
+        // 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
 
         if *time == current_time {
             break;
@@ -217,7 +234,16 @@ 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));
+        // 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
 
         if *time == current_time {
             break;
@@ -281,8 +307,23 @@ 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));
+        // 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
 
         if *time == current_time {
             break;
@@ -463,7 +504,7 @@ pub fn convert_battery_harvest(
             } else {
                 None
             },
-            health: format!("{:.2}%", battery_harvest.health_percent)
+            health: format!("{:.2}%", battery_harvest.health_percent),
         })
         .collect()
 }