-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MetaDraw Fragmentation Reanalysis (#2361)
* Started MetaDraw Researching with different fragment ions. Got the functional code of the new controls finished, just need to integtrate with the existing MetaDraw structure * Implemented the full refragmentation system. Only issueis that I had to open up the set methods for the fragment ions in each PsmFromTsv * Expanded test coverage * Expanded test coverage * Rerun Appveyor * fixed unit test * fixed unit test? * maybe fixed test? * fixed test? * Prayed to a higher power and removed message box popup * Broke out the meta draw fragment ion renalysis into its own control * adjusted union operation * Fixed ion annotaiton spacing * fixed broken unit test * Made the spectral library spit out new ion types * changed ion spacing --------- Co-authored-by: trishorts <mshort@chem.wisc.edu>
- Loading branch information
Showing
15 changed files
with
9,272 additions
and
47 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| <UserControl x:Class="MetaMorpheusGUI.FragmentReanalysisControl" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:local="clr-namespace:MetaMorpheusGUI" | ||
| xmlns:guiFunctions="clr-namespace:GuiFunctions;assembly=GuiFunctions" | ||
| mc:Ignorable="d" | ||
| d:DesignHeight="450" d:DesignWidth="800"> | ||
| <Grid d:DataContext="{x:Type guiFunctions:FragmentationReanalysisViewModel}" > | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="*"/> | ||
| </Grid.RowDefinitions> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="*"/> | ||
| </Grid.ColumnDefinitions> | ||
|
|
||
| <!-- All options in the header --> | ||
| <Grid Grid.Row="0"> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="*"/> | ||
| </Grid.RowDefinitions> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition Width="Auto"/> | ||
| <ColumnDefinition Width="*"/> | ||
| <ColumnDefinition Width="*"/> | ||
| <ColumnDefinition Width="*"/> | ||
| </Grid.ColumnDefinitions> | ||
|
|
||
| <Button Grid.Row="0" Grid.Column="0" x:Name="SearchButton" Grid.RowSpan="2" Content="Search" VerticalAlignment="Center" Margin="5 3" | ||
| VerticalContentAlignment="Center" Click="SearchWithNewIons_OnClick"/> | ||
| <CheckBox Grid.Row="0" Grid.Column="1" Grid.RowSpan="2" Content="Persist?" VerticalAlignment="Center" | ||
| IsChecked="{Binding Persist}" | ||
| Margin="5 3" ToolTip="Research each identification as they are selected"/> | ||
|
|
||
| <StackPanel Grid.Row="0" Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center"> | ||
| <TextBlock Text="Set Dissociation Type: " VerticalAlignment="Center"/> | ||
| <ComboBox x:Name="DissociationTypeComboBox" ItemsSource="{Binding DissociationTypes}" | ||
| SelectedItem="{Binding SelectedDissociationType}" | ||
| Margin="5 3" VerticalContentAlignment="Center" Width="80" /> | ||
| </StackPanel> | ||
| <StackPanel Grid.Row="0" Grid.Column="3" Orientation="Horizontal" VerticalAlignment="Center"> | ||
| <CheckBox Content="Use internal ions of minimum length " IsChecked="{Binding UseInternalIons}" | ||
| HorizontalContentAlignment="Right" VerticalAlignment="Center" /> | ||
| <local:IntegerTexBoxControl Text="{Binding MinInternalIonLength, FallbackValue=10}" | ||
| HorizontalAlignment="Center" HorizontalContentAlignment="Center" IsEnabled="{Binding UseInternalIons}" | ||
| VerticalAlignment="Center" VerticalContentAlignment="Center" BorderThickness="1" /> | ||
| </StackPanel> | ||
| </Grid> | ||
|
|
||
| <!-- Fragment ion type display --> | ||
| <ListView Grid.Row="1" Grid.Column="0" Background="{StaticResource BackgroundColor}" | ||
| ItemsSource="{Binding PossibleProducts}" BorderThickness="0"> | ||
| <ListView.ItemTemplate> | ||
| <DataTemplate> | ||
| <StackPanel Orientation="Horizontal"> | ||
| <CheckBox IsChecked="{Binding Use}" /> | ||
| <TextBlock Text="{Binding TypeString}"></TextBlock> | ||
| </StackPanel> | ||
| </DataTemplate> | ||
| </ListView.ItemTemplate> | ||
| <ListView.ItemsPanel> | ||
| <ItemsPanelTemplate> | ||
| <UniformGrid Columns="6"/> | ||
| </ItemsPanelTemplate> | ||
| </ListView.ItemsPanel> | ||
| </ListView> | ||
| </Grid> | ||
| </UserControl> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using System.Windows; | ||
| using System.Windows.Controls; | ||
| using System.Windows.Data; | ||
| using System.Windows.Documents; | ||
| using System.Windows.Input; | ||
| using System.Windows.Media; | ||
| using System.Windows.Media.Imaging; | ||
| using System.Windows.Navigation; | ||
| using System.Windows.Shapes; | ||
|
|
||
| namespace MetaMorpheusGUI | ||
| { | ||
| /// <summary> | ||
| /// Interaction logic for FragmentReanalysisControl.xaml | ||
| /// </summary> | ||
| public partial class FragmentReanalysisControl : UserControl | ||
| { | ||
| private MetaDraw parent; | ||
| public FragmentReanalysisControl() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
|
|
||
| internal void LinkMetaDraw(MetaDraw metaDraw) | ||
| { | ||
| parent = metaDraw; | ||
| } | ||
|
|
||
| private void SearchWithNewIons_OnClick(object sender, RoutedEventArgs e) | ||
| { | ||
| parent.SearchWithNewIons_OnClick(sender, e); | ||
| } | ||
| } | ||
| } |
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
23 changes: 23 additions & 0 deletions
23
MetaMorpheus/GuiFunctions/MetaDraw/FragmentResearching/FragmentViewModel.cs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| using Omics.Fragmentation; | ||
|
|
||
| namespace GuiFunctions | ||
| { | ||
| public class FragmentViewModel : BaseViewModel | ||
| { | ||
| public ProductType ProductType { get; } | ||
| public string TypeString => ProductType.ToString(); | ||
| private bool use; | ||
|
|
||
| public bool Use | ||
| { | ||
| get => use; | ||
| set { use = value; OnPropertyChanged(nameof(Use)); } | ||
| } | ||
|
|
||
| public FragmentViewModel(bool use, ProductType type) | ||
| { | ||
| Use = use; | ||
| ProductType = type; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.