asadfadSADFGSDASGBsdasfodubahdsfouabfoub

CLAWS-UMICH · May 22, 2024 · c82e9f4 · c82e9f4
1 parent 853038a
commit c82e9f4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/Assets/CLAWS/2-Geosampling/GeosamplingManager.cs b/Assets/CLAWS/2-Geosampling/GeosamplingManager.cs
@@ -61,6 +61,19 @@ public static void CreateLoadedGeosample(Geosample sample)
     }
 
 
+    public static void SendData(Geosample Sample)
+    {
+        for (int i = 0; i < AstronautInstance.User.GeosampleData.AllGeosamples.Count; i++)
+        {
+            if (AstronautInstance.User.GeosampleData.AllGeosamples[i].geosample_id == Sample.geosample_id)
+            {
+                AstronautInstance.User.GeosampleData.AllGeosamples[i] = Sample;
+            }
+        }
+        GameObject.Find("Controller").GetComponent<WebsocketDataHandler>().SendGeosampleData();
+        EventBus.Publish<GeosampleSentEvent>(new());
+    }
+
     public static void SendData()
     {
         GameObject.Find("Controller").GetComponent<WebsocketDataHandler>().SendGeosampleData();

diff --git a/Assets/CLAWS/2-Geosampling/GeosamplingZone.cs b/Assets/CLAWS/2-Geosampling/GeosamplingZone.cs
@@ -69,7 +69,7 @@ public void Init()
 
         AstronautInstance.User.GeosampleZonesData.AllGeosampleZones.Add(Zone);
 
-        GeosamplingManager.SendData();  
+        GeosamplingManager.SendData();
         StartCoroutine(TrackUserLocation());
     }
 

diff --git a/Assets/GeosamplingPhotoScreen.cs b/Assets/GeosamplingPhotoScreen.cs
@@ -52,7 +52,7 @@ public void UseThisPhoto()
         {
             Geosample.SetPhoto(s);
             Geosample.Sample.photo_jpg = s;
-            GeosamplingManager.SendData();
+            GeosamplingManager.SendData(Geosample.Sample);
         }
         else
         {

diff --git a/Assets/SingleGeosampleScreen.cs b/Assets/SingleGeosampleScreen.cs
@@ -99,8 +99,8 @@ public void Load(Geosample Sample_f)
         Sample = Sample_f;
 
         CurrentScreen = GeoSampleScreens.None;
-        SetZone(((char)('A' + (char)(Sample.zone_id++ % 27))).ToString());
-        SetSampleName("Sample " + Sample.geosample_id);
+        // SetZone(((char)('A' + (char)(Sample.zone_id++ % 27))).ToString());
+        // SetSampleName("Sample " + Sample.geosample_id);
         SetDescription(Sample.description);
         SetStar();
         StarredIcon.SetActive(Sample_f.starred);
@@ -205,7 +205,7 @@ public void waitingForXRF(XRFScanEvent e)
         XRFReadings.SetActive(true);
 
         Sample.eva_data.data = e.data;
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
     }
 
     public void OnShapeButtonPressed()
@@ -349,7 +349,7 @@ public void SetSampleName(string name)
     {
         Name_tmp.text = name;
 
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
     }
     public void SetID()
     {
@@ -376,7 +376,7 @@ public void SetZone(string letter)
         }
 
         SetZoneId();
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
     }
     public void SetCoordinates()
     {
@@ -396,7 +396,7 @@ public void SetRockType(string name)
         // called after xrf scan
         RockType_tmp.text = name;
         Sample.rock_type = name;
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
     }
     [SerializeField]
     public void SetShape(GeosamplingShape shape_in)
@@ -437,7 +437,7 @@ public void SetShape(GeosamplingShape shape_in)
                 break;
         }
 
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
         CloseCurrentScreen();
     }
     public void SetShape(string shape_in)
@@ -477,33 +477,33 @@ public void SetShape(string shape_in)
         Debug.Log("setting shape to " + shape.ToString());
         Shape_visual.SetShape(shape);
 
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
         CloseCurrentScreen();
     }
     public void SetColor(string hex)
     {
         Color_visual.SetColor(hex);
         Sample.color = hex;
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
     }
     public void SetPhoto(string jpg)
     {
         Sample.photo_jpg = jpg;
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
     }
     public void SetDescription(string desc)
     {
         desc = desc.Trim();
         Sample.description = desc;
         Description.text = desc;
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
     }
     public void SetNote()
     {
         // TODO update tmp
 
         // TODO update Sample.note
-        GeosamplingManager.SendData();
+        GeosamplingManager.SendData(Sample);
     }
     public void SetStar()
     {