From 6cf5fe74543d80a75587d9b3e7ca98b7e296aeff Mon Sep 17 00:00:00 2001 From: Am6er Date: Tue, 3 Sep 2024 17:54:37 +0300 Subject: [PATCH] Fix calibration validation (offset > -100) --- BecquerelMonitor/BecquerelMonitor.csproj | 4 ++-- BecquerelMonitor/DeviceConfigForm.cs | 6 ++++-- BecquerelMonitor/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/BecquerelMonitor/BecquerelMonitor.csproj b/BecquerelMonitor/BecquerelMonitor.csproj index 1149075..776b24e 100644 --- a/BecquerelMonitor/BecquerelMonitor.csproj +++ b/BecquerelMonitor/BecquerelMonitor.csproj @@ -35,8 +35,8 @@ 2022.07.08.7 true index.html - 3 - 2024.09.03.3 + 4 + 2024.09.03.4 true true true diff --git a/BecquerelMonitor/DeviceConfigForm.cs b/BecquerelMonitor/DeviceConfigForm.cs index e4bbc99..3bf2206 100644 --- a/BecquerelMonitor/DeviceConfigForm.cs +++ b/BecquerelMonitor/DeviceConfigForm.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.Diagnostics; using System.Drawing; using System.IO; using System.Linq; @@ -896,8 +897,9 @@ void setNewCalibration(TextBox t, int order) t.ForeColor = Color.Black; this.SetActiveDeviceConfigDirty(); } - catch + catch (Exception ex) { + Trace.WriteLine(ex.ToString()); t.ForeColor = Color.Red; } } @@ -1947,7 +1949,7 @@ double fromStringtoDouble(string str) System.Globalization.CultureInfo.InvariantCulture, out result)) { - if (result > -100.0 && result < 100.0) + if (result > -200.0 && result < 200.0) { return result; } diff --git a/BecquerelMonitor/Properties/AssemblyInfo.cs b/BecquerelMonitor/Properties/AssemblyInfo.cs index 344d0e5..80d7892 100644 --- a/BecquerelMonitor/Properties/AssemblyInfo.cs +++ b/BecquerelMonitor/Properties/AssemblyInfo.cs @@ -4,13 +4,13 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyVersion("2024.09.03.3")] +[assembly: AssemblyVersion("2024.09.03.4")] [assembly: AssemblyProduct("BecquerelMonitor")] [assembly: AssemblyCopyright("free")] [assembly: AssemblyTrademark("none")] [assembly: AssemblyConfiguration("")] [assembly: Guid("40110b38-4882-47c1-ad94-a71e58dcb5f8")] -[assembly: AssemblyFileVersion("2024.09.03.3")] +[assembly: AssemblyFileVersion("2024.09.03.4")] [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("free")] [assembly: CompilationRelaxations(8)]