dotMorten/NmeaParser
1
0
Fork 0
mirror of https://github.com/dotMorten/NmeaParser.git synced 2026-01-20 15:40:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor tweaks

Browse source
This commit is contained in:
Morten Nielsen 2020-08-02 20:37:15 -07:00
parent fbfe89c704
commit 3f8a7d4b8f
3 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/NmeaParser/Gnss/Ntrip/Client.cs
View file

@ -132,18 +132,21 @@ namespace NmeaParser.Gnss.Ntrip
if (string.IsNullOrWhiteSpace(mountPoint))
throw new ArgumentException(nameof(mountPoint));
var sckt = Request(mountPoint);
return new NtripDataStream(sckt);
return new NtripDataStream(() => Request(mountPoint));
}
private class NtripDataStream : System.IO.Stream
{
private Func<Socket> m_openSocketAction;
private Socket m_socket;
public NtripDataStream(Socket socket)
public NtripDataStream(Func<Socket> openSocketAction)
{
m_socket = socket;
m_openSocketAction = openSocketAction;
m_socket = openSocketAction();
}
public override bool CanRead => true;
public override bool CanRead => m_socket.Connected;
public override bool CanSeek => false;
@ -158,6 +161,14 @@ namespace NmeaParser.Gnss.Ntrip
public override int Read(byte[] buffer, int offset, int count)
{
if (isDiposed)
throw new ObjectDisposedException("NTRIP Stream");
if(!m_socket.Connected)
{
// reconnect
m_socket.Dispose();
m_socket = m_openSocketAction();
}
int read = m_socket.Receive(buffer, offset, count, SocketFlags.None);
position += read;
return read;
@ -168,6 +179,14 @@ namespace NmeaParser.Gnss.Ntrip
TaskCompletionSource<int> tcs = new TaskCompletionSource<int>();
if (cancellationToken.CanBeCanceled)
cancellationToken.Register(() => tcs.TrySetCanceled());
if (isDiposed)
throw new ObjectDisposedException("NTRIP Stream");
if (!m_socket.Connected)
{
// reconnect
m_socket.Dispose();
m_socket = m_openSocketAction();
}
m_socket.BeginReceive(buffer, offset, count, SocketFlags.None, ReceiveCallback, tcs);
return tcs.Task;
}
@ -195,10 +214,11 @@ namespace NmeaParser.Gnss.Ntrip
public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
protected override void Dispose(bool disposing)
{
isDiposed = true;
m_socket.Dispose();
base.Dispose(disposing);
}
private bool isDiposed;
public override int ReadTimeout { get => m_socket.ReceiveTimeout; set => m_socket.ReceiveTimeout = value; }
}
}

6
src/SampleApp.WinDesktop/NtripView.xaml.cs
View file

@ -69,7 +69,11 @@ namespace SampleApp.WinDesktop
}
catch (System.Exception ex)
{
Debugger.Break();
if(!stream.CanRead)
{
// TODO: Restart stream
return;
}
}
var device = MainWindow.currentDevice;
if (device != null && device.CanWrite)

20
src/SampleApp.WinDesktop/PointPlotView.xaml.cs
View file

@ -105,12 +105,10 @@ namespace SampleApp.WinDesktop
if (autoFit)
{
maxDif = distances.Max();
if (maxDif < .1)
maxDif = .1;
if (maxDif < .25)
maxDif = .25;
else if (maxDif < .5)
maxDif = .5;
if (maxDif < 0.05)
maxDif = 0.05;
else if (maxDif < 1)
maxDif = Math.Ceiling(maxDif * 10) / 10d;
else
maxDif = Math.Ceiling(maxDif);
currentScale = maxDif / (Math.Min(size.Width, size.Height) * .5);
@ -253,12 +251,10 @@ namespace SampleApp.WinDesktop
maxDif = e.Delta < 0 ? maxDif * 2 : maxDif / 2;
else
maxDif = e.Delta < 0 ? maxDif + 1 : maxDif - 1;
if (maxDif < .1)
maxDif = .1;
if (maxDif < .25)
maxDif = .25;
else if (maxDif < .5)
maxDif = .5;
if (maxDif < 0.05)
maxDif = 0.05;
else if (maxDif < 1)
maxDif = Math.Ceiling(maxDif * 10) / 10d;
else
maxDif = Math.Ceiling(maxDif);
currentScale = maxDif / (Math.Min(size.Width, size.Height) * .5);