diff options
| author | ClementTsang <cjhtsang@uwaterloo.ca> | 2020-05-13 00:14:54 -0400 |
|---|---|---|
| committer | ClementTsang <cjhtsang@uwaterloo.ca> | 2020-05-13 00:15:41 -0400 |
| commit | 549d61b836f738c5cafeb3f5d25338c85b882bb9 (patch) | |
| tree | 1c71e5d600cf80b8a4a128e93c703806b2151ab3 /src/canvas | |
| parent | 4831ec3d5c1d642718d84131c8248dd3c428d4de (diff) | |
bug: add extra check for process cpu value to be >= 0
Diffstat (limited to 'src/canvas')
| -rw-r--r-- | src/canvas/widgets/cpu_graph.rs | 2 | ||||
| -rw-r--r-- | src/canvas/widgets/network_graph.rs | 108 |
2 files changed, 57 insertions, 53 deletions
diff --git a/src/canvas/widgets/cpu_graph.rs b/src/canvas/widgets/cpu_graph.rs index 232e8a72..043f7025 100644 --- a/src/canvas/widgets/cpu_graph.rs +++ b/src/canvas/widgets/cpu_graph.rs @@ -148,7 +148,7 @@ impl CpuGraphWidget for Painter { .enumerate() .rev() .filter_map(|(itx, (cpu, cpu_show_vec))| { - if *cpu_show_vec { + if *cpu_show_vec { Some( Dataset::default() .marker(if use_dot { diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs index 316bd8e6..07146eaa 100644 --- a/src/canvas/widgets/network_graph.rs +++ b/src/canvas/widgets/network_graph.rs @@ -132,37 +132,39 @@ impl NetworkGraphWidget for Painter { let dataset = if app_state.app_config_fields.use_old_network_legend && !hide_legend { let mut ret_val = vec![]; - ret_val.push( - Dataset::default() - .name(format!("RX: {:7}", app_state.canvas_data.rx_display)) - .marker(if app_state.app_config_fields.use_dot { - Marker::Dot - } else { - Marker::Braille - }) - .style(self.colours.rx_style) - .data(&network_data_rx).graph_type(tui::widgets::GraphType::Line), - ); + ret_val.push( + Dataset::default() + .name(format!("RX: {:7}", app_state.canvas_data.rx_display)) + .marker(if app_state.app_config_fields.use_dot { + Marker::Dot + } else { + Marker::Braille + }) + .style(self.colours.rx_style) + .data(&network_data_rx) + .graph_type(tui::widgets::GraphType::Line), + ); - ret_val.push( - Dataset::default() - .name(format!("TX: {:7}", app_state.canvas_data.tx_display)) - .marker(if app_state.app_config_fields.use_dot { - Marker::Dot - } else { - Marker::Braille - }) - .style(self.colours.tx_style) - .data(&network_data_tx).graph_type(tui::widgets::GraphType::Line), - ); - ret_val.push( - Dataset::default() - .name(format!( - "Total RX: {:7}", - app_state.canvas_data.total_rx_display - )) - .style(self.colours.total_rx_style), - ); + ret_val.push( + Dataset::default() + .name(format!("TX: {:7}", app_state.canvas_data.tx_display)) + .marker(if app_state.app_config_fields.use_dot { + Marker::Dot + } else { + Marker::Braille + }) + .style(self.colours.tx_style) + .data(&network_data_tx) + .graph_type(tui::widgets::GraphType::Line), + ); + ret_val.push( + Dataset::default() + .name(format!( + "Total RX: {:7}", + app_state.canvas_data.total_rx_display + )) + .style(self.colours.total_rx_style), + ); ret_val.push( Dataset::default() @@ -177,29 +179,31 @@ impl NetworkGraphWidget for Painter { } else { let mut ret_val = vec![]; - ret_val.push( - Dataset::default() - .name(&app_state.canvas_data.rx_display) - .marker(if app_state.app_config_fields.use_dot { - Marker::Dot - } else { - Marker::Braille - }) - .style(self.colours.rx_style) - .data(&network_data_rx).graph_type(tui::widgets::GraphType::Line), - ); + ret_val.push( + Dataset::default() + .name(&app_state.canvas_data.rx_display) + .marker(if app_state.app_config_fields.use_dot { + Marker::Dot + } else { + Marker::Braille + }) + .style(self.colours.rx_style) + .data(&network_data_rx) + .graph_type(tui::widgets::GraphType::Line), + ); - ret_val.push( - Dataset::default() - .name(&app_state.canvas_data.tx_display) - .marker(if app_state.app_config_fields.use_dot { - Marker::Dot - } else { - Marker::Braille - }) - .style(self.colours.tx_style) - .data(&network_data_tx).graph_type(tui::widgets::GraphType::Line), - ); + ret_val.push( + Dataset::default() + .name(&app_state.canvas_data.tx_display) + .marker(if app_state.app_config_fields.use_dot { + Marker::Dot + } else { + Marker::Braille + }) + .style(self.colours.tx_style) + .data(&network_data_tx) + .graph_type(tui::widgets::GraphType::Line), + ); ret_val }; |