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

new local annotation format #16

Open
wants to merge 71 commits into
base: develop
Choose a base branch
from
Open

new local annotation format #16

wants to merge 71 commits into from

Commits on Oct 2, 2017

  1. made a simple trakem2 import module

    @fcollman
    fcollman committed Oct 2, 2017
    Configuration menu
    Copy the full SHA
    9da7e42 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2017

  1. Merge branch 'simple_trakem2_import' into develop

    @fcollman
    fcollman committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    9db3bd4 View commit details
    Browse the repository at this point in the history

  2. changed import order

    @fcollman
    fcollman committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    3037c04 View commit details
    Browse the repository at this point in the history

  3. fixing bugs in registration apps

    @fcollman
    fcollman committed Oct 11, 2017
    Configuration menu
    Copy the full SHA
    3b1020c View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2017

  1. fixed apply alignment to deal with mismatched zs

    @fcollman
    fcollman committed Oct 12, 2017
    Configuration menu
    Copy the full SHA
    d8a4769 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2017

  1. added split stack modules

    @fcollman
    fcollman committed Oct 29, 2017
    Configuration menu
    Copy the full SHA
    c533038 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2017

  1. Merge branch 'develop' of github.com:fcollman/render-python-apps into… 

    … develop
    @fcollman
    fcollman committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    86075ab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of https://github.com/AllenInstitute/render-py… 

    …thon-apps into develop
    @fcollman
    fcollman committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    d706e2d View commit details
    Browse the repository at this point in the history

  3. adapted to a more general file name that just has a specific suffix

    @sharmishtaa
    sharmishtaa committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    21c6c0b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into applyframe_bug

    @sharmishtaa
    sharmishtaa committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    c3b8fde View commit details
    Browse the repository at this point in the history

  5. indent fix

    @sharmishtaa
    sharmishtaa committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    f3b5dcf View commit details
    Browse the repository at this point in the history

  6. indent fix

    @sharmishtaa
    sharmishtaa committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    14ab0ae View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19 from AllenInstitute/applyframe_bug 

    adapted to a more general file name that just has a specific suffix
    @sharmishtaa
    sharmishtaa committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    eee316e View commit details
    Browse the repository at this point in the history

  8. fixed indent

    @sharmishtaa
    sharmishtaa committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    f3ae6ab View commit details
    Browse the repository at this point in the history

  9. Merge pull request #20 from AllenInstitute/fixindent 

    fixed indent
    @sharmishtaa
    sharmishtaa committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    9c00cf0 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2017

  1. changed annotation format to have z

    @fcollman
    fcollman committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    94bf55c View commit details
    Browse the repository at this point in the history

  2. added z to global

    @fcollman
    fcollman committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    0adbcbd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:fcollman/render-python-apps into… 

    … develop
    @fcollman
    fcollman committed Nov 10, 2017
    Configuration menu
    Copy the full SHA
    3b5cebc View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2017

  1. Create CONTRIBUTING.md

    @fcollman
    fcollman committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    51040ae View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2017

  1. Add AWS SDK for Python.

    @perlman
    perlman committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    2121408 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2017

  1. Update to copy channels and new renderapi.

    @perlman
    perlman committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    c88ee2e View commit details
    Browse the repository at this point in the history

  2. Updated code for moving stacks to the cloud.

    @perlman
    perlman committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    98f015b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3 from fcollman/eric-dev 

    Updated cloud transfer code
    @fcollman
    fcollman committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    958620e View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2017

  1. added pool option

    @sharmishtaa
    sharmishtaa committed Dec 21, 2017
    Configuration menu
    Copy the full SHA
    a768b49 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #21 from AllenInstitute/update_filtermatches 

    added pool option
    @fcollman
    fcollman committed Dec 21, 2017
    Configuration menu
    Copy the full SHA
    c314ad8 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2017

  1. Uploading leila's changes - selection of z values and uploading mask

    @sharmishtaa
    sharmishtaa committed Dec 22, 2017
    Configuration menu
    Copy the full SHA
    1319d3f View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Merge pull request #22 from AllenInstitute/uploadmask 

    Uploadmask
    @fcollman
    fcollman committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    0b8e3ed View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2018

  1. new zoned deconvolution

    @ogliko
    ogliko committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    e15dca7 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2018

  1. modified apply_deconv_zoned and added scikit-image and nomkl

    @ogliko
    ogliko committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    7cde961 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. Merge pull request #23 from AllenInstitute/olga_fibics 

    new zoned deconvolution module
    @fcollman
    fcollman committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    2ad8414 View commit details
    Browse the repository at this point in the history

  2. uncommented first two lines to specify package

    @ogliko
    ogliko committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    8735264 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #24 from AllenInstitute/olga_fibics 

    uncommented first two lines to specify package
    @sharmishtaa
    sharmishtaa committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    a254eb6 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2018

  1. changes to work with new libraries

    @sharmishtaa
    sharmishtaa committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    7dfdd8c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from AllenInstitute/filter_pointmatches_poly 

    changes to work with new libraries
    @sharmishtaa
    sharmishtaa committed Mar 15, 2018
    Configuration menu
    Copy the full SHA
    3299211 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2018

  1. lightening requirements

    @fcollman
    fcollman committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    a35b2ac View commit details
    Browse the repository at this point in the history

  2. reduces requirement strictness

    @fcollman
    fcollman committed Apr 6, 2018
    Configuration menu
    Copy the full SHA
    7e333c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2018

  1. added setz option to let the output stack take the z of the destinati… 

    …on stack
    @sharmishtaa
    sharmishtaa committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    66ba0ad View commit details
    Browse the repository at this point in the history

  2. Merge pull request #26 from AllenInstitute/fitptmatchesandsetz 

    added setz option to let the output stack take the z of the destinati…
    @fcollman
    fcollman committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    7df8d03 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2018

  1. updating repo to current pipeline

    @fcollman
    fcollman committed May 7, 2018
    Configuration menu
    Copy the full SHA
    e98496f View commit details
    Browse the repository at this point in the history

