HamBook – Diff between revs 27 and 29

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 27 Rev 29
Line 463... Line 463...
463 { 463 {
464 Log.Error(exception, Resources.Failed_to_set_power_state); 464 Log.Error(exception, Resources.Failed_to_set_power_state);
465 } 465 }
466 } 466 }
Line 467... Line 467...
467   467  
468 private void scrollableToolStripComboBox2_MouseWheel(object sender, MouseEventArgs e) 468 private async void scrollableToolStripComboBox2_MouseWheel(object sender, MouseEventArgs e)
469 { 469 {
470 var toolStripComboBox = (ScrollableToolStripComboBox)sender; 470 var toolStripComboBox = (ScrollableToolStripComboBox)sender;
471 if (int.TryParse(toolStripComboBox.Text, out var frequency)) 471 if (int.TryParse(toolStripComboBox.Text, out var frequency))
472 { 472 {
Line 478... Line 478...
478 case 1: 478 case 1:
479 frequency = frequency + Configuration.Navigation.FrequencyStep; 479 frequency = frequency + Configuration.Navigation.FrequencyStep;
480 break; 480 break;
481 } 481 }
Line 482... Line -...
482   -  
483 if (frequency < 0) -  
484 { -  
485 frequency = 0; -  
486 } -  
487   482  
488 if (!_vfoAReaderWriterLockSlim.TryEnterReadLock(250)) 483 if (!_vfoAReaderWriterLockSlim.TryEnterReadLock(250))
489 { 484 {
490 return; 485 return;
Line 491... Line 486...
491 } 486 }
492   487  
493 try -  
494 { -  
495 toolStripComboBox.Value = $"{frequency}"; -  
496 } -  
497 finally -  
498 { -  
499 if (_vfoAReaderWriterLockSlim.IsReadLockHeld) -  
500 { -  
501 _vfoAReaderWriterLockSlim.ExitReadLock(); -  
502 } -  
503 } -  
504 } -  
505 } -  
506   -  
507 private async void scrollableToolStripComboBox2_SelectedIndexChanged(object sender, EventArgs e) -  
508 { -  
509 var toolStripComboBox = (ToolStripComboBox)sender; -  
510 if (int.TryParse(toolStripComboBox.Text, out var frequency)) -  
511 { -  
512 try 488 try
513 { 489 {
514 using (var soundPlayer = new SoundPlayer(Assembly.GetExecutingAssembly().GetManifestResourceStream("HamBook.Effects.pot.wav"))) 490 using (var soundPlayer = new SoundPlayer(Assembly.GetExecutingAssembly().GetManifestResourceStream("HamBook.Effects.pot.wav")))
-   491 {
-   492 if (await _catAssemblies.CatSetAsync<int, bool>("FB", new object[] { frequency }, _cancellationToken))
Line 515... Line 493...
515 { 493 {
-   494 toolStripComboBox.Text = $"{frequency}";
516 await _catAssemblies.CatSetAsync<int, bool>("FB", new object[] { frequency }, _cancellationToken); 495  
517   496 soundPlayer.Play();
518 soundPlayer.Play(); 497 }
519 } 498 }
520 } 499 }
521 catch (Exception exception) 500 catch (Exception exception)
522 { 501 {
523 Log.Error(exception, Resources.Failed_to_set_VFO_B_frequency); 502 Log.Error(exception, Resources.Failed_to_set_VFO_B_frequency);
Line 524... Line 503...
524 } 503 }
525 } 504 }
526 } 505 }
527   506  
528 private void scrollableToolStripComboBox2_TextChanged(object sender, EventArgs e) 507 private async void scrollableToolStripComboBox2_KeyPress(object sender, KeyPressEventArgs e)
529 { 508 {
Line 530... Line -...
530 if (!_vfoAReaderWriterLockSlim.TryEnterReadLock(250)) -  
531 { -  
532 return; -  
533 } 509 switch (e.KeyChar)
534   -  
535 try -  
536 { -  
537 var toolStripComboBox = (ScrollableToolStripComboBox)sender; -  
538 var frequency = toolStripComboBox.Text; 510 {
539   511 case (char)Keys.Enter:
540 _vfoAScheduledContinuation.Schedule(TimeSpan.FromSeconds(1), async () => 512 var toolStripComboBox = (ScrollableToolStripComboBox)sender;
-   513  
-   514 if (int.TryParse(toolStripComboBox.Text, out var frequency))
-   515 {
-   516 try
-   517 {
541 { 518 using (var soundPlayer = new SoundPlayer(Assembly.GetExecutingAssembly().GetManifestResourceStream("HamBook.Effects.pot.wav")))
542 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => 519 {
543 { 520 if (await _catAssemblies.CatSetAsync<int, bool>("FB", new object[] { frequency }, _cancellationToken))
544 toolStripComboBox.Value = $"{frequency}"; 521 {
545 }); 522 e.Handled = true;
546   523  
547 }, _cancellationToken); 524 soundPlayer.Play();
548 } 525 }
-   526 }
549 finally 527 }
-   528 catch (Exception exception)
550 { 529 {
551 if (_vfoAReaderWriterLockSlim.IsReadLockHeld) 530 Log.Error(exception, Resources.Failed_to_set_VFO_B_frequency);
Line 552... Line 531...
552 { 531 }
553 _vfoAReaderWriterLockSlim.ExitReadLock(); 532 }
Line 635... Line 614...
635 { 614 {
636 var fa = await _catAssemblies.CatReadAsync<int>("FA", new object[] { }, _cancellationToken); 615 var fa = await _catAssemblies.CatReadAsync<int>("FA", new object[] { }, _cancellationToken);
Line 637... Line 616...
637   616  
638 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => 617 contextMenuStrip1.InvokeIfRequired(contextMenuStrip =>
639 { 618 {
Line 640... Line 619...
640 scrollableToolStripComboBox1.Value = $"{fa}"; 619 scrollableToolStripComboBox1.Text = $"{fa}";
Line 641... Line 620...
641   620  
642 }); 621 });
Line 651... Line 630...
651 { 630 {
652 var fb = await _catAssemblies.CatReadAsync<int>("FB", new object[] { }, _cancellationToken); 631 var fb = await _catAssemblies.CatReadAsync<int>("FB", new object[] { }, _cancellationToken);
Line 653... Line 632...
653   632  
654 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => 633 contextMenuStrip1.InvokeIfRequired(contextMenuStrip =>
655 { 634 {
Line 656... Line 635...
656 scrollableToolStripComboBox2.Value = $"{fb}"; 635 scrollableToolStripComboBox2.Text = $"{fb}";
657   636  
658 }); 637 });
659 } 638 }
Line 1050... Line 1029...
1050 { 1029 {
1051 Log.Error(exception, Resources.Failed_to_read_squelch); 1030 Log.Error(exception, Resources.Failed_to_read_squelch);
1052 } 1031 }
1053 } 1032 }
Line 1054... Line 1033...
1054   1033  
1055 private void scrollableToolStripComboBox1_MouseWheel(object sender, MouseEventArgs e) 1034 private async void scrollableToolStripComboBox1_MouseWheel(object sender, MouseEventArgs e)
1056 { 1035 {
1057 var toolStripComboBox = (ScrollableToolStripComboBox)sender; 1036 var toolStripComboBox = (ScrollableToolStripComboBox)sender;
1058 if (int.TryParse(toolStripComboBox.Text, out var frequency)) 1037 if (int.TryParse(toolStripComboBox.Text, out var frequency))
1059 { 1038 {
Line 1065... Line 1044...
1065 case 1: 1044 case 1:
1066 frequency = frequency + Configuration.Navigation.FrequencyStep; 1045 frequency = frequency + Configuration.Navigation.FrequencyStep;
1067 break; 1046 break;
1068 } 1047 }
Line 1069... Line -...
1069   -  
1070 if (frequency < 0) -  
1071 { -  
1072 frequency = 0; -  
1073 } -  
1074   -  
1075 if (!_vfoAReaderWriterLockSlim.TryEnterReadLock(250)) -  
1076 { -  
1077 return; -  
1078 } -  
1079   -  
1080 try -  
1081 { -  
1082 toolStripComboBox.Value = $"{frequency}"; -  
1083 } -  
1084 finally -  
1085 { -  
1086 if (_vfoAReaderWriterLockSlim.IsReadLockHeld) -  
1087 { -  
1088 _vfoAReaderWriterLockSlim.ExitReadLock(); -  
1089 } -  
1090 } -  
1091 } -  
1092 } -  
1093   -  
1094 private async void scrollableToolStripComboBox1_SelectedIndexChanged(object sender, EventArgs e) -  
1095 { -  
1096 var toolStripComboBox = (ToolStripComboBox)sender; -  
1097 if (int.TryParse(toolStripComboBox.Text, out var frequency)) -  
1098 { 1048  
1099 try 1049 try
1100 { 1050 {
1101 using (var soundPlayer = new SoundPlayer(Assembly.GetExecutingAssembly().GetManifestResourceStream("HamBook.Effects.pot.wav"))) 1051 using (var soundPlayer = new SoundPlayer(Assembly.GetExecutingAssembly().GetManifestResourceStream("HamBook.Effects.pot.wav")))
1102 { 1052 {
-   1053 if (await _catAssemblies.CatSetAsync<int, bool>("FA", new object[] { frequency }, _cancellationToken))
-   1054 {
-   1055 toolStripComboBox.Text = $"{frequency}";
1103 await _catAssemblies.CatSetAsync<int, bool>("FA", new object[] { frequency }, _cancellationToken); 1056  
-   1057 soundPlayer.Play();
1104 soundPlayer.Play(); 1058 }
1105 } 1059 }
1106 } 1060 }
1107 catch (Exception exception) 1061 catch (Exception exception)
1108 { 1062 {
1109 Log.Error(exception, Resources.Failed_to_set_VFO_A_frequency); 1063 Log.Error(exception, Resources.Failed_to_set_VFO_A_frequency);
1110 } 1064 }
1111 } 1065 }
Line 1112... Line 1066...
1112 } 1066 }
1113   1067  
1114 private void scrollableToolStripComboBox1_TextChanged(object sender, EventArgs e) 1068 private async void scrollableToolStripComboBox1_KeyPress(object sender, KeyPressEventArgs e)
1115 { 1069 {
1116 if(!_vfoAReaderWriterLockSlim.TryEnterReadLock(250)) 1070 switch (e.KeyChar)
1117 { 1071 {
Line 1118... Line -...
1118 return; -  
1119 } -  
1120   1072 case (char)Keys.Enter:
1121 try -  
Line 1122... Line -...
1122 { -  
1123 var toolStripComboBox = (ScrollableToolStripComboBox)sender; -  
1124 var frequency = toolStripComboBox.Text; 1073 e.Handled = true;
1125   1074  
1126 _vfoAScheduledContinuation.Schedule(TimeSpan.FromSeconds(1), async () => 1075 var toolStripComboBox = (ScrollableToolStripComboBox)sender;
1127 { 1076  
-   1077 if (int.TryParse(toolStripComboBox.Text, out var frequency))
-   1078 {
-   1079 try
-   1080 {
1128 contextMenuStrip1.InvokeIfRequired(contextMenuStrip => 1081 using (var soundPlayer = new SoundPlayer(Assembly.GetExecutingAssembly().GetManifestResourceStream("HamBook.Effects.pot.wav")))
1129 { 1082 {
1130 toolStripComboBox.Value = $"{frequency}"; 1083 if (await _catAssemblies.CatSetAsync<int, bool>("FA", new object[] { frequency }, _cancellationToken))
1131 }); 1084 {
1132   1085
1133 }, _cancellationToken); 1086 soundPlayer.Play();
1134 } 1087 }
1135 finally 1088 }
-   1089 }
1136 { 1090 catch (Exception exception)
-   1091 {
1137 if (_vfoAReaderWriterLockSlim.IsReadLockHeld) 1092 Log.Error(exception, Resources.Failed_to_set_VFO_A_frequency);
1138 { 1093 }
Line 1139... Line 1094...
1139 _vfoAReaderWriterLockSlim.ExitReadLock(); 1094 }
1140 } 1095 break;
Line 1211... Line 1166...
1211 } 1166 }
1212 }); 1167 });
1213 }, _cancellationToken); 1168 }, _cancellationToken);
1214 } 1169 }
Line -... Line 1170...
-   1170  
1215   1171  
1216 } 1172 }