Skip to content

Fix makie 0.24 #16

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jul 21, 2025
Merged

Fix makie 0.24 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b5cd88b
Fix Makie@0.24 compat, and default epoch to UNIX_EPOCH
rossviljoen Jul 20, 2025
48272d8
factor out unixtime_to_number
rossviljoen Jul 20, 2025
b80bf03
update tick on epoch change
rossviljoen Jul 20, 2025
002552d
fixup
rossviljoen Jul 21, 2025
a3ee85f
bump patch
rossviljoen Jul 21, 2025
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "UnixTimes"
uuid = "ab1a18e7-b408-4913-896c-624bb82ed7f4"
authors = ["Christian Rorvik <christian.rorvik@gmail.com>"]
version = "1.7.1"
version = "1.7.2"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Expand Down
28 changes: 16 additions & 12 deletions ext/UnixTimesMakieExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,40 @@ using Observables
using Dates

struct UnixTimeConversion <: Makie.AbstractDimConversion
custom_epoch::Observable{Union{Nothing, UnixTime}}
function UnixTimeConversion(custom_epoch = nothing)
new(Observable{Union{Nothing, UnixTime}}(custom_epoch; ignore_equal_values=true))
custom_epoch::Observable{UnixTime}
function UnixTimeConversion(custom_epoch = UNIX_EPOCH)
new(Observable{UnixTime}(custom_epoch; ignore_equal_values=true))
end
end

function number_to_unixtime(conversion::UnixTimeConversion, i)
Nanosecond(round(Int64, Float64(i))) + something(conversion.custom_epoch[], UNIX_EPOCH)
Nanosecond(round(Int64, Float64(i))) + conversion.custom_epoch[]
end
function unixtime_to_number(conversion::UnixTimeConversion, value::UnixTime)
Dates.value(value - conversion.custom_epoch[])
end

Makie.expand_dimensions(::PointBased, y::AbstractVector{<:UnixTime}) = (keys(y), y)

Makie.needs_tick_update_observable(conversion::UnixTimeConversion) = nothing
Makie.needs_tick_update_observable(conversion::UnixTimeConversion) = conversion.custom_epoch

Makie.should_dim_convert(::Type{UnixTime}) = true

Makie.create_dim_conversion(::Type{UnixTime}) = UnixTimeConversion()

function Makie.convert_dim_value(conversion::UnixTimeConversion, value::UnixTime)
Dates.value(value - something(conversion.custom_epoch[], UNIX_EPOCH))
unixtime_to_number(conversion, value)
end
function Makie.convert_dim_value(conversion::UnixTimeConversion, values::AbstractArray{UnixTime})
Dates.value.(values .- something(conversion.custom_epoch[], UNIX_EPOCH))
unixtime_to_number.(tuple(conversion), values)
end
function Makie.convert_dim_value(conversion::UnixTimeConversion, attr, values, prev_values)
unixtime_to_number.(tuple(conversion), values)
end

function Makie.convert_dim_observable(conversion::UnixTimeConversion, values::Observable, deregister)
if conversion.custom_epoch[] === nothing
conversion.custom_epoch[] = last(values[])
end

result = map(values, conversion.custom_epoch) do vs, ep
Dates.value.(vs .- something(ep, UNIX_EPOCH))
Dates.value.(vs .- ep)
end
append!(deregister, result.inputs)
result
Expand Down