Commits on May 10, 2018

  1. changed to argschema and changed module name

    @sharmishtaa
    sharmishtaa committed May 10, 2018
    Configuration menu
    Copy the full SHA
    c8c3ced View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27 from AllenInstitute/fix_squeezestack 

    changed to argschema and changed module name
    @sharmishtaa
    sharmishtaa committed May 10, 2018
    Configuration menu
    Copy the full SHA
    4fc21f7 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2018

  1. adding option for buffer size in creating trakem2 projects

    @sharmishtaa
    sharmishtaa committed May 30, 2018
    Configuration menu
    Copy the full SHA
    aa5403a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #28 from AllenInstitute/addbuffer 

    adding option for buffer size in creating trakem2 projects
    @sharmishtaa
    sharmishtaa committed May 30, 2018
    Configuration menu
    Copy the full SHA
    7094a8f View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2018

  1. making a big commit to sync with repo

    @fcollman
    fcollman committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    9be5065 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:AllenInstitute/render-python-apps… 

    … into develop
    @fcollman
    fcollman committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    1a14023 View commit details
    Browse the repository at this point in the history

  3. merging

    @fcollman
    fcollman committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    e05a072 View commit details
    Browse the repository at this point in the history

  4. merging in develop

    @fcollman
    fcollman committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    776fe0e View commit details
    Browse the repository at this point in the history

  5. adding new files

    @fcollman
    fcollman committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    d4407bb View commit details
    Browse the repository at this point in the history

  6. fixing merge mistakes

    @fcollman
    fcollman committed Jun 1, 2018
    Configuration menu
    Copy the full SHA
    2835a54 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2018

  1. Merge pull request #29 from AllenInstitute/forrest_big_merge 

    Forrest big merge
    @sharmishtaa
    sharmishtaa committed Jun 5, 2018
    Configuration menu
    Copy the full SHA
    3d35a9f View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2018

  1. forrest leila changes for cross modal registration

    @sharmishtaa
    sharmishtaa committed Jun 13, 2018
    Configuration menu
    Copy the full SHA
    38170e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2018

  1. adding module for filtering pointmatches with a fixed rectangle

    @sharmishtaa
    sharmishtaa committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    fa969ef View commit details
    Browse the repository at this point in the history

  2. cleaning up

    @sharmishtaa
    sharmishtaa committed Jun 27, 2018
    Configuration menu
    Copy the full SHA
    8b515c6 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2018

  1. change opencv python to contrib

    @fcollman
    fcollman committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    020dc57 View commit details
    Browse the repository at this point in the history

  2. Update requirements.txt

    @fcollman
    fcollman committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    009cc52 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #32 from AllenInstitute/filter_by_rectangle 

    Filter by rectangle
    @fcollman
    fcollman committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    6e9fce8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #30 from AllenInstitute/forrest_leila_changes 

    forrest leila changes for cross modal registration
    @fcollman
    fcollman committed Jun 29, 2018
    Configuration menu
    Copy the full SHA
    c9b4ce2 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. Update Dockerfile

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    9ccb66b View commit details
    Browse the repository at this point in the history

  2. update requirements

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    05d5733 View commit details
    Browse the repository at this point in the history

  3. merging in alleninstitute

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    2b9fa35 View commit details
    Browse the repository at this point in the history

  4. merging develop

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    a3ab273 View commit details
    Browse the repository at this point in the history

  5. adding synapse detection

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    c75fbdd View commit details
    Browse the repository at this point in the history

  6. merging in develop

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    0682f40 View commit details
    Browse the repository at this point in the history

  7. adding affine only

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    d31e6b0 View commit details
    Browse the repository at this point in the history

  8. adding docker ignore

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    840e73e View commit details
    Browse the repository at this point in the history

  9. merging

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    a11ef09 View commit details
    Browse the repository at this point in the history

  10. adding conda env script

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    a1e986c View commit details
    Browse the repository at this point in the history

  11. adding module for anish annotations

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    d79fe88 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop'

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    1630191 View commit details
    Browse the repository at this point in the history

  13. fixing opencv req

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    2b837ae View commit details
    Browse the repository at this point in the history

  14. adding an apt-get update

    @fcollman
    fcollman committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    d48bc0a View commit details
    Browse the repository at this point in the history