Skip to content

Conversation

@vagechirkov
Copy link
Contributor

Fixes #9707

@agramfort
Copy link
Member

I've merged with main branch to attempt to fix CIs @vagechirkov

Copy link
Member

@larsoner larsoner left a comment

Choose a reason for hiding this comment

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

Other than a minor suggestion to help with maintainability, LGTM!

vagechirkov and others added 4 commits September 14, 2021 18:23
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
Copy link
Member

@agramfort agramfort left a comment

Choose a reason for hiding this comment

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

CI failure is unrelated.

@larsoner merge if happy

channels[ch_type] = count

good_channels = ', '.join(
[f'{v} {k.upper()}' for k, v in channels.items()])
Copy link
Member

Choose a reason for hiding this comment

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

On main I get:
Screenshot from 2021-09-15 13-58-04

On this PR it's a little bit less nice:

Screenshot from 2021-09-15 13-58-27

I prefer the longer / complete names, so some variant of this:

Suggested change
[f'{v} {k.upper()}' for k, v in channels.items()])
titles =
[f'{v} {titles.get(k, k)}' for k, v in channels.items()])

I'll push a commit, can you see if you agree @vagechirkov ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it looks better with full names.

@larsoner
Copy link
Member

Azure failure is an unrelated / spurious caching error after successful tests. @vagechirkov can you add a latest.inc entry for this fix? Then I'll merge!

@larsoner
Copy link
Member

Pushed a commit to move the change to below those of new contributors, then will merge once CIs come back happy. Thanks in advance @vagechirkov !

@agramfort
Copy link
Member

thx @vagechirkov and @larsoner !

@larsoner larsoner merged commit e43136c into mne-tools:main Sep 16, 2021
hoechenberger pushed a commit to hoechenberger/mne-python that referenced this pull request Sep 17, 2021
* update info html template

* add all channel types to the html repr

* update html repr test

* Update mne/io/meas_info.py

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>

* Update mne/io/meas_info.py

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>

* add repr_html smoke test

* ENH: Titles

* update changelog

* fix name in the change log

* FIX: Move down

Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
agramfort added a commit that referenced this pull request Oct 7, 2021
* Pull in changes from old PR

* [MRG, BUG] Fixed bug with EDF channel types and minor bug where other types of channels were not written and bug where annotations were not written to correct scale (#9694)

* Fixing bug

* Update doc.

* Update docstring

* Add diff

* Add diff

* Add diff

* Add warning

* Fix flake

* Adding test at data level.

* Dont mess with global random state

* Adding note to edf export

* Adding note to edf export

* Adding updated unit tests and io reading for edf

* Adding unit test for channel type

* Adding change log

* Add warning

* Add additional parameter

* Fix docstring

* Fixing other test

* Fix flake

* Apply suggestions from code review

Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>

* Update mne/export/tests/test_export.py

Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>

* Fixing flake

* Apply suggestions from code review

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* Update mne/export/_edf.py

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* Update mne/export/_edf.py

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* Update mne/export/_edf.py

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* Merge

* Address comments

* Check double export

* Fix flake

* Remove scruff

* Fix codespell

* Apply suggestions from code review

Co-authored-by: Daniel McCloy <dan@mccloy.info>

* update docstring

* Commeent on stim

* Fix annotations

* Adding docstring

* Fix number of annotations

* Add check for duration

* Fix issues

* Fix docstring

* Apply suggestions from code review

Co-authored-by: Clemens Brunner <clemens.brunner@gmail.com>

* Clarify warning and inline comment

* Fix docstring

* Fix doc warning and len(annotations).

Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>
Co-authored-by: Daniel McCloy <dan@mccloy.info>
Co-authored-by: Clemens Brunner <clemens.brunner@gmail.com>

* Remove _BEM_VIEWS from __init__.py

* Add back cropped MNE logo

* Change default of raw_psd back to False again

* Remove old JS libraries

* FIX _repr_html_ of Info add all channel types (#9725)

* update info html template

* add all channel types to the html repr

* update html repr test

* Update mne/io/meas_info.py

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>

* Update mne/io/meas_info.py

Co-authored-by: Eric Larson <larson.eric.d@gmail.com>

* add repr_html smoke test

* ENH: Titles

* update changelog

* fix name in the change log

* FIX: Move down

Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>

* Don't call tight_layout() on figs passed to _fig_to_img()

* Reduce verbosity related to prjector handling

* Don't produce empty drop figure if no epochs were dropped

* Don't add legend to GFP plots

* use viz.utils.tight_layout()

* More tight_layout()

* Fix warnings

* Finally tight_layout() issues 🙈

* Add back time zone test

* Deprecation handling

* Better deprecation testing

* ALMOST finish work on tutorial

* Disable carousel buttons

* Finalize tutorial

* Maximize main content column width

* Allow more than 1 BEM sliders in a row

* Apply changes discussed with Alex

* flake

* Add options to decimate time points in STC and Evoked plots

* Add time decimation params to parse_folder()

* Try to speed up tutorial rendering

* Allow further decimation, render STCs in parse_folder()

* Style and further speedups

* Even more speeeedd 🚗💨💨

* flake

* Apply suggestions from code review [ci skip]

Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>

* Fix reference

* Reduce processing time

* Further reduce tutorial runtime [skip azp][skip actions]

* Explain butterfly param

* Avoid "deprecated" decorator

* Re-enable add_sys_info test

* Don't show STC traces, fix layout

* Remove some cruft

* Add changelog entries

* Remove duplicate line in changelog [ci skip]

* A few tiny layout tweaks

* Hack around issue between deprecated decorator and numpydoc

* Better Note for add_code

* Revert "Hack around issue between deprecated decorator and numpydoc"

This reverts commit 6d8f9ac.

* ENH: Better decorator

* BUG: Dont force tight_layout

* DOC: Better linking

* FIX: Ori labels

* STY: Flake

* FIX: Missed one

* TST: "Fix" doctest

* FIX: One more

* Use docdict for some more subject and subjects_dir params

* Explain slices=None and reformat code for readability

* Correct STC subject docstrings

* Fix: plot_bem() requires subject param

* Remove whitespace

* Properly encode titles and TOC entries

* Center SVGs, fix horizontal scrolling issue

* Add fill_doc decorator to plot_bem()

* Fix tests

* ENH: Speed up test

* Speed up evoked rendering in test

* MAINT: Speed up tests

* FIX: Also mayavi

Co-authored-by: Adam Li <adam2392@gmail.com>
Co-authored-by: Alexandre Gramfort <alexandre.gramfort@m4x.org>
Co-authored-by: Daniel McCloy <dan@mccloy.info>
Co-authored-by: Clemens Brunner <clemens.brunner@gmail.com>
Co-authored-by: Valerii <42982039+vagechirkov@users.noreply.github.com>
Co-authored-by: Eric Larson <larson.eric.d@gmail.com>
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.

_repr_html_ of Info missing many data channels

3 participants