Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New timezone option: seconds since unix epoch #5450

Merged
merged 6 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions crates/re_log_types/src/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ use time::{format_description::FormatItem, OffsetDateTime, UtcOffset};
pub enum TimeZone {
Local,
Utc,

/// Seconds since unix epoch
UnixEpoch,
emilk marked this conversation as resolved.
Show resolved Hide resolved
}

/// A date-time represented as nanoseconds since unix epoch
Expand Down Expand Up @@ -91,6 +94,7 @@ impl Time {
TimeZone::Utc => {
format!("{}Z", datetime.format(&parsed_format).unwrap())
}
TimeZone::UnixEpoch => datetime.format(&parsed_format).unwrap(),
}
}

Expand All @@ -101,19 +105,23 @@ impl Time {
if let Some(datetime) = self.to_datetime() {
let is_whole_second = nanos_since_epoch % 1_000_000_000 == 0;
let is_whole_millisecond = nanos_since_epoch % 1_000_000 == 0;
let prefix = match time_zone_for_timestamps {
TimeZone::UnixEpoch => "[unix_timestamp]",
TimeZone::Utc | TimeZone::Local => "[hour]:[minute]:[second]",
};

let time_format = if is_whole_second {
"[hour]:[minute]:[second]"
prefix.to_owned()
} else if is_whole_millisecond {
"[hour]:[minute]:[second].[subsecond digits:3]"
format!("{prefix}.[subsecond digits:3]")
} else {
"[hour]:[minute]:[second].[subsecond digits:6]"
format!("{prefix}.[subsecond digits:6]")
};

let date_is_today = datetime.date() == OffsetDateTime::now_utc().date();
let date_format = format!("[year]-[month]-[day] {time_format}");
let parsed_format = if date_is_today {
time::format_description::parse(time_format).unwrap()
time::format_description::parse(&time_format).unwrap()
} else {
time::format_description::parse(&date_format).unwrap()
};
Expand Down Expand Up @@ -147,9 +155,15 @@ impl Time {
let time_format = if self.is_exactly_midnight() {
"[year]-[month]-[day]"
} else if is_whole_minute {
"[hour]:[minute]"
match time_zone_for_timestamps {
TimeZone::UnixEpoch => "[unix_timestamp]",
TimeZone::Utc | TimeZone::Local => "[hour]:[minute]",
}
} else {
"[hour]:[minute]:[second]"
match time_zone_for_timestamps {
TimeZone::UnixEpoch => "[unix_timestamp]",
TimeZone::Utc | TimeZone::Local => "[hour]:[minute]:[second]",
}
};
let parsed_format = time::format_description::parse(time_format).unwrap();

Expand Down Expand Up @@ -302,6 +316,19 @@ mod tests {
&Time::from_us_since_epoch(69_900).format(TimeZone::Local),
"+0.070s"
);

assert_eq!(
&Time::from_us_since_epoch(42_000_000).format(TimeZone::UnixEpoch),
"+42s"
);
assert_eq!(
&Time::from_us_since_epoch(69_000).format(TimeZone::UnixEpoch),
"+0.069s"
);
assert_eq!(
&Time::from_us_since_epoch(69_900).format(TimeZone::UnixEpoch),
"+0.070s"
);
}

#[test]
Expand Down
10 changes: 10 additions & 0 deletions crates/re_viewer/src/ui/rerun_menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,22 @@ fn options_menu_ui(

ui.horizontal(|ui| {
ui.label("Timezone:");
});
ui.horizontal(|ui| {
re_ui
.radio_value(ui, &mut app_options.time_zone, TimeZone::Utc, "UTC")
.on_hover_text("Display timestamps in UTC");
re_ui
.radio_value(ui, &mut app_options.time_zone, TimeZone::Local, "Local")
.on_hover_text("Display timestamps in the local timezone");
re_ui
.radio_value(
ui,
&mut app_options.time_zone,
TimeZone::UnixEpoch,
"Unix Epoch",
)
.on_hover_text("Display timestamps in seconds since unix epoch");
});

{
Expand Down
Loading