Fix cpu legend colouring (#83)

* Initial fix, but pending a rewrite.

* Initial fix, but pending a rewrite.

* Merged two separate iterations into one for cpu legend.

* Refactor average cpu, fix bug with legend and cursor.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/data_conversion.rs b/src/data_conversion.rs
index c99bf75f..15160a8d 100644
--- a/src/data_conversion.rs
+++ b/src/data_conversion.rs
@@ -38,6 +38,7 @@ pub struct ConvertedCpuData {
     pub cpu_name: String,
     /// Tuple is time, value
     pub cpu_data: Vec<Point>,
+    pub legend_value: String,
 }
 
 pub fn convert_temp_row(app: &App) -> Vec<Vec<String>> {
@@ -102,8 +103,7 @@ pub fn convert_disk_row(current_data: &data_farmer::DataCollection) -> Vec<Vec<S
 }
 
 pub fn convert_cpu_data_points(
-    show_avg_cpu: bool, current_data: &data_farmer::DataCollection, display_time: u64,
-    is_frozen: bool,
+    current_data: &data_farmer::DataCollection, display_time: u64, is_frozen: bool,
 ) -> Vec<ConvertedCpuData> {
     let mut cpu_data_vector: Vec<ConvertedCpuData> = Vec::new();
     let current_time = if is_frozen {
@@ -115,25 +115,22 @@ pub fn convert_cpu_data_points(
     } else {
         current_data.current_instant
     };
-    let cpu_listing_offset = if show_avg_cpu { 0 } else { 1 };
 
     for (time, data) in &current_data.timed_data_vec {
         let time_from_start: f64 =
             (display_time as f64 - current_time.duration_since(*time).as_millis() as f64).floor();
 
         for (itx, cpu) in data.cpu_data.iter().enumerate() {
-            if !show_avg_cpu && itx == 0 {
-                continue;
-            }
-
             // Check if the vector exists yet
-            let itx_offset = itx - cpu_listing_offset;
+            let itx_offset = itx;
             if cpu_data_vector.len() <= itx_offset {
                 cpu_data_vector.push(ConvertedCpuData::default());
                 cpu_data_vector[itx_offset].cpu_name =
                     current_data.cpu_harvest[itx].cpu_name.clone();
             }
 
+            cpu_data_vector[itx_offset].legend_value = format!("{:.0}%", cpu.0.round());
+
             //Insert joiner points
             for &(joiner_offset, joiner_val) in &cpu.1 {
                 let offset_time = time_from_start - joiner_offset as f64;