Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Mar 7, 2015
  1. @aschampion

    Remove use of eval for JSON parsing

    aschampion authored
    While the safety of eval is not a concern here, it is still brittle,
    slow (~60% slower than JSON.parse in modern browsers), allows
    unintuitive behavior (arbitrary script in responses), and needless given
    we do not support pre-native-JSON browsers.
Commits on Mar 6, 2015
  1. @tomka
  2. @tomka

    Neuron dendrogram: make tag selection a dialog opened by a button

    tomka authored
    This replaces the input box to select tags for highlighting with a
    dialog that is opened by the button "Highlight tags". The dialog shows
    only tags that are actually available in the selected skeleton.
    
    Closes catmaid/CATMAID#860
  3. @tomka

    Neuron dendrogram: replace growlAlert() with CATMAID.info()

    tomka authored
    The new call does the same as the old, but requires one less global to be
    defined for the dendrogram and makes the code shorter.
  4. @tomka

    Add growl error convenience methods

    tomka authored
    CATMAID.msg(title, msg) will display a regular growl message and
    CATMAID.info(msg) as well as CATMAID.warn(msg) have the title set
    accordingly already.
  5. @tomka

    Add missing space (minor)

    tomka authored
  6. @acardona
  7. @tomka

    3D viewer disable automatic matrix update for floor and bounding box

    tomka authored
    The matrix of an object gets updated automatically every render call, if
    not disabled explicitly. No transformations are applied to the floor
    and the bounding box after initial positioning. Therefore, an automatic
    update of the mesh's matrices is not required.
Commits on Mar 5, 2015
  1. @tomka

    3D viewer: remove unnecessary rotation component order change of camera

    tomka authored
    This was put in by me for testing, but was not meant to be committed.
  2. @tomka
  3. @tomka
  4. @tomka
  5. @acardona
  6. @acardona

    GroupGraph: new buttons to "Save" and "Open..." to/from JSON.

    acardona authored
    Functionality requested by Chris Doe.
    
    Refactored the cloneWidget method to avoid redundancy.
  7. @tomka

    3D viewer: add suppert four different rotation axes

    tomka authored
    This extends the animation tools to allow rotation in one of the four axes X, Y,
    Z and Current Up. There is still a small problem with the camera view doing
    small local rotations on its own. This, however, will be fixed in a separate
    commit. The rotations them self work.
    
    See catmaid/CATMAID#917
  8. @acardona

    GroupGraph: new function "Clone" to open a widget with identical content

    acardona authored
    positioned in the exact same way.
Commits on Mar 4, 2015
  1. @tomka
  2. @tomka

    3D viewer: determine a node scaling automatically

    tomka authored
    This initializes the node scaling so that smallest resolution component
    is multiplied by two. It has been tested for different resolutions and
    helps to make node sizes appear similar across them. The default
    geometry sizes have been changed to match the current sizes.
    
    See catmaid/CATMAID#934
  3. @tomka

    3D viewer: add option to scale node handles of skeletons

    tomka authored
    Node handles are the active node and nodes that have special tags.
    
    See catmaid/CATMAID#934
  4. @tomka
  5. @tomka
  6. @acardona
  7. @acardona

    WebGLApplication: approximate upstream arbor by strahler number

    acardona authored
    when 'microtubules end' tags do not exist for shading by dendritic-backbone.
  8. @acardona
  9. @acardona

    Merge branch 'Arbor-dev'

    acardona authored
Commits on Mar 3, 2015
  1. @aschampion

    3D viewer: lint (minor)

    aschampion authored
    Change return comparison in intersectionFound from weak equality with
    false to strong equality with null, since intersect returns null or a
    nodeId.
  2. @tomka

    Merge branch '3dviewer-pickmap'

    tomka authored
  3. @tomka

    3D viewer: move ray based picking into own function and use color map…

    tomka authored
    … as fallback
    
    If now an object should be picked, a ray is cast first. If this results
    in a node being picked, it is used. Otherwise, the color based picking
    function is used. The latter will find a result for sure, but takes
    maybe a second longer.
    
    See catmaid/CATMAID#890
  4. @tomka

    3D viewer: add a method to pick a node by a color pick map

    tomka authored
    This method renders the all pickable objects (e.g. all spheres and
    radius volumes) to an off screen buffer. Then it checks for a certain
    position in this buffer (usually mouse coordinates) and if the resulting
    color is mapped to a clickable object, the object's ID is returned. This
    is a much more precise way to pick objects. However, it also is slightly
    slower than casting a ray.
  5. @tomka

    3D viewer: make options available to space object

    tomka authored
    Some functions in a Space objects already need the option object and get
    it passed in (which is fine). This is however not possible for all
    functions, e.g. functions called as a result of a mouse action won't
    have easy access to the WebGLApplication object. There is no effort
    involved in keeping this reference in sync, because it is the same
    object that the WebGLApplication references.
  6. @tomka
Commits on Feb 28, 2015
  1. @unidesigner
  2. @acardona

    AnalyzeArbor: approximate twigs by Strahler number of the branches

    acardona authored
    for neurons that do not have "microtubule ends" tags.
    
    Also added option to always use Strahler number, for comparison.
  3. @acardona

    AnalyzeArbor: options dialog to configure plot dimensions

    acardona authored
    and the Strahler number for approximating twigs.
  4. @acardona

    WebGLApplication: when smoothing, do half as many Vector3 copy operat…

    acardona authored
    …ions.
    
    The Vector3 instances are reused and therefore only half of the vertices
    need an update.
Something went wrong with that request. Please try again.