refactor: generalize CpuGraph -> Graph
This commit is contained in:
parent
93de64f4b9
commit
96a972f9f0
2 changed files with 14 additions and 14 deletions
|
|
@ -7,33 +7,33 @@ use crate::app;
|
||||||
const CYAN: Color = Color::from_rgb8(0, 255, 255);
|
const CYAN: Color = Color::from_rgb8(0, 255, 255);
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct CpuGraph {
|
pub struct Graph {
|
||||||
timeline: VecDeque<f32>,
|
timeline: VecDeque<f32>,
|
||||||
|
|
||||||
pub cache: canvas::Cache,
|
pub cache: canvas::Cache,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl CpuGraph {
|
impl Graph {
|
||||||
pub fn new(usage: f32) -> Self {
|
pub fn new(value: f32) -> Self {
|
||||||
Self {
|
Self {
|
||||||
timeline: {
|
timeline: {
|
||||||
let mut vec = VecDeque::new();
|
let mut vec = VecDeque::new();
|
||||||
vec.push_front(usage);
|
vec.push_front(value);
|
||||||
vec
|
vec
|
||||||
},
|
},
|
||||||
..Default::default()
|
..Default::default()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update(&mut self, usage: f32) {
|
pub fn update(&mut self, value: f32) {
|
||||||
self.timeline.push_back(usage);
|
self.timeline.push_back(value);
|
||||||
if self.timeline.len() > 1000 {
|
if self.timeline.len() > 1000 {
|
||||||
self.timeline.pop_front();
|
self.timeline.pop_front();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl canvas::Program<app::Message, Theme, Renderer> for CpuGraph {
|
impl canvas::Program<app::Message, Theme, Renderer> for Graph {
|
||||||
type State = ();
|
type State = ();
|
||||||
fn draw(
|
fn draw(
|
||||||
&self,
|
&self,
|
||||||
|
|
@ -4,9 +4,9 @@ use iced::{
|
||||||
};
|
};
|
||||||
use smol::Timer;
|
use smol::Timer;
|
||||||
|
|
||||||
use crate::{app::cpu_graph::CpuGraph, sysinfo_snapshot::SysinfoSnapshot};
|
use crate::{app::graph::Graph, sysinfo_snapshot::SysinfoSnapshot};
|
||||||
|
|
||||||
mod cpu_graph;
|
mod graph;
|
||||||
|
|
||||||
enum Message {
|
enum Message {
|
||||||
Info(SysinfoSnapshot),
|
Info(SysinfoSnapshot),
|
||||||
|
|
@ -14,8 +14,8 @@ enum Message {
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
struct State {
|
struct State {
|
||||||
total_cpu_graph: CpuGraph,
|
total_cpu_graph: Graph,
|
||||||
cpu_graphs: Vec<CpuGraph>,
|
cpu_graphs: Vec<Graph>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl State {
|
impl State {
|
||||||
|
|
@ -51,12 +51,12 @@ impl State {
|
||||||
self.cpu_graphs = snapshot
|
self.cpu_graphs = snapshot
|
||||||
.cpus
|
.cpus
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|usage| CpuGraph::new(usage))
|
.map(|value| Graph::new(value))
|
||||||
.collect();
|
.collect();
|
||||||
} else {
|
} else {
|
||||||
for (graph, usage) in self.cpu_graphs.iter_mut().zip(snapshot.cpus.into_iter())
|
for (graph, value) in self.cpu_graphs.iter_mut().zip(snapshot.cpus.into_iter())
|
||||||
{
|
{
|
||||||
graph.update(usage);
|
graph.update(value);
|
||||||
graph.cache.clear();
|
graph.cache.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue