make default sample rate adjustable in export

hcmlab · Nov 18, 2024 · 05173ef · 05173ef
1 parent 32649f9
commit 05173ef
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/Controls/MainHandler.cs b/Controls/MainHandler.cs
@@ -23,7 +23,7 @@ public partial class MainHandler
     {
 
         //Config
-        public static string BuildVersion = "1.2.9.5";
+        public static string BuildVersion = "1.2.9.6";
         public static MEDIABACKEND MediaBackend = (Properties.Settings.Default.MediaBackend == "Hardware") ? MEDIABACKEND.MEDIAKIT : MEDIABACKEND.MEDIA;
         public static bool ENABLE_PYTHON = Properties.Settings.Default.EnablePython;
         public static bool ENABLE_LIGHTNING = Properties.Settings.Default.EnableLightning;

diff --git a/Database/DatabaseAnnoMainWindow.xaml.cs b/Database/DatabaseAnnoMainWindow.xaml.cs
@@ -875,7 +875,7 @@ private void Export_Click(object sender, RoutedEventArgs e)
 
            if(DatabaseHandler.ExportMultipleCSV(selectedAnnos, selectedStreams, (DatabaseSession)SessionsBox.SelectedItem))
             {
-                MessageTools.Information("Sucessfully exported data to csv");
+                MessageTools.Information("Sucessfully exported data to csv with " + Properties.Settings.Default.DefaultDiscreteSampleRate.ToString()  + " hz.\nAdapt sample rate in Settings->Annotations->Discrete Samplerate");
             };
 
         }

diff --git a/Database/DatabaseHandler.cs b/Database/DatabaseHandler.cs
@@ -4630,15 +4630,21 @@ public static AnnoList ConvertDiscreteAnnoListToContinuousList(AnnoList annolist
 
             double time = 0;
             double sr = 25;
-            double srtime = 0.04;
-
-            if (signals.Count > 0)
+            if (Properties.Settings.Default.DefaultDiscreteSampleRate != 0)
             {
-                sr = signals[0].rate;
-                srtime = 1/ sr;
+                sr = Properties.Settings.Default.DefaultDiscreteSampleRate;
             }
 
-
+
+            //if (signals.Count > 0)
+            //{
+            //    sr = signals[0].rate;
+
+            //}
+
+            double srtime = Math.Round(1 / sr, 2);
+
+
 
             //Fetch actual Annolists from DatabaseAnnotations
             List<AnnoList> annoLists = new List<AnnoList>();

diff --git a/bin/nova.exe b/bin/nova.exe
-Original file line number
+Diff line change
@@ Expand Up / @@ -875,7 +875,7 @@ private void Export_Click(object sender, RoutedEventArgs e) @@
                if(DatabaseHandler.ExportMultipleCSV(selectedAnnos, selectedStreams, (DatabaseSession)SessionsBox.SelectedItem))
                 {
-                    MessageTools.Information("Sucessfully exported data to csv");
+                    MessageTools.Information("Sucessfully exported data to csv with " + Properties.Settings.Default.DefaultDiscreteSampleRate.ToString()  + " hz.\nAdapt sample rate in Settings->Annotations->Discrete Samplerate");
                 };
             }
@@ Expand Down @@