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.

Sign up for GitHub

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

Jump to bottom

Add background settings UI and functionality #110

Merged
merged 32 commits into from
Mar 1, 2024
Merged

Add background settings UI and functionality #110

merged 32 commits into from
Mar 1, 2024

Conversation

jmborr
Copy link
Member

@jmborr jmborr commented Jan 12, 2024

Added a new dialog for background settings in RefRed. The settings include the options to subtract background, use functional background, and use two background regions. A new model to store the options and a signal to display the dialog were also implemented.

Short description of the changes:

Long description of the changes:

Check list for the pull request

  • I have read the [CONTRIBUTING]
  • I have read the [CODE_OF_CONDUCT]
  • I have added tests for my changes
  • I have updated the documentation accordingly

Check list for the reviewer

  • I have read the [CONTRIBUTING]
  • I have verified the proposed changes
  • best software practices
    • all internal functions have an underbar, as is python standard
    • clearly named variables (better to be verbose in variable names)
    • code comments explaining the intent of code blocks
  • All the tests are passing
  • The documentation is up to date
  • code comments added when explaining intent

Manual test for the reviewer

References

@jmborr
Add background settings UI and functionality
e90f42f 
Added a new dialog for background settings in RefRed. The settings include the options to subtract background, use functional background, and use two background regions. A new model to store the options and a signal to display the dialog were also implemented.

Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr jmborr self-assigned this Jan 12, 2024
jmborr added 28 commits January 30, 2024 14:50
@jmborr
Add background settings UI and functionality
dbafc74 
Added a new dialog for background settings in RefRed. The settings include the options to subtract background, use functional background, and use two background regions. A new model to store the options and a signal to display the dialog were also implemented.

Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
Expunge background settings updates outside CompositeBackgroundSettings
38506c5 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fixing the second background functionality in the 1D plot
d289e0d 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
correctly populate the background widgets for the 2D plot
438f57a 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
from the 2D plot, save the second background boundaries to big_table
ae9fea3 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
norm peak boundary lines respond to increments in spinboxes
e6f6a8a 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
norm back boundary lines respond to increments in spinboxes
709c37b 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
activate norm back2 boundary lines
a691e71 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
Change norm back2 boundary lines upon User in(de)crementing SpinBoxes…
4b8ef49 
… by one

Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
Update and enforce background settings when selecting a different row…
2ee3316 
… in the reduction table

Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix flake8 whinings
431df3f 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix some of the mypy warnings
ee670a1 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix some of the mypy warnings
1f1cd17 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
have only one conda environment file
af1a0b5 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
passing the background to lr_reduction as it expects it
93b9f8b 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_sf_preview with a mock of QFileDialog.getOpenFileName
f205482 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
start RefRed with DATA tab as active
76cc0de 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_popup_plot_1d
f504e49 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_plot2d_dialog
7ed0482 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_sf_calculator
d86110b 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_reduce_and_export_data
5f287c5 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_load_run_auto_peak_finder
202a6da 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_update_reduction_table_thread
e766f51 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_run_file_found
2ba9a7a 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_run_file_found_but_filename_is_list
f259fa0 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_getMetadataObject
6ed2dbb 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
mock QApplication in the module that is imported
9f0e2b7 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
fix test_init_reduction_sf_calculator
ec9030c 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@backmari
Copy link
Collaborator

Looks good! 👏 A couple of small comments.

@jmborr
fix test_init_reduction_sf_calculator
5cc27f2 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr jmborr requested a review from backmari February 28, 2024 22:22
@jmborr
fix test_init_reduction_sf_calculator
8957034 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr
pass zero as default for normalization peak and background boundaries
fa78074 
Signed-off-by: Jose Borreguero <borreguero@gmail.com>
@jmborr jmborr merged commit e3d7476 into next Mar 1, 2024
3 checks passed
@jmborr jmborr deleted the background_dialog branch March 1, 2024 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@backmari backmari backmari approved these changes

Assignees

@jmborr jmborr

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jmborr @backmari