lp:~nipy-developers/nipy/merge-affine-image

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~nipy-developers/nipy/obsolete-do-not-use

nipy-developers: Pending requested 2010-04-30

Diff: 11225 lines (+7065/-2345)

47 files modified

doc/users/coordinate_map.rst (+716/-7)
examples/fiac/fiac_example.py (+13/-4)
examples/fiac/fiac_util.py (+10/-7)
nipy/algorithms/interpolation.py (+2/-1)
nipy/algorithms/kernel_smooth.py (+5/-4)
nipy/algorithms/resample.py (+20/-13)
nipy/algorithms/tests/test_kernel_smooth.py (+2/-2)
nipy/algorithms/tests/test_resample.py (+25/-25)
nipy/core/api.py (+3/-2)
nipy/core/image/affine_image.py (+373/-0)
nipy/core/image/image.py (+513/-104)
nipy/core/image/image_list.py (+33/-6)
nipy/core/image/tests/test_affine_image.py (+130/-0)
nipy/core/image/tests/test_generators.py (+5/-5)
nipy/core/image/tests/test_image.py (+101/-53)
nipy/core/image/tests/test_image_list.py (+26/-3)
nipy/core/image/tests/test_rollaxis.py (+308/-0)
nipy/core/image/tests/test_xyz_image.py (+313/-0)
nipy/core/image/tests/test_xyz_image_fmri.py (+145/-0)
nipy/core/image/xyz_image.py (+702/-0)
nipy/core/reference/array_coords.py (+67/-43)
nipy/core/reference/coordinate_map.py (+1464/-503)
nipy/core/reference/coordinate_system.py (+68/-49)
nipy/core/reference/slices.py (+218/-95)
nipy/core/reference/tests/matrix_groups.py (+23/-19)
nipy/core/reference/tests/test_array_coords.py (+40/-2)
nipy/core/reference/tests/test_coordinate_map.py (+346/-183)
nipy/core/reference/tests/test_coordinate_system.py (+1/-1)
nipy/core/reference/tests/test_evaluate.py (+0/-39)
nipy/core/reference/tests/test_matrix_groups.py (+4/-3)
nipy/core/reference/tests/test_parametrized_surface.py (+3/-3)
nipy/core/reference/tests/test_slices.py (+24/-25)
nipy/core/transforms/affines.py (+11/-5)
nipy/io/files.py (+81/-63)
nipy/io/imageformats/nifti1.py (+72/-0)
nipy/io/nifti_ref.py (+230/-295)
nipy/io/tests/test_nifti_ref.py (+80/-141)
nipy/io/tests/test_save.py (+77/-75)
nipy/modalities/fmri/design.py (+16/-16)
nipy/modalities/fmri/fmri.py (+14/-26)
nipy/modalities/fmri/fmristat/delay.py (+407/-405)
nipy/modalities/fmri/fmristat/model.py (+2/-2)
nipy/modalities/fmri/fmristat/npzimage.py (+0/-110)
nipy/modalities/fmri/fmristat/tests/test_FIAC.py (+0/-1)
nipy/modalities/fmri/pca.py (+109/-1)
nipy/modalities/fmri/tests/test_fmri.py (+9/-4)
nipy/modalities/fmri/tests/test_pca_image.py (+254/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1928. By Matthew Brett <mb312@blair> on 2010-04-30

BF - added back pca image test file created during conflict resolution

1927. By Matthew Brett <mb312@blair> on 2010-04-30

BF - merge from trunk with many conflicts partly resolved

1926. By Jonathan Taylor <jtaylo@dell-desktop> on 2009-07-07

coverage seems good for xyz_image, coordinate_map, coordinate_system, slices,

1925. By Jonathan Taylor <jtaylo@dell-desktop> on 2009-07-07

renamed "world"->"reference"

1924. By Jonathan Taylor <jtaylo@dell-desktop> on 2009-07-07

name argument to coordinate system represents origin, defaults to '' , consider renaming to 'origin'

1923. By Jonathan Taylor <jtaylo@dell-desktop> on 2009-07-06

lpi->xyz, can have either LPS or RAS coords

1922. By Jonathan Taylor <jtaylo@dell-desktop> on 2009-07-06

docstring

1921. By Jonathan Taylor <jtaylo@dell-desktop> on 2009-07-06

some changes to nifti_ref docstring

some small changes to load / save

two methods added to nifti1 that remove fps notation from load/save

1920. By Jonathan Taylor <jtaylo@dell-desktop> on 2009-07-06

nifti_ref doesn't reorder -- test_save3, test_save4 deprecated

1919. By Jonathan Taylor <jtaylo@dell-desktop> on 2009-07-06

simplified the nifti_ref module, no longer tries to reorder anything,
returns an LPS AffineTransform