Totally rewrite dashboard as a GTK application #54
|
@ -68,16 +68,6 @@ impl PieChart {
|
|||
end_angle,
|
||||
color,
|
||||
}| {
|
||||
println!(
|
||||
"wedge: {:.02?} {:.02?} {:.02?}",
|
||||
start_angle, end_angle, color
|
||||
);
|
||||
println!(
|
||||
"wedge: {:.02?} {:.02?} [{:.02?}]",
|
||||
start_angle + self.rotation,
|
||||
end_angle + self.rotation,
|
||||
self.rotation
|
||||
);
|
||||
context.move_to(self.center_x, self.center_y);
|
||||
context.set_source_rgb(color.r, color.g, color.b);
|
||||
context.arc(
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use chrono::{Datelike, Local, Utc};
|
||||
use geo_types::{Latitude, Longitude};
|
||||
use glib::Sender;
|
||||
use gtk::{prelude::*, subclass::prelude::*, Orientation};
|
||||
use gtk::prelude::*;
|
||||
use ifc::IFC;
|
||||
use std::{
|
||||
env,
|
||||
|
@ -12,12 +12,11 @@ mod app_window;
|
|||
use app_window::ApplicationWindow;
|
||||
|
||||
mod components;
|
||||
use components::{Date, TransitClock};
|
||||
|
||||
mod drawing;
|
||||
|
||||
mod soluna_client;
|
||||
use soluna_client::{SolunaClient, SunMoon};
|
||||
use soluna_client::SolunaClient;
|
||||
|
||||
mod solstices;
|
||||
use solstices::EVENTS;
|
||||
|
|
|
@ -133,9 +133,11 @@ fn parse_events() -> Vec<Option<YearlyEvents>> {
|
|||
pub struct Solstices(HashMap<i32, YearlyEvents>);
|
||||
|
||||
impl Solstices {
|
||||
/*
|
||||
pub fn acquire(&self, year: i32) -> Option<YearlyEvents> {
|
||||
self.0.get(&year).map(|c| c.clone())
|
||||
}
|
||||
*/
|
||||
|
||||
pub fn next_event(&self, date: chrono::DateTime<chrono::Utc>) -> Option<Event> {
|
||||
let year_events = self.0.get(&date.year());
|
||||
|
@ -152,7 +154,7 @@ impl Solstices {
|
|||
} else {
|
||||
self.0
|
||||
.get(&(date.year() + 1))
|
||||
.map(|events| Event::SpringEquinox(year_events.spring_equinox.clone()))
|
||||
.map(|_| Event::SpringEquinox(year_events.spring_equinox.clone()))
|
||||
}
|
||||
}
|
||||
None => None,
|
||||
|
|
Loading…
Reference in New Issue