Fix deadtime% calculation

Am6er · Sep 6, 2024 · 66589e4 · 66589e4
1 parent 27216de
commit 66589e4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/BecquerelMonitor/BecquerelMonitor.csproj b/BecquerelMonitor/BecquerelMonitor.csproj
@@ -35,8 +35,8 @@
     <MinimumRequiredVersion>2022.07.08.7</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>index.html</WebPage>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>2024.09.06.2</ApplicationVersion>
+    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationVersion>2024.09.06.3</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/BecquerelMonitor/DCControlPanel.cs b/BecquerelMonitor/DCControlPanel.cs
@@ -365,10 +365,10 @@ public void ShowRecordingStatus()
             if (totalSeconds != 0.0)
             {
                 cps = (double)activeResultData.EnergySpectrum.ValidPulseCount / totalSeconds;
-                deadTime = (double)activeResultData.EnergySpectrum.LiveTime / totalSeconds;
+                deadTime = (double)100.0 * (totalSeconds - activeResultData.EnergySpectrum.LiveTime) / totalSeconds;
             }
             this.countRateTextBox.Text = cps.ToString("f2");
-            this.deadTimetextBox.Text = deadTime.ToString("f4");
+            this.deadTimetextBox.Text = deadTime.ToString("f6");
         }
 
         // Token: 0x06000297 RID: 663 RVA: 0x0000BAD8 File Offset: 0x00009CD8

diff --git 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.06.2")]
+[assembly: AssemblyVersion("2024.09.06.3")]
 [assembly: AssemblyProduct("BecquerelMonitor")]
 [assembly: AssemblyCopyright("free")]
 [assembly: AssemblyTrademark("none")]
 [assembly: AssemblyConfiguration("")]
 [assembly: Guid("40110b38-4882-47c1-ad94-a71e58dcb5f8")]
-[assembly: AssemblyFileVersion("2024.09.06.2")]
+[assembly: AssemblyFileVersion("2024.09.06.3")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyCompany("free")]
 [assembly: CompilationRelaxations(8)]