Update raman graph after data is received and not before

MissouriMRDT · Oct 20, 2024 · 6ce2e3c · 6ce2e3c
1 parent c23ace2
commit 6ce2e3c
Showing 1 changed file with 9 additions and 85 deletions.
diff --git a/Basestation_Software.Web/Core/Components/RamanGraph.razor b/Basestation_Software.Web/Core/Components/RamanGraph.razor
@@ -7,139 +7,63 @@
    <p>
        <RadzenChart>
           <RadzenLineSeries Data="@ramanGraph" CategoryProperty="Raman_Shift" ValueProperty="Intensity" />
+            <RadzenValueAxis Min="0" Max="65535" Step="10000" />
        </RadzenChart>
    </p>
    <button @onclick=RequestRamanData> Request Raman Spectroscopy Data </button>
 </div> 
 
 
 @code {
-    //Variables
-    private static List<ushort> _raman1 = new List<ushort>(500),
-    _raman2 = new List<ushort>(500),
-    _raman3 = new List<ushort>(500),
-    _raman4 = new List<ushort>(500),
-    _raman5 = new List<ushort>(48);
-
-
     class DataItem
     {
         public int Raman_Shift { get; set; }
         public double Intensity { get; set; }
-
-        public DataItem()
-        {
-            Raman_Shift = 0;
-            Intensity = 0f;
-        }
     }
 
     DataItem[] ramanGraph = new DataItem[2048];
 
 
-    private async void RequestRamanData()
+    private async Task RequestRamanData()
     {
         await _RoveCommService.SendAsync<uint>("Instruments", "RequestRamanReading", [0], reliable: false);
-
-        for (int i = 0; i < 2048; i++)
-        {
-            if (i < 500)
-            {
-                ramanGraph[i] = new DataItem
-                {
-                    Raman_Shift = i,
-                    Intensity = _raman1[i],
-                };
-            }
-            else if (i >= 500 && i < 1000)
-            {
-                ramanGraph[i] = new DataItem
-                {
-                    Raman_Shift = i,
-                    Intensity = _raman2[i - 500],
-                };
-            }
-
-            else if (i >= 1000 && i < 1500)
-            {
-                ramanGraph[i] = new DataItem
-                {
-                    Raman_Shift = i,
-                    Intensity = _raman3[i - 1000],
-                };
-            }
-
-            else if (i >= 1500 && i < 2000)
-            {
-                ramanGraph[i] = new DataItem
-                {
-                    Raman_Shift = i,
-                    Intensity = _raman4[i - 1500],
-                };
-            }
-
-            else
-            {
-                ramanGraph[i] = new DataItem
-                {
-                        Raman_Shift = i,
-                        Intensity = _raman5[i - 2000],
-                };
-            }
-        }
     }
 
-
     protected override async Task OnInitializedAsync()
     {
-        //Initialize values of ramanGraph and _raman variables to not throw errors if RoveComm packets not sent
+        // Initialize ramanGraph
         for (int i = 0; i < 2048; i++)
-        {
-            ramanGraph[i] = new DataItem();
-        }
-
-        for (int i = 0; i < 500; i++)
-        {
-            _raman1.Add(0);
-            _raman2.Add(0);
-            _raman3.Add(0);
-            _raman4.Add(0);
-        }
-
-        for (int i = 0; i < 48; i++)
-        {
-            _raman5.Add(0);
-        }
+            ramanGraph[i] = new DataItem { Raman_Shift = i, Intensity = 0 };
 
         //Receiving RoveComm packets if they are sent in
         _RoveCommService.On<ushort>("Instruments", "RamanReading_Part1", async (packet) =>
         {
-            _raman1 = packet.Data;
+            for (int i = 0; i < 500; i++) ramanGraph[i].Intensity = packet.Data[i];
             await InvokeAsync(StateHasChanged);
         });
 
         await Task.CompletedTask;
         _RoveCommService.On<ushort>("Instruments", "RamanReading_Part2", async (packet) =>
         {
-            _raman2 = packet.Data;
+            for (int i = 0; i < 500; i++) ramanGraph[i + 500].Intensity = packet.Data[i];
             await InvokeAsync(StateHasChanged);
         });
 
         _RoveCommService.On<ushort>("Instruments", "RamanReading_Part3", async (packet) =>
         {
-            _raman3 = packet.Data;
+            for (int i = 0; i < 500; i++) ramanGraph[i + 1000].Intensity = packet.Data[i];
             await InvokeAsync(StateHasChanged);
         });
 
         _RoveCommService.On<ushort>("Instruments", "RamanReading_Part4", async (packet) =>
         {
-            _raman4 = packet.Data;
+            for (int i = 0; i < 500; i++) ramanGraph[i + 1500].Intensity = packet.Data[i];
             await InvokeAsync(StateHasChanged);
         });
 
         _RoveCommService.On<ushort>("Instruments", "RamanReading_Part5", async (packet) =>
         {
-            _raman5 = packet.Data;
+            for (int i = 0; i < 48; i++) ramanGraph[i + 2000].Intensity = packet.Data[i];
             await InvokeAsync(StateHasChanged);
         });
     }