Remove warnings regarding possible references to NULL
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing

This commit is contained in:
Jens True 2021-12-15 21:08:30 +01:00
parent 86cfc546ac
commit dc3aedea12
5 changed files with 36 additions and 27 deletions

@ -40,7 +40,14 @@ namespace Tidstagning
{ {
get get
{ {
return Assembly.GetExecutingAssembly().GetName().Version.ToString(); if (Assembly.GetExecutingAssembly().GetName().Version != null)
{
return Assembly.GetExecutingAssembly().GetName().Version.ToString();
}
else
{
return "N/A";
}
} }
} }

@ -19,7 +19,7 @@ namespace Tidstagning
{ {
InitializeComponent(); InitializeComponent();
System.IO.StreamReader deltager_handle = new System.IO.StreamReader(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "/Tidstagning/" + "Deltager.txt"); System.IO.StreamReader deltager_handle = new System.IO.StreamReader(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "/Tidstagning/" + "Deltager.txt");
string deltager; string? deltager;
while ((deltager = deltager_handle.ReadLine()) != null) while ((deltager = deltager_handle.ReadLine()) != null)
{ {
string[] dele = deltager.Split(','); string[] dele = deltager.Split(',');

@ -1,7 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Threading;
namespace Tidstagning namespace Tidstagning
{ {
class Procedure class Procedure
@ -11,7 +11,7 @@ namespace Tidstagning
List<DateTime> signaler; List<DateTime> signaler;
uint signalLength = 500; uint signalLength = 500;
System.Threading.Timer? timer; Timer? delayTimer;
Int16 idx = 0; Int16 idx = 0;
public Procedure() public Procedure()
@ -22,7 +22,7 @@ namespace Tidstagning
public void ReadFile(string file) public void ReadFile(string file)
{ {
System.IO.StreamReader procedure_handle = new System.IO.StreamReader(file); System.IO.StreamReader procedure_handle = new System.IO.StreamReader(file);
string line; string? line;
while ((line = procedure_handle.ReadLine()) != null) while ((line = procedure_handle.ReadLine()) != null)
{ {
addEntry(line); addEntry(line);
@ -76,8 +76,8 @@ namespace Tidstagning
{ {
signaler = new List<DateTime>(); signaler = new List<DateTime>();
idx = 0; idx = 0;
if (timer != null) if (delayTimer != null)
timer.Dispose(); delayTimer.Dispose();
} }
public void setObjects(Relay horn_obj, ResultList log_obj) public void setObjects(Relay horn_obj, ResultList log_obj)
@ -114,18 +114,22 @@ namespace Tidstagning
Run(); Run();
return;//time already passed return;//time already passed
} }
log.Write("Næste signal: " + alertTime.ToString(@"HH\:mm\:ss") + " Om: " + timeToGo.ToString(@"hh\:mm\:ss")); if (log is not null)
timer = new System.Threading.Timer(x =>
{ {
this.Alarm(); log.Write("Næste signal: " + alertTime.ToString(@"HH\:mm\:ss") + " Om: " + timeToGo.ToString(@"hh\:mm\:ss"));
}, null, timeToGo, new System.TimeSpan(0)); }
delayTimer = new Timer(x =>
{
this.Alarm();
}, null, timeToGo, new TimeSpan(0));
} }
private void Alarm() private void Alarm()
{ {
log.Write("HORN!"); if(log is not null)
log.Write("HORN!");
horn.Sound(signalLength); if(horn is not null)
horn.Sound(signalLength);
next(); next();
Run(); Run();

@ -9,7 +9,6 @@ namespace Tidstagning
class Relay class Relay
{ {
SerialPort com; SerialPort com;
System.Threading.Timer? cooldownTimer;
struct SignalSpec struct SignalSpec
{ {
@ -89,7 +88,7 @@ namespace Tidstagning
Off(); Off();
} }
cooldownTimer = new System.Threading.Timer(x => System.Threading.Timer cooldownTimer = new System.Threading.Timer(x =>
{ {
signals.Dequeue(); signals.Dequeue();
Run(); Run();

@ -4,16 +4,15 @@ namespace Tidstagning
{ {
class ResultList class ResultList
{ {
System.IO.StreamWriter filehandle_log;
System.IO.StreamWriter filehandle; System.IO.StreamWriter filehandle_results;
System.IO.StreamWriter filehandle2;
Tidstagning.MainUI parentForm; Tidstagning.MainUI parentForm;
string racenumber = ""; string racenumber = "";
public ResultList(string filename, Tidstagning.MainUI log_object) public ResultList(string filename, Tidstagning.MainUI log_object)
{ {
filename = MakeSafeFilename(filename, '_'); filename = MakeSafeFilename(filename, '_');
filehandle = new System.IO.StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "/Tidstagning/" + filename + "_" + DateTime.Now.ToString(" dd-MM-yyyy HH-mm-ss") + ".txt"); filehandle_log = new System.IO.StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "/Tidstagning/" + filename + "_" + DateTime.Now.ToString(" dd-MM-yyyy HH-mm-ss") + ".txt");
filehandle2 = new System.IO.StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "/Tidstagning/" + filename + "_" + DateTime.Now.ToString(" dd-MM-yyyy HH-mm-ss") + ".csv"); filehandle_results = new System.IO.StreamWriter(Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "/Tidstagning/" + filename + "_" + DateTime.Now.ToString(" dd-MM-yyyy HH-mm-ss") + ".csv");
parentForm = log_object; parentForm = log_object;
} }
@ -58,21 +57,21 @@ namespace Tidstagning
public void Write(string textstring) public void Write(string textstring)
{ {
filehandle.WriteLine(textstring); filehandle_log.WriteLine(textstring);
parentForm.LogAppend(textstring + "\r\n"); parentForm.LogAppend(textstring + "\r\n");
filehandle.Flush(); filehandle_log.Flush();
} }
public void WriteCSV(string textstring) public void WriteCSV(string textstring)
{ {
filehandle2.WriteLine(textstring); filehandle_results.WriteLine(textstring);
filehandle2.Flush(); filehandle_results.Flush();
} }
public void Close() public void Close()
{ {
filehandle.Close(); filehandle_log.Close();
filehandle2.Close(); filehandle_results.Close();
} }
} }