Skip to content

MRG: fix lower-case TRK codes, add error message #600

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.

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

Merged
merged 3 commits into from
Feb 20, 2018

Conversation

matthew-brett
Copy link
Member

An alternative to #590 - Kesshi's initial fix and test, plus some better error
checking in axcodes2ornt.

kesshijordan and others added 3 commits January 9, 2018 18:29
As Kesshi Jordan pointed out, TRK files can have lower-case axis codes,
and this causes unexpected output from axcodes2ornt.  Extend
axcodes2ornt to

a) Check whether the axis codes do in fact correspond to the labels.
b) Check for duplicate labels.
@coveralls
Copy link

Coverage Status

Coverage increased (+1.03%) to 96.362% when pulling 9ac73d0 on matthew-brett:trk-codes-with-check into 6eacaf5 on nipy:master.

@codecov-io
Copy link

codecov-io commented Feb 19, 2018

Codecov Report

Merging #600 into master will increase coverage by 1.06%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #600      +/-   ##
==========================================
+ Coverage    93.4%   94.47%   +1.06%     
==========================================
  Files         189      177      -12     
  Lines       25820    24962     -858     
  Branches     2752     2661      -91     
==========================================
- Hits        24118    23582     -536     
+ Misses       1205      908     -297     
+ Partials      497      472      -25
Impacted Files Coverage Δ
nibabel/streamlines/trk.py 94.29% <100%> (ø) ⬆️
nibabel/orientations.py 97.56% <100%> (+0.08%) ⬆️
nibabel/streamlines/tests/test_trk.py 100% <100%> (ø) ⬆️
nibabel/tests/test_orientations.py 100% <100%> (ø) ⬆️
nibabel/benchmarks/bench_array_to_file.py
nibabel/externals/netcdf.py
nibabel/externals/tests/test_six.py
nibabel/externals/tests/test_netcdf.py
nibabel/benchmarks/bench_finite_range.py
nibabel/benchmarks/bench_fileslice.py
... and 6 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6eacaf5...9ac73d0. Read the comment docs.

@kesshijordan
Copy link
Contributor

That looks good, @matthew-brett . Thanks!

@matthew-brett
Copy link
Member Author

@effigies - any thoughts on this one?

@effigies
Copy link
Member

LGTM

@matthew-brett matthew-brett merged commit 8312af6 into nipy:master Feb 20, 2018
@matthew-brett
Copy link
Member Author

Thanks @kesshijordan @effigies .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants