Adding saving and loading of UUIDs to PlayerPrefs

Author: dbirman

Assets/Scripts/TrajectoryPlanner/TrajectoryPlannerManager.cs

@@ -262,15 +262,15 @@ public async void CheckForSavedProbes(Task annotationDatasetLoadTask)
 
         private void LoadSavedProbes()
         {
-            var savedProbes = localPrefs.LoadSavedProbes();
+            var savedProbes = localPrefs.LoadSavedProbeData();
 
             foreach (var savedProbe in savedProbes)
             {
                 var probeInsertion = new ProbeInsertion(savedProbe.apmldv, savedProbe.angles, 
                     coordinateSpaceOpts[savedProbe.coordinateSpaceName], coordinateTransformOpts[savedProbe.coordinateTransformName]);
                 AddNewProbeTransformed(savedProbe.type, probeInsertion,
                     savedProbe.manipulatorId, savedProbe.zeroCoordinateOffset, savedProbe.brainSurfaceOffset,
-                    savedProbe.dropToSurfaceWithDepth);
+                    savedProbe.dropToSurfaceWithDepth, savedProbe.uuid);
             }
 
             UpdateQuickSettings();
@@ -488,9 +488,14 @@ public ProbeManager AddNewProbe(int probeType)
         }
 
         public ProbeManager AddNewProbeTransformed(int probeType, ProbeInsertion insertion,
-            int manipulatorId, Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth)
+            int manipulatorId, Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth,
+            string uuid = null)
         {
             ProbeManager probeManager = AddNewProbe(probeType);
+
+            if (uuid != null)
+                probeManager.OverrideUUID(uuid);
+
             if (!PlayerPrefs.IsLinkDataExpired())
             {
                 probeManager.SetZeroCoordinateOffset(zeroCoordinateOffset);
@@ -1085,7 +1090,8 @@ private void OnApplicationQuit()
                 new (Vector3 apmldv, Vector3 angles, 
                 int type, int manipulatorId,
                 string coordinateSpace, string coordinateTransform,
-                Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth)[allProbeManagers.Count];
+                Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth,
+                string uuid)[allProbeManagers.Count];
 
             for (int i =0; i< allProbeManagers.Count; i++)
             {
@@ -1095,7 +1101,8 @@ private void OnApplicationQuit()
                     probeInsertion.angles,
                     probe.ProbeType, probe.GetManipulatorId(),
                     probeInsertion.CoordinateSpace.Name, probeInsertion.CoordinateTransform.Name,
-                    probe.GetZeroCoordinateOffset(), probe.GetBrainSurfaceOffset(), probe.IsSetToDropToSurfaceWithDepth());
+                    probe.GetZeroCoordinateOffset(), probe.GetBrainSurfaceOffset(), probe.IsSetToDropToSurfaceWithDepth(),
+                    probe.UUID);
             }
             localPrefs.SaveCurrentProbeData(probeCoordinates);
         }

Assets/Scripts/TrajectoryPlanner/Utilities/PlayerPrefs.cs

@@ -405,15 +405,17 @@ private void SaveVector3Pref(string prefStr, Vector3 value)
     public (Vector3 apmldv, Vector3 angles,
                 int type, int manipulatorId,
                 string coordinateSpaceName, string coordinateTransformName,
-                Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth)[] LoadSavedProbes()
+                Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth,
+                string uuid)[] LoadSavedProbeData()
     {
         int probeCount = UnityEngine.PlayerPrefs.GetInt("probecount", 0);
 
         var savedProbes =
             new (Vector3 apmldv, Vector3 angles,
                 int type, int manipulatorId,
                 string coordinateSpaceName, string coordinateTransformName,
-                Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth)[probeCount];
+                Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth,
+                string uuid)[probeCount];
 
         for (int i = 0; i < probeCount; i++)
         {
@@ -433,11 +435,13 @@ private void SaveVector3Pref(string prefStr, Vector3 value)
             var d = UnityEngine.PlayerPrefs.GetFloat("d" + i);
             var brainSurfaceOffset = UnityEngine.PlayerPrefs.GetFloat("brain_surface_offset" + i);
             var dropToSurfaceWithDepth = UnityEngine.PlayerPrefs.GetInt("drop_to_surface_with_depth" + i) == 1;
+            string uuid = UnityEngine.PlayerPrefs.GetString("uuid" + i);
 
             savedProbes[i] = (new Vector3(ap, ml, dv), new Vector3(phi, theta, spin),
                 type, manipulatorId,
                 coordSpaceName, coordTransName,
-                new Vector4(x, y, z, d), brainSurfaceOffset, dropToSurfaceWithDepth);
+                new Vector4(x, y, z, d), brainSurfaceOffset, dropToSurfaceWithDepth,
+                uuid);
         }
 
         return savedProbes;
@@ -451,7 +455,8 @@ public void SaveCurrentProbeData(
         (Vector3 apmldv, Vector3 angles,
                 int type, int manipulatorId,
                 string coordinateSpace, string coordinateTransform,
-                Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth)[] allProbeData)
+                Vector4 zeroCoordinateOffset, float brainSurfaceOffset, bool dropToSurfaceWithDepth,
+                string uuid)[] allProbeData)
     {
         for (int i = 0; i < allProbeData.Length; i++)
         {
@@ -474,6 +479,7 @@ public void SaveCurrentProbeData(
             UnityEngine.PlayerPrefs.SetFloat("brain_surface_offset" + i, allProbeData[i].brainSurfaceOffset);
             UnityEngine.PlayerPrefs.SetInt("drop_to_surface_with_depth" + i,
                 allProbeData[i].dropToSurfaceWithDepth ? 1 : 0);
+            UnityEngine.PlayerPrefs.SetString("uuid" + i, allProbeData[i].uuid);
         }
         UnityEngine.PlayerPrefs.SetInt("probecount", allProbeData.Length);
         UnityEngine.PlayerPrefs.SetString("timestamp",