mmagnuski / eegDb

eegDb is an egglab plugin that eases up managing preprocessing routines. It allows to create project databases for reproducible eeg preprocessing with eeglab.
MIT License
3 stars 3 forks source link

Changing ICAw to reflect new structure (#8) #27

Closed mmagnuski closed 10 years ago

mmagnuski commented 10 years ago

: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 and git checkout this branch and then run ICAw_buildbase() to see how the structure looks now.

mmagnuski commented 10 years ago

This branch also changes the text display of eegDb entries in winreject GUI.

mmagnuski commented 10 years ago

database operations and winreject are done (at least so it seems)

mzakrzewska commented 10 years ago

Not sure what I did here. Need some time to get familiar with all this stuff.

mmagnuski commented 10 years ago

Do not merge, please. This was work in progress - pull request was only for visibility and discussion.

mmagnuski commented 10 years ago

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

mmagnuski commented 10 years ago

Ok, now it is reopen but cannot be merged, eh...

mmagnuski commented 10 years ago

Hmm... I have to either create a new pull request or create a new branch and a new pull request.

mmagnuski commented 10 years ago

Maybe closing again will help

mmagnuski commented 10 years ago

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:

mmagnuski commented 10 years ago

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.