Deconvolution GUI Modularity #2429
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Updated to MzLib 1.0.548 and fixed custom ions in search tasks * reverted calibration task change * merged in master bbbyy * Enabled Library Loading from command line
Streamlined deconvolution parameter management by introducing `DeconHostViewModel` and custom control `HostDeconParamControl`. Updated `CommonParameters.cs` to change default `ProductDeconvolutionParameters` in negative mode from `-10` to `-20`. Modified `SearchTaskWindow.xaml` and `SearchTaskWindow.xaml.cs` to use the new view model, improving separation of concerns and maintainability. Updated `SaveButton_Click` and other relevant methods to retrieve parameters via the view model.
… set from the GUI with the new code structure
Refactored several XAML files to improve UI structure and readability: - Removed unnecessary `GroupBox` in `SearchTaskWindow.xaml` and added a new one for "Peak Trimming". - Adjusted layout in `ClassicDeconParamsControl.xaml` and `HostDeconParamControl.xaml`. Enhanced ViewModel logic: - Updated `DeconHostViewModel.cs` and `DeconParamsViewModel.cs` to include additional properties and validation logic. - Added `[ExcludeFromCodeCoverage]` attribute to `IsoDecDeconParamsViewModel.cs`. Expanded unit tests: - Removed obsolete `GuiFunctionsTest.cs`. - Added new test classes for `ClassicDeconParamsViewModel`, `DeconParamsViewModel`, `DeconHostViewModel`, and `MzLibExtensions`. - Included tests for property changes, validation logic, and conversion methods.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2429 +/- ##
==========================================
+ Coverage 93.69% 93.73% +0.03%
==========================================
Files 141 145 +4
Lines 21883 22067 +184
Branches 3001 3043 +42
==========================================
+ Hits 20504 20684 +180
- Misses 927 929 +2
- Partials 452 454 +2
|
|
"Minimum intensity ratio" and "Nominal window width" won't accept non-integer inputs. |
|
Also, can't set assumed charge states to negative when no data is loaded in. |
It is set to positive mode. No negatives can be input. Once RNA is added, then the toggle between positive and negative will be exposed. |
trishorts
requested review from
trishorts,
Alexander-Sol,
pcruzparri,
elaboy,
avcarr2 and
zhuoxinshi
trishorts
previously approved these changes
Nov 4, 2024
elaboy
previously approved these changes
Nov 4, 2024
trishorts
approved these changes
Nov 7, 2024
Alexander-Sol
approved these changes
Nov 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactored the deconvolution parameters handling in the MetaMorpheus GUI to use custom controls and view models for better modularity and extensibility.
SearchTaskWindow.xamland.xaml.cs: Replaced stack panels and checkboxes withHostDeconParamControland bound toDeconHostViewModel.GPTMDTaskWindow.xamlandSearchTaskWindow.xaml: ReplacedGroupBoxfor "Deisotoping" withHostDeconParamControlbound toDeconHostViewModel.DeconvolutionTypeToControlConverterfor convertingDeconParamsViewModelto appropriate controls.ClassicDeconParamsControlandHostDeconParamControl.ClassicDeconParamsViewModel,DeconHostViewModel, andIsoDecDeconParamsViewModel.MetaMorpheus.sln.DotSettingsto include "Decon" and "Deconvolute" in the user dictionary.To Consider:
Do we want to expose the product deconvolution parameters?
Do we want to add decon parameter setting to calibration?