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

Update Numerical Inputs #2433

Merged
merged 24 commits into from
Nov 4, 2024
Merged

Update Numerical Inputs #2433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8be2574
Updated to MzLib 1.0.548 and fixed custom ions in search tasks
nbollis May 21, 2024
a00af8a
reverted calibration task change
nbollis May 21, 2024
22c60ba
merged in master
nbollis May 30, 2024
f4695bb
merged in master bbbyy
nbollis Jun 10, 2024
d4f8b9d
Merge branch 'smith-chem-wisc:master' into master
nbollis Jun 19, 2024
1f0dc48
merged in master
nbollis Jun 21, 2024
5c0268b
idkman
nbollis Jul 3, 2024
b7e6a0f
merged in master
nbollis Jul 16, 2024
6446d89
Merge remote-tracking branch 'upstream/master'
nbollis Jul 24, 2024
322235d
Spectral Library from Command Line (#2386)
nbollis Jul 23, 2024
8b48c95
merged in master
nbollis Aug 6, 2024
2ef973f
Merge branch 'master' of https://github.com/nbollis/MetaMorpheus
nbollis Aug 6, 2024
0abcd9b
Merge branch 'master' of https://github.com/nbollis/MetaMorpheus
nbollis Aug 7, 2024
f9030f9
merged in master
nbollis Sep 4, 2024
046067e
merged in master
nbollis Sep 17, 2024
c38f081
Merge remote-tracking branch 'upstream/master'
nbollis Oct 3, 2024
0c04007
Merge remote-tracking branch 'upstream/master'
nbollis Oct 10, 2024
d66bf7b
Merge remote-tracking branch 'upstream/master'
Oct 18, 2024
1a4d4c0
Merge remote-tracking branch 'upstream/master'
nbollis Oct 21, 2024
c2cb244
Merge branch 'master' of https://github.com/nbollis/MetaMorpheus
nbollis Oct 21, 2024
500481e
Merge remote-tracking branch 'upstream/master'
nbollis Oct 31, 2024
13995aa
Add alignment properties and key handling to TextBoxControls
nbollis Oct 31, 2024
405d05a
Replace TextBox with custom numeric controls in XAML
nbollis Oct 31, 2024
6ac8828
Merge branch 'master' into IntegerAndDoubleBoxes
elaboy Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@
<StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="maxMissedCleavageLabel" Content="Max Missed Cleavages" />
<TextBox x:Name="MissedCleavagesTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
<local:IntegerTexBoxControl x:Name="MissedCleavagesTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
<TextBox.ToolTip>
<TextBlock>
Maximum number of missed proteolytic cleavages allowed.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="proteaseLabel" Content="Protease" />
Expand All @@ -114,55 +114,55 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="lblMinPeptideLength" Content="Min Peptide Len" />
<TextBox x:Name="MinPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<local:IntegerTexBoxControl x:Name="MinPeptideLengthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<TextBox.ToolTip>
<TextBlock>
The minimum allowed peptide length. Must be a positive, non-zero integer.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="lblMaxPeptideLength" Content="Max Peptide Len" />
<TextBox x:Name="MaxPeptideLengthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
<local:IntegerTexBoxControl x:Name="MaxPeptideLengthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500" TextChanged="ProteaseSpecificUpdate">
<TextBox.ToolTip>
<TextBlock>
The maximum allowed peptide length. Leave empty for no limitation.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="LbMinVariantDepth" Content="Min read depth for variants" />
<TextBox x:Name="MinVariantDepthTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<local:IntegerTexBoxControl x:Name="MinVariantDepthTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<TextBox.ToolTip>
<TextBlock>
The minimum number of reads to consider a nucleic acid sequence variant.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="LbMaxHeterozygousVariants" Content="Max heterozygous variants for combinitorics" />
<TextBox x:Name="MaxHeterozygousVariantsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<local:IntegerTexBoxControl x:Name="MaxHeterozygousVariantsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<TextBox.ToolTip>
<TextBlock>
The maximum number of heterozygous variants for combinitorics.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="MinimumScoreLabel" Content="Minimum score allowed:" />
<TextBox x:Name="MinScoreAllowed" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<local:IntegerTexBoxControl x:Name="MinScoreAllowed" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<TextBox.ToolTip>
<TextBlock>
The minimum MetaMorpheus score allowed for a PSM to be reportable.
<LineBreak/>
Decreasing this number increases search time.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="1">
Expand All @@ -188,25 +188,25 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="MaxModsPerPeptideLabel" Content="Max Mods Per Peptide" />
<TextBox x:Name="MaxModsPerPeptideTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<local:IntegerTexBoxControl x:Name="MaxModsPerPeptideTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<TextBox.ToolTip>
<TextBlock>
The maximum number of modifications allowed on a single isoform.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="MaxModificationIsoformsLabel" Content="Max Modification Isoforms" />
<TextBox x:Name="MaxModificationIsoformsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<local:IntegerTexBoxControl x:Name="MaxModificationIsoformsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<TextBox.ToolTip>
<TextBlock>
The maximum number of isoforms (sequences with modifications) allowed from a given unmodified "base-sequence".
<LineBreak/>
This prevents highly ambiguous regions from greatly expanding the search space.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label x:Name="ionsToSearchLabel" Content="Dissociation Type" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
Expand All @@ -220,15 +220,15 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="5">
<Label Content="Max Threads" />
<TextBox x:Name="MaxThreadsTextBox" PreviewTextInput="CheckIfNumber" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<local:IntegerTexBoxControl x:Name="MaxThreadsTextBox" Width="45" ToolTipService.ShowDuration="999999" ToolTipService.InitialShowDelay="500">
<TextBox.ToolTip>
<TextBlock>
By default, MetaMorpheus uses this machine's number of threads minus one to maximize search speed while letting you use your computer for other purposes.
<LineBreak/>
Enter a lower number to limit CPU usage.
</TextBlock>
</TextBox.ToolTip>
</TextBox>
</local:IntegerTexBoxControl>
</StackPanel>
</StackPanel>
</Grid>
Expand Down
5 changes: 0 additions & 5 deletions MetaMorpheus/GUI/TaskWindows/CalibrateTaskWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,6 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
DialogResult = true;
}

private void CheckIfNumber(object sender, TextCompositionEventArgs e)
{
e.Handled = GlobalGuiSettings.CheckIsPositiveInteger(e.Text);
}

private void KeyPressed(object sender, KeyEventArgs e)
{
if (e.Key == Key.Return)
Expand Down
Loading