From dea0b0fbdb5c48325ba78bf9ae56f116051bf1f0 Mon Sep 17 00:00:00 2001 From: Am6er Date: Fri, 7 Jun 2024 16:24:10 +0300 Subject: [PATCH] Fix selection if peak.Nuclide is null --- BecquerelMonitor/BecquerelMonitor.csproj | 4 ++-- BecquerelMonitor/EnergySpectrumView.Designer.cs | 2 +- BecquerelMonitor/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BecquerelMonitor/BecquerelMonitor.csproj b/BecquerelMonitor/BecquerelMonitor.csproj index 4eedca5..57a00b4 100644 --- a/BecquerelMonitor/BecquerelMonitor.csproj +++ b/BecquerelMonitor/BecquerelMonitor.csproj @@ -35,8 +35,8 @@ 2022.07.08.7 true index.html - 1 - 2024.06.07.1 + 2 + 2024.06.07.2 true true true diff --git a/BecquerelMonitor/EnergySpectrumView.Designer.cs b/BecquerelMonitor/EnergySpectrumView.Designer.cs index a6aa251..7ecbcc3 100644 --- a/BecquerelMonitor/EnergySpectrumView.Designer.cs +++ b/BecquerelMonitor/EnergySpectrumView.Designer.cs @@ -3457,7 +3457,7 @@ void ShowCursorValues(Graphics g) detected_peak = peak; } } - if (number_of_peaks == 1 && detected_peak != null && detected_peak.Nuclide.Intencity > 0) + if (number_of_peaks == 1 && detected_peak != null && detected_peak.Nuclide != null && detected_peak.Nuclide.Intencity > 0) { ROIAriphmetics roiAriphmetics = new ROIAriphmetics(this.roiConfig); ROIEfficiencyData effData = roiAriphmetics.CalculateEfficiency(detected_peak.Energy); diff --git a/BecquerelMonitor/Properties/AssemblyInfo.cs b/BecquerelMonitor/Properties/AssemblyInfo.cs index 4d03878..6a875a2 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.06.07.1")] +[assembly: AssemblyVersion("2024.06.07.2")] [assembly: AssemblyProduct("BecquerelMonitor")] [assembly: AssemblyCopyright("free")] [assembly: AssemblyTrademark("none")] [assembly: AssemblyConfiguration("")] [assembly: Guid("40110b38-4882-47c1-ad94-a71e58dcb5f8")] -[assembly: AssemblyFileVersion("2024.06.07.1")] +[assembly: AssemblyFileVersion("2024.06.07.2")] [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("free")] [assembly: CompilationRelaxations(8)]