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

[EEG Browser] Add ability to view annotations in event panel and overlaid on signal viewer #8235

Merged
merged 7 commits into from
Nov 24, 2022

Conversation

laemtl
Copy link
Contributor

@laemtl laemtl commented Nov 22, 2022

Replaces #7828

@laemtl laemtl force-pushed the 2021_11_12_add_front_end_annotation_support branch 2 times, most recently from a55921a to 37a9a93 Compare November 22, 2022 20:11
@laemtl
Copy link
Contributor Author

laemtl commented Nov 22, 2022

@driusan Ready to be merged.

@laemtl laemtl force-pushed the 2021_11_12_add_front_end_annotation_support branch from e246870 to a0b5be5 Compare November 24, 2022 02:38
@laemtl laemtl added the Blocking PR should be prioritized because it is blocking the progress of another task label Nov 24, 2022
@laemtl laemtl requested a review from maltheism November 24, 2022 18:13
@laemtl
Copy link
Contributor Author

laemtl commented Nov 24, 2022

@maltheism, we need a JS guru to review this, do you have time to take a look?

if (!(typeof text.json === 'string'
|| text.json instanceof String)) return;
return tsvParse(
text.json.replace('trial_type', 'label'))
.map(({ onset, duration, label }, i) => ({
Copy link
Member

@maltheism maltheism Nov 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@laemtl npm isn't complaining that there's a space before onset and after label? Otherwise the code looks great.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eslint doesn't complain but I can fix it!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a personal preference regarding the format of the code but I'm concerned why eslint isn't working? Today I encountered that before & after "space" issue for code I was writing for ccna.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe because it's a ts file and not a js file?

Copy link
Contributor Author

@laemtl laemtl Nov 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly, the ESLint config is not including the .tsx at the moment.
I can enable eslint a bit later once all the EEG PRs will be merged, since it will impact all the files.

@laemtl laemtl added the Passed manual tests PR has been successfully tested by at least one peer label Nov 24, 2022
@driusan driusan merged commit 2ac39b0 into aces:main Nov 24, 2022
@ridz1208 ridz1208 added this to the 25.0.0 milestone Mar 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Blocking PR should be prioritized because it is blocking the progress of another task Passed manual tests PR has been successfully tested by at least one peer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants