Merge develop into master#433

Merged

teddychao merged 833 commits intomasterfrom develop

Dec 11, 2022

+50,748-56,903

This pull request is big! We're only showing the most recent 250 commits

Commits on Jun 7, 2022

Commits on Jun 8, 2022

Merge pull request #394 from bachlab/224-data-editor-to-show-missing-epochs-in-time-order
teddychao
authored
Merge branch 'develop' into gaze_pp
teddychao
authored

Commits on Jun 13, 2022

add eye_pp
Teddy
committed

Commits on Jun 14, 2022

Update gaze_pp
Teddy
committed
Add combination for gaze_pp
Teddy
committed
convert nan to 0 in data.stats
Teddy
committed
Update field name for scr_pp and pupil_pp
Teddy
committed
Update pspm_con1.m
Teddy
committed

Commits on Jun 21, 2022

Update gaze_pp
Teddy
committed
Update pupil_pp
Teddy
committed
Update pspm_load_data
Teddy
committed
Update pspm_load_data.m
Teddy
committed
Update pspm_load_data.m
Teddy
committed
Update pspm_pupil_pp.m
Teddy
committed
Update pspm_con1.m
Teddy
committed
correct channel -> chan for pupil_pp
Teddy
committed
Update .editorconfig
teddychao
authored
Update channel to chan
Teddy
committed
Remove unused functions
Teddy
committed
update pspm_pupil_pp
Teddy
committed
do not include test_dynamic
Teddy
committed
Update pspm_con1.m
Teddy
committed
Update pspm_con1.m
Teddy
committed

Commits on Jun 27, 2022

Add compatibility to key word 'channel'
Teddy
committed
Update pspm_test_github_actions.m
Teddy
committed
update channel to chan in test functions
Teddy
committed
update channeltype to chantype
Teddy
committed

Commits on Jun 28, 2022

add new function pspm_option_checker
Teddy
committed
Update pspm_con1.m
Teddy
committed
Update test function
Teddy
committed
Update document
Teddy
committed
Revert "Update pspm_con1.m"
Teddy
committed

Commits on Jul 5, 2022

Update pspm_option_checker
Teddy
committed
Update pspm_write_channel.m
Teddy
committed
Update write_channel
Teddy
committed
Update pspm_write_channel.m
Teddy
committed
Update chan for ecg2hb and write_channel
Teddy
committed
Update pspm_options.m
Teddy
committed
Update pspm_con1.m
Teddy
committed
Update internal function in pspm_options
Teddy
committed
Update pspm_con1.m
Teddy
committed
Update pspm_con1.m
Teddy
committed

Commits on Jul 6, 2022

Update interpolate
Teddy
committed

Commits on Jul 12, 2022

Commits on Jul 14, 2022

Update pspm_con1.m
Teddy
committed
Update pspm_con1.m
Teddy
committed
Merge pull request #401 from bachlab/395-incorrect-assigned-nan
teddychao
authored
update release notes
Teddy
committed
Update documents
Teddy
committed
display text updates
Teddy
committed
Delete release_notes.bbl
Teddy
committed

Commits on Jul 15, 2022

Merge pull request #402 from bachlab/New-6_0
teddychao
authored
fix date
Teddy
committed

Commits on Jul 19, 2022

Commits on Jul 30, 2022

Commits on Jul 31, 2022

Update help text
Teddy
committed

Commits on Aug 1, 2022

update help text
Teddy
committed
Merge pull request #405 from bachlab/404-figure-displaying-in-a-separate-window
teddychao
authored
update help text
Teddy
committed
update help text
Teddy
committed
Update help text
Teddy
committed
fix conflicts
Teddy
committed

Commits on Aug 2, 2022

Update help text
Teddy
committed

Commits on Aug 3, 2022

Update help text
Teddy
committed

Commits on Aug 4, 2022

Update help text
Teddy
committed
test
Teddy
committed
Merge branch 'test1' into 372-sort-out-help-text
teddychao
authored
Merge branch 'develop' of https://github.com/bachlab/PsPM into 372-sort-out-help-text
Teddy
committed
Updata help text
Teddy
committed
update help text
Teddy
committed
Update help text
Teddy
committed
update help text
Teddy
committed

