User library and some other changes

AppShell.xaml

@@ -6,6 +6,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:EnlightenMAUI"
     Shell.FlyoutBehavior="Disabled"
+    Shell.TabBarBackgroundColor="#333"
+    Shell.TabBarForegroundColor="#EEE"
+    Shell.TabBarDisabledColor="#555"
+    Shell.TabBarUnselectedColor="#BBB"
+    Shell.TabBarTitleColor="#EEE"
     Title="EnlightenMAUI">
 
     <Shell.BindingContext>

EnlightenMAUI.csproj

@@ -51,15 +51,15 @@
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android34.0|AnyCPU'">
 	  <IsPublishable>False</IsPublishable>
-	  <ApplicationDisplayVersion>0.9.56</ApplicationDisplayVersion>
+	  <ApplicationDisplayVersion>0.9.60</ApplicationDisplayVersion>
 	  <ApplicationTitle>EnlightenMobile</ApplicationTitle>
 	  <DefineConstants>$(DefineConstants);USE_DECON</DefineConstants>
 	  <AndroidStoreUncompressedFileExtensions>.so</AndroidStoreUncompressedFileExtensions>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-android34.0|AnyCPU'">
 	  <IsPublishable>False</IsPublishable>
-	  <ApplicationDisplayVersion>0.9.56</ApplicationDisplayVersion>
+	  <ApplicationDisplayVersion>0.9.60</ApplicationDisplayVersion>
 	  <ApplicationTitle>EnlightenMobile</ApplicationTitle>
 	  <AndroidPackageFormat>apk</AndroidPackageFormat>
 	  <AndroidStoreUncompressedFileExtensions>.so</AndroidStoreUncompressedFileExtensions>
@@ -92,6 +92,8 @@
 	<ItemGroup>
 	  <None Remove="appsettings.json" />
 	  <None Remove="libdpSTJE.so" />
+	  <None Remove="Platforms\Android\Resources\values-night\styles.xml" />
+	  <None Remove="Platforms\Android\Resources\values\styles.xml" />
 	  <None Remove="Platforms\Android\Resources\xml\device_filter.xml" />
 	  <None Remove="Stj.ProtectionSdk.so" />
 	  <None Remove="Resources\AppIcon\appicon.svg" />
@@ -185,6 +187,9 @@
 	  <MauiXaml Update="Popups\AddToLibraryPopup.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Popups\ExportPopup.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Popups\OverlaysPopup.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
@@ -214,14 +219,13 @@
 
 	<ItemGroup>
 	  <Folder Include="Processing\library\" />
-	  <Folder Include="Processing\ml\" />
 	</ItemGroup>
 
 	<ItemGroup Condition="Exists('..\EMAUIHelpers\models')">
 	  <MauiAsset Include="..\EMAUIHelpers\models\nrd-d2-r53-model-12-opset18\background_model.onnx" Link="Processing\ml\background_model.onnx">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </MauiAsset>
-	  <MauiAsset Include="..\EMAUIHelpers\models\nrd5-r3-model-17-opset18\background_model_light.onnx" Link="Processing\ml\background_model_light.onnx">
+	  <MauiAsset Include="..\EMAUIHelpers\models\nrd5-r3-model-17-opset18\r3-model-17-light.onnx" Link="Processing\ml\r3-model-17-light.onnx">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 	  </MauiAsset>
 	</ItemGroup>

MauiProgram.cs

@@ -6,6 +6,11 @@
 using EnlightenMAUI.Models;
 using System.Reflection;
 using Telerik.Maui.Controls.Compatibility;
+using Android.Content.Res;
+
+#if ANDROID
+using AndroidX.AppCompat.Widget;
+#endif
 
 namespace EnlightenMAUI;
 
@@ -38,6 +43,50 @@ public static MauiApp CreateMauiApp()
 
         builder.Services.AddTransient<AppShell>();
 
+        Microsoft.Maui.Handlers.RadioButtonHandler.Mapper.AppendToMapping("MyCustomization", (handler, view) =>
+        {
+#if ANDROID
+            if (handler.PlatformView is Android.Widget.RadioButton radioButton)
+            {
+                var states = new int[][]
+                {
+                        new int[] { Android.Resource.Attribute.StateChecked },
+                        new int[] { -Android.Resource.Attribute.StateChecked }
+                };
+
+                // Define the colors corresponding to the states (border color)
+                var colors = new int[]
+                {
+                        new Android.Graphics.Color(0x27, 0xc0, 0xa1),
+                        new Android.Graphics.Color(0x27, 0xc0, 0xa1)
+                };
+
+                // Create a ColorStateList with the states and colors
+                var colorStateList = new Android.Content.Res.ColorStateList(states, colors);
+
+                // Apply the color tint to the button's border
+                radioButton.ButtonTintList = colorStateList;
+            }
+#endif
+        });
+
+        /*
+        Microsoft.Maui.Handlers.EntryHandler.Mapper.AppendToMapping("MyCustomization", (handler, view) =>
+        {
+#if ANDROID
+            //handler.PlatformView.BorderStyle = Android.Graphics.Color.White;
+            var pv = handler.PlatformView;
+            if (pv is AppCompatEditText editText)
+            {
+                editText.Background?.Mutate();
+                var color = new Android.Graphics.Color(0x27, 0xc0, 0xa1);
+                var hintColor = new Android.Graphics.Color(0xBB, 0xBB, 0xBB);
+                editText.BackgroundTintList = ColorStateList.ValueOf(Android.Graphics.Color.Transparent);
+                //editText.SetHintTextColor(hintColor);
+            }
+#endif
+        });
+        */
 
 #if DEBUG
         builder.Logging.AddDebug();

Models/API6BLESpectrometer.cs

@@ -700,7 +700,7 @@ public async Task updateRSSI()
             logger.debug("current RSSI {0}", rssi);
             NotifyPropertyChanged("rssi");
             await Task.Delay(500);
-            if (rssi < -90)
+            if (rssi < -105)
             {
                 ++badSignalCount;
 
@@ -845,15 +845,16 @@ public override async Task<bool> takeOneAveragedAsync()
             stretchedDark = new double[smoothed.Length];
             measurement.dark = stretchedDark;
             measurement.postProcessed = smoothed;
-            measurement.processingMethod = "Noise and Background Removal";
+            measurement.processingMethod = PlatformUtil.modelName;
         }
         else
         {
             double[] staticWavenumbers = Enumerable.Range(400, 2008).Select(x => (double)x).ToArray();
             double[] newIntensities = Wavecal.mapWavenumbers(wavenumbers, measurement.processed, staticWavenumbers);
             measurement.wavenumbers = staticWavenumbers;
             measurement.postProcessed = newIntensities;
-        }
+			measurement.processingMethod = "";
+		}
 
         ////////////////////////////////////////////////////////////////////////
         // Store Measurement

Models/API9BLESpectrometer.cs

@@ -1179,7 +1179,7 @@ public async Task updateRSSI()
                 logger.debug("current RSSI {0}", rssi);
                 NotifyPropertyChanged("rssi");
                 await Task.Delay(500);
-                if (rssi < -90)
+                if (rssi < -105)
                 {
                     ++badSignalCount;
 
@@ -1322,15 +1322,16 @@ public override async Task<bool> takeOneAveragedAsync()
                 measurement.rawDark = dark;
                 measurement.dark = stretchedDark;
                 measurement.postProcessed = smoothed;
-                measurement.processingMethod = "Noise and Background Removal";
+                measurement.processingMethod = PlatformUtil.modelName;
             }
             else
             {
                 double[] staticWavenumbers = Enumerable.Range(400, 2008).Select(x => (double)x).ToArray();
                 double[] newIntensities = Wavecal.mapWavenumbers(wavenumbers, measurement.processed, staticWavenumbers);
                 measurement.wavenumbers = staticWavenumbers;
                 measurement.postProcessed = newIntensities;
-            }
+				measurement.processingMethod = "";
+			}
 
             ////////////////////////////////////////////////////////////////////////
             // Store Measurement

Models/BluetoothSpectrometer.cs

@@ -1230,7 +1230,7 @@ public async Task updateRSSI()
             logger.debug("current RSSI {0}", rssi);
             NotifyPropertyChanged("rssi");
             await Task.Delay(500); 
