From eca32bbd53d4fc51095700621525ac479f06c06c Mon Sep 17 00:00:00 2001
From: sara <sara.halter@gmx.ch>
Date: Sat, 4 Dec 2021 15:19:24 +0100
Subject: Fix network sink block (again)

---
 src/gr-fadingui/grc/fadingui_netsink.block.yml |  5 ++---
 src/gr-fadingui/python/netsink.py              | 12 +++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/gr-fadingui/grc/fadingui_netsink.block.yml b/src/gr-fadingui/grc/fadingui_netsink.block.yml
index a23dc52..3cd8ae7 100644
--- a/src/gr-fadingui/grc/fadingui_netsink.block.yml
+++ b/src/gr-fadingui/grc/fadingui_netsink.block.yml
@@ -7,7 +7,7 @@ templates:
   imports: |-
     import fadingui
     import numpy as np
-  make: fadingui.netsink(address=${address}, dtype=${type}, vlen=${veclen})
+  make: fadingui.netsink(address=${address}, dtype="${type}", vlen=${veclen})
 
 #  Make one 'parameters' list entry for every parameter you want settable from the GUI.
 #     Keys include:
@@ -18,8 +18,7 @@ parameters:
 - id: type
   label: Type
   dtype: enum
-  options: [complex, float, int, np.short, np.byte]
-  option_labels: [complex, float, int, short, byte]
+  options: [complex, float, int, short, byte]
   option_attributes:
       size: [gr.sizeof_gr_complex, gr.sizeof_float, gr.sizeof_int, gr.sizeof_short, gr.sizeof_char]
   hide: part
diff --git a/src/gr-fadingui/python/netsink.py b/src/gr-fadingui/python/netsink.py
index d2dfc92..130e5dc 100644
--- a/src/gr-fadingui/python/netsink.py
+++ b/src/gr-fadingui/python/netsink.py
@@ -15,7 +15,17 @@ class netsink(gr.sync_block):
     Keep in mind that is quite slow.
     """
     def __init__(self, address, dtype, vlen):
-        dt = np.dtype(dtype, (vlen,)) if vlen > 1 else dtype
+        to_numpy = {
+            "complex": np.complex64,
+            "float": np.float32,
+            "int": np.int32,
+            "short": np.short,
+            "byte": np.byte,
+        }
+
+        dt = to_numpy[dtype]
+        if vlen > 1:
+            dt = np.dtype(dt, (vlen,))
         print(dt)
 
         gr.sync_block.__init__(self,
-- 
cgit v1.2.1