Commits on Aug 5, 2022

update help text
Teddy
committed

Commits on Aug 6, 2022

update help text
Teddy
committed
update help text document name
Teddy
committed

Commits on Aug 8, 2022

update help text
Teddy
committed
update help text
Teddy
committed
Update help text
Teddy
committed
Merge branch 'develop' into 385-streamline-options-input-between-functions
teddychao
authored

Commits on Aug 10, 2022

update "version history" module
Teddy
committed

Commits on Aug 15, 2022

Change the name of module Version History
teddy.chao
committed
Update copyright info
teddy.chao
committed
Update maintained by info
teddy.chao
committed
update author info
teddy.chao
committed

Commits on Aug 16, 2022

Update progress document
teddy.chao
committed
Create pspm_options_subfields.numbers
Teddy
committed
update file format of options_subfields
Teddy
committed

Commits on Aug 20, 2022

Update pspm.fig
teddy.chao
committed

Commits on Aug 28, 2022

update pspm_help
teddy.chao
committed
revert chan to channel
teddy.chao
committed

Commits on Aug 29, 2022

update chan related variables
Teddy
committed
update variable name for pspm_interpolate
teddy.chao
committed
update channel for find_valid_fixations and get_smi
teddy.chao
committed
fix find_valid_fixations
teddy.chao
committed
fix issues of smi and pupil
teddy.chao
committed
fix issues for scr_pp and gaze_pp
teddy.chao
committed

Commits on Aug 30, 2022

fix gaze_pp
Teddy
committed
Update chan for some import functions
teddy.chao
committed
Update channel/chan confusion in test functions
teddy.chao
committed
Update warning ID
teddy.chao
committed
Update pspm_get_txt_test.m
Teddy
committed

Commits on Sep 6, 2022

Update pspm_options
teddy.chao
committed
Add glm for pspm_options
teddy.chao
committed
Update gaze_pp and import with pspm_options
teddy.chao
committed
add pspm_options to load1
teddy.chao
committed
fix some bugs
Teddy
committed

Commits on Sep 13, 2022

update pspm_beta
t.chao.bham
committed
Merge branch 'new_pspm_beta_start' into fix-issue-410
t.chao.bham
committed
add support for calling pspm directly
t.chao.bham
committed
add option analysis
teddy.chao
committed
Update the subfield table
t.chao.bham
committed

Commits on Sep 19, 2022

Update starter
t.chao.bham
committed
Update code annotation
t.chao.bham
committed
Update pspm_guide.m
Teddy
committed

Commits on Sep 20, 2022

Update sorted code for guide
t.chao.bham
committed
Add appdesigner
t.chao.bham
committed
update UI for pspm app designer
Teddy
committed
Update ui controller for appdesigner
t.chao.bham
committed

Commits on Sep 23, 2022

Commits on Sep 25, 2022

Merge branch 'develop' into 385-streamline-options-input-between-functions
Teddy
authored

Commits on Sep 26, 2022

Update documentation
Teddy
committed

Commits on Sep 27, 2022

update section name
Teddy
committed
Update the logic of overwrite
Teddy
committed
Generalise overwrite behaviour
Teddy
committed
Update pspm_options_subfields_simp.csv
Teddy
committed
Merge pull request #415 from bachlab/correct-text
Teddy
authored
Merge branch 'develop' into fix-issue-410
Teddy
authored
Update pspm_ui_app.m
Teddy
committed
Merge branch 'fix-issue-410' of https://github.com/bachlab/PsPM into fix-issue-410
Teddy
committed
Merge pull request #411 from bachlab/fix-issue-410
Teddy
authored
Merge branch 'develop' of https://github.com/bachlab/PsPM into 385-streamline-options-input-between-functions
Teddy
committed
Update the logic of overwrite
t.chao.bham
committed

Commits on Sep 29, 2022

