MarkAHamann/MorseTrainer
1
0
Fork 0
mirror of https://github.com/MarkAHamann/MorseTrainer.git synced 2026-03-13 16:43:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed backspace over prosigns, limited farnsworth within WPM, disable textboxes during transmit

Browse source
This commit is contained in:
Mark Hamann 2016-03-06 14:16:50 -08:00
parent ad793adfc5
commit f675fc3ff7
1 changed files with 36 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
MorseTrainer/Form1.cs
View file

@ -252,6 +252,13 @@ namespace MorseTrainer
btnStartStop.Text = "Stop";
txtAnalysis.Focus();
txtAnalysis.Clear();
txtFrequency.Enabled = false;
txtDuration.Enabled = false;
txtWPM.Enabled = false;
txtFarnsworth.Enabled = false;
txtStartDelay.Enabled = false;
txtStopDelay.Enabled = false;
txtVolume.Enabled = false;
}
}
@ -339,6 +346,13 @@ namespace MorseTrainer
else
{
Analyze();
txtFrequency.Enabled = true;
txtDuration.Enabled = true;
txtWPM.Enabled = true;
txtFarnsworth.Enabled = true;
txtStartDelay.Enabled = true;
txtStopDelay.Enabled = true;
txtVolume.Enabled = true;
btnStartStop.Text = "Start";
btnStartStop.Enabled = true;
InputtingKeys = false;
@ -698,13 +712,8 @@ namespace MorseTrainer
}
set
{
_toneGenerator.FarnsworthWPM = value;
if (_toneGenerator.WPM < _toneGenerator.FarnsworthWPM)
{
WPM = value;
WPMSlider = value;
WPMText = value;
}
float limited = Math.Min(value, _toneGenerator.WPM);
_toneGenerator.FarnsworthWPM = limited;
}
}
@ -722,6 +731,11 @@ namespace MorseTrainer
slider.Value = sliderValue;
}
float val = FarnsworthWPMSliderToValue(slider.Value);
if (val > WPM)
{
val = WPM;
FarnsworthWPMValueToSlider(val);
}
FarnsworthWPM = val;
FarnsworthWPMText = val;
}
@ -739,6 +753,11 @@ namespace MorseTrainer
if (e.KeyChar == '\r')
{
float val = FarnsworthWPMTextToValue(textbox.Text);
if (val > WPM)
{
val = WPM;
txtFarnsworth.Text = FarnsworthWPMValueToText(val);
}
FarnsworthWPM = val;
FarnsworthWPMSlider = val;
textbox.BackColor = SystemColors.Window;
@ -1300,14 +1319,19 @@ namespace MorseTrainer
// backspace
if (txtAnalysis.TextLength > 0)
{
//txtAnalysis.SuspendLayout();
txtAnalysis.Select(txtAnalysis.TextLength-1, 1);
if (txtAnalysis.Text[txtAnalysis.TextLength - 1] == '>'
&& txtAnalysis.TextLength > 3
&& txtAnalysis.Text[txtAnalysis.TextLength - 4] == '<')
{
txtAnalysis.Select(txtAnalysis.TextLength - 4, 4);
}
else
{
txtAnalysis.Select(txtAnalysis.TextLength - 1, 1);
}
txtAnalysis.ReadOnly = false;
txtAnalysis.SelectedText = "";
txtAnalysis.ReadOnly = true;
//txtAnalysis.Text = txtAnalysis.Text.Remove(txtAnalysis.TextLength - 1);
//txtAnalysis.Select(txtAnalysis.TextLength, 0);
//txtAnalysis.ResumeLayout();
}
processed = true;
}