Skip to content

Fix loading datetime and dynamic properties in newer MATLAB versions (2024b onwards) #216

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix loading datetime and dynamic properties in newer MATLAB versions (2024b onwards) #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions src/MAT_subsys.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,10 +302,13 @@ end

function get_dynamic_properties(subsys::Subsystem, dep_id::UInt32)

if length(subsys.dynprop_metadata) == 0
if dep_id == UInt32(0)
return Dict{String,Any}()
end

# dynprops metadata is stored in format
# [(nprops, prop_obj_id_1, ..., prop_obj_id_n), ...] for each dep_id

offset = 1
while dep_id > 0
nprops = subsys.dynprop_metadata[offset]
Expand All @@ -318,7 +321,7 @@ function get_dynamic_properties(subsys::Subsystem, dep_id::UInt32)
offset += 1
dyn_prop_obj_ids = subsys.dynprop_metadata[offset:(offset + ndynprops - 1)]

if dyn_prop_obj_ids == UInt32[]
if length(dyn_prop_obj_ids) == 0
return Dict{String,Any}()
end
dyn_prop_map = Dict{String,Any}()
Expand All @@ -338,7 +341,7 @@ function get_properties(subsys::Subsystem, object_id::UInt32)
return Dict{String,Any}()
end

class_id, _, _, saveobj_id, normobj_id, _ = get_object_metadata(subsys, object_id)
class_id, _, _, saveobj_id, normobj_id, dep_id = get_object_metadata(subsys, object_id)
if saveobj_id != 0
saveobj_ret_type = true
obj_type_id = saveobj_id
Expand All @@ -349,7 +352,7 @@ function get_properties(subsys::Subsystem, object_id::UInt32)

defaults = get_default_properties(subsys, class_id)
prop_map = merge(defaults, get_saved_properties(subsys, obj_type_id, saveobj_ret_type))
dyn_props = get_dynamic_properties(subsys, object_id)
dyn_props = get_dynamic_properties(subsys, dep_id)
merge!(prop_map, dyn_props)
return prop_map
end
Expand Down
2 changes: 1 addition & 1 deletion src/MAT_types.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ end
ms_to_datetime(ms::Complex) = ms_to_datetime(real(ms))
function ms_to_datetime(ms::Real)
s, ms_rem = fldmod(ms, 1_000) # whole seconds and remainder milliseconds
return DateTime(1970, 1, 1) + Second(s) + Millisecond(ms_rem)
return DateTime(1970, 1, 1) + Second(s) + Millisecond(round(Int, ms_rem))
end

function from_duration(obj::MatlabOpaque)
Expand Down
Loading