HamBook – Diff between revs 22 and 26

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 22 Rev 26
Line 92... Line 92...
92 rowProgress.Row.Cells["ClarColumn"].Value = result.Clar; 92 rowProgress.Row.Cells["ClarColumn"].Value = result.Clar;
93 rowProgress.Row.Cells["ModeColumn"].Value = (string)result.MemoryRadioMode; 93 rowProgress.Row.Cells["ModeColumn"].Value = (string)result.MemoryRadioMode;
94 rowProgress.Row.Cells["CtcssColumn"].Value = (string)result.CtcssMode; 94 rowProgress.Row.Cells["CtcssColumn"].Value = (string)result.CtcssMode;
95 rowProgress.Row.Cells["PhaseColumn"].Value = (string)result.Phase; 95 rowProgress.Row.Cells["PhaseColumn"].Value = (string)result.Phase;
96 rowProgress.Row.Cells["TagColumn"].Value = result.Tag; 96 rowProgress.Row.Cells["TagColumn"].Value = result.Tag;
97 rowProgress.Row.Cells["TextColumn"].Value = result.Text.Trim(); 97 rowProgress.Row.Cells["TextColumn"].Value = result.Text;
98 rowProgress.Row.Tag = rowProgressSuccess.Data; 98 rowProgress.Row.Tag = rowProgressSuccess.Data;
Line 99... Line 99...
99   99  
100 break; 100 break;
101 case DataGridViewRowProgressFailure rowProgressFailure: 101 case DataGridViewRowProgressFailure rowProgressFailure:
Line 189... Line 189...
189 { 189 {
190 toolStripProgressBar1.Minimum = 0; 190 toolStripProgressBar1.Minimum = 0;
191 toolStripProgressBar1.Maximum = 98; 191 toolStripProgressBar1.Maximum = 98;
Line 192... Line 192...
192   192  
193 var memoryBankQueue = new ConcurrentQueue<int>(); 193 var memoryBankQueue = new ConcurrentQueue<int>();
Line 194... Line 194...
194 var snapshotsQueuedTaskCompletionSource = new TaskCompletionSource<object>(); 194 var memoryBankReadTaskCompletionSource = new TaskCompletionSource<object>();
195   195  
196 async void IdleHandler(object idleHandlerSender, EventArgs idleHandlerArgs) 196 async void IdleHandler(object idleHandlerSender, EventArgs idleHandlerArgs)
Line 197... Line 197...
197 { 197 {
198 await snapshotsQueuedTaskCompletionSource.Task; 198 await memoryBankReadTaskCompletionSource.Task;
199   199  
200 try 200 try
Line 240... Line 240...
240 foreach (var memoryBank in Enumerable.Range(1, 99)) 240 foreach (var memoryBank in Enumerable.Range(1, 99))
241 { 241 {
242 memoryBankQueue.Enqueue(memoryBank); 242 memoryBankQueue.Enqueue(memoryBank);
243 } 243 }
Line 244... Line 244...
244   244  
245 snapshotsQueuedTaskCompletionSource.TrySetResult(new { }); 245 memoryBankReadTaskCompletionSource.TrySetResult(new { });
246 } 246 }
247 catch (Exception exception) 247 catch (Exception exception)
248 { 248 {
Line 433... Line 433...
433 { 433 {
434 return; 434 return;
435 } 435 }
Line 436... Line 436...
436   436  
437 var fileName = saveFileDialog1.FileName; 437 var fileName = saveFileDialog1.FileName;
438 var list = new List<MemoryChannelOrganizerBank>(); 438 var list = new List<MemoryChannelIndexed>();
439 foreach(var row in dataGridView1.Rows.OfType<DataGridViewRow>().OrderBy(row => row.Index)) 439 foreach(var row in dataGridView1.Rows.OfType<DataGridViewRow>().OrderBy(row => row.Index))
440 { 440 {
441 if (row.Tag is MemoryChannel memoryChannel) 441 if (row.Tag is MemoryChannel memoryChannel)
442 { 442 {
443 var memoryChannelOrganizerBanks = new MemoryChannelOrganizerBank(row.Index, memoryChannel); 443 var memoryChannelOrganizerBanks = new MemoryChannelIndexed(row.Index, memoryChannel);
444 list.Add(memoryChannelOrganizerBanks); 444 list.Add(memoryChannelOrganizerBanks);
445 } 445 }
Line 446... Line 446...
446 } 446 }
Line 447... Line 447...
447   447  
448 var memoryBanks = list.ToArray(); 448 var memoryBanks = list.ToArray();
449   449  
450 switch (await Serialization.Serialize(memoryBanks, fileName, "MemoryChannelOrganizerBank", 450 switch (await Serialization.Serialize(memoryBanks, fileName, "MemoryChannelOrganizerBank",
451 "<!ATTLIST MemoryChannelOrganizerBank xmlns:xsi CDATA #IMPLIED xsi:noNamespaceSchemaLocation CDATA #IMPLIED>", 451 "<!ATTLIST MemoryChannelOrganizerBank xmlns:xsi CDATA #IMPLIED xsi:noNamespaceSchemaLocation CDATA #IMPLIED>",
452 CancellationToken.None)) 452 CancellationToken.None))
453 { 453 {
454 case SerializationSuccess<MemoryChannelOrganizerBank[]> configuration: 454 case SerializationSuccess<MemoryChannelIndexed[]> configuration:
455 Log.Information(Resources.Serialized_memory_banks); 455 Log.Information(Resources.Serialized_memory_banks);
456 break; 456 break;
Line 466... Line 466...
466 { 466 {
467 return; 467 return;
468 } 468 }
Line 469... Line 469...
469   469  
470 var fileName = openFileDialog1.FileName; 470 var fileName = openFileDialog1.FileName;
Line 471... Line 471...
471 MemoryChannelOrganizerBank[] memoryBanks = null; 471 MemoryChannelIndexed[] memoryBanks = null;
472   472  
473 var deserializationResult = 473 var deserializationResult =
Line 474... Line 474...
474 await Serialization.Deserialize<MemoryChannelOrganizerBank[]>(fileName, 474 await Serialization.Deserialize<MemoryChannelIndexed[]>(fileName,
475 "urn:hambook-memorychannelorganizerbank-schema", "MemoryChannelOrganizerBanks.xsd", CancellationToken.None); 475 "urn:hambook-memorychannelorganizerbank-schema", "MemoryChannelOrganizerBanks.xsd", CancellationToken.None);
476   476  
477 switch (deserializationResult) 477 switch (deserializationResult)
478 { 478 {
479 case SerializationSuccess<MemoryChannelOrganizerBank[]> serializationSuccess: 479 case SerializationSuccess<MemoryChannelIndexed[]> serializationSuccess:
480 Log.Information(Resources.Deserialized_memory_banks); 480 Log.Information(Resources.Deserialized_memory_banks);
481 memoryBanks = serializationSuccess.Result; 481 memoryBanks = serializationSuccess.Result;
Line 486... Line 486...
486 } 486 }
Line 487... Line 487...
487   487  
488 toolStripProgressBar1.Minimum = 0; 488 toolStripProgressBar1.Minimum = 0;
Line 489... Line 489...
489 toolStripProgressBar1.Maximum = 98; 489 toolStripProgressBar1.Maximum = 98;
490   490  
Line 491... Line 491...
491 var memoryBankQueue = new ConcurrentQueue<MemoryChannelOrganizerBank>(); 491 var memoryBankQueue = new ConcurrentQueue<MemoryChannelIndexed>();
492 var snapshotsQueuedTaskCompletionSource = new TaskCompletionSource<object>(); 492 var snapshotsQueuedTaskCompletionSource = new TaskCompletionSource<object>();
493   493