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.

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

Fix date time conversion #6

Merged
merged 10 commits into from
Aug 5, 2024
Merged

Fix date time conversion #6

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a2f2812
reinstate BST test
jefferis Aug 4, 2024
098bc17
Fix reading of Igor DateTime
jefferis Aug 4, 2024
e002bb2
simplify conversion using time_add
jefferis Aug 4, 2024
df4d412
test tweaks
jefferis Aug 4, 2024
d77cccc
setup github actions
jefferis Aug 4, 2024
09d906f
setup pkgdown gh pages
jefferis Aug 4, 2024
dbd0fdf
urls in description should be in <>
jefferis Aug 4, 2024
4c271ac
add github URLs
jefferis Aug 4, 2024
ec79897
don't read pxp attributes that we should ignore
jefferis Aug 4, 2024
bcc1f97
roxygenise
jefferis Aug 4, 2024
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
16 changes: 3 additions & 13 deletions R/ReadIgorBinary.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,19 +344,9 @@ read.pxp<-function(pxpfile,regex,ReturnTimeSeries=FALSE,Verbose=FALSE,
# results regardless of the local timezone of the test machine
.convertIgorDate<-function(dateval, tz=""){
igor_origin=ISOdatetime(1904,1,1,hour=0,min = 0, sec=0, tz=tz)
igor_origin_utc=ISOdatetime(1904,1,1,hour=0,min = 0, sec=0, tz='GMT')
origin_offset=as.numeric(igor_origin)-as.numeric(igor_origin_utc)

dateval=dateval+as.numeric(igor_origin)
res=as.POSIXct(dateval, tz = tz)
# this takes the same clock time (ie hms) but switches time zone, thereby
# changing the moment in time
res_utc=timechange::time_force_tz(res, tz = 'GMT')
res_offset=as.numeric(res)-as.numeric(res_utc)

# DST correction
dst_correction=origin_offset-res_offset
res=res-dst_correction
# this takes care of tz offset differences between the actual date and the origin
# e.g. because date is during daylight savings (but origin was not)
res=timechange::time_add(igor_origin, second = dateval)
res
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the key change it seems. I'm not quite sure why a straight add doesn't do this but ...

}

Expand Down