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

flexible grid to streamline affine generation and pathlength function #1114

Merged
merged 26 commits into from Oct 28, 2016
Merged

flexible grid to streamline affine generation and pathlength function #1114

merged 26 commits into from Oct 28, 2016

Commits on Aug 25, 2016

  1. added two functions to create a flexible trackvis affine capable of r… 

    …econciling streamlines and grids with different voxel orders
    @kesshijordan
    kesshijordan committed Aug 25, 2016
    Copy the full SHA
    94ace14 View commit details
    Browse the repository at this point in the history

  2. edit documentation

    @kesshijordan
    kesshijordan committed Aug 25, 2016
    Copy the full SHA
    b1d14b4 View commit details
    Browse the repository at this point in the history

  3. added bago's pathlength function

    @kesshijordan
    kesshijordan committed Aug 25, 2016
    Copy the full SHA
    19d8458 View commit details
    Browse the repository at this point in the history

  4. added test for bago's pathlength function

    @kesshijordan
    kesshijordan committed Aug 25, 2016
    Copy the full SHA
    f23b73f View commit details
    Browse the repository at this point in the history

  5. moved bago's path length test function to the tests directory

    @kesshijordan
    kesshijordan committed Aug 25, 2016
    Copy the full SHA
    3bc1b6d View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. documentation

    @kesshijordan
    kesshijordan committed Aug 26, 2016
    Copy the full SHA
    338019a View commit details
    Browse the repository at this point in the history

  2. added tests for flexi trackvis affine

    @kesshijordan
    kesshijordan committed Aug 26, 2016
    Copy the full SHA
    3292baa View commit details
    Browse the repository at this point in the history

  3. fixed tests and changed flext tvis aff to get dimension from trackvis… 

    … header
    @kesshijordan
    kesshijordan committed Aug 26, 2016
    Copy the full SHA
    bf5429e View commit details
    Browse the repository at this point in the history

  4. fixed tests and changed flext tvis aff to get dimension from trackvis… 

    … header
    @kesshijordan
    kesshijordan committed Aug 26, 2016
    Copy the full SHA
    565f04c View commit details
    Browse the repository at this point in the history

  5. forced streamline vox order to be string in flexi tvis affine

    @kesshijordan
    kesshijordan committed Aug 26, 2016
    Copy the full SHA
    0fc2d4d View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2016

  1. fixed colon spacing in docstring

    @kesshijordan
    kesshijordan committed Sep 13, 2016
    Copy the full SHA
    df0fc3f View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2016

  1. Merge remote-tracking branch 'upstream'

    @kesshijordan
    kesshijordan committed Sep 23, 2016
    Copy the full SHA
    2b45791 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2016

  1. addressing errors in test

    @kesshijordan
    kesshijordan committed Sep 29, 2016
    Copy the full SHA
    186ae52 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master'

    @kesshijordan
    kesshijordan committed Sep 29, 2016
    Copy the full SHA
    e25afae View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master'

    @kesshijordan
    kesshijordan committed Sep 29, 2016
    Copy the full SHA
    4378acf View commit details
    Browse the repository at this point in the history

  4. cleaning up

    @kesshijordan
    kesshijordan committed Sep 29, 2016
    Copy the full SHA
    8f03892 View commit details
    Browse the repository at this point in the history

  5. numpy.ufunc.at failed one build, so mod to conform

    @kesshijordan
    kesshijordan committed Sep 29, 2016
    Copy the full SHA
    05a9153 View commit details
    Browse the repository at this point in the history

  6. fixed type

    @kesshijordan
    kesshijordan committed Sep 29, 2016
    Copy the full SHA
    a78e5e0 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2016

  1. previous fix for np 1.7 introduced errors: addressed this

    @kesshijordan
    kesshijordan committed Sep 30, 2016
    Copy the full SHA
    6abccfc View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2016

  1. BF - fix _min_at function

    @MrBago
    MrBago committed Oct 1, 2016
    Copy the full SHA
    d2c0d14 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2016

  1. Merge pull request #1 from MrBago/bf_minat 

    BF - fix _min_at function
    @kesshijordan
    kesshijordan committed Oct 4, 2016
    Copy the full SHA
    2dfaa4c View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2016

  1. PEP8 compliance edits

    @kesshijordan
    kesshijordan committed Oct 27, 2016
    Copy the full SHA
    4cdd9b6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of git://github.com/nipy/dipy 

    Conflicts:
	dipy/tracking/tests/test_utils.py
    @kesshijordan
    kesshijordan committed Oct 27, 2016
    Copy the full SHA
    9bca8be View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:kesshijordan/dipy 

    Conflicts:
	dipy/tracking/tests/test_utils.py
    @kesshijordan
    kesshijordan committed Oct 27, 2016
    Copy the full SHA
    9b53344 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/nipy/dipy 

    Conflicts:
	dipy/tracking/tests/test_utils.py
    @kesshijordan
    kesshijordan committed Oct 27, 2016
    Copy the full SHA
    3834ee6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/kesshijordan/dipy 

    Conflicts:
	dipy/tracking/tests/test_utils.py
    @kesshijordan
    kesshijordan committed Oct 27, 2016
    Copy the full SHA
    a59c50f View commit details
    Browse the repository at this point in the history