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.

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

Overhaul IndexSeries and add "order_of_images" to Images #459

Merged
merged 34 commits into from
Apr 30, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3f4166e
Change dtype of IndexSeries.data to uint32, update .data attributes
rly Aug 5, 2020
11bb76d
Merge branch 'dev' into fix/indexseries
rly Aug 5, 2020
6392ade
Update release notes
rly Aug 5, 2020
0ab6c6e
Add ImageStack type and reference to it from IndexSeries
rly Aug 25, 2020
b21a206
Merge branch 'dev' into fix/indexseries
rly Aug 25, 2020
0ca18e2
Update release notes
rly Aug 25, 2020
8d01630
Merge branch 'fix/indexseries' of https://github.com/NeurodataWithout…
rly Aug 25, 2020
d0df236
Fix typo
rly Aug 25, 2020
6e1532a
Revamp ImageStack to be n-dimensional
rly Jul 31, 2021
d103c5b
Fix ImageStack shape
rly Jul 31, 2021
2a86096
Update format_release_notes.rst
rly Jul 31, 2021
bd92803
Allow images in file/stimulus/presentation
rly Jul 31, 2021
a98bf54
Add ImageStacks
rly Jul 31, 2021
c040369
Update nwb.file.yaml
rly Jul 31, 2021
eb50a4a
Merge branch 'dev' into fix/indexseries
rly Jul 31, 2021
d83bff3
Update format_release_notes.rst
rly Jul 31, 2021
2fdf8bc
Update format_release_notes.rst
rly Jul 31, 2021
8542e76
Update format_release_notes.rst
rly Jul 31, 2021
ae94494
Update nwb.base.yaml
rly Aug 2, 2021
6a62ac6
Add dataset of references to Images object in Images
rly Aug 2, 2021
1ffb289
Move Images and ImageStacks to stimulus/templates
rly Aug 2, 2021
1a6ac80
Update format_release_notes.rst
rly Aug 2, 2021
3f2e574
Update nwb.image.yaml
rly Aug 2, 2021
5513786
Update nwb.base.yaml
rly Aug 2, 2021
8209f29
Update format_release_notes.rst
rly Aug 2, 2021
2eb95c8
Update nwb.image.yaml
rly Aug 2, 2021
bbb35bd
Update nwb.image.yaml
rly Aug 2, 2021
a203ff2
Remove new ImageStack and ImageStacks types
rly Apr 26, 2022
475657a
Merge branch 'dev' into fix/indexseries
rly Apr 26, 2022
9342424
Merge branch 'dev' into fix/indexseries
rly Apr 26, 2022
5f5d79e
Rename "order" dataset to "ordered_images"
rly Apr 26, 2022
718a114
Fix release notes
rly Apr 26, 2022
c00ceff
Update Images docstring
rly Apr 26, 2022
03f7759
Rename "ordered_images" to "order_of_images"
rly Apr 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/nwb.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ groups:
- neurodata_type_inc: Image
doc: Images stored in this collection.
quantity: '+'
- name: order
- name: ordered_images
rly marked this conversation as resolved.
Show resolved Hide resolved
neurodata_type_inc: VectorData
dims:
- num_images
Expand Down
2 changes: 1 addition & 1 deletion core/nwb.image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -214,5 +214,5 @@ groups:
- name: indexed_images
target_type: Images
doc: Link to Images object containing an ordered set of images that are indexed. The Images object
must contain a 'order' dataset specifying the order of the images in the Images type.
must contain a 'ordered_images' dataset specifying the order of the images in the Images type.
quantity: '?'
6 changes: 3 additions & 3 deletions docs/format/source/format_release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ Minor changes
- Clarified the doc string for the ``reference`` column of the electrodes table. (#498)
- Added ``cell_id`` field to ``IntracellularElectrode``. (#512)
- Allowed ``NWBFile/stimulus/templates`` to contain ``Images`` objects. (#459)
- Added new optional "order" dataset to ``Images`` that contains an ordered list of object references to
``Image`` objects stored in the ``Images`` object. (#459)
- Added new optional "ordered_images" dataset to ``Images`` that contains an ordered list of object references to
``Image`` objects stored in the same ``Images`` object. (#459)
- Overhauled ``IndexSeries`` type (#459):
- Fixed dtype of ``data`` dataset of ``IndexSeries`` (int32 -> uint32).
- Updated ``unit`` attribute of ``data`` to have fixed value "N/A".
- Updated docstrings for the ``conversion`` and ``resolution`` attributes of ``data`` to indicate that
these fields are not used.
- Added link to an ``Images`` object, which contains an ordered collection of images.
Discouraged use of the link to an ``ImageSeries``.
Discouraged use of the ``indexed_timeseries`` link to an ``ImageSeries``.
- Updated ``TimeIntervals`` to use the new ``TimeSeriesReferenceVectorData`` type. This does not alter the overall structure
of ``TimeIntervals`` in a major way aside from changing the value of the ``neurodata_type`` attribute in the file
from ``VectorData`` to ```TimeSeriesReferenceVectorData``. This change replaces the existing ``TimeIntervals.timeseries``
Expand Down