-
Notifications
You must be signed in to change notification settings - Fork 23
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
[Draft] Make dynamic tables expandable #1137
Draft
h-mayorquin
wants to merge
3
commits into
main
Choose a base branch
from
fix_add_electrodes_bug
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+59
−22
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,6 @@ | |
import h5py | ||
import numpy as np | ||
import zarr | ||
from hdmf import Container | ||
from hdmf.data_utils import DataIO | ||
from hdmf.utils import get_data_shape | ||
from hdmf_zarr import NWBZarrIO | ||
|
@@ -104,10 +103,11 @@ def get_default_dataset_io_configurations( | |
known_dataset_fields = ("data", "timestamps") | ||
for neurodata_object in nwbfile.objects.values(): | ||
if isinstance(neurodata_object, DynamicTable): | ||
dynamic_table = neurodata_object # For readability | ||
|
||
for column in dynamic_table.columns: | ||
candidate_dataset = column.data # VectorData object | ||
dynamic_table = neurodata_object # For readability | ||
for column in (*dynamic_table.columns, dynamic_table.id): | ||
dataset_name = "data" | ||
candidate_dataset = getattr(column, dataset_name) # Safer way to access data attribute | ||
# noinspection PyTypeChecker | ||
if _is_dataset_written_to_file( | ||
candidate_dataset=candidate_dataset, backend=backend, existing_file=existing_file | ||
|
@@ -119,16 +119,14 @@ def get_default_dataset_io_configurations( | |
continue # Skip | ||
|
||
# Skip over columns whose values are links, such as the 'group' of an ElectrodesTable | ||
if any(isinstance(value, Container) for value in candidate_dataset): | ||
continue # Skip | ||
# if any(isinstance(value, Container) for value in candidate_dataset): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I commented this because this was catching the ElectrodeGroups column. There is probably a better way. |
||
# continue # Skip | ||
|
||
# Skip when columns whose values are a reference type | ||
if isinstance(column, TimeSeriesReferenceVectorData): | ||
continue | ||
|
||
# Skip datasets with any zero-length axes | ||
dataset_name = "data" | ||
candidate_dataset = getattr(column, dataset_name) | ||
full_shape = get_data_shape(data=candidate_dataset) | ||
if any(axis_length == 0 for axis_length in full_shape): | ||
continue | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here, we add the ids of the tables to the set that we catch for setting the DataIO.