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

[FIX] make masker report tables horizontally scrollable and not overlap with masker report images #4308

Merged
merged 12 commits into from Mar 9, 2024

Conversation

Remi-Gau
Copy link
Collaborator

@Remi-Gau Remi-Gau commented Mar 4, 2024

Changes proposed in this pull request:

  • make sure tables do not overlap with the images
  • add horizontal scroll bar to tables

@Remi-Gau
Copy link
Collaborator Author

Remi-Gau commented Mar 4, 2024

@bthirion
if you want the diff to be easier to read we might want to get #4302 merged first, so line indent and formatting won't show on every diff for HTML and CSS.

Copy link
Contributor

github-actions bot commented Mar 4, 2024

👋 @Remi-Gau Thanks for creating a PR!

Until this PR is ready for review, you can include the [WIP] tag in its title, or leave it as a github draft.

Please make sure it is compliant with our contributing guidelines. In particular, be sure it checks the boxes listed below.

  • PR has an interpretable title.
  • PR links to Github issue with mention Closes #XXXX (see our documentation on PR structure)
  • Code is PEP8-compliant (see our documentation on coding style)
  • Changelog or what's new entry in doc/changes/latest.rst (see our documentation on PR structure)

For new features:

  • There is at least one unit test per new function / class (see our documentation on testing)
  • The new feature is demoed in at least one relevant example.

For bug fixes:

  • There is at least one test that would fail under the original bug conditions.

We will review it as quick as possible, feel free to ping us with questions if needed.

@Remi-Gau Remi-Gau changed the title [FIX] make masker report tables horizaontally scrollable and not overlap with masker report images [FIX] make masker report tables horizontally scrollable and not overlap with masker report images Mar 4, 2024
@Remi-Gau Remi-Gau marked this pull request as ready for review March 4, 2024 09:47
@Remi-Gau Remi-Gau requested review from bthirion and emdupre and removed request for bthirion and emdupre March 4, 2024 14:07
Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

Aside one small glitch, it is very hard to say anything on this.
Can you point to some generated outputs ?

doc/changes/latest.rst Outdated Show resolved Hide resolved
Co-authored-by: bthirion <bertrand.thirion@inria.fr>
@Remi-Gau
Copy link
Collaborator Author

Remi-Gau commented Mar 5, 2024

Can you point to some generated outputs ?

Once #4295 is in I will ask for a full build of the doc so we can all easily check the reports.

Copy link

codecov bot commented Mar 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.12%. Comparing base (abb80ff) to head (9487957).
Report is 22 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4308      +/-   ##
==========================================
+ Coverage   91.85%   92.12%   +0.27%     
==========================================
  Files         144      143       -1     
  Lines       16419    16438      +19     
  Branches     3434     3444      +10     
==========================================
+ Hits        15082    15144      +62     
+ Misses        792      749      -43     
  Partials      545      545              
Flag Coverage Δ
macos-latest_3.10_test_plotting 91.92% <ø> (?)
macos-latest_3.11_test_plotting 91.92% <ø> (+0.06%) ⬆️
macos-latest_3.12_test_plotting 91.92% <ø> (?)
macos-latest_3.8_test_plotting 91.88% <ø> (?)
macos-latest_3.9_test_plotting 91.88% <ø> (?)
ubuntu-latest_3.10_test_plotting 91.92% <ø> (+0.06%) ⬆️
ubuntu-latest_3.11_test_plotting 91.92% <ø> (?)
ubuntu-latest_3.12_test_plotting 91.92% <ø> (?)
ubuntu-latest_3.8_test_min 68.87% <ø> (?)
ubuntu-latest_3.8_test_plot_min 91.63% <ø> (?)
ubuntu-latest_3.8_test_plotting 91.88% <ø> (?)
ubuntu-latest_3.9_test_plotting 91.88% <ø> (?)
windows-latest_3.10_test_plotting 91.89% <ø> (?)
windows-latest_3.11_test_plotting 91.89% <ø> (?)
windows-latest_3.12_test_plotting 91.89% <ø> (?)
windows-latest_3.8_test_plotting 91.85% <ø> (?)
windows-latest_3.9_test_plotting 91.86% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Remi-Gau and others added 9 commits March 5, 2024 17:42
* fix several issues in glm reports

* further fixes

* change cmap for glass brain

* fix remaining issues

* [full doc] request full build

* update changelog

* [full doc] request full build
… when not a `string` (nilearn#4297)

* for views to be pairs of int or float when not a string

* update changelog
* fix cut position in nifti maps maskers

* update changelog
* remove conftest tempita

* ignore tempita in pyproject.toml
* add script to check duration of test suite

* add comment

* comment and refactor

* typo

* improve paging

* add workflow

* Update maint_tools/requirements.txt

* fail on bad request

* upload artefacts

* upload artefacts

* remove running on PR

* Apply suggestions from code review

Co-authored-by: Elizabeth DuPre <emd222@cornell.edu>

* update doc string

* update doc string

* refactor

---------

Co-authored-by: Elizabeth DuPre <emd222@cornell.edu>
* display masker reports in doc

* update changelog

* refactor

* add notebooks

* clear cells

* [full doc] request full build

* add link to examples

* [full doc] request full build

* fix doc build
@Remi-Gau
Copy link
Collaborator Author

Remi-Gau commented Mar 6, 2024

Before

image

After

The parameters and regions summary buttons are below the image and thus cannot overlap with it when unfolded.

Note

When the reports are embedded in the doc pages, they are too narrow for the unfolded table to ever overlap with the image.

image

@Remi-Gau
Copy link
Collaborator Author

Remi-Gau commented Mar 6, 2024

Before

Tables are not horizontally scrollabe

image

After

First column is visible by default.

image

Tables are scrollable.

image

@Remi-Gau Remi-Gau requested a review from bthirion March 8, 2024 20:26
Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

LGTM, thx !

@Remi-Gau Remi-Gau merged commit 4b1e997 into nilearn:main Mar 9, 2024
32 of 33 checks passed
@Remi-Gau Remi-Gau deleted the fix/4301 branch March 9, 2024 10:11
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.

Tables are "unbrowsable" on narrow view ports tables in masker HTML report overlap with the masker image
2 participants