tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-22 21:24:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant logic in cpu chart causing average to show the wrong colour

Browse Source
This commit is contained in:
ClementTsang 2020-01-28 22:42:14 -05:00
parent f32035b8d5
commit 2d25abaa16
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/canvas.rs
View File

@ -401,18 +401,8 @@ fn draw_cpu_graph<B: backend::Backend>(f: &mut Frame<B>, app_state: &app::App, d
let mut cpu_entries_vec: Vec<(Style, Vec<(f64, f64)>)> = Vec::new(); let mut cpu_entries_vec: Vec<(Style, Vec<(f64, f64)>)> = Vec::new();
for (i, cpu) in cpu_data.iter().enumerate() { for (i, cpu) in cpu_data.iter().enumerate() {
let mut avg_cpu_exist_offset = 0;
if app_state.show_average_cpu {
if i == 0 {
// Skip, we want to render the average cpu last!
continue;
} else {
avg_cpu_exist_offset = 1;
}
}
cpu_entries_vec.push(( cpu_entries_vec.push((
Style::default().fg(COLOUR_LIST[(i - avg_cpu_exist_offset) % COLOUR_LIST.len()]), Style::default().fg(COLOUR_LIST[(i) % COLOUR_LIST.len()]),
cpu.cpu_data cpu.cpu_data
.iter() .iter()
.map(<(f64, f64)>::from) .map(<(f64, f64)>::from)
@ -423,7 +413,7 @@ fn draw_cpu_graph<B: backend::Backend>(f: &mut Frame<B>, app_state: &app::App, d
if app_state.show_average_cpu { if app_state.show_average_cpu {
if let Some(avg_cpu_entry) = cpu_data.first() { if let Some(avg_cpu_entry) = cpu_data.first() {
cpu_entries_vec.push(( cpu_entries_vec.push((
Style::default().fg(COLOUR_LIST[(cpu_data.len() - 1) % COLOUR_LIST.len()]), Style::default().fg(COLOUR_LIST[0]),
avg_cpu_entry avg_cpu_entry
.cpu_data .cpu_data
.iter() .iter()