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.

Sign up for GitHub

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

Jump to bottom

merge #2

Merged
merged 130 commits into from
Oct 20, 2014
Merged

merge #2

merged 130 commits into from
Oct 20, 2014

Conversation

andrewolaughlin
Copy link
Owner

No description provided.

alexhuth and others added 30 commits September 10, 2013 10:28
@alexhuth
initial vertexrois: now rois.py/ROIpack can be used to generate an SV…
b5ae9c7 
…G from vertex set of ROIs
Merge branch 'master' into vertexrois
4d5b082
Minor change to cortex/rois.py to make explicit that cache should be …
6537af0 
…created. ML
@marklescroart
First steps to making sulcal / display layers on webgl viewer.
b262499 
NOT FINISHED.
@marklescroart
Can save sulcal layers as separate ctm (so you choose whether to disp…
9de4aa7 
…lay sucli / rois). Need to implement multi-layer ROIpack objects

to make this work the real way. Also did some improvements to saved views.

ML
@marklescroart
Updates to extra_layers. Also playing with animation stuff in view.py…
e5a63c2 
…; inconclusive.
@marklescroart
Quick attempt to make quickflat work with rois
fdbe317
@BaladityaY
adding svgroi+svgsplines
472e509
@marklescroart
First steps to making sulcal / display layers on webgl viewer.
91df942 
NOT FINISHED.
@marklescroart
Can save sulcal layers as separate ctm (so you choose whether to disp…
2fc9128 
…lay sucli / rois). Need to implement multi-layer ROIpack objects

to make this work the real way. Also did some improvements to saved views.

ML
@marklescroart
Updates to extra_layers. Also playing with animation stuff in view.py…
4b2d872 
…; inconclusive.
@marklescroart
Couple stoopid bugs in rebase of branch to master fixed.
8b33f2b
@marklescroart
More stoopid fixes w/ merge w/ master branch.
2e0e9ae
@marklescroart
Final cleanup of merge/rebase nonsense. I hope.
68b1d90
@marklescroart
Laptop updates to add extra_disp layer
c8b07b1
@marklescroart
Merge branch 'extra_layers' of https://github.com/gallantlab/pycortex …
26c98f5 
…into extra_layers

Conflicts:
	cortex/brainctm.py
	cortex/database.py
	cortex/quickflat.py
	cortex/utils.py
	cortex/webgl/view.py
@marklescroart
Merge branch 'extra_layers' of https://github.com/gallantlab/pycortex …
f8b0299 
…into extra_layers

Conflicts:
	cortex/quickflat.py
@marklescroart
First steps to making sulcal / display layers on webgl viewer.
134754e 
NOT FINISHED.
@marklescroart
Can save sulcal layers as separate ctm (so you choose whether to disp…
8785696 
…lay sucli / rois). Need to implement multi-layer ROIpack objects

to make this work the real way. Also did some improvements to saved views.

ML
@marklescroart
Updates to extra_layers. Also playing with animation stuff in view.py…
19a8b8a 
…; inconclusive.
@marklescroart
Quick attempt to make quickflat work with rois
b9990ff
@marklescroart
First steps to making sulcal / display layers on webgl viewer.
f0dc55a 
NOT FINISHED.
@marklescroart
Can save sulcal layers as separate ctm (so you choose whether to disp…
07fea84 
…lay sucli / rois). Need to implement multi-layer ROIpack objects

to make this work the real way. Also did some improvements to saved views.

ML
@marklescroart
Updates to extra_layers. Also playing with animation stuff in view.py…
0a5741d 
…; inconclusive.
@marklescroart
Couple stoopid bugs in rebase of branch to master fixed.
6d15652
@marklescroart
More stoopid fixes w/ merge w/ master branch.
9f1cc52
@marklescroart
Final cleanup of merge/rebase nonsense. I hope.
2bf681a
@marklescroart
Laptop updates to add extra_disp layer
9fd3028
@marklescroart
Misc fiddlings with memo function to debug, final fix of quickflat af…
de5fd1f 
…ter merge/rebase
@marklescroart
Changes to get/set views, for incorporation back to master branch
dcc0ee5
marklescroart and others added 27 commits October 1, 2014 00:59
@marklescroart
New colormap
eac403c
@marklescroart
Merging changes
09263ca
@marklescroart
Fix to missing last-frame of animations
60de3bb
@alexhuth
Merge branch 'master' of https://github.com/gallantlab/pycortex
1ae8989
@alexhuth
fixed problem with adjacency matrix
3a60735
@alexhuth
Merge branch 'master' of https://github.com/gallantlab/pycortex
8306706
@alexhuth
Merge branch 'master' of https://github.com/gallantlab/pycortex
c4d5add
@BaladityaY
integrated get_roi() with current pycortex
861ac89
@BaladityaY
added all back?
6879e5f
@BaladityaY
fixed get_roi() with current pycortex
61b1b66
@BaladityaY
removed unnecessary comments
65a65a1
@BaladityaY
Merge branch 'master' of https://github.com/gallantlab/pycortex
059c92e
@BaladityaY
fixed merge conflicts
176b7c2
@BaladityaY
removed useless files?
9ef5af7
@alexhuth
added ability to input custom dropout map to quickflat
b9aadf1
@alexhuth
added ability to rotate brain into canonical (90 degree) views using …
cbf2240 
…arrow keys
@BaladityaY
fixed svg parser close path command bug
6925009
@marklescroart
correct saving of orthographic views
37cdad4
@jamesgao
Merge pull request #109 from gallantlab/vertexrois
0783975 
Vertexrois
@jamesgao
Prefer new name for new function
a39164e
@jamesgao
Merge pull request #110 from gallantlab/animation_edits
bc829d4 
Animation edits
@alexhuth
Fixed bug in face area computation
3f6268d
@alexhuth
Fixed default m with new fixed triangle areas
6b6e38f
@alexhuth
Cast user-supplied masks to boolean arrays
7abb176
@alexhuth
Removed all import *'s from svgroi.py............. (these are passive…
b1085a5 
… aggressive dots)....
@alexhuth
fixed colorpickers so defaults work w/ new version of minicolors
d5ec03c
@alexhuth
Merge branch 'master' of https://github.com/gallantlab/pycortex
a5f75e3
@andrewolaughlin andrewolaughlin self-assigned this Oct 20, 2014
andrewolaughlin added a commit that referenced this pull request Oct 20, 2014
@andrewolaughlin
Merge pull request #2 from gallantlab/master
b8865a5 
merge
@andrewolaughlin andrewolaughlin merged commit b8865a5 into andrewolaughlin:master Oct 20, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@andrewolaughlin andrewolaughlin

Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@andrewolaughlin @alexhuth @marklescroart @BaladityaY @jamesgao @anwarnunez