merge#2

Merged

andrewolaughlin merged 130 commits intoandrewolaughlin:masterfrom

gallantlab:master

Oct 20, 2014

Commits on Sep 10, 2013

initial vertexrois: now rois.py/ROIpack can be used to generate an SVG from vertex set of ROIs
alexhuth
committed

Commits on Oct 17, 2013

Commits on Apr 30, 2014

First steps to making sulcal / display layers on webgl viewer.
marklescroart
committed

Commits on May 2, 2014

Can save sulcal layers as separate ctm (so you choose whether to display sucli / rois). Need to implement multi-layer ROIpack objects
marklescroart
committed

Commits on May 14, 2014

Updates to extra_layers. Also playing with animation stuff in view.py; inconclusive.
marklescroart
committed

Commits on May 17, 2014

Quick attempt to make quickflat work with rois
marklescroart
committed

Commits on Jun 6, 2014

adding svgroi+svgsplines
BaladityaY
committed

Commits on Jun 11, 2014

Commits on Jun 13, 2014

Changes to get/set views, for incorporation back to master branch
marklescroart
committed

Commits on Jul 15, 2014

Updates to quicklflat and blah I don't know need to change back to master real quick tho
marklescroart
committed

Commits on Aug 12, 2014

Commits on Aug 14, 2014

Commits on Sep 4, 2014

Commits on Sep 10, 2014

Merge pull request #106 from andrewolaughlin/master
jamesgao
committed

Commits on Sep 11, 2014

now webgl works nicely with multiple display layers
alexhuth
committed

Commits on Sep 14, 2014

fixed bug that broke CTM for HCP subject
alexhuth
committed

Commits on Sep 15, 2014

Commits on Sep 16, 2014

fixed bug where calling VolumeRGB.volume multiple times would give different values
alexhuth
committed

Commits on Sep 19, 2014

Commits on Sep 25, 2014

Commits on Sep 26, 2014

Commits on Sep 29, 2014

First steps to re-coding animation
marklescroart
committed
Make saveIMG use getImage
James Gao
committed
attempts to fix saveIMG, aborted in favor of James' help.
Mark Lescroart
committed
Merge with JG changes
Mark Lescroart
committed
Further improvements to animation sequence. _get_anim_seq() now works.
Mark Lescroart
committed
Add a marching_cubes function to pycortex
jamesgao
committed
Additions to allow external display files displayed on webgl surfaces
Mark Lescroart
committed

Commits on Sep 30, 2014

A few changes to getState in mriview.js
Mark Lescroart
committed
Add slice setting to getState / setState
James Gao
committed
New colormap
marklescroart
committed

Commits on Oct 7, 2014