-            if (rssi < -90)
+            if (rssi < -105)
             {
                 ++badSignalCount;
 
@@ -1373,14 +1373,15 @@ public override async Task<bool> takeOneAveragedAsync()
             measurement.rawDark = dark;
             measurement.dark = stretchedDark;
             measurement.postProcessed = smoothed;
-            measurement.processingMethod = "Noise and Background Removal";
+            measurement.processingMethod = PlatformUtil.modelName;
         }
         else
         {
             double[] staticWavenumbers = Enumerable.Range(400, 2008).Select(x => (double)x).ToArray();
             double[] newIntensities = Wavecal.mapWavenumbers(wavenumbers, measurement.processed, staticWavenumbers);
             measurement.wavenumbers = staticWavenumbers;
             measurement.postProcessed = newIntensities;
+            measurement.processingMethod = "";
         }
 
         ////////////////////////////////////////////////////////////////////////

Models/Measurement.cs

@@ -6,6 +6,12 @@
 namespace EnlightenMAUI.Models;
 
 
+public class AgnosticSimpleMeasurement
+{
+    public Tuple<List<double>, List<double>> data;
+    public Dictionary<string, string> metadata;
+}
+
 public class spectrumJSON
 {
     public string id;
@@ -225,7 +231,7 @@ public double[] postProcessed
     public double excitationNM { get; set; }
     public float[] wavecalCoeffs { get; set; }
     public double? laserPower { get; set; }
-    public string processingMethod { get; set; } = "Wavenumber Interpolation Only";
+    public string processingMethod { get; set; } = "";
 
     ////////////////////////////////////////////////////////////////////////
     // Methods
@@ -559,7 +565,7 @@ public void postProcess()
     /// - support full ENLIGHTEN metadata
     /// - support SaveOptions (selectable output fields)
     /// </todo>
-    public async Task<bool> saveAsync(bool librarySave = false, bool autoSave = false)
+    public async Task<bool> saveAsync(bool librarySave = false, bool autoSave = false, bool forceWrite = false, Dictionary<string, string> forcedMetadata = null)
     {
         logger.debug("Measurement.saveAsync: starting");
 
@@ -584,7 +590,7 @@ public async Task<bool> saveAsync(bool librarySave = false, bool autoSave = fals
             return true;
         }
 
-        if (processed is null || raw is null || spec is null)
+        if ((processed is null || raw is null || spec is null) && !forceWrite)
         {
             logger.error("saveAsync: nothing to save");
             return false;
@@ -593,9 +599,15 @@ public async Task<bool> saveAsync(bool librarySave = false, bool autoSave = fals
         pathname = Path.Join(savePath, filename);
         logger.debug($"Measurement.saveAsync: creating {pathname}");
 
+        UserLibrary ul = UserLibrary.getInstance();
+        ul.addSpectrum(this, PlatformUtil.getFileName(filename));
+
         using (StreamWriter sw = new StreamWriter(pathname))
         {
-            writeMetadata(sw);
+            if (forcedMetadata != null)
+                writeMetadata(sw, forcedMetadata);
+            else if (spec != null)
+                writeMetadata(sw);
             sw.WriteLine();
             writeSpectra(sw, librarySave);
         }
@@ -656,7 +668,8 @@ void writeMetadata(StreamWriter sw)
         sw.WriteLine("Laser Wavelength, {0}", spec.eeprom.laserExcitationWavelengthNMFloat);
         sw.WriteLine("Timestamp, {0}", timestamp.ToString("dd/MM/yyyy HH:mm:ss.fff"));
         sw.WriteLine("Library Used, {0}", libraryUsed);
-        sw.WriteLine("Processing Method, {0}", spec.measurement.processingMethod);
+        sw.WriteLine("DalaiRamanID.DALAI Enabled, {0}", spec.measurement.processingMethod.Length > 0);
+        sw.WriteLine("DalaiRamanID.DALAI Model, {0}", spec.measurement.processingMethod);
         if (spec.measurement.declaredScore.HasValue)
         {
             if (spec.measurement.declaredMatch.Length > 0)
@@ -680,7 +693,15 @@ void writeMetadata(StreamWriter sw)
         sw.WriteLine("QR Scan, {0}", spec.qrValue);
         sw.WriteLine("Host Description, {0}", settings.hostDescription);
         if (location != null)
-            sw.WriteLine("Location, lat {0}, lon {1}", location.Latitude, location.Longitude);
+            sw.WriteLine("Location, lat {0} : lon {1}", location.Latitude, location.Longitude);
+    }
+
+    void writeMetadata(StreamWriter sw, Dictionary<string,string> metadata)
+    {
+        foreach (string key in metadata.Keys)
+        {
+            sw.WriteLine($"{key},{metadata[key]}");
+        }
     }
 
     string render(double[] a, int index, string format = "f2")

Models/Settings.cs

@@ -259,7 +259,7 @@ public bool autoRetry
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(autoRetry)));
         }
     }
