Merge branch 'ber-gui'

5 files changed, 59 insertions, 17 deletions

diff --git a/src/gr-fadingui/grc/fadingui_ber.block.yml b/src/gr-fadingui/grc/fadingui_ber.block.yml
index 477f9ff..b0ec75c 100644
--- a/src/gr-fadingui/grc/fadingui_ber.block.yml
+++ b/src/gr-fadingui/grc/fadingui_ber.block.yml
@@ -5,7 +5,7 @@ category: '[fadingui]'
 templates:
   imports: import fadingui
   make: fadingui.ber(vgl=${vgl}, vlen=${vlen},address=${address})
-
+  
 #  Make one 'parameters' list entry for every parameter you want settable from the GUI.
 #     Keys include:
 #     * id (makes the value accessible as \$keyname, e.g. in the make entry)
@@ -21,7 +21,7 @@ parameters:
 - id: address
   label: Address
   dtype: string
-  default: "udp://localhost:31415"
+  default: "udp://localhost:31420"
 
 
 #  Make one 'inputs' list entry per input and one 'outputs' list entry per output.
diff --git a/src/gr-fadingui/python/ber.py b/src/gr-fadingui/python/ber.py
index 205dcd4..664780f 100644
--- a/src/gr-fadingui/python/ber.py
+++ b/src/gr-fadingui/python/ber.py
@@ -23,6 +23,7 @@ import socket
 from urllib.parse import urlparse
 
 import numpy as np
+from numpy_ringbuffer import RingBuffer
 from gnuradio import gr
 
 from fadingui.logger import get_logger
@@ -42,6 +43,9 @@ class ber(gr.sync_block):
         self.vgl=vgl
         self.vlen=vlen
 
+        self.ber_samples = RingBuffer(capacity=100, dtype=int)
+        self.ber_samples.extend(np.zeros(self.ber_samples.maxlen))
+
         # Create a socket and parse remote machine url
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self.url = urlparse(address)
@@ -65,14 +69,21 @@ class ber(gr.sync_block):
         # FIXME: this could be (very) slow, is there a faster way with numpy?
         # Maybe numpy.array2string
         return bytes(str(data) + "\n", "ascii")
-    
+
+    def ber_stats(self):
+        ber_max = np.max(self.ber_samples)
+        ber_min = np.min(self.ber_samples)
+        ber_avg = np.sum(self.ber_samples) / self.ber_samples.maxlen
+
+        return ber_max, ber_min, ber_avg    
+
 
     def work(self, input_items, output_items):
         inp = input_items[0]
 
         log.debug(f"Length: {len(inp)}")
-        log.debug(f"Inp_vector:{inp}")
-        
+        # log.debug(f"Inp_vector:{inp}")
+
         for i in inp:
             i = np.array(i, dtype=np.uint8)
             v = np.array(self.vgl, dtype=np.uint8) ^ i
@@ -81,11 +92,16 @@ class ber(gr.sync_block):
             trueber = ber - 32
             if trueber < 0:
                 trueber = 0
-            log.debug(f"BER {trueber} in Paket {i}")
-        
-            self.send(self.encode(trueber))
+            # log.debug(f"BER {trueber} in Paket {i}")
 
-        return len(inp)
+            self.ber_samples.appendleft(trueber)
+
+
+        ber_max, ber_min, ber_avg = self.ber_stats()
+        log.debug(f"Statistics: {ber_max}, {ber_min}, {ber_avg}")
 
+        self.send(self.encode([trueber, ber_max, ber_avg]))
+
+        return len(inp)
         #return len(input_items[0])
 
diff --git a/src/gr-fadingui/python/logger.py b/src/gr-fadingui/python/logger.py
index a101b9e..a189aeb 100644
--- a/src/gr-fadingui/python/logger.py
+++ b/src/gr-fadingui/python/logger.py
@@ -10,5 +10,5 @@ def get_logger(module):
     log.addHandler(stdout_handler)
     stdout_handler.setFormatter(formatter)
 
-    log.setLevel(logging.WARNING)
+    log.setLevel(logging.DEBUG)
     return log
diff --git a/src/gui/gui.py b/src/gui/gui.py
index b298fd8..7e2357b 100755
--- a/src/gui/gui.py
+++ b/src/gui/gui.py
@@ -249,12 +249,18 @@ with window(label="Bit Error Rate ", width=300, height=150, pos=(200,875)) as be
             add_theme_color(mvThemeCol_Text,(0,0,0)) #Schwarz
             add_theme_style(mvStyleVar_FrameRounding, 5)
 
-    add_button(label="BER", height=60, width=150,pos=(75,60))
-    bind_item_theme(last_item(),"button_ber")
+    add_button(label="BER", height=60, width=-1, tag="ber_value")
+    bind_item_theme(last_item(), "button_ber")
 
 # bind_item_theme(ber_window, "ber_window")
 # bind_item_font(ber_window, test)
 
+def set_ber(values):
+    ber_curr, ber_max, ber_avg = values
+    configure_item("ber_value", label=f"Current: {ber_curr}, Max: {ber_max}, Avg: {ber_avg}")
+
+ber_value = net.network_value(url="udp://localhost:31420", dtype=float, refresh_func=set_ber)
+
 #================================================
 # Picture Window
 
@@ -278,8 +284,9 @@ set_primary_window("primary_window", True)
 
 # Main loop
 while is_dearpygui_running():
-    for plt in network_plots:
-        plt.refresh_series(plt.series_tag)
+    for plt, tag in network_plots.items():
+        plt.refresh_series(tag)
+    ber_value.refresh()
 
     render_dearpygui_frame()
 
diff --git a/src/gui/net.py b/src/gui/net.py
index 1ddb1d0..820bc84 100644
--- a/src/gui/net.py
+++ b/src/gui/net.py
@@ -13,10 +13,12 @@ class udpsource:
     """
     Creates an UDP listening socket
     """
-    def __init__(self, url, dtype, timeout=0.05):
+    def __init__(self, url, dtype, timeout=0.05, blocksize=1024):
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self.url = urlparse(url)
         self.dtype = dtype
         self.timeout = timeout
+        self.blocksize = blocksize
 
         if self.url.scheme == "udp":
             self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -50,8 +52,7 @@ class udpsource:
             return None
 
         # read from socket
-        blocksize = 1024
-        string = ready[0].recv(nblocks * blocksize).decode("ascii")
+        string = ready[0].recv(nblocks * self.blocksize).decode("ascii")
 
         # decode string, remove empty values
         chunks = filter(None, re.split(r"\[(.+?)\]", string))
@@ -72,6 +73,24 @@ class udpsource:
 
         return values
 
+class network_value(udpsource):
+    def __init__(self, url, dtype, refresh_func):
+        udpsource.__init__(self, url, dtype, blocksize=16)
+
+        self._refresh = refresh_func
+        self.value = None
+
+        self.bind()
+
+    def read(self):
+        return udpsource.read(self, 1)
+
+    def refresh(self):
+        self.value = self.read()
+        if self.value:
+            self._refresh(self.value)
+
+
 class network_plot(udpsource):
     """
     Wraps a udpsource while at the same time intefacing with DearPyGUI as a plot element.