gergely/wl-seasonal-hours-clock
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

[Refactor] Convert utc_hour_font_size to a constant

Browse Source
This commit is contained in:
Gergely Polonkai 2022-05-23 13:48:45 +02:00
parent 2fd9d4e8de
commit f567362c29
No known key found for this signature in database
GPG Key ID: 2D2885533B869ED4
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@ -20,7 +20,7 @@ mod svg_clock;
use svg_clock::{ use svg_clock::{
cache_hour_name_paths, svg_to_usvg, HOUR_NAMES, HOUR_NAME_FONT_SIZE, IMAGE_WIDTH, OUTER_R, cache_hour_name_paths, svg_to_usvg, HOUR_NAMES, HOUR_NAME_FONT_SIZE, IMAGE_WIDTH, OUTER_R,
RING_WIDTH, RING_WIDTH, UTC_HOUR_FONT_SIZE,
}; };
sctk::default_environment!(SeasonalClock, desktop); sctk::default_environment!(SeasonalClock, desktop);
@ -72,7 +72,6 @@ fn hour_marker(
hour: i32, hour: i32,
hour_name_path_data: &PathData, hour_name_path_data: &PathData,
is_current_hour: bool, is_current_hour: bool,
utc_hour_font_size: f32,
) -> Group { ) -> Group {
let season = match hour { let season = match hour {
0..=5 => Season::Winter, 0..=5 => Season::Winter,
@ -94,7 +93,7 @@ fn hour_marker(
let x1 = IMAGE_WIDTH as f32 / 2.0 - delta_x; let x1 = IMAGE_WIDTH as f32 / 2.0 - delta_x;
let y1 = (IMAGE_WIDTH as f32 / 2.0 - OUTER_R) + delta_y; let y1 = (IMAGE_WIDTH as f32 / 2.0 - OUTER_R) + delta_y;
let utc_hour_y = IMAGE_WIDTH as f32 / 2.0 - OUTER_R + RING_WIDTH + utc_hour_font_size; let utc_hour_y = IMAGE_WIDTH as f32 / 2.0 - OUTER_R + RING_WIDTH + UTC_HOUR_FONT_SIZE;
let path_data = PathData::new() let path_data = PathData::new()
.move_to((x1, y1)) .move_to((x1, y1))
@ -125,7 +124,7 @@ fn hour_marker(
.set("y", utc_hour_y) .set("y", utc_hour_y)
.set("text-anchor", "middle") .set("text-anchor", "middle")
.set("dominant-baseline", "mathematical") .set("dominant-baseline", "mathematical")
.set("font-size", utc_hour_font_size) .set("font-size", UTC_HOUR_FONT_SIZE)
.add(TextNode::new(format!("U {:02}", hour))); .add(TextNode::new(format!("U {:02}", hour)));
Group::new() Group::new()
@ -238,9 +237,8 @@ fn gen_svg(config: &Option<Config>, hour_name_path_cache: &[PathData; 24]) -> Do
let moon_phase = moon_illumination.phase * 28.0; let moon_phase = moon_illumination.phase * 28.0;
let local_hour_font_size = IMAGE_WIDTH as f32 * 0.02357; let local_hour_font_size = IMAGE_WIDTH as f32 * 0.02357;
let utc_hour_font_size = IMAGE_WIDTH as f32 * 0.021462;
let sun_radius = IMAGE_WIDTH as f32 * 0.0142871; let sun_radius = IMAGE_WIDTH as f32 * 0.0142871;
let marker_radius = OUTER_R - RING_WIDTH - 2.0 * utc_hour_font_size; let marker_radius = OUTER_R - RING_WIDTH - 2.0 * UTC_HOUR_FONT_SIZE;
let border = Rectangle::new() let border = Rectangle::new()
.set("x", 0i32) .set("x", 0i32)
@ -316,7 +314,6 @@ fn gen_svg(config: &Option<Config>, hour_name_path_cache: &[PathData; 24]) -> Do
hour, hour,
&hour_name_path_cache[hour as usize], &hour_name_path_cache[hour as usize],
hour == utc_hour as i32, hour == utc_hour as i32,
utc_hour_font_size,
)); ));
} }

1
src/svg_clock.rs
View File

@ -16,6 +16,7 @@ pub const IMAGE_WIDTH: u32 = 700;
pub const HOUR_NAME_FONT_SIZE: f32 = IMAGE_WIDTH as f32 * 0.019109; pub const HOUR_NAME_FONT_SIZE: f32 = IMAGE_WIDTH as f32 * 0.019109;
pub const OUTER_R: f32 = (IMAGE_WIDTH as f32) / 2.0 - 3.0 * HOUR_NAME_FONT_SIZE; pub const OUTER_R: f32 = (IMAGE_WIDTH as f32) / 2.0 - 3.0 * HOUR_NAME_FONT_SIZE;
pub const RING_WIDTH: f32 = HOUR_NAME_FONT_SIZE * 3.0; pub const RING_WIDTH: f32 = HOUR_NAME_FONT_SIZE * 3.0;
pub const UTC_HOUR_FONT_SIZE: f32 = IMAGE_WIDTH as f32 * 0.021462;
pub fn svg_to_usvg(document: Document) -> Tree { pub fn svg_to_usvg(document: Document) -> Tree {
let doc_str = document.to_string(); let doc_str = document.to_string();