Merge pull request #104 from immersivecognition/personal/jack/2022-improvements

Personal/jack/2022 improvements

Author: jackbrookes

Assets/UXF/Scripts/DataHandling/FileSaver.cs

@@ -6,7 +6,7 @@
 using System.IO;
 using System.Threading;
 using System.Linq;
-
+using System.Globalization;
 
 namespace UXF
 {
@@ -19,6 +19,13 @@ public class FileSaver : LocalFileDataHander
         [Tooltip("Enable to sort session files into folders. The trial_results CSV is never put into a folder.")]
         public bool sortDataIntoFolders = true;
 
+        /// <summary>
+        /// Enable to force the data to save with an english-US format (i.e. `,` to serapate values,
+        /// and `.` to separate decimal points).
+        /// </summary>
+        [Tooltip("Enable to force the data to save with an english-US format (i.e. `,` to serapate values, and `.` to separate decimal points).")]
+        public bool forceENUSLocale = true;
+
         /// <summary>
         /// Enable to print debug messages to the console.
         /// </summary>
@@ -45,12 +52,21 @@ public class FileSaver : LocalFileDataHander
         /// </summary>
         public override void SetUp()
         {
+            if (forceENUSLocale)
+            {
+                Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
+            }
+
             quitting = false;
             Directory.CreateDirectory(base.StoragePath);
 
             if (!IsActive)
             {
                 parallelThread = new Thread(Worker);
+                if (forceENUSLocale)
+                {
+                    parallelThread.CurrentCulture = new CultureInfo("en-US");
+                }
                 parallelThread.Start();
             }
             else
@@ -150,7 +166,7 @@ public override string HandleDataTable(UXFDataTable table, string experiment, st
             if (verboseDebug) Utilities.UXFDebugLogFormat("Queuing save of file: {0}", savePath);
 
             ManageInWorker(() => { File.WriteAllLines(savePath, lines); });
-            return GetRelativePath(StoragePath, savePath);;
+            return GetRelativePath(StoragePath, savePath);
         }
 
         public override string HandleJSONSerializableObject(List<object> serializableObject, string experiment, string ppid, int sessionNum, string dataName, UXFDataType dataType, int optionalTrialNum = 0)

Assets/UXF/Scripts/Etc/Editor/EasyEventEditor.cs

@@ -928,7 +928,7 @@ MethodInfo InvokeFindMethod(string functionName, object targetObject, UnityEvent
             findMethod = eventObject.GetType().GetMethod("FindMethod", BindingFlags.NonPublic | BindingFlags.Instance, null,
                     new System.Type[] {
                     typeof(string),
-#if UNITY_2021_1_OR_NEWER
+#if UNITY_2020_1_OR_NEWER
                     typeof(System.Type),
 #else
                     typeof(object),
@@ -947,7 +947,7 @@ MethodInfo InvokeFindMethod(string functionName, object targetObject, UnityEvent
             return null;
         }
 
-#if UNITY_2021_1_OR_NEWER
+#if UNITY_2020_1_OR_NEWER
         return findMethod.Invoke(eventObject, new object[] {functionName, targetObject?.GetType(), listenerMode, argType }) as MethodInfo;
 #else
         return findMethod.Invoke(eventObject, new object[] {functionName, targetObject, listenerMode, argType }) as MethodInfo;

Assets/UXF/Tests/Editor/TestLocale.cs

@@ -70,6 +70,7 @@ Tuple<Session, FileSaver> CreateSession(string ppidExtra)
             sessionLogger.Initialise();
 
             fileSaver.verboseDebug = false;
+            fileSaver.forceENUSLocale = false;
 
             string experimentName = "unit_test";
             string ppid = "test_locale_" + ppidExtra;

Assets/UXF/VERSION.txt

@@ -1 +1 @@
-2.3.5
+2.3.6