update the data saving in load1 for sf
Teddy
committed
update pspm_options
Teddy
committed

Commits on Oct 6, 2022

verify option subfields
teddy.chao
committed

Commits on Oct 7, 2022

Update pspm_options
teddy.chao
committed
update pspm_options
teddy.chao
committed
Update pspm_options.m
Teddy
committed
Update pspm_options.m
Teddy
committed
Update pspm_options.m
Teddy
committed
Update pspm_options.m
Teddy
committed
update option fields
Teddy
committed

Commits on Oct 11, 2022

Commits on Oct 13, 2022

Update pspm_options_subfields_simp.numbers
Teddy
committed

Commits on Oct 17, 2022

Update pspm_options
teddy.chao
committed
update pspm_options
t.chao.bham
committed

Commits on Oct 18, 2022

Update pspm_options_subfields_simp.numbers
teddy.chao
committed
Merge branch '385-streamline-options-input-between-functions' of https://github.com/bachlab/PsPM into 385-streamline-options-input-between-functions
teddy.chao
committed
update pspm_options
Teddy
committed
update pspm_options
Teddy
committed

Commits on Oct 25, 2022

update pspm_options
Teddy
committed

Commits on Oct 29, 2022

update pspm_options
Teddy
committed
Update pspm_options_subfields_simp.numbers
teddy.chao
committed
Merge branch '385-streamline-options-input-between-functions' of https://github.com/bachlab/PsPM into 385-streamline-options-input-between-functions
teddy.chao
committed

Commits on Oct 30, 2022

update pspm_options
Teddy
committed

Commits on Oct 31, 2022

update pspm_options
teddy.chao
committed
bugfix for pspm_options
Teddy
committed
update extract_segments
Teddy
committed

Commits on Nov 1, 2022

bug fix for pspm_options
t.chao.bham
committed
update pspm_options
t.chao.bham
committed
Update pspm_options_subfields_simp.numbers
teddy.chao
committed
pspm_get_rf to use pspm_options
t.chao.bham
committed
Merge branch '385-streamline-options-input-between-functions' of https://github.com/bachlab/PsPM into 385-streamline-options-input-between-functions
t.chao.bham
committed

Commits on Nov 3, 2022

Update pspm_options.m
Teddy
committed
chantype -> channeltype
teddy.chao
committed
update test functions
teddy.chao
committed

Commits on Nov 4, 2022

Commits on Nov 13, 2022

Update function names
Teddy
committed
Rename chantype to channel_type
Teddy
committed

Commits on Nov 14, 2022

update pspm_options
Teddy
committed
update pspm_options
teddychao
committed
update pspm_options
teddy.chao
committed

Commits on Nov 15, 2022

update pspm_options
Teddy
committed
update pspm_options
Teddy
committed
update pspm_options
Teddy
committed
update pspm_options
Teddy
committed
Update pspm_options.m
Teddy
committed
update pspm_options
Teddy
committed
update pspm_options
Teddy
committed
Update pspm_options_subfields.numbers
Teddy
committed
Update pspm_write_channel.m
Teddy
committed
update description text
teddy.chao
committed

Commits on Nov 19, 2022

update some help text
Teddy
committed

Commits on Nov 20, 2022

fix a bug in pspm_options
teddy.chao
committed

Commits on Nov 22, 2022

Commits on Nov 25, 2022

Update channel for find_fixation
Teddy
committed
Update interpolate for channel
Teddy
committed
Update pspm_options_subfields.numbers
Teddy
committed

Commits on Nov 26, 2022

update dcm and options
Teddy
committed
fix incorrect parameters
Teddy
committed
update pspm_options
Teddy
committed

Commits on Nov 27, 2022

Update pspm_options.m
Teddy
committed

Commits on Nov 28, 2022

Commits on Nov 29, 2022

generalise channel for pspm_options
Teddy
committed
Update pspm_options_subfields.numbers
Teddy
committed

Commits on Dec 2, 2022

Merge pull request #399 from bachlab/385-streamline-options-input-between-functions
dominikbach
authored