aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNao Pross <np@0hm.ch>2021-12-14 19:40:03 +0100
committerNao Pross <np@0hm.ch>2021-12-14 19:40:03 +0100
commit06f4ef810c7089c8b994f438b90b293762133bdd (patch)
tree5794b50d22b0f3db403c43adc92d04114c4dcfdb /src
parentBER block angepasst (diff)
downloadFading-06f4ef810c7089c8b994f438b90b293762133bdd.tar.gz
Fading-06f4ef810c7089c8b994f438b90b293762133bdd.zip
Implement network_value to show BER
Diffstat (limited to 'src')
-rw-r--r--src/gr-fadingui/python/ber.py10
-rwxr-xr-xsrc/gui/gui.py11
-rw-r--r--src/gui/net.py24
3 files changed, 32 insertions, 13 deletions
diff --git a/src/gr-fadingui/python/ber.py b/src/gr-fadingui/python/ber.py
index 1c5debf..664780f 100644
--- a/src/gr-fadingui/python/ber.py
+++ b/src/gr-fadingui/python/ber.py
@@ -43,7 +43,7 @@ class ber(gr.sync_block):
self.vgl=vgl
self.vlen=vlen
- self.ber_samples = RingBuffer(capacity=2000, dtype=int)
+ 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
@@ -84,8 +84,6 @@ class ber(gr.sync_block):
log.debug(f"Length: {len(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
@@ -102,11 +100,7 @@ class ber(gr.sync_block):
ber_max, ber_min, ber_avg = self.ber_stats()
log.debug(f"Statistics: {ber_max}, {ber_min}, {ber_avg}")
- #self.send(self.encode(ber_max, ber_min, ber_avg))
- self.send(self.encode(trueber))
- self.send(self.encode(ber_max))
- self.send(self.encode(ber_min))
- self.send(self.encode(ber_avg))
+ self.send(self.encode([trueber, ber_max, ber_avg]))
return len(inp)
#return len(input_items[0])
diff --git a/src/gui/gui.py b/src/gui/gui.py
index 6091618..9ac69f7 100755
--- a/src/gui/gui.py
+++ b/src/gui/gui.py
@@ -253,12 +253,18 @@ with window(label="Bit Error Rate ", width=300, height=150, pos=(1200,875), no_t
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
with window(label="Picture", width=400, height=300, pos=(0,825)) as picture_window :
@@ -275,6 +281,7 @@ set_primary_window("primary_window", True)
while is_dearpygui_running():
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 715e7a0..f836f42 100644
--- a/src/gui/net.py
+++ b/src/gui/net.py
@@ -12,11 +12,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
def __del__(self):
self.sock.close()
@@ -33,8 +34,7 @@ class udpsource:
return None
# read from socket
- blocksize = 1024 * 4
- 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))
@@ -55,6 +55,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.