From 8cec827b45fe0f8f4f9d7a35ff916c0062541e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20W=C3=A4chtler?= <jens.f.waechtler@fau.de>
Date: Wed, 7 Dec 2022 09:54:59 +0100
Subject: [PATCH] Resolve merge conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Philipp Kramer <philipp.kramer@fau.de>
Co-authored-by: Leander Tolksdorf <leandet98@zedat.fu-berlin.de>
Co-authored-by: Jan Degen <jan.degen@fau.de>
Signed-off-by: Jens Wächtler <jens.f.waechtler@fau.de>
---
 Apps/frontend/src/components/Waves.svelte | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/Apps/frontend/src/components/Waves.svelte b/Apps/frontend/src/components/Waves.svelte
index fb1ae4cf..c3135cd9 100644
--- a/Apps/frontend/src/components/Waves.svelte
+++ b/Apps/frontend/src/components/Waves.svelte
@@ -1,6 +1,11 @@
 <script>
   import { beforeUpdate, onMount } from "svelte";
-  import { ColorRGBA, WebglPlot, WebglSquare, WebglThickLine } from "webgl-plot";
+  import {
+    ColorRGBA,
+    WebglPlot,
+    WebglSquare,
+    WebglThickLine,
+  } from "webgl-plot";
   import {
     CANVAS_HEIGHT,
     CANVAS_WIDTH,
@@ -68,7 +73,9 @@
       let xNew = Math.round(xCurr);
       for (let x = xLast[channelIndex] + 1; x < xNew + 1; x++) {
         channelSamples[channelIndex][x] = samples[channelIndex];
-        channelSamples[channelIndex][(x+WAVE_CURSOR_SIZE) % canvasElement.width] = undefined;
+        channelSamples[channelIndex][
+          (x + WAVE_CURSOR_SIZE) % canvasElement.width
+        ] = undefined;
       }
       xLast[channelIndex] = xNew;
 
@@ -121,8 +128,8 @@
       const size = 0.01;
       let x = (xArr[i] * 2) / CANVAS_WIDTH - 1;
       let scale = lines[i].scaleY * 5;
-      let y = channelSamples[i][xLast[i]-1] * 100 * scale / CANVAS_HEIGHT;
-      heads[i].setSquare(x - (size/2), y - size, x + (size/2), y + size);
+      let y = (channelSamples[i][xLast[i] - 1] * 100 * scale) / CANVAS_HEIGHT;
+      heads[i].setSquare(x - size / 2, y - size, x + size / 2, y + size);
     }
   };