Fix export ECSV precision with smooth

Am6er · Dec 16, 2024 · eea404e · eea404e
1 parent 8f3b386
commit eea404e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 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>3</ApplicationRevision>
-    <ApplicationVersion>2024.11.17.3</ApplicationVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>2024.12.16.1</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/BecquerelMonitor/DocumentManager.cs b/BecquerelMonitor/DocumentManager.cs
@@ -1028,6 +1028,7 @@ public void ExportDocumentToECSV(DocEnergySpectrum doc, BackgroundMode bgMode, S
             PolynomialEnergyCalibration cal = (PolynomialEnergyCalibration)doc.ActiveResultData.EnergySpectrum.EnergyCalibration;
 
             EnergySpectrum energySpectrum;
+            double[] dSpectrum = new double[doc.ActiveResultData.EnergySpectrum.NumberOfChannels];
             SpectrumAriphmetics sa = new SpectrumAriphmetics();
             if (bgMode == BackgroundMode.Substract && doc.ActiveResultData.BackgroundEnergySpectrum != null)
             {
@@ -1043,11 +1044,14 @@ public void ExportDocumentToECSV(DocEnergySpectrum doc, BackgroundMode bgMode, S
             {
                 case SmoothingMethod.SimpleMovingAverage:
                     int points = GlobalConfigManager.GetInstance().GlobalConfig.ChartViewConfig.NumberOfSMADataPoints;
-                    energySpectrum.Spectrum = sa.SMA(energySpectrum.Spectrum, points, countlimit: countlimit);
+                    dSpectrum = sa.SMA2(Array.ConvertAll(energySpectrum.Spectrum, i => (double)i), points, countlimit: countlimit);
                     break;
                 case SmoothingMethod.WeightedMovingAverage:
                     points = GlobalConfigManager.GetInstance().GlobalConfig.ChartViewConfig.NumberOfWMADataPoints;
-                    energySpectrum.Spectrum = sa.WMA(energySpectrum.Spectrum, points, countlimit: countlimit);
+                    dSpectrum = sa.WMA2(Array.ConvertAll(energySpectrum.Spectrum, i => (double)i), points, countlimit: countlimit);
+                    break;
+                default:
+                    dSpectrum = Array.ConvertAll(energySpectrum.Spectrum, i => (double)i);
                     break;
             }
 
@@ -1058,7 +1062,7 @@ public void ExportDocumentToECSV(DocEnergySpectrum doc, BackgroundMode bgMode, S
                     streamWriter.WriteLine("channel, energy, count");
                     for (int i = 0; i < energySpectrum.NumberOfChannels; i++)
                     {
-                        streamWriter.WriteLine(i + "," + cal.ChannelToEnergy(i) + "," + energySpectrum.Spectrum[i]);
+                        streamWriter.WriteLine(i + "," + cal.ChannelToEnergy(i) + "," + dSpectrum[i]);
                     }
                 }
             }

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