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

ERPLAB version 10.0 #173

Merged
merged 78 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
532e9c0
02/16/22
ammsimmons Feb 17, 2023
6dd508b
022823
ammsimmons Mar 1, 2023
da2a9ff
030623
ammsimmons Mar 7, 2023
3cb9ec6
030723
ammsimmons Mar 8, 2023
ba20084
Painted GUI
ammsimmons Mar 10, 2023
c2059ae
031723
ammsimmons Mar 20, 2023
9dc96ab
032423
ammsimmons Mar 25, 2023
e4f66f7
032723
ammsimmons Mar 28, 2023
59dae2b
Update pop_decoding.m
ammsimmons Apr 5, 2023
0fa25c4
040723
ammsimmons Apr 7, 2023
95b9664
Merge branch 'master' into mvpa
ammsimmons Apr 10, 2023
761f474
Merge branch 'master' into mvpa
ammsimmons Apr 13, 2023
5734c12
041423 - MVPC
ammsimmons Apr 14, 2023
ff8a945
Merge branch 'master' into mvpa
ammsimmons Apr 21, 2023
8dd7163
mvpc tools added
ammsimmons Apr 22, 2023
c9c1eb0
Update mvpc viewer
ammsimmons Apr 25, 2023
ff5c307
Merge branch 'mvpa' of https://github.com/lucklab/erplab into mvpa
ammsimmons Apr 26, 2023
f93549d
bug fix MVPC menu + viewer
ammsimmons Apr 28, 2023
535a389
EEGLAB integrated bestset/mvpcset
ammsimmons May 1, 2023
f33f6a5
mvpc averager + saveas + globals fix
ammsimmons May 8, 2023
748987f
bug fix: multiple files
ammsimmons May 12, 2023
ea6ca40
Merge branch 'master' into mvpa
ammsimmons May 12, 2023
fe2ef0f
Initial "CommonFloor" option code
ammsimmons May 12, 2023
846f2f2
Update decodingGUI.mlapp
ammsimmons May 15, 2023
f1461df
"CommonFloor" complete
ammsimmons May 15, 2023
730f4c0
"Common floor" fix
ammsimmons May 16, 2023
3e52b43
"Common Floor" fix 2
ammsimmons May 17, 2023
7737b64
051922
ammsimmons May 20, 2023
c55c1bc
052523
ammsimmons May 25, 2023
eb539c5
Merge branch 'master' into mvpa
ammsimmons May 25, 2023
d0c7e7a
Finished CombineBESTbins routine
ammsimmons May 26, 2023
9828bd3
Bugfix GUI
ammsimmons May 26, 2023
d5b50ff
bug fix
ammsimmons May 30, 2023
31d1433
Merge branch 'master' into mvpa
ammsimmons May 31, 2023
9fae5de
Merge branch 'master' into mvpa
ammsimmons Jun 1, 2023
c5a7501
Bug fix:
ammsimmons Jun 1, 2023
b98dd55
multiple bug fix
ammsimmons Jun 6, 2023
e7c708a
mvpc viewer updated
ammsimmons Jun 7, 2023
e0e2bb3
PlotMVPCconfusions
ammsimmons Jun 7, 2023
9871b53
Merge branch 'master' into mvpa
ammsimmons Jun 8, 2023
124c256
scripting debug pt1
ammsimmons Jun 10, 2023
fa4ae3b
Merge branch 'master' into mvpa
ammsimmons Jun 12, 2023
52cd868
Update pop_savemybest.m
ammsimmons Jun 12, 2023
d21a5c5
bug fix: decoding t-f transform, best saving
ammsimmons Jun 13, 2023
719551f
Updated combinedBESTbins func
ammsimmons Jun 14, 2023
c579c8c
update decoding toolbox gui
ammsimmons Jun 17, 2023
7a00ec4
export MVPC
ammsimmons Jun 21, 2023
a58473f
Merge branch 'master' into mvpa
ammsimmons Jun 22, 2023
c6aa73a
Finish mvpc2text routine + mvpc fields
ammsimmons Jun 23, 2023
3a24be0
updated general decoding fuctions
ammsimmons Jun 27, 2023
4342356
Update pop_extractbest.m
ammsimmons Jun 28, 2023
793c08e
Merge branch 'master' into mvpa
ammsimmons Jun 30, 2023
c46d20b
CROSSNOBIS + updated mvpcviewr + mvcpmenu
ammsimmons Jul 1, 2023
1676c15
updated decoding GUI
ammsimmons Jul 1, 2023
c8b6028
gui updates
ammsimmons Jul 1, 2023
c922685
prelim select classes GUI
ammsimmons Jul 6, 2023
c1ed6d8
GUI with classes
ammsimmons Jul 7, 2023
7d73374
finalized GUI logic with class selection
ammsimmons Jul 8, 2023
e2bafd4
decode classes option
ammsimmons Jul 10, 2023
14c23a8
quick bug fix
ammsimmons Jul 10, 2023
246aa23
confusions
ammsimmons Jul 11, 2023
51f29ee
confusions + bugs
ammsimmons Jul 14, 2023
928687e
updated gui names, onevone
ammsimmons Jul 14, 2023
52e3b2d
Revision Beta
ammsimmons Jul 18, 2023
c04eb4a
update main function documentation
ammsimmons Jul 19, 2023
0b505cb
Update decodingGUI.mlapp
ammsimmons Jul 19, 2023
0c377cc
Merge Decoding toolbox and ERP Wave Viewer
guanghuizhang0328 Jul 19, 2023
10009a2
Update eegplugin_erplab.m
ammsimmons Jul 19, 2023
f7d8755
Simulated wave menu
guanghuizhang0328 Jul 19, 2023
019a54b
fix to merged with erplab waveviwer
ammsimmons Jul 19, 2023
25806fa
Change time range for ERP wave viewer
guanghuizhang0328 Jul 19, 2023
956c32f
bug fix (class checking + binary decoding BETA)
ammsimmons Jul 21, 2023
3cdf7d1
baseline correction-whole
guanghuizhang0328 Jul 21, 2023
51783b9
Viewer - Grid locations
guanghuizhang0328 Jul 21, 2023
0b5a3bd
Cancel bug in Plot org
guanghuizhang0328 Jul 21, 2023
074da8a
Cancel option for all panels-ERP Viewer
guanghuizhang0328 Jul 21, 2023
f5bbbf6
Bugs
guanghuizhang0328 Jul 21, 2023
b1f4891
Final Release version 10.0
ammsimmons Jul 21, 2023
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
Binary file modified GUIs/artifactinterpGUI.fig
Binary file not shown.
Binary file modified GUIs/artifactmenuGUI.fig
Binary file not shown.
Binary file added GUIs/binselectorGUI.mlapp
Binary file not shown.
Binary file added GUIs/combinebestbinsGUI.mlapp
Binary file not shown.
Binary file added GUIs/decodingGUI.mlapp
Binary file not shown.
Binary file modified GUIs/export2textGUI.fig
Binary file not shown.
Binary file modified GUIs/geterpvaluesGUI2.fig
Binary file not shown.
Binary file modified GUIs/grandaveragerGUI.fig
Binary file not shown.
Binary file modified GUIs/meaviewerGUI.fig
Binary file not shown.
2 changes: 1 addition & 1 deletion GUIs/meaviewerGUI.m
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@ function mplotdata(hObject, handles, ibin, ich, iset, xlim, ylim, tittle)
checknan(handles, val)
end
hold off
drawnow
%drawnow

nbinput = length(binput);
nchinput = length(chinput);
Expand Down
Binary file added GUIs/mvpa_save_multi_file.fig
Binary file not shown.
Loading