Closed mmagnuski closed 10 years ago
This branch also changes the text display of eegDb entries in winreject GUI.
database operations
and winreject
are done (at least so it seems)
Not sure what I did here. Need some time to get familiar with all this stuff.
Do not merge, please. This was work in progress - pull request was only for visibility and discussion.
Merge has been reverted but re-opening a pull request is not so easy... working on this.
If you want to commit to this branch use:
git push origin new-structure
Ok, now it is reopen but cannot be merged, eh...
Hmm... I have to either create a new pull request or create a new branch and a new pull request.
Maybe closing again will help
This is strange - now although new-structure and master are different by at least +800/-300 lines of code, creating a pull request to merge new-structure to master shows only one commit and one line of change. Seems that GitHub is fooled by the fact that this pull request was merged (although the merge has been reverted) and all the commits here are overlooked now :anguished:
I don't know how to resolve this... Although reverted the commits from this branch can not be merged to master (useful in the future when this branch is ready to merge), GitHub stopped seeing them - they are present only here and here the merge option is gone. I have created a question at stack overflow - maybe someone will help.
:construction: This is work in progress, but shows what (approximately) the new structure would look like. Most of other functions in eegDb need to be changed to match structure changes.
git pull
andgit checkout
this branch and then runICAw_buildbase()
to see how the structure looks now.Check files:
'\gui\winreject.m'
'\database operations\ICAw_addw.m'
'\database operations\ICAw_checkbase.m'
'\database operations\ICAw_checkfields.m'
'\database operations\ICAw_clearica.m'
'\database operations\eegDb_getepoching.m'
'\database operations\eegDb_getfield.m'
'\database operations\eegDb_struct2text.m'
'\database operations\eegDb_whatepoch.m'
'\database operations\recoverEEG.m'
'\dependencies\eeg_rejmat.m'
'\dependencies\segmentEEG.m'
'\eeglabsubst\eegplot2.m'
'\gui\ICAw_gui_choose_chan.m'
'\gui\cooleegplot.m'
'\gui\gui_chooselist.m'
'\gui\gui_editbox.m'
'\gui\gui_multiedit.m'
'\manage marks\ICAw_addrej.m'
'\manage marks\ICAw_applyrej.m'
'\manage marks\ICAw_getrej.m'
'\manage marks\ICAw_newrejtype.m'
'\manage marks\ICAw_rejTMP.m'
'\manage marks\ICAw_scanrejtypes.m'
'\manage versions\ICAw_addversion.m'
'\manage versions\ICAw_bringversion.m'
'\manage versions\ICAw_getversions.m'
'\manage versions\ICAw_mainversion.m'
'\manage versions\ICAw_updateversion.m'
'\manage versions\ICAw_ver2EEG.m'
'\manage versions\ICAw_vers_compare.m'