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

Adapt GUI to new split optimization #65

Merged
merged 20 commits into from
Jan 23, 2024
Merged

Adapt GUI to new split optimization #65

merged 20 commits into from
Jan 23, 2024

Conversation

4rnaudB
Copy link
Member

@4rnaudB 4rnaudB commented Jan 10, 2024

Checklist

  • I've given this PR a concise, self-descriptive, and meaningful title
  • I've applied the relevant labels to this PR
  • I've added relevant tests for my contribution
  • I've assigned a reviewer

Description

With the new shimming-toolbox update letting users select specific orders from the scanner, this PR is to update the GUI prompts to use the new syntax. The GUI will only allow using all orders below the select one and use the same scanner orders and coils with riro and static.

@4rnaudB 4rnaudB self-assigned this Jan 10, 2024
@4rnaudB 4rnaudB requested a review from po09i January 10, 2024 19:02
.vscode/settings.json Outdated Show resolved Hide resolved
fsleyes_plugin_shimming_toolbox/components/component.py Outdated Show resolved Hide resolved
@@ -21,7 +21,7 @@ def test_st_plugin_b0shim_dyn_lsq_mse():
options = {'optimizer-method': 'Least Squares',
'optimizer-criteria': 'Mean Squared Error',
'slices': 'Auto detect',
'scanner-coil-order': '1',
'scanner-coil-order': '0,1,2',
Copy link
Member

Choose a reason for hiding this comment

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

Does this do something now that we use the checkboxes?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's just to test all checkboxes

Copy link
Member

Choose a reason for hiding this comment

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

Yes but the option scanner-coil-order is not being used anymore. We hardcoded to click on all checkboxes in the test.

Copy link
Member Author

Choose a reason for hiding this comment

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

maybe keep it to indicate what is going on in the test but add a comment to indicate that this parameter is not used.

test/gui/test_tabs.py Outdated Show resolved Hide resolved
test/gui/test_tabs.py Outdated Show resolved Hide resolved
4rnaudB and others added 6 commits January 16, 2024 17:18
Co-authored-by: Alex Dastous <47249340+po09i@users.noreply.github.com>
Co-authored-by: Alex Dastous <47249340+po09i@users.noreply.github.com>
Co-authored-by: Alex Dastous <47249340+po09i@users.noreply.github.com>
@po09i
Copy link
Member

po09i commented Jan 17, 2024

I updated to python 3.10, the installation now works. However, some tests are now failing. It seems to be related to the st_function.split(' ')[1] call where an index error happens if st_function is a single word (e.g.: st_prepare_fieldmap)

@@ -21,7 +21,7 @@ def test_st_plugin_b0shim_dyn_lsq_mse():
options = {'optimizer-method': 'Least Squares',
'optimizer-criteria': 'Mean Squared Error',
'slices': 'Auto detect',
'scanner-coil-order': '1',
'scanner-coil-order': '0,1,2',
Copy link
Member

Choose a reason for hiding this comment

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

Yes but the option scanner-coil-order is not being used anymore. We hardcoded to click on all checkboxes in the test.

test/gui/test_b0shim_tab.py Outdated Show resolved Hide resolved
4rnaudB and others added 3 commits January 18, 2024 18:08
Co-authored-by: Alex Dastous <47249340+po09i@users.noreply.github.com>
@4rnaudB 4rnaudB merged commit 814441d into main Jan 23, 2024
3 checks passed
@4rnaudB 4rnaudB deleted the ab/split_opt branch January 23, 2024 21:38
@po09i po09i added this to the 1.0 milestone Aug 15, 2024
@po09i po09i added Package: Plugin enhancement New feature or request labels Aug 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request Package: Plugin
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants