aces / brainbrowser

Web-based visualization tools for neurological data.
https://brainbrowser.cbrain.mcgill.ca/
GNU Affero General Public License v3.0
352 stars 124 forks source link

Merge of Bigbrain Viewer capability into main branch. #313

Closed natacha-beck closed 8 years ago

natacha-beck commented 8 years ago

In this PR I tried to merge everything from Lindsay work on the BigBrain viewer the code source can be found here.

For the moment you will found the bigbrain viewer under examples/bigbrain-viewer, in this way you can test the functionality.

I tried to generalize the functionality added by Lindsay and to put this one in appropriate files (see viewer.gridHelper for example). I also fixed some little stuffs in same time.

Here is some notes about what I have done during the merge process:

Integration of BBl:

Step 1 (27c91bfa7fbebe6362124a487452c11d751f0fe0):

Step 2 (2bf03ee260c05e06df03d604f2100b30f40648f2):

  • Added missing images

Step 3 (186596028e5c5a3651a9281b2c1c72439e17981b):

  • Added missing css, and *.js file for the bigbrain viewer + fix path in code.

Step 4 (2fe2ca2ab3b013f8f158f8c39961ef3af257fb6b):

  • Run jshint + fix some of the warning (indentation + equality operator)

Step 5 (8fb11bc2e5461cb9a6bbf979fe293b66b1f2012c):

  • More jshint fix.
  • Added Bigbrain Grid in Three.js (TODO: should not be here)
  • In rendering.js add some code to handle axes (TODO: should not be here)

Step 6 (1a8e11df4a096b2b53e1d5efcd18a5a927e96634):

  • more fix for jshint (axes)

Step 7 (8a06fa89cd74b6c74171c7c4d1395633b56aab6f):

  • Replace more for loop by forEach loop.

Step 8 (61b5009579c99ffb76fce9c686569f84b826062a):

  • Add jshint rules to ignore loopfunc and eval usage
  • Fixed usage of searchapes as a global variable.
  • Temporary added getVertex2 in src/brainbrowser/surface-viewer.js (TODO: should not be here)
  • Temporary added a version of viewer.pick_bb in src/brainbrowser/surface-viewer/modules/rendering.js (TODO: should not be here)

Step 9 (7cb489b6dd92afd4a0f147daa47665fc0a10c4bd):

  • Some more fix for jshint

Step 10 (28ed43e00d48b106f64b8162ea7bb05ea14f62ea):

  • Fix of Grid and fix of getVertex2

Step 11 (17ba618d014693b6b5ef805dfee1d999db8e13ae):

  • Split pick_bb in 2: 1 == the old one, 2 == pick by index.
  • Remove getVertex2

Step 12 (f287c9c4d619614b39ed84050cb7b3241f2ec603, bee7171fbd940a489efcebb52135474c181975e0, 0a3eb5e84c0f0d985ec834fbe50f81f26ac28db5, 99a8ad86cc64c2d66ea5fd8a9bf6b8aa9369c926 )

  • Extract gridHelper.

Step 13 (7568f60e5ee6d10bce96b79daa75f28b6ce66b54):

  • Fix rotation of related models

Step 14 (1bf02a0c257b53b4cc3f32827f8262c1cd9e92d4):

  • Fix bug with color slider when no color available ==> provide a default

Step 15 (49be218212952b45da63aa3e019b350007bdcd85):

  • Fix format and autoload issues

Here is some general comment/issue that seems to be present:

Please let me know all yours comments, I'm sure this PR have place for improvement.

natacha-beck commented 8 years ago

Here is some issue reported:

natacha-beck commented 8 years ago

At this point all the previous comments are fixed. Please take a look and let me know if you find something.

natacha-beck commented 8 years ago

New batch of comment from @lblewis :

From @jonathanlurie :

natacha-beck commented 8 years ago

Need to fix this one from @lblewis

natacha-beck commented 8 years ago

Fix the 'model centric' part.

natacha-beck commented 8 years ago

Just fix the last bug that @lblewis had mention. Please go head for a code review.

natacha-beck commented 8 years ago

With @jonathanlurie we have observed some strange behaviour concerning the grid. When a user manipulates the opacity of the shape, then the grid resizes, but the center of rotation stays the same; this kind of behaviour can thus generate some strange effects (this comportement is insync with @lblewis version).

natacha-beck commented 8 years ago

@rdvincent I just done the update, with your comments.