Merge from wandell/frontend to isetbio/frontend

[hjiang36]

Hi, I just did some subtree merge from wandell/frontend repository (branch Haomiao) to here. By subtree merge, all history and log of old frontend repository should be there. Currently, the repository code structure is like:

data/ - store some useful data file
external tools/   - includes external toolbox or functions (ellipse fitting, etc.)
isetbio dev/ - includes some under development functions or trials for isetbio, possibly, we should remove this one and move all its content to isetbio dev branch
scripts/ - helpful scripts, we might add some comments to make them something like tutorials
simulations - all kinds of simulations here
tutorials - contains well-commented tutorials
validation - validation scripts

If you have any suggestions for the code structures here, please let me know. To do the subtree merge, the following command is used:

$ git remote add -f frontend https://github.com/wandell/frontend.git
$ git merge -s ours --no-commit frontend/Haomiao
$ git read-tree --prefix=/ -u frontend/Haomiao
$ git pull -s subtree frontend Haomiao
$ git commit -m "Merge from wandell/frontend branch Haomiao to isetbio/frontend"
$ git push

A helpful reference page for subtree merging can be found here

I'm planning move wandell/frontend master branch into simulations/colorContour/dhb later today (I'm not sure if this is the right thing to do). If you get any good suggestions on, let me know.

Best Regards, HJ

[DavidBrainard]

On Jul 10, 2014, at 12:49 PM, Haomiao Jiang notifications@github.com wrote:

Hi, I just did some subtree merge from wandell/frontend repository (branch Haomiao) to here. By subtree merge, all history and log of old frontend repository should be there. Currently, the repository code structure is like:

data/ - store some useful data file external tools/ - includes external toolbox or functions (ellipse fitting, etc.) isetbio dev/ - includes some under development functions or trials for isetbio, possibly, we should remove this one and move all its content to isetbio dev branch scripts/ - helpful scripts, we might add some comments to make them something like tutorials simulations - all kinds of simulations here tutorials - contains well-commented tutorials validation - validation scripts If you have any suggestions for the code structures here, please let me know. To do the subtree merge, the following command is used:

$ git remote add -f frontend https://github.com/wandell/frontend.git $ git merge -s ours --no-commit frontend/Haomiao $ git read-tree --prefix=/ -u frontend/Haomiao $ git pull -s subtree frontend Haomiao $ git commit -m "Merge from wandell/frontend branch Haomiao to isetbio/frontend" $ git push A helpful reference page for subtree merging can be found here

I'm planning move wandell/frontend master branch into simulations/colorContour/dhb later today (I'm not sure if this is the right thing to do). If you get any good suggestions on, let me know

This seems like a good place to put it, at least for now. I will stay out of the old version until I hear that you've moved it, and then start working with the version in isetbio.

DB

[hjiang36]

I've merged wandell/frontend (master branch) to isetbio/fronend/simulations/colorContour/dhb. Please check.

HJ