Rename 'Shot at' column to ISO

This commit is contained in:
pjht 2023-06-14 14:36:04 -05:00
parent e96762ae64
commit 8ef1712e26
Signed by: pjht
GPG Key ID: CA239FC6934E6F3A

View File

@ -41,7 +41,7 @@ enum RollField {
Date, Date,
Exposures, Exposures,
Film, Film,
ShotAt, ISO,
} }
#[derive(Copy, Clone, Debug, PartialEq, Eq)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@ -149,7 +149,7 @@ impl eframe::App for MyApp {
("Date", RollField::Date), ("Date", RollField::Date),
("Exposures", RollField::Exposures), ("Exposures", RollField::Exposures),
("Film", RollField::Film), ("Film", RollField::Film),
("Shot at", RollField::ShotAt), ("ISO", RollField::ISO),
] { ] {
let label_text = if field_id == self.roll_sort.0 { let label_text = if field_id == self.roll_sort.0 {
RichText::new(format!("{} {}", name, self.roll_sort.1)) RichText::new(format!("{} {}", name, self.roll_sort.1))
@ -185,7 +185,7 @@ impl eframe::App for MyApp {
RollField::Film => self.state.films[roll_1.film] RollField::Film => self.state.films[roll_1.film]
.name .name
.cmp(&self.state.films[roll_2.film].name), .cmp(&self.state.films[roll_2.film].name),
RollField::ShotAt => roll_1 RollField::ISO => roll_1
.shot_at .shot_at
.unwrap_or(self.state.films[roll_1.film].iso) .unwrap_or(self.state.films[roll_1.film].iso)
.cmp( .cmp(