feature: Rework network y-axis, linear interpolation for off-screen data

.github/workflows/ci.yml

@@ -52,6 +52,8 @@ jobs:
           override: true
           components: clippy
 
+      # TODO: Can probably put cache here in the future; I'm worried if this will cause issues with clippy though since cargo check breaks it; maybe wait until 1.52, when fix lands.
+
       - run: cargo clippy --all-targets --workspace -- -D warnings
 
   # Compile/check test.

.vscode/settings.json

@@ -26,7 +26,10 @@
     "Mahmoud",
     "Marcin",
     "Mousebindings",
+    "NAS's",
     "Nonexhaustive",
+    "PEBI",
+    "PETA",
     "PKGBUILD",
     "PKGBUILDs",
     "Polishchuk",
@@ -90,6 +93,7 @@
     "libc",
     "markdownlint",
     "memb",
+    "minmax",
     "minwindef",
     "musl",
     "musleabihf",
@@ -102,14 +106,17 @@
     "nvme",
     "paren",
     "pcpu",
+    "piasecki",
     "pids",
     "pmem",
     "powerpc",
     "powerpc le",
     "ppid",
     "prepush",
     "processthreadsapi",
+    "pvanheus",
     "regexes",
+    "rposition",
     "rsplitn",
     "runlevel",
     "rustc",

CHANGELOG.md

@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [#381](https://github.com/ClementTsang/bottom/pull/381): Added a filter in the config file for network interfaces.
 
+- [#392](https://github.com/ClementTsang/bottom/pull/392): Added CPU load averages (1, 5, 15) for Unix-based systems.
+
 - [#406](https://github.com/ClementTsang/bottom/pull/406): Added the Nord colour scheme, as well as a light variant.
 
 - [#409](https://github.com/ClementTsang/bottom/pull/409): Added `Ctrl-w` and `Ctrl-h` shortcuts in search, to delete a word and delete a character respectively.
@@ -25,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [#425](https://github.com/ClementTsang/bottom/pull/425): Added user into the process widget for Unix-based systems.
 
+- [#437](https://github.com/ClementTsang/bottom/pull/437): Redo dynamic network y-axis, add linear scaling, unit type, and prefix options.
+
 ## Changes
 
 - [#372](https://github.com/ClementTsang/bottom/pull/372): Hides the SWAP graph and legend in normal mode if SWAP is 0.
@@ -37,6 +41,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [#420](https://github.com/ClementTsang/bottom/pull/420): Updated tui-rs, allowing for prettier looking tables!
 
+- [#437](https://github.com/ClementTsang/bottom/pull/437): Add linear interpolation step in drawing step to pr event missing entries on the right side of charts.
+
 ## Bug Fixes
 
 - [#416](https://github.com/ClementTsang/bottom/pull/416): Fixes grouped vs ungrouped modes in the processes widget having inconsistent spacing.

Cargo.toml

@@ -48,8 +48,10 @@ futures = "0.3.12"
 indexmap = "~1.6"
 itertools = "0.10.0"
 once_cell = "1.5.2"
+# ordered-float = "2.1.1"
 regex = "1.4.3"
 serde = { version = "1.0.123", features = ["derive"] }
+# Sysinfo is still used in Linux for the ProcessStatus
 sysinfo = "0.16.4"
 thiserror = "1.0.24"
 toml = "0.5.8"

README.md

@@ -128,7 +128,7 @@ Or, you can just download the binary from the [latest release](https://github.co
 
 ### Nightly
 
-You can install pre-release nightly versions [here](https://github.com/ClementTsang/bottom/releases/tag/nightly).  Builds are generated every day at 00:00 UTC, based on the most recent commit on the master branch.
+You can install pre-release nightly versions [here](https://github.com/ClementTsang/bottom/releases/tag/nightly). Builds are generated every day at 00:00 UTC, based on the most recent commit on the master branch.
 
 ### Cargo
 
@@ -252,38 +252,41 @@ Run using `btm`.
 Use `btm --help` for more information.
 
 ```
-    --advanced_kill                        Shows more options when killing a process on Unix-like systems.
-    --autohide_time                        Temporarily shows the time scale in graphs.
--b, --basic                                Hides graphs and uses a more basic look.
-    --battery                              Shows the battery widget.
--S, --case_sensitive                       Enables case sensitivity by default.
--c, --celsius                              Sets the temperature type to Celsius.
-    --color <COLOR SCHEME>                 Use a color scheme, use --help for supported values.
--C, --config <CONFIG PATH>                 Sets the location of the config file.
--u, --current_usage                        Sets process CPU% to be based on current CPU%.
--t, --default_time_value <MS>              Default time value for graphs in ms.
-    --default_widget_count <INT>           Sets the n'th selected widget type as the default.
-    --default_widget_type <WIDGET TYPE>    Sets the default widget type, use --help for more info.
-    --disable_click                        Disables mouse clicks.
--m, --dot_marker                           Uses a dot marker for graphs.
--f, --fahrenheit                           Sets the temperature type to Fahrenheit.
--g, --group                                Groups processes with the same name by default.
--h, --help                                 Prints help information.  Use --help for more info.
--a, --hide_avg_cpu                         Hides the average CPU usage.
-    --hide_table_gap                       Hides the spacing between table headers and entries.
-    --hide_time                            Completely hides the time scaling.
--k, --kelvin                               Sets the temperature type to Kelvin.
--l, --left_legend                          Puts the CPU chart legend to the left side.
-    --mem_as_value                         Defaults to showing process memory usage by value.
-    --process_command                      Show processes as their commands by default.
--r, --rate <MS>                            Sets a refresh rate in ms.
--R, --regex                                Enables regex by default.
-    --show_table_scroll_position           Shows the scroll position tracker in table widgets.
--d, --time_delta <MS>                      The amount in ms changed upon zooming.
--T, --tree                                 Defaults to showing the process widget in tree mode.
-    --use_old_network_legend               DEPRECATED - uses the older network legend.
--V, --version                              Prints version information.
--W, --whole_word                           Enables whole-word matching by default.
+        --advanced_kill                        Shows more options when killing a process on Unix-like systems.
+        --autohide_time                        Temporarily shows the time scale in graphs.
+    -b, --basic                                Hides graphs and uses a more basic look.
+        --battery                              Shows the battery widget.
+    -S, --case_sensitive                       Enables case sensitivity by default.
+    -c, --celsius                              Sets the temperature type to Celsius.
+        --color <COLOR SCHEME>                 Use a color scheme, use --help for supported values.
+    -C, --config <CONFIG PATH>                 Sets the location of the config file.
+    -u, --current_usage                        Sets process CPU% to be based on current CPU%.
+    -t, --default_time_value <MS>              Default time value for graphs in ms.
+        --default_widget_count <INT>           Sets the n'th selected widget type as the default.
+        --default_widget_type <WIDGET TYPE>    Sets the default widget type, use --help for more info.
+        --disable_click                        Disables mouse clicks.
+    -m, --dot_marker                           Uses a dot marker for graphs.
+    -f, --fahrenheit                           Sets the temperature type to Fahrenheit.
+    -g, --group                                Groups processes with the same name by default.
+    -h, --help                                 Prints help information.  Use --help for more info.
+    -a, --hide_avg_cpu                         Hides the average CPU usage.
+        --hide_table_gap                       Hides the spacing between table headers and entries.
+        --hide_time                            Completely hides the time scaling.
+    -k, --kelvin                               Sets the temperature type to Kelvin.
+    -l, --left_legend                          Puts the CPU chart legend to the left side.
+        --mem_as_value                         Defaults to showing process memory usage by value.
+        --network_use_binary_prefix            Displays the network widget with binary prefixes.
+        --network_use_bytes                    Displays the network widget using bytes.
+        --network_use_log                      Displays the network widget with a log scale.
+        --process_command                      Show processes as their commands by default.
+    -r, --rate <MS>                            Sets a refresh rate in ms.
+    -R, --regex                                Enables regex by default.
+        --show_table_scroll_position           Shows the scroll position tracker in table widgets.
+    -d, --time_delta <MS>                      The amount in ms changed upon zooming.
+    -T, --tree                                 Defaults to showing the process widget in tree mode.
+        --use_old_network_legend               DEPRECATED - uses the older network legend.
+    -V, --version                              Prints version information.
+    -W, --whole_word                           Enables whole-word matching by default.
 ```
 
 ### Keybindings
@@ -464,7 +467,7 @@ As yet _another_ process/system visualization and management application, bottom
 
 - RAM and swap usage visualization
 
-- Network visualization for receiving and transmitting, on a log-graph scale
+- Network visualization for receiving and transmitting
 
 - Display information about disk capacity and I/O per second
 
@@ -599,6 +602,9 @@ These are the following supported flag config values, which correspond to the fl
 | `show_table_scroll_position` | Boolean                                                                                        | Shows the scroll position tracker in table widgets.             |
 | `process_command`            | Boolean                                                                                        | Show processes as their commands by default.                    |
 | `advanced_kill`              | Boolean                                                                                        | Shows more options when killing a process on Unix-like systems. |
+| `network_use_binary_prefix`  | Boolean                                                                                        | Displays the network widget with binary prefixes.               |
+| `network_use_bytes`          | Boolean                                                                                        | Displays the network widget using bytes.                        |
+| `network_use_log`            | Boolean                                                                                        | Displays the network widget with a log scale.                   |
 
 #### Theming
 

src/app.rs

@@ -21,6 +21,7 @@ use crate::{
     options::Config,
     options::ConfigFlags,
     options::WidgetIdEnabled,
+    units::data_units::DataUnit,
     utils::error::{BottomError, Result},
     Pid,
 };
@@ -34,6 +35,12 @@ pub mod states;
 
 const MAX_SEARCH_LENGTH: usize = 200;
 
+#[derive(Debug, Clone)]
+pub enum AxisScaling {
+    Log,
+    Linear,
+}
+
 /// AppConfigFields is meant to cover basic fields that would normally be set
 /// by config files or launch options.
 #[derive(Debug)]
@@ -55,6 +62,10 @@ pub struct AppConfigFields {
     pub no_write: bool,
     pub show_table_scroll_position: bool,
     pub is_advanced_kill: bool,
+    // TODO: Remove these, move network details state-side.
+    pub network_unit_type: DataUnit,
+    pub network_scale_type: AxisScaling,
+    pub network_use_binary_prefix: bool,
 }
 
 /// For filtering out information
@@ -708,7 +719,7 @@ impl App {
         if self.delete_dialog_state.is_showing_dd {
             if self.dd_err.is_some() {
                 self.close_dd();
-            } else if self.delete_dialog_state.selected_signal != KillSignal::CANCEL {
+            } else if self.delete_dialog_state.selected_signal != KillSignal::Cancel {
                 // If within dd...
                 if self.dd_err.is_none() {
                     // Also ensure that we didn't just fail a dd...
@@ -886,7 +897,7 @@ impl App {
             if kbd_signal > 31 {
                 kbd_signal %= 10;
             }
-            self.delete_dialog_state.selected_signal = KillSignal::KILL(kbd_signal);
+            self.delete_dialog_state.selected_signal = KillSignal::Kill(kbd_signal);
             if kbd_signal < 10 {
                 self.delete_dialog_state.keyboard_signal_select = kbd_signal;
             } else {
@@ -991,23 +1002,23 @@ impl App {
             {
                 if self.app_config_fields.is_advanced_kill {
                     match self.delete_dialog_state.selected_signal {
-                        KillSignal::KILL(prev_signal) => {
+                        KillSignal::Kill(prev_signal) => {
                             self.delete_dialog_state.selected_signal = match prev_signal - 1 {
-                                0 => KillSignal::CANCEL,
+                                0 => KillSignal::Cancel,
                                 // 32+33 are skipped
-                                33 => KillSignal::KILL(31),
-                                signal => KillSignal::KILL(signal),
+                                33 => KillSignal::Kill(31),
+                                signal => KillSignal::Kill(signal),
                             };
                         }
-                        KillSignal::CANCEL => {}
+                        KillSignal::Cancel => {}
                     };
                 } else {
                     self.delete_dialog_state.selected_signal = KillSignal::default();
                 }
             }
             #[cfg(target_os = "windows")]
             {
-                self.delete_dialog_state.selected_signal = KillSignal::KILL(1);
+                self.delete_dialog_state.selected_signal = KillSignal::Kill(1);
             }
         }
     }
@@ -1067,53 +1078,53 @@ impl App {
             {
                 if self.app_config_fields.is_advanced_kill {
                     let new_signal = match self.delete_dialog_state.selected_signal {
-                        KillSignal::CANCEL => 1,
+                        KillSignal::Cancel => 1,
                         // 32+33 are skipped
                         #[cfg(target_os = "linux")]
-                        KillSignal::KILL(31) => 34,
+                        KillSignal::Kill(31) => 34,
                         #[cfg(target_os = "macos")]
-                        KillSignal::KILL(31) => 31,
-                        KillSignal::KILL(64) => 64,
-                        KillSignal::KILL(signal) => signal + 1,
+                        KillSignal::Kill(31) => 31,
+                        KillSignal::Kill(64) => 64,
+                        KillSignal::Kill(signal) => signal + 1,
                     };
-                    self.delete_dialog_state.selected_signal = KillSignal::KILL(new_signal);
+                    self.delete_dialog_state.selected_signal = KillSignal::Kill(new_signal);
                 } else {
-                    self.delete_dialog_state.selected_signal = KillSignal::CANCEL;
+                    self.delete_dialog_state.selected_signal = KillSignal::Cancel;
                 }
             }
             #[cfg(target_os = "windows")]
             {
-                self.delete_dialog_state.selected_signal = KillSignal::CANCEL;
+                self.delete_dialog_state.selected_signal = KillSignal::Cancel;
             }
         }
     }
 
     pub fn on_page_up(&mut self) {
         if self.delete_dialog_state.is_showing_dd {
             let mut new_signal = match self.delete_dialog_state.selected_signal {
-                KillSignal::CANCEL => 0,
-                KillSignal::KILL(signal) => max(signal, 8) - 8,
+                KillSignal::Cancel => 0,
+                KillSignal::Kill(signal) => max(signal, 8) - 8,
             };
             if new_signal > 23 && new_signal < 33 {
                 new_signal -= 2;
             }
             self.delete_dialog_state.selected_signal = match new_signal {
-                0 => KillSignal::CANCEL,
-                sig => KillSignal::KILL(sig),
+                0 => KillSignal::Cancel,
+                sig => KillSignal::Kill(sig),
             };
         }
     }
 
     pub fn on_page_down(&mut self) {
         if self.delete_dialog_state.is_showing_dd {
             let mut new_signal = match self.delete_dialog_state.selected_signal {
-                KillSignal::CANCEL => 8,
-                KillSignal::KILL(signal) => min(signal + 8, MAX_SIGNAL),
+                KillSignal::Cancel => 8,
+                KillSignal::Kill(signal) => min(signal + 8, MAX_SIGNAL),
             };
             if new_signal > 31 && new_signal < 42 {
                 new_signal += 2;
             }
-            self.delete_dialog_state.selected_signal = KillSignal::KILL(new_signal);
+            self.delete_dialog_state.selected_signal = KillSignal::Kill(new_signal);
         }
     }
 
@@ -1672,8 +1683,8 @@ impl App {
             if let Some(current_selected_processes) = &self.to_delete_process_list {
                 #[cfg(target_family = "unix")]
                 let signal = match self.delete_dialog_state.selected_signal {
-                    KillSignal::KILL(sig) => sig,
-                    KillSignal::CANCEL => 15, // should never happen, so just TERM
+                    KillSignal::Kill(sig) => sig,
+                    KillSignal::Cancel => 15, // should never happen, so just TERM
                 };
                 for pid in &current_selected_processes.1 {
                     #[cfg(target_family = "unix")]
@@ -2229,7 +2240,7 @@ impl App {
         } else if self.help_dialog_state.is_showing_help {
             self.help_dialog_state.scroll_state.current_scroll_index = 0;
         } else if self.delete_dialog_state.is_showing_dd {
-            self.delete_dialog_state.selected_signal = KillSignal::CANCEL;
+            self.delete_dialog_state.selected_signal = KillSignal::Cancel;
         }
     }
 
@@ -2312,7 +2323,7 @@ impl App {
                 .max_scroll_index
                 .saturating_sub(1);
         } else if self.delete_dialog_state.is_showing_dd {
-            self.delete_dialog_state.selected_signal = KillSignal::KILL(MAX_SIGNAL);
+            self.delete_dialog_state.selected_signal = KillSignal::Kill(MAX_SIGNAL);
         }
     }
 
@@ -2871,13 +2882,13 @@ impl App {
                 },
             ) {
                 Some((_, _, _, _, 0)) => {
-                    self.delete_dialog_state.selected_signal = KillSignal::CANCEL
+                    self.delete_dialog_state.selected_signal = KillSignal::Cancel
                 }
                 Some((_, _, _, _, idx)) => {
                     if *idx > 31 {
-                        self.delete_dialog_state.selected_signal = KillSignal::KILL(*idx + 2)
+                        self.delete_dialog_state.selected_signal = KillSignal::Kill(*idx + 2)
                     } else {
-                        self.delete_dialog_state.selected_signal = KillSignal::KILL(*idx)
+                        self.delete_dialog_state.selected_signal = KillSignal::Kill(*idx)
                     }
                 }
                 _ => {}