From 44ef586e4f1ba69a0e5bb487ab6e4605ead3dbd0 Mon Sep 17 00:00:00 2001
From: DJ2LS <dj2ls@protonmail.com>
Date: Fri, 1 Oct 2021 19:05:43 +0200
Subject: [PATCH] optimized scatter

removed scales and popups, code cleanup as well
---
 gui/preload-main.js | 37 ++++++++++++++++++++++++-------------
 tnc/modem.py        |  9 +++++----
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/gui/preload-main.js b/gui/preload-main.js
index 4e10bd9b..25158f27 100644
--- a/gui/preload-main.js
+++ b/gui/preload-main.js
@@ -83,7 +83,7 @@ window.addEventListener('DOMContentLoaded', () => {
         });
 
     // SETUP OF SCATTER DIAGRAM
-
+/*
     global.data = {
         datasets: [{
             label: 'Scatter Dataset',
@@ -113,15 +113,20 @@ window.addEventListener('DOMContentLoaded', () => {
                 x: {
                     type: 'linear',
                     position: 'bottom',
-                    display: false
+                    display: false,
+                    min: -50,
+                    max: 50
                 },
                 y: {
-                    display: false
+                    display: false,
+                    min: -50,
+                    max: 50
                 }
 
             }
         }
     });
+*/
 
     // on click waterfall scatter toggle view
     // waterfall
@@ -335,24 +340,30 @@ ipcRenderer.on('action-update-tnc-state', (event, arg) => {
                 plugins: {
                     legend: {
                         display: false,
+                        },
+                    tooltip: {
+                        enabled: false
                     },
                 },
                 animations: false,
-                tooltips: {
-                    enabled: false,
-                },
                 scales: {
-                    display: false,
-                    grid: {
-                        display: false
-                    },
                     x: {
                         type: 'linear',
                         position: 'bottom',
-                        display: false
+                        display: true,
+                        min: -50,
+                        max: 50,
+                        ticks: {
+                            display: false
+                        }            
                     },
                     y: {
-                        display: false
+                        display: true,
+                        min: -50,
+                        max: 50,
+                        ticks: {
+                            display: false
+                        }
                     }
                 }
         }
@@ -363,7 +374,7 @@ ipcRenderer.on('action-update-tnc-state', (event, arg) => {
     var data = arg.scatter
     var newdata = {
         datasets: [{
-            label: 'constellation diagram',
+            //label: 'constellation diagram',
             data: data,
             options: config,
             backgroundColor: 'rgb(255, 99, 132)'
diff --git a/tnc/modem.py b/tnc/modem.py
index 501faa08..964e5754 100644
--- a/tnc/modem.py
+++ b/tnc/modem.py
@@ -626,20 +626,21 @@ class RF():
             for j in range(MODEM_STATS_NR_MAX):
                 # check if odd or not to get every 2nd item for x
                 if (j % 2) == 0:
-                    xsymbols = round(modemStats.rx_symbols[i][j])
-                    ysymbols = round(modemStats.rx_symbols[i][j+1])
+                    xsymbols = round(modemStats.rx_symbols[i][j]/1000)
+                    ysymbols = round(modemStats.rx_symbols[i][j+1]/1000)
                     # check if value 0.0 or has real data
                     if xsymbols != 0.0 and ysymbols != 0.0:
                         scatterdata.append({"x": xsymbols, "y": ysymbols})
 
         # only append scatter data if new data arrived
-        
         if 150 > len(scatterdata) > 0:
             static.SCATTER = scatterdata
         else:
+            # only take every tenth data point
             scatterdata_small = scatterdata[::10]
             static.SCATTER = scatterdata_small
-
+            
+            
     def calculate_ber(self, freedv):
         Tbits = self.c_lib.freedv_get_total_bits(freedv)
         Terrs = self.c_lib.freedv_get_total_bit_errors(freedv)