-    bool _autoRetry = true;
+    bool _autoRetry = false;
 
 
     public string getSavePath()

Models/USBSpectrometer.cs

@@ -526,14 +526,15 @@ public override async Task<bool> takeOneAveragedAsync()
                 measurement.rawDark = dark;
                 measurement.dark = stretchedDark;
                 measurement.postProcessed = smoothed;
-                measurement.processingMethod = "Noise and Background Removal";
+                measurement.processingMethod = PlatformUtil.modelName;
             }
             else
             {
                 double[] staticWavenumbers = Enumerable.Range(400, 2008).Select(x => (double)x).ToArray();
                 double[] newIntensities = Wavecal.mapWavenumbers(wavenumbers, measurement.processed, staticWavenumbers);
                 measurement.wavenumbers = staticWavenumbers;
                 measurement.postProcessed = newIntensities;
+                measurement.processingMethod = "";
             }
 
             ////////////////////////////////////////////////////////////////////////

Models/UserLibrary.cs

@@ -0,0 +1,62 @@
+using EnlightenMAUI.Platforms;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace EnlightenMAUI.Models
+{
+    internal class UserLibrary
+    {
+        static UserLibrary instance = null;
+
+        Settings settings = Settings.getInstance();
+        public Dictionary<string, string> userSpectra = new Dictionary<string, string>();
+        public List<string> userSpectraKeys
+        {
+            get
+            {
+                return new List<string>(userSpectra.Keys);
+            }
+        }
+
+        static public UserLibrary getInstance()
+        {
+            if (instance == null)
+                instance = new UserLibrary();
+
+            return instance;
+        }
+
+        public UserLibrary()
+        {
+            loadTodaySpectra();
+        }
+
+        public async Task loadTodaySpectra()
+        {
+            Dictionary<string, Measurement> library = new Dictionary<string, Measurement>();
+            Dictionary<string, double[]> originalRaws = new Dictionary<string, double[]>();
+            Dictionary<string, double[]> originalDarks = new Dictionary<string, double[]>();
+            string path = PlatformUtil.getAutoSavePath(true);
+            await PlatformUtil.loadFiles(useAssets: false, path, library, originalRaws, originalDarks, true, null, skipSearch: true);
+
+            foreach (string tag in library.Keys)
+            {
+                Measurement m = library[tag];
+                string userTag = $"{m.timestamp.ToString("HH:mm:ss")} {(m.declaredMatch != null && m.declaredMatch.Length > 0 ? m.declaredMatch[0] : "")} {(m.declaredScore.HasValue ? m.declaredScore.Value.ToString("f2") : "")}";
+                Logger.getInstance().debug("adding {0} to user library as {1}", userTag, tag);
+                userSpectra.Add(userTag, tag);
+            }
+        }
+
+        public void addSpectrum(Measurement m, string tag)
+        {
+            string userTag = $"{m.timestamp.ToString("HH:mm:ss")} {(m.declaredMatch != null && m.declaredMatch.Length > 0 ? m.declaredMatch[0] : "")} {(m.declaredScore.HasValue ? m.declaredScore.Value.ToString("f2") : "")}";
+            if (!userSpectra.ContainsKey(userTag))
+            {
+                Logger.getInstance().debug("adding {0} to user library as {1}", userTag, tag);
+                userSpectra.Add(userTag, tag);
+            }
+        }
+    }
+}