Skip to content

Conversation

@SophieHerbst
Copy link
Contributor

Needed for issue #848

Define image_kwargs per channel type for plotting epochs image in report.add_epochs

SophieHerbst and others added 25 commits February 14, 2024 16:49
…python into report_add_image_kwargs

cannot push without merging upstream
Co-authored-by: Richard Höchenberger <richard.hoechenberger@gmail.com>
…-python into report_add_image_kwargs

asked to merge upstream before pushing
* upstream/main:
  [pre-commit.ci] pre-commit autoupdate (mne-tools#12453)
  MAINT: Fix CIs for PyQt6 (mne-tools#12452)
  DOC: add missing info to interpolate bads docstring (mne-tools#12448)
  FIX: na_rep for reports (mne-tools#12447)
  ENH: Multiple raw instance support to head pos average (mne-tools#12445)
  ENH: Add image_kwargs to report.add_epochs (mne-tools#12443)
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.

Just fixed a merge conflict and added a little check, let me know if you agree with the changes @SophieHerbst and I'll merge when green!

@hoechenberger hoechenberger enabled auto-merge (squash) February 22, 2024 11:32
@hoechenberger hoechenberger merged commit ae6e55e into mne-tools:main Feb 22, 2024
@SophieHerbst SophieHerbst deleted the report_image_kwargs branch February 23, 2024 11:33
snwnde pushed a commit to snwnde/mne-python that referenced this pull request Mar 20, 2024
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Richard Höchenberger <richard.hoechenberger@gmail.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.

3 participants