diff options
-rw-r--r-- | flowgraphs/lena512color.png (renamed from src/gui/lena512color.png) | bin | 474775 -> 474775 bytes | |||
-rw-r--r-- | flowgraphs/qam_sim.grc | 231 | ||||
-rwxr-xr-x | flowgraphs/qam_sim.py | 199 | ||||
-rw-r--r-- | flowgraphs/qpsk_sim.grc | 102 | ||||
-rwxr-xr-x | flowgraphs/qpsk_sim.py | 8 | ||||
-rw-r--r-- | src/gr-fadingui/python/netsink.py | 36 | ||||
-rwxr-xr-x | src/gui/gui.py | 267 | ||||
-rw-r--r-- | src/gui/net.py | 32 | ||||
-rw-r--r-- | src/gui/res/pic/lena512color.png | bin | 0 -> 474775 bytes | |||
-rw-r--r-- | src/gui/res/pic/lena512color.tiff (renamed from src/gui/lena512color.tiff) | bin | 786572 -> 786572 bytes | |||
-rw-r--r-- | src/gui/res/ttf/Hack-Bold.ttf | bin | 0 -> 317628 bytes | |||
-rw-r--r-- | src/gui/res/ttf/Hack-BoldItalic.ttf | bin | 0 -> 322288 bytes | |||
-rw-r--r-- | src/gui/res/ttf/Hack-Italic.ttf | bin | 0 -> 316156 bytes | |||
-rw-r--r-- | src/gui/res/ttf/Hack-Regular.ttf | bin | 0 -> 309408 bytes |
14 files changed, 643 insertions, 232 deletions
diff --git a/src/gui/lena512color.png b/flowgraphs/lena512color.png Binary files differindex 7d364e0..7d364e0 100644 --- a/src/gui/lena512color.png +++ b/flowgraphs/lena512color.png diff --git a/flowgraphs/qam_sim.grc b/flowgraphs/qam_sim.grc index 02b174c..f1f9cc9 100644 --- a/flowgraphs/qam_sim.grc +++ b/flowgraphs/qam_sim.grc @@ -8,7 +8,7 @@ options: description: '' gen_cmake: 'On' gen_linking: dynamic - generate_options: no_gui + generate_options: qt_gui hier_block_src_path: '.:' id: qam_sim max_nouts: '0' @@ -32,19 +32,78 @@ options: state: enabled blocks: -- name: access_code_symbols +- name: access_code id: variable parameters: comment: '' - value: '[(-0.31622776601683794-0.31622776601683794j), (-0.31622776601683794+0.31622776601683794j), - (-0.9486832980505138-0.9486832980505138j), (-0.9486832980505138-0.31622776601683794j)]' + value: np.exp(1j * (np.pi * 13 * np.arange(20) ** 20 / 20)) states: bus_sink: false bus_source: false bus_structure: null - coordinate: [792, 1092.0] + coordinate: [32, 348.0] rotation: 0 state: true +- name: access_code_sps + id: variable + parameters: + comment: '' + value: np.asarray(np.matmul(np.matrix(access_code).T, np.matrix(np.ones(sps)))).ravel() + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [424, 196.0] + rotation: 0 + state: disabled +- name: access_code_sps + id: variable + parameters: + comment: '' + value: '[(1+0j), (1+0j), (1+0j), (1+0j), (-0.4539904997395467+0.8910065241883679j), + (-0.4539904997395467+0.8910065241883679j), (-0.4539904997395467+0.8910065241883679j), + (-0.4539904997395467+0.8910065241883679j), (0.30901699445433095+0.9510565162693603j), + (0.30901699445433095+0.9510565162693603j), (0.30901699445433095+0.9510565162693603j), + (0.30901699445433095+0.9510565162693603j), (-0.45399010831290065+0.8910067236300974j), + (-0.45399010831290065+0.8910067236300974j), (-0.45399010831290065+0.8910067236300974j), + (-0.45399010831290065+0.8910067236300974j), (0.30910023286329796+0.9510294664435246j), + (0.30910023286329796+0.9510294664435246j), (0.30910023286329796+0.9510294664435246j), + (0.30910023286329796+0.9510294664435246j), (0.6958765427916561+0.7181614283657487j), + (0.6958765427916561+0.7181614283657487j), (0.6958765427916561+0.7181614283657487j), + (0.6958765427916561+0.7181614283657487j), (0.6995785030650676+0.7145557487343022j), + (0.6995785030650676+0.7145557487343022j), (0.6995785030650676+0.7145557487343022j), + (0.6995785030650676+0.7145557487343022j), (-0.8755764602527171+0.4830795609952073j), + (-0.8755764602527171+0.4830795609952073j), (-0.8755764602527171+0.4830795609952073j), + (-0.8755764602527171+0.4830795609952073j), (-0.8320971948858552-0.5546298389584634j), + (-0.8320971948858552-0.5546298389584634j), (-0.8320971948858552-0.5546298389584634j), + (-0.8320971948858552-0.5546298389584634j), (0.13124680853227685+0.9913497239874998j), + (0.13124680853227685+0.9913497239874998j), (0.13124680853227685+0.9913497239874998j), + (0.13124680853227685+0.9913497239874998j), (0.9219105024602736-0.38740292390926256j), + (0.9219105024602736-0.38740292390926256j), (0.9219105024602736-0.38740292390926256j), + (0.9219105024602736-0.38740292390926256j), (0.9881969645782696-0.15318863925988194j), + (0.9881969645782696-0.15318863925988194j), (0.9881969645782696-0.15318863925988194j), + (0.9881969645782696-0.15318863925988194j), (-0.5511352729247617-0.8344159100461522j), + (-0.5511352729247617-0.8344159100461522j), (-0.5511352729247617-0.8344159100461522j), + (-0.5511352729247617-0.8344159100461522j), (-0.24665339430031927+0.9691037628036181j), + (-0.24665339430031927+0.9691037628036181j), (-0.24665339430031927+0.9691037628036181j), + (-0.24665339430031927+0.9691037628036181j), (-0.44951814008601154-0.8932712027898431j), + (-0.44951814008601154-0.8932712027898431j), (-0.44951814008601154-0.8932712027898431j), + (-0.44951814008601154-0.8932712027898431j), (-0.23300791854304934-0.9724748376673998j), + (-0.23300791854304934-0.9724748376673998j), (-0.23300791854304934-0.9724748376673998j), + (-0.23300791854304934-0.9724748376673998j), (1+0j), (1+0j), (1+0j), (1+0j), + (0.8559628469680924+0.5170373338650489j), (0.8559628469680924+0.5170373338650489j), + (0.8559628469680924+0.5170373338650489j), (0.8559628469680924+0.5170373338650489j), + (-0.8354473464520049-0.5495704971214372j), (-0.8354473464520049-0.5495704971214372j), + (-0.8354473464520049-0.5495704971214372j), (-0.8354473464520049-0.5495704971214372j), + (-0.999246638643493+0.03880921488101298j), (-0.999246638643493+0.03880921488101298j), + (-0.999246638643493+0.03880921488101298j), (-0.999246638643493+0.03880921488101298j)]' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [256, 196.0] + rotation: 0 + state: disabled - name: carrier_freq id: variable parameters: @@ -54,7 +113,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [472, 572.0] + coordinate: [472, 756.0] rotation: 0 state: true - name: excess_bw @@ -66,7 +125,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [336, 1156.0] + coordinate: [336, 1332.0] rotation: 0 state: true - name: frame @@ -80,7 +139,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [48, 612.0] + coordinate: [48, 796.0] rotation: 0 state: disabled - name: frame_len @@ -92,7 +151,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [184, 252.0] + coordinate: [184, 436.0] rotation: 0 state: true - name: nfilts @@ -104,7 +163,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [256, 1156.0] + coordinate: [256, 1332.0] rotation: 0 state: true - name: qam_const @@ -122,7 +181,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [472, 356.0] + coordinate: [472, 532.0] rotation: 0 state: true - name: rrc_taps @@ -134,7 +193,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [432, 1156.0] + coordinate: [432, 1332.0] rotation: 0 state: true - name: samp_rate @@ -170,7 +229,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [48, 252.0] + coordinate: [48, 436.0] rotation: 0 state: true - name: analog_random_source_x_0 @@ -190,7 +249,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [48, 420.0] + coordinate: [40, 604.0] rotation: 0 state: true - name: blocks_complex_to_mag_0 @@ -206,9 +265,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1088, 1080.0] + coordinate: [1088, 1272.0] rotation: 0 - state: disabled + state: enabled - name: blocks_null_source_0 id: blocks_null_source parameters: @@ -225,7 +284,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [48, 528.0] + coordinate: [48, 712.0] rotation: 0 state: true - name: blocks_repack_bits_bb_0 @@ -245,7 +304,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [768, 1300.0] + coordinate: [768, 1476.0] rotation: 0 state: true - name: blocks_stream_mux_0 @@ -264,9 +323,28 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [272, 416.0] + coordinate: [272, 600.0] rotation: 0 state: true +- name: blocks_stream_mux_1 + id: blocks_stream_mux + parameters: + affinity: '' + alias: '' + comment: '' + lengths: '[len(access_code)*4, len(testvec)//4*sps]' + maxoutbuf: '0' + minoutbuf: '0' + num_inputs: '2' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [728, 528.0] + rotation: 0 + state: disabled - name: blocks_stream_to_vector_0 id: blocks_stream_to_vector parameters: @@ -282,7 +360,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [992, 1312.0] + coordinate: [1000, 1488.0] rotation: 0 state: true - name: blocks_tagged_stream_align_0 @@ -300,7 +378,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [496, 1308.0] + coordinate: [496, 1484.0] rotation: 0 state: true - name: blocks_throttle_0 @@ -319,7 +397,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [744, 444.0] + coordinate: [864, 628.0] rotation: 0 state: true - name: blocks_vector_source_x_0 @@ -339,9 +417,29 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [48, 324.0] + coordinate: [48, 508.0] rotation: 0 state: true +- name: blocks_vector_source_x_1 + id: blocks_vector_source_x + parameters: + affinity: '' + alias: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + repeat: 'True' + tags: '[]' + type: complex + vector: access_code_sps + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [256, 300.0] + rotation: 0 + state: disabled - name: channels_channel_model_0 id: channels_channel_model parameters: @@ -360,7 +458,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [312, 716.0] + coordinate: [312, 900.0] rotation: 0 state: enabled - name: channels_selective_fading_model_0 @@ -373,7 +471,7 @@ blocks: alias: '' comment: '' delays: (0,1.8) - fDTs: ((4*carrier_freq)/(3*10e8))/samp_rate + fDTs: ((2*carrier_freq)/(3*10e8))/samp_rate mags: (1,0.12) maxoutbuf: '0' minoutbuf: '0' @@ -383,9 +481,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [600, 572.0] + coordinate: [600, 748.0] rotation: 0 - state: disabled + state: enabled - name: digital_constellation_decoder_cb_0 id: digital_constellation_decoder_cb parameters: @@ -399,7 +497,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [256, 1308.0] + coordinate: [256, 1484.0] rotation: 0 state: true - name: digital_constellation_modulator_0 @@ -420,7 +518,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [472, 420.0] + coordinate: [472, 604.0] rotation: 0 state: true - name: digital_corr_est_cc_0 @@ -429,18 +527,18 @@ blocks: affinity: '' alias: '' comment: '' - mark_delay: len(access_code_symbols) // 2 + mark_delay: len(access_code) // 2 maxoutbuf: '0' minoutbuf: '0' sps: '1' - symbols: access_code_symbols + symbols: access_code threshold: '0.9' threshold_method: digital.THRESHOLD_ABSOLUTE states: bus_sink: false bus_source: false bus_structure: null - coordinate: [792, 972.0] + coordinate: [792, 1148.0] rotation: 0 state: true - name: digital_lms_dd_equalizer_cc_0 @@ -453,13 +551,13 @@ blocks: maxoutbuf: '0' minoutbuf: '0' mu: 5e-3 - num_taps: '2' + num_taps: '5' sps: '1' states: bus_sink: false bus_source: false bus_structure: null - coordinate: [520, 980.0] + coordinate: [520, 1156.0] rotation: 0 state: true - name: digital_pfb_clock_sync_xxx_0 @@ -482,7 +580,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [248, 1004.0] + coordinate: [248, 1180.0] rotation: 0 state: true - name: fadingui_ber_0 @@ -498,7 +596,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1184, 1300.0] + coordinate: [1200, 1468.0] rotation: 0 state: true - name: fadingui_datasource_0 @@ -515,7 +613,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [208, 612.0] + coordinate: [208, 788.0] rotation: 0 state: disabled - name: fadingui_multipath_fading_0 @@ -533,9 +631,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [648, 740.0] + coordinate: [648, 924.0] rotation: 0 - state: enabled + state: disabled - name: fadingui_netsink_0 id: fadingui_netsink parameters: @@ -549,7 +647,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [984, 620.0] + coordinate: [984, 796.0] rotation: 0 state: enabled - name: fadingui_netsink_1 @@ -565,7 +663,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [800, 916.0] + coordinate: [800, 1100.0] rotation: 0 state: enabled - name: fadingui_netsink_3 @@ -581,7 +679,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1280, 916.0] + coordinate: [1280, 1100.0] rotation: 0 state: enabled - name: fadingui_netsink_4 @@ -597,7 +695,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [528, 916.0] + coordinate: [528, 1100.0] rotation: 0 state: enabled - name: fadingui_phasecorrection_0 @@ -613,7 +711,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1032, 988.0] + coordinate: [1032, 1164.0] rotation: 0 state: enabled - name: import_0 @@ -718,9 +816,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1304, 800.0] + coordinate: [1304, 984.0] rotation: 0 - state: disabled + state: enabled - name: qtgui_time_sink_x_0 id: qtgui_time_sink_x parameters: @@ -815,7 +913,30 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1272, 1060.0] + coordinate: [1320, 1252.0] + rotation: 0 + state: enabled +- name: root_raised_cosine_filter_0 + id: root_raised_cosine_filter + parameters: + affinity: '' + alias: '' + alpha: excess_bw + comment: '' + decim: '1' + gain: '10' + interp: '1' + maxoutbuf: '0' + minoutbuf: '0' + ntaps: int(samp_rate) + samp_rate: samp_rate + sym_rate: 1 / sps + type: fir_filter_ccf + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [472, 380.0] rotation: 0 state: disabled - name: virtual_sink_0 @@ -828,7 +949,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [952, 444.0] + coordinate: [1048, 628.0] rotation: 0 state: true - name: virtual_sink_1 @@ -841,7 +962,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1000, 756.0] + coordinate: [1000, 940.0] rotation: 0 state: true - name: virtual_sink_2 @@ -854,7 +975,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1336, 988.0] + coordinate: [1336, 1164.0] rotation: 0 state: true - name: virtual_source_0 @@ -867,7 +988,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [48, 1308.0] + coordinate: [48, 1484.0] rotation: 0 state: true - name: virtual_source_1 @@ -880,7 +1001,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [48, 1052.0] + coordinate: [48, 1228.0] rotation: 0 state: true - name: virtual_source_2 @@ -893,7 +1014,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [56, 756.0] + coordinate: [56, 940.0] rotation: 0 state: true @@ -903,15 +1024,18 @@ connections: - [blocks_null_source_0, '0', blocks_stream_mux_0, '2'] - [blocks_repack_bits_bb_0, '0', blocks_stream_to_vector_0, '0'] - [blocks_stream_mux_0, '0', digital_constellation_modulator_0, '0'] +- [blocks_stream_mux_1, '0', blocks_throttle_0, '0'] - [blocks_stream_to_vector_0, '0', fadingui_ber_0, '0'] - [blocks_tagged_stream_align_0, '0', blocks_repack_bits_bb_0, '0'] - [blocks_throttle_0, '0', virtual_sink_0, '0'] - [blocks_vector_source_x_0, '0', blocks_stream_mux_0, '0'] +- [blocks_vector_source_x_1, '0', root_raised_cosine_filter_0, '0'] - [channels_channel_model_0, '0', channels_selective_fading_model_0, '0'] - [channels_channel_model_0, '0', fadingui_multipath_fading_0, '0'] - [channels_selective_fading_model_0, '0', fadingui_netsink_0, '0'] - [channels_selective_fading_model_0, '0', virtual_sink_1, '0'] - [digital_constellation_decoder_cb_0, '0', blocks_tagged_stream_align_0, '0'] +- [digital_constellation_modulator_0, '0', blocks_stream_mux_1, '1'] - [digital_constellation_modulator_0, '0', blocks_throttle_0, '0'] - [digital_corr_est_cc_0, '0', fadingui_phasecorrection_0, '0'] - [digital_corr_est_cc_0, '1', blocks_complex_to_mag_0, '0'] @@ -927,6 +1051,7 @@ connections: - [fadingui_phasecorrection_0, '0', fadingui_netsink_3, '0'] - [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_0, '2'] - [fadingui_phasecorrection_0, '0', virtual_sink_2, '0'] +- [root_raised_cosine_filter_0, '0', blocks_stream_mux_1, '0'] - [virtual_source_0, '0', digital_constellation_decoder_cb_0, '0'] - [virtual_source_1, '0', digital_pfb_clock_sync_xxx_0, '0'] - [virtual_source_2, '0', channels_channel_model_0, '0'] diff --git a/flowgraphs/qam_sim.py b/flowgraphs/qam_sim.py index 66045c2..bd8589b 100755 --- a/flowgraphs/qam_sim.py +++ b/flowgraphs/qam_sim.py @@ -9,10 +9,25 @@ # Author: Naoki Sean Pross, Sara Cinzia Halter # GNU Radio version: 3.8.2.0 +from distutils.version import StrictVersion + +if __name__ == '__main__': + import ctypes + import sys + if sys.platform.startswith('linux'): + try: + x11 = ctypes.cdll.LoadLibrary('libX11.so') + x11.XInitThreads() + except: + print("Warning: failed to XInitThreads()") + +from PyQt5 import Qt +from gnuradio import qtgui +from gnuradio.filter import firdes +import sip from gnuradio import blocks import numpy from gnuradio import channels -from gnuradio.filter import firdes from gnuradio import digital from gnuradio import gr import sys @@ -23,11 +38,40 @@ from gnuradio import eng_notation import fadingui import numpy as np +from gnuradio import qtgui -class qam_sim(gr.top_block): +class qam_sim(gr.top_block, Qt.QWidget): def __init__(self): gr.top_block.__init__(self, "QAM Sim") + Qt.QWidget.__init__(self) + self.setWindowTitle("QAM Sim") + qtgui.util.check_set_qss() + try: + self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc')) + except: + pass + self.top_scroll_layout = Qt.QVBoxLayout() + self.setLayout(self.top_scroll_layout) + self.top_scroll = Qt.QScrollArea() + self.top_scroll.setFrameStyle(Qt.QFrame.NoFrame) + self.top_scroll_layout.addWidget(self.top_scroll) + self.top_scroll.setWidgetResizable(True) + self.top_widget = Qt.QWidget() + self.top_scroll.setWidget(self.top_widget) + self.top_layout = Qt.QVBoxLayout(self.top_widget) + self.top_grid_layout = Qt.QGridLayout() + self.top_layout.addLayout(self.top_grid_layout) + + self.settings = Qt.QSettings("GNU Radio", "qam_sim") + + try: + if StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): + self.restoreGeometry(self.settings.value("geometry").toByteArray()) + else: + self.restoreGeometry(self.settings.value("geometry")) + except: + pass ################################################## # Variables @@ -41,21 +85,107 @@ class qam_sim(gr.top_block): self.qam_const = qam_const = digital.constellation_16qam().base() self.frame_len = frame_len = len(testvec) +4 self.carrier_freq = carrier_freq = 2.4e9 - self.access_code_symbols = access_code_symbols = [(-0.31622776601683794-0.31622776601683794j), (-0.31622776601683794+0.31622776601683794j), (-0.9486832980505138-0.9486832980505138j), (-0.9486832980505138-0.31622776601683794j)] + self.access_code = access_code = np.exp(1j * (np.pi * 13 * np.arange(20) ** 20 / 20)) ################################################## # Blocks ################################################## + self.qtgui_time_sink_x_0 = qtgui.time_sink_f( + 1024, #size + samp_rate / sps, #samp_rate + "", #name + 1 #number of inputs + ) + self.qtgui_time_sink_x_0.set_update_time(0.10) + self.qtgui_time_sink_x_0.set_y_axis(0, 10) + + self.qtgui_time_sink_x_0.set_y_label('Amplitude', "") + + self.qtgui_time_sink_x_0.enable_tags(True) + self.qtgui_time_sink_x_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, qtgui.TRIG_SLOPE_POS, 0.0, 0, 0, "") + self.qtgui_time_sink_x_0.enable_autoscale(False) + self.qtgui_time_sink_x_0.enable_grid(False) + self.qtgui_time_sink_x_0.enable_axis_labels(True) + self.qtgui_time_sink_x_0.enable_control_panel(False) + self.qtgui_time_sink_x_0.enable_stem_plot(False) + + + labels = ['Signal 1', 'Signal 2', 'Signal 3', 'Signal 4', 'Signal 5', + 'Signal 6', 'Signal 7', 'Signal 8', 'Signal 9', 'Signal 10'] + widths = [1, 1, 1, 1, 1, + 1, 1, 1, 1, 1] + colors = ['blue', 'red', 'green', 'black', 'cyan', + 'magenta', 'yellow', 'dark red', 'dark green', 'dark blue'] + alphas = [1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0] + styles = [1, 1, 1, 1, 1, + 1, 1, 1, 1, 1] + markers = [-1, -1, -1, -1, -1, + -1, -1, -1, -1, -1] + + + for i in range(1): + if len(labels[i]) == 0: + self.qtgui_time_sink_x_0.set_line_label(i, "Data {0}".format(i)) + else: + self.qtgui_time_sink_x_0.set_line_label(i, labels[i]) + self.qtgui_time_sink_x_0.set_line_width(i, widths[i]) + self.qtgui_time_sink_x_0.set_line_color(i, colors[i]) + self.qtgui_time_sink_x_0.set_line_style(i, styles[i]) + self.qtgui_time_sink_x_0.set_line_marker(i, markers[i]) + self.qtgui_time_sink_x_0.set_line_alpha(i, alphas[i]) + + self._qtgui_time_sink_x_0_win = sip.wrapinstance(self.qtgui_time_sink_x_0.pyqwidget(), Qt.QWidget) + self.top_grid_layout.addWidget(self._qtgui_time_sink_x_0_win) + self.qtgui_const_sink_x_0 = qtgui.const_sink_c( + 1024, #size + "", #name + 3 #number of inputs + ) + self.qtgui_const_sink_x_0.set_update_time(0.10) + self.qtgui_const_sink_x_0.set_y_axis(-2, 2) + self.qtgui_const_sink_x_0.set_x_axis(-2, 2) + self.qtgui_const_sink_x_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, qtgui.TRIG_SLOPE_POS, 0.0, 0, "") + self.qtgui_const_sink_x_0.enable_autoscale(False) + self.qtgui_const_sink_x_0.enable_grid(False) + self.qtgui_const_sink_x_0.enable_axis_labels(True) + + + labels = ['', '', '', '', '', + '', '', '', '', ''] + widths = [1, 1, 1, 1, 1, + 1, 1, 1, 1, 1] + colors = ["blue", "red", "red", "red", "red", + "red", "red", "red", "red", "red"] + styles = [0, 0, 0, 0, 0, + 0, 0, 0, 0, 0] + markers = [0, 0, 0, 0, 0, + 0, 0, 0, 0, 0] + alphas = [1.0, 1.0, 1.0, 1.0, 1.0, + 1.0, 1.0, 1.0, 1.0, 1.0] + + for i in range(3): + if len(labels[i]) == 0: + self.qtgui_const_sink_x_0.set_line_label(i, "Data {0}".format(i)) + else: + self.qtgui_const_sink_x_0.set_line_label(i, labels[i]) + self.qtgui_const_sink_x_0.set_line_width(i, widths[i]) + self.qtgui_const_sink_x_0.set_line_color(i, colors[i]) + self.qtgui_const_sink_x_0.set_line_style(i, styles[i]) + self.qtgui_const_sink_x_0.set_line_marker(i, markers[i]) + self.qtgui_const_sink_x_0.set_line_alpha(i, alphas[i]) + + self._qtgui_const_sink_x_0_win = sip.wrapinstance(self.qtgui_const_sink_x_0.pyqwidget(), Qt.QWidget) + self.top_grid_layout.addWidget(self._qtgui_const_sink_x_0_win) self.fadingui_phasecorrection_0 = fadingui.phasecorrection(frame_len) self.fadingui_netsink_4 = fadingui.netsink(address='udp://localhost:31417', dtype="complex", vlen=1) self.fadingui_netsink_3 = fadingui.netsink(address='udp://localhost:31419', dtype="complex", vlen=1) self.fadingui_netsink_1 = fadingui.netsink(address='udp://localhost:31418', dtype="complex", vlen=1) self.fadingui_netsink_0 = fadingui.netsink(address='udp://localhost:31416', dtype="complex", vlen=1) - self.fadingui_multipath_fading_0 = fadingui.multipath_fading(amplitudes=[0.12], delays=[1.8], los =True) self.fadingui_ber_0 = fadingui.ber(vgl=testvec + list(np.zeros(4)), vlen=frame_len,address='udp://localhost:31415') self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, 2 * np.pi / 100, rrc_taps, 32, 16, 1.5, 1) - self.digital_lms_dd_equalizer_cc_0 = digital.lms_dd_equalizer_cc(2, 5e-3, 1, qam_const) - self.digital_corr_est_cc_0 = digital.corr_est_cc(access_code_symbols, 1, len(access_code_symbols) // 2, 0.9, digital.THRESHOLD_ABSOLUTE) + self.digital_lms_dd_equalizer_cc_0 = digital.lms_dd_equalizer_cc(5, 5e-3, 1, qam_const) + self.digital_corr_est_cc_0 = digital.corr_est_cc(access_code, 1, len(access_code) // 2, 0.9, digital.THRESHOLD_ABSOLUTE) self.digital_constellation_modulator_0 = digital.generic_mod( constellation=qam_const, differential=False, @@ -65,6 +195,7 @@ class qam_sim(gr.top_block): verbose=False, log=False) self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(qam_const) + self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, ((2*carrier_freq)/(3*10e8))/samp_rate, False, 4.0, 21, (0,1.8), (1,0.12), 8 ) self.channels_channel_model_0 = channels.channel_model( noise_voltage=100e-3, frequency_offset=0, @@ -79,6 +210,7 @@ class qam_sim(gr.top_block): self.blocks_stream_mux_0 = blocks.stream_mux(gr.sizeof_char*1, [len(testvec), 4, 0]) self.blocks_repack_bits_bb_0 = blocks.repack_bits_bb(2, 8, "", False, gr.GR_LSB_FIRST) self.blocks_null_source_0 = blocks.null_source(gr.sizeof_char*1) + self.blocks_complex_to_mag_0 = blocks.complex_to_mag(1) self.analog_random_source_x_0 = blocks.vector_source_b(list(map(int, numpy.random.randint(0, 255, 400))), True) @@ -87,6 +219,7 @@ class qam_sim(gr.top_block): # Connections ################################################## self.connect((self.analog_random_source_x_0, 0), (self.blocks_stream_mux_0, 1)) + self.connect((self.blocks_complex_to_mag_0, 0), (self.qtgui_time_sink_x_0, 0)) self.connect((self.blocks_null_source_0, 0), (self.blocks_stream_mux_0, 2)) self.connect((self.blocks_repack_bits_bb_0, 0), (self.blocks_stream_to_vector_0, 0)) self.connect((self.blocks_stream_mux_0, 0), (self.digital_constellation_modulator_0, 0)) @@ -94,20 +227,29 @@ class qam_sim(gr.top_block): self.connect((self.blocks_tagged_stream_align_0, 0), (self.blocks_repack_bits_bb_0, 0)) self.connect((self.blocks_throttle_0, 0), (self.channels_channel_model_0, 0)) self.connect((self.blocks_vector_source_x_0, 0), (self.blocks_stream_mux_0, 0)) - self.connect((self.channels_channel_model_0, 0), (self.fadingui_multipath_fading_0, 0)) + self.connect((self.channels_channel_model_0, 0), (self.channels_selective_fading_model_0, 0)) + self.connect((self.channels_selective_fading_model_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) + self.connect((self.channels_selective_fading_model_0, 0), (self.fadingui_netsink_0, 0)) self.connect((self.digital_constellation_decoder_cb_0, 0), (self.blocks_tagged_stream_align_0, 0)) self.connect((self.digital_constellation_modulator_0, 0), (self.blocks_throttle_0, 0)) + self.connect((self.digital_corr_est_cc_0, 1), (self.blocks_complex_to_mag_0, 0)) self.connect((self.digital_corr_est_cc_0, 0), (self.fadingui_phasecorrection_0, 0)) self.connect((self.digital_lms_dd_equalizer_cc_0, 0), (self.digital_corr_est_cc_0, 0)) self.connect((self.digital_lms_dd_equalizer_cc_0, 0), (self.fadingui_netsink_1, 0)) + self.connect((self.digital_lms_dd_equalizer_cc_0, 0), (self.qtgui_const_sink_x_0, 1)) self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.digital_lms_dd_equalizer_cc_0, 0)) self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.fadingui_netsink_4, 0)) - self.connect((self.fadingui_multipath_fading_0, 0), (self.digital_pfb_clock_sync_xxx_0, 0)) - self.connect((self.fadingui_multipath_fading_0, 0), (self.fadingui_netsink_0, 0)) + self.connect((self.digital_pfb_clock_sync_xxx_0, 0), (self.qtgui_const_sink_x_0, 0)) self.connect((self.fadingui_phasecorrection_0, 0), (self.digital_constellation_decoder_cb_0, 0)) self.connect((self.fadingui_phasecorrection_0, 0), (self.fadingui_netsink_3, 0)) + self.connect((self.fadingui_phasecorrection_0, 0), (self.qtgui_const_sink_x_0, 2)) + def closeEvent(self, event): + self.settings = Qt.QSettings("GNU Radio", "qam_sim") + self.settings.setValue("geometry", self.saveGeometry()) + event.accept() + def get_testvec(self): return self.testvec @@ -122,6 +264,7 @@ class qam_sim(gr.top_block): def set_sps(self, sps): self.sps = sps self.set_rrc_taps(firdes.root_raised_cosine(self.nfilts, self.nfilts, 1.0/float(self.sps), self.excess_bw, 45*self.nfilts)) + self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate / self.sps) def get_nfilts(self): return self.nfilts @@ -143,6 +286,8 @@ class qam_sim(gr.top_block): def set_samp_rate(self, samp_rate): self.samp_rate = samp_rate self.blocks_throttle_0.set_sample_rate(self.samp_rate) + self.channels_selective_fading_model_0.set_fDTs(((2*self.carrier_freq)/(3*10e8))/self.samp_rate) + self.qtgui_time_sink_x_0.set_samp_rate(self.samp_rate / self.sps) def get_rrc_taps(self): return self.rrc_taps @@ -168,13 +313,14 @@ class qam_sim(gr.top_block): def set_carrier_freq(self, carrier_freq): self.carrier_freq = carrier_freq + self.channels_selective_fading_model_0.set_fDTs(((2*self.carrier_freq)/(3*10e8))/self.samp_rate) - def get_access_code_symbols(self): - return self.access_code_symbols + def get_access_code(self): + return self.access_code - def set_access_code_symbols(self, access_code_symbols): - self.access_code_symbols = access_code_symbols - self.digital_corr_est_cc_0.set_mark_delay(len(self.access_code_symbols) // 2) + def set_access_code(self, access_code): + self.access_code = access_code + self.digital_corr_est_cc_0.set_mark_delay(len(self.access_code) // 2) @@ -183,21 +329,34 @@ class qam_sim(gr.top_block): def main(top_block_cls=qam_sim, options=None): if gr.enable_realtime_scheduling() != gr.RT_OK: print("Error: failed to enable real-time scheduling.") + + if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) < StrictVersion("5.0.0"): + style = gr.prefs().get_string('qtgui', 'style', 'raster') + Qt.QApplication.setGraphicsSystem(style) + qapp = Qt.QApplication(sys.argv) + tb = top_block_cls() - def sig_handler(sig=None, frame=None): - tb.stop() - tb.wait() + tb.start() + + tb.show() - sys.exit(0) + def sig_handler(sig=None, frame=None): + Qt.QApplication.quit() signal.signal(signal.SIGINT, sig_handler) signal.signal(signal.SIGTERM, sig_handler) - tb.start() + timer = Qt.QTimer() + timer.start(500) + timer.timeout.connect(lambda: None) - tb.wait() + def quitting(): + tb.stop() + tb.wait() + qapp.aboutToQuit.connect(quitting) + qapp.exec_() if __name__ == '__main__': main() diff --git a/flowgraphs/qpsk_sim.grc b/flowgraphs/qpsk_sim.grc index 75bf3e1..ea9518b 100644 --- a/flowgraphs/qpsk_sim.grc +++ b/flowgraphs/qpsk_sim.grc @@ -76,8 +76,8 @@ blocks: parameters: alias: '' comment: '' - payload_len: '4096' - preamble: '[0xbe, 0xef]' + payload_len: '16' + preamble: '[0x1f, 0x35]' states: bus_sink: false bus_source: false @@ -96,7 +96,19 @@ blocks: bus_structure: null coordinate: [184, 252.0] rotation: 0 - state: true + state: enabled +- name: frame_len + id: variable + parameters: + comment: '' + value: 2 + 4 + 16 + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [208, 604.0] + rotation: 0 + state: disabled - name: nfilts id: variable parameters: @@ -174,7 +186,7 @@ blocks: bus_structure: null coordinate: [48, 252.0] rotation: 0 - state: true + state: enabled - name: analog_random_source_x_0 id: analog_random_source_x parameters: @@ -194,7 +206,24 @@ blocks: bus_structure: null coordinate: [48, 420.0] rotation: 0 - state: true + state: enabled +- name: analog_simple_squelch_cc_0 + id: analog_simple_squelch_cc + parameters: + affinity: '' + alias: '' + alpha: '' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + threshold: '' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [1000, 692.0] + rotation: 0 + state: disabled - name: blocks_complex_to_mag_0 id: blocks_complex_to_mag parameters: @@ -211,6 +240,25 @@ blocks: coordinate: [1064, 1080.0] rotation: 0 state: enabled +- name: blocks_null_source_0 + id: blocks_null_source + parameters: + affinity: '' + alias: '' + bus_structure_source: '[[0,],]' + comment: '' + maxoutbuf: '0' + minoutbuf: '0' + num_outputs: '1' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [744, 344.0] + rotation: 0 + state: disabled - name: blocks_repack_bits_bb_0 id: blocks_repack_bits_bb parameters: @@ -247,9 +295,28 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [272, 416.0] + coordinate: [240, 416.0] rotation: 0 - state: true + state: enabled +- name: blocks_stream_mux_1 + id: blocks_stream_mux + parameters: + affinity: '' + alias: '' + comment: '' + lengths: '[]' + maxoutbuf: '0' + minoutbuf: '0' + num_inputs: '2' + type: complex + vlen: '1' + states: + bus_sink: false + bus_source: false + bus_structure: null + coordinate: [928, 344.0] + rotation: 0 + state: disabled - name: blocks_stream_to_vector_0 id: blocks_stream_to_vector parameters: @@ -324,7 +391,7 @@ blocks: bus_structure: null coordinate: [48, 324.0] rotation: 0 - state: true + state: enabled - name: channels_channel_model_0 id: channels_channel_model parameters: @@ -356,7 +423,7 @@ blocks: alias: '' comment: '' delays: (0,1.8) - fDTs: ((4*carrier_freq)/(3*10e8))/samp_rate + fDTs: ((2*carrier_freq)/(3*10e8))/samp_rate mags: (1,0.12) maxoutbuf: '0' minoutbuf: '0' @@ -475,7 +542,7 @@ blocks: affinity: '' alias: '' comment: '' - vgl: testvec + list(np.zeros(4)) + vgl: list(np.zeros(frame_len)) vlen: frame_len states: bus_sink: false @@ -490,8 +557,8 @@ blocks: affinity: '' alias: '' comment: '' - fname: '' - frame_obj: '' + fname: ./lena512color.png + frame_obj: frame maxoutbuf: '0' minoutbuf: '0' states: @@ -717,7 +784,7 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [1240, 828.0] + coordinate: [552, 852.0] rotation: 0 state: disabled - name: qtgui_time_sink_x_0 @@ -827,9 +894,9 @@ blocks: bus_sink: false bus_source: false bus_structure: null - coordinate: [928, 428.0] + coordinate: [1104, 428.0] rotation: 0 - state: true + state: enabled - name: virtual_sink_1 id: virtual_sink parameters: @@ -900,10 +967,13 @@ connections: - [analog_random_source_x_0, '0', blocks_stream_mux_0, '1'] - [blocks_complex_to_mag_0, '0', fadingui_netsink_0_0, '0'] - [blocks_complex_to_mag_0, '0', qtgui_time_sink_x_0, '0'] +- [blocks_null_source_0, '0', blocks_stream_mux_1, '0'] - [blocks_repack_bits_bb_0, '0', blocks_stream_to_vector_0, '0'] - [blocks_stream_mux_0, '0', digital_constellation_modulator_0, '0'] +- [blocks_stream_mux_1, '0', virtual_sink_0, '0'] - [blocks_stream_to_vector_0, '0', fadingui_ber_0, '0'] - [blocks_tagged_stream_align_0, '0', blocks_repack_bits_bb_0, '0'] +- [blocks_throttle_0, '0', blocks_stream_mux_1, '1'] - [blocks_throttle_0, '0', virtual_sink_0, '0'] - [blocks_vector_source_x_0, '0', blocks_stream_mux_0, '0'] - [channels_channel_model_0, '0', channels_selective_fading_model_0, '0'] @@ -918,11 +988,11 @@ connections: - [digital_corr_est_cc_0, '1', blocks_complex_to_mag_0, '0'] - [digital_pfb_clock_sync_xxx_0, '0', digital_cma_equalizer_cc_0, '0'] - [digital_pfb_clock_sync_xxx_0, '0', fadingui_netsink_4, '0'] +- [digital_pfb_clock_sync_xxx_0, '0', qtgui_const_sink_x_0, '0'] - [fadingui_datasource_0, '0', digital_constellation_modulator_0, '0'] - [fadingui_multipath_fading_0, '0', fadingui_netsink_0, '0'] - [fadingui_multipath_fading_0, '0', virtual_sink_1, '0'] - [fadingui_phasecorrection_0, '0', fadingui_netsink_3, '0'] -- [fadingui_phasecorrection_0, '0', qtgui_const_sink_x_0, '0'] - [fadingui_phasecorrection_0, '0', virtual_sink_2, '0'] - [virtual_source_0, '0', digital_constellation_decoder_cb_0, '0'] - [virtual_source_1, '0', digital_pfb_clock_sync_xxx_0, '0'] diff --git a/flowgraphs/qpsk_sim.py b/flowgraphs/qpsk_sim.py index 63d8a6e..cb9315b 100755 --- a/flowgraphs/qpsk_sim.py +++ b/flowgraphs/qpsk_sim.py @@ -52,7 +52,7 @@ class qpsk_sim(gr.top_block): self.fadingui_netsink_1 = fadingui.netsink(address='udp://localhost:31418', dtype="complex", vlen=1) self.fadingui_netsink_0_0 = fadingui.netsink(address='udp://localhost:31415', dtype="float", vlen=1) self.fadingui_netsink_0 = fadingui.netsink(address='udp://localhost:31416', dtype="complex", vlen=1) - self.fadingui_ber_0 = fadingui.ber(vgl=testvec + list(np.zeros(4)), vlen=frame_len,address='udp://localhost:31420') + self.fadingui_ber_0 = fadingui.ber(vgl=list(np.zeros(frame_len)), vlen=frame_len,address='udp://localhost:31420') self.digital_pfb_clock_sync_xxx_0 = digital.pfb_clock_sync_ccf(sps, 2 * np.pi / 100, rrc_taps, 32, 16, 1.5, 1) self.digital_corr_est_cc_0 = digital.corr_est_cc(access_code_symbols, 1, len(access_code_symbols) // 2, 0.9, digital.THRESHOLD_ABSOLUTE) self.digital_constellation_modulator_0 = digital.generic_mod( @@ -65,7 +65,7 @@ class qpsk_sim(gr.top_block): log=False) self.digital_constellation_decoder_cb_0 = digital.constellation_decoder_cb(qpsk_const) self.digital_cma_equalizer_cc_0 = digital.cma_equalizer_cc(15, 1, 2e-3, 1) - self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, ((4*carrier_freq)/(3*10e8))/samp_rate, False, 4.0, 21, (0,1.8), (1,0.12), 8 ) + self.channels_selective_fading_model_0 = channels.selective_fading_model( 8, ((2*carrier_freq)/(3*10e8))/samp_rate, False, 4.0, 21, (0,1.8), (1,0.12), 8 ) self.channels_channel_model_0 = channels.channel_model( noise_voltage=100e-3, frequency_offset=2e-3, @@ -145,7 +145,7 @@ class qpsk_sim(gr.top_block): def set_samp_rate(self, samp_rate): self.samp_rate = samp_rate self.blocks_throttle_0.set_sample_rate(self.samp_rate) - self.channels_selective_fading_model_0.set_fDTs(((4*self.carrier_freq)/(3*10e8))/self.samp_rate) + self.channels_selective_fading_model_0.set_fDTs(((2*self.carrier_freq)/(3*10e8))/self.samp_rate) def get_rrc_taps(self): return self.rrc_taps @@ -171,7 +171,7 @@ class qpsk_sim(gr.top_block): def set_carrier_freq(self, carrier_freq): self.carrier_freq = carrier_freq - self.channels_selective_fading_model_0.set_fDTs(((4*self.carrier_freq)/(3*10e8))/self.samp_rate) + self.channels_selective_fading_model_0.set_fDTs(((2*self.carrier_freq)/(3*10e8))/self.samp_rate) def get_access_code_symbols(self): return self.access_code_symbols diff --git a/src/gr-fadingui/python/netsink.py b/src/gr-fadingui/python/netsink.py index 06e376c..8851fe9 100644 --- a/src/gr-fadingui/python/netsink.py +++ b/src/gr-fadingui/python/netsink.py @@ -3,12 +3,16 @@ # # Copyright 2021 Sara Cinzia Halter, Naoki Pross. +import os import socket from urllib.parse import urlparse import numpy as np from gnuradio import gr +from fadingui.logger import get_logger +log = get_logger("netsink") + class netsink(gr.sync_block): """ Sink that sends the data over the network using UDP. @@ -26,7 +30,6 @@ class netsink(gr.sync_block): dt = to_numpy[dtype] if vlen > 1: dt = np.dtype(dt, (vlen,)) - print(dt) gr.sync_block.__init__(self, name="Network Sink", @@ -34,9 +37,28 @@ class netsink(gr.sync_block): out_sig=None) # Create a socket and parse remote machine url - self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) self.url = urlparse(address) - self.srv = (self.url.hostname, self.url.port) + self.srv = None + + if self.url.scheme == "udp": + log.debug(f"Creating UDP socket to {self.srv}") + self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + self.srv = (self.url.hostname, self.url.port) + self.socket.connect(self.srv) + + elif self.url.scheme == "file": + log.debug(f"Creating UNIX file socket to {self.url.path}") + self.socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) + self.srv = self.url.path + try: + self.socket.connect(self.srv) + except FileNotFoundError: + log.error("Cannot find socket file, is the server (GUI) running?") + raise + + else: + raise NotImplemented + def send(self, data): """ @@ -46,7 +68,11 @@ class netsink(gr.sync_block): @return Number of bytes that were actually sent """ assert type(data) == bytes - return self.socket.sendto(data, self.srv) + try: + return self.socket.sendto(data, self.srv) + except socket.error as err: + log.warn(f"No data was sent: {err}") + return 0 def encode(self, data): """ @@ -62,7 +88,7 @@ class netsink(gr.sync_block): def work(self, input_items, output_items): # send only every k-th sample - inp = input_items[0][::3] + inp = input_items[0][::2] inp_len = len(inp) blocksize = 1024 diff --git a/src/gui/gui.py b/src/gui/gui.py index 9ac69f7..7e2357b 100755 --- a/src/gui/gui.py +++ b/src/gui/gui.py @@ -39,14 +39,60 @@ show_demo() show_debug() #================================================ +# Globl variables + +# Network Plots +time_plot = net.network_plot(url="udp://localhost:31415", dtype=float, \ + nsamples=500, tag="time_plot", label="Time plot") +channel_plot = net.network_constellation_plot(url="udp://localhost:31416", \ + nsamples=512, tag="channel_plot", label="Channel") +synchronized_plot = net.network_constellation_plot(url="udp://localhost:31417", \ + nsamples=512, tag="synchronized_plot", label="Synchronized") +equalized_plot = net.network_constellation_plot(url="udp://localhost:31418", \ + nsamples=512, tag="equalized_plot", label="Equalized") +locked_plot = net.network_constellation_plot(url="udp://localhost:31419", \ + nsamples=512, tag="locked_plot", label="Locked") + +constellation_plots = [channel_plot, synchronized_plot, equalized_plot, locked_plot] +network_plots = [time_plot] + constellation_plots + +const_plots_start = (800, 25) +const_plot_win_width = 560 +const_plot_win_height = 560 + +# size of the plot windows +plot_window_sizes = { + time_plot: (800, 400), + channel_plot: (const_plot_win_width, const_plot_win_height), + synchronized_plot: (const_plot_win_width, const_plot_win_height), + equalized_plot: (const_plot_win_width, const_plot_win_height), + locked_plot: (const_plot_win_width, const_plot_win_height), +} + +# Where to place the network plot windows +plot_window_positions = { + time_plot: (0, 425), + channel_plot: (const_plots_start), + synchronized_plot: (const_plots_start[0] + const_plot_win_width, \ + const_plots_start[1]), + equalized_plot: (const_plots_start[0], \ + const_plots_start[1] + const_plot_win_height), + locked_plot: (const_plots_start[0] + const_plot_win_width, \ + const_plots_start[1] + const_plot_win_height), +} + +# Wheter contellation plots axes are locked +plots_locked = True + +#================================================ # Set up theme and looks # Font -# with font_registry(): -# # first argument ids the path to the .ttf or .otf file -# default_font = add_font("NotoSerifCJKjp-Medium.otf", 20) -# second_font = add_font("NotoSerifCJKjp-Medium.otf", 10) -# test = add_font("NotoSerifCJKjp-Medium.otf", 30) +with font_registry(): + # first argument ids the path to the .ttf or .otf file + default_font = add_font("res/ttf/Hack-Regular.ttf", 20) + # second_font = add_font("NotoSerifCJKjp-Medium.otf", 10) + # test = add_font("NotoSerifCJKjp-Medium.otf", 30) # Constellation diagrams with theme(tag="constellation_series_theme"): @@ -62,50 +108,59 @@ with theme(tag="constellation_series_theme"): def exit(sender, data): stop_dearpygui() -# Flow graph window -def on_rx_node_link(sender, app_data): - link_id_1, link_id_2 = app_data - add_node_link(link_id_1, link_id_2, parent=sender) - -def on_rx_node_delink(sender, app_data): - link_id = app_data - # do nothing - # delete_item(link_id) - -# add and load images -def add_and_load_image(image_path): - width, height, channels, data = load_image(image_path) - - with texture_registry() as reg_id: - texture_id = add_static_texture(width, height, data, parent=reg_id) - - return add_image(texture_id) - - #================================================ # Primary Window with window(tag="primary_window"): # Grössere Schrifftart/ Grösse für das ganze Dokument definiert - # bind_font(default_font) + bind_font(default_font) with menu_bar(): with menu(label="Settings"): - add_menu_item(label="Toggle Fullscreen",callback=toggle_viewport_fullscreen) - add_menu_item(label="Minimize",callback=minimize_viewport) - add_menu_item(label="Close", callback=exit) + add_menu_item(label="Toggle Fullscreen", callback=toggle_viewport_fullscreen) + add_menu_item(label="Minimize", callback=minimize_viewport) + add_menu_item(label="Close", callback=exit, tag="menu_settings_close") with theme(tag="close"): with theme_component(): add_theme_color(mvThemeCol_Text,(255, 64, 64)) add_theme_style(mvStyleVar_Alpha, 5) - bind_item_theme(last_item(),"close") + bind_item_theme("menu_settings_close", "close") + + with menu(label="Windows"): + def restore_windows(): + global plot_window_sizes, plot_window_positions + + for plot in network_plots: + configure_item(plot.window_tag, + width=plot_window_sizes[plot][0], + height=plot_window_sizes[plot][1], + pos=plot_window_positions[plot]) + + add_menu_item(label="Restore Default Positions", callback=restore_windows) + + def unlock_plots(): + global plots_locked + if plots_locked: + for plot in constellation_plots: + set_axis_limits_auto(plot.xaxis_tag) + set_axis_limits_auto(plot.yaxis_tag) + else: + for plot in constellation_plots: + set_axis_limits(plot.xaxis_tag, -2, 2) + set_axis_limits(plot.yaxis_tag, -2, 2) + + plots_locked = not plots_locked + + add_menu_item(label="Unlocked plots", callback=unlock_plots, check=True) + + #================================================ # Flow Graph Window with window(label="RX DSP Flow Graph", width=800, height=400, pos=(0,25), tag="rx_win"): - with node_editor(callback=on_rx_node_link, delink_callback=on_rx_node_delink): + with node_editor(): with node(label="USRP Source", pos=(20,100)): with node_attribute(tag="src_out", attribute_type=mvNode_Attr_Output): add_text("Signal from antenna") @@ -139,118 +194,59 @@ with window(label="RX DSP Flow Graph", width=800, height=400, pos=(0,25), tag="r #================================================ # Network plots -time_plot = net.network_plot(url="udp://localhost:31415", dtype=float, \ - nsamples=500, tag="time_plot", label="Time plot") -channel_plot = net.network_constellation_plot(url="udp://localhost:31416", \ - nsamples=200, tag="channel_plot", label="Channel") -synchronized_plot = net.network_constellation_plot(url="udp://localhost:31417", \ - nsamples=200, tag="synchronized_plot", label="Synchronized") -equalized_plot = net.network_constellation_plot(url="udp://localhost:31418", \ - nsamples=200, tag="equalized_plot", label="Equalized") -locked_plot = net.network_constellation_plot(url="udp://localhost:31419", \ - nsamples=200, tag="locked_plot", label="Locked") - -network_plots = { - time_plot: "time_plot_series", - channel_plot: "channel_plot_series", - synchronized_plot: "synchronized_plot_series", - equalized_plot: "equalized_plot_series", - locked_plot: "locked_plot_series", -} - -with window(label="Time domain", width=800, height=350, pos=(0,425)): +def make_constellation_plot_window(plot, label): + with window(label=label, no_collapse=True, no_close=True, \ + width=plot_window_sizes[plot][0], \ + height=plot_window_sizes[plot][1], \ + pos=plot_window_positions[plot], \ + tag=plot.window_tag): + with plot: + # Fit to width of window + configure_item(plot.tag, width=-1, height=-1) + + # Create and configure axis + add_plot_axis(mvXAxis, label="In-Phase", tag=plot.xaxis_tag) + add_plot_axis(mvYAxis, label="Quadrature", tag=plot.yaxis_tag) + + add_plot_legend() + set_axis_limits(plot.xaxis_tag, -2, 2) + set_axis_limits(plot.yaxis_tag, -2, 2) + + # Add series from network + add_scatter_series(plot.xdata, plot.ydata, \ + label=label, parent=plot.xaxis_tag, tag=plot.series_tag) + bind_item_theme(plot.series_tag, "constellation_series_theme") + +make_constellation_plot_window(channel_plot, "Channel") +make_constellation_plot_window(synchronized_plot, "Synchronized") +make_constellation_plot_window(equalized_plot, "Equalized") +make_constellation_plot_window(locked_plot, "Locked") + +with window(label="Time domain", width=800, height=400, pos=(0,425), tag=time_plot.window_tag): with time_plot: - configure_item("time_plot", width=-1, height=-1) - - add_plot_axis(mvXAxis, label="Time", tag="xaxis_time") - add_plot_axis(mvYAxis, label="Amplitude", tag="yaxis_time") - add_line_series(time_plot.xdata, time_plot.ydata, parent="yaxis_time", tag=network_plots[time_plot]) - -with window(label="Channel", width=560, height=400, pos=(800,25)): - with channel_plot: - configure_item("channel_plot", width=-1, height=-1) - - add_plot_axis(mvXAxis, label="In-Phase", tag="inphase_channel") - add_plot_axis(mvYAxis, label="Quadrature", tag="quadrature_channel") - - add_plot_legend() - set_axis_limits("inphase_channel", -2.5, 2.5) - set_axis_limits("quadrature_channel", -2.5, 2.5) - - series_tag = network_plots[channel_plot] - add_scatter_series(channel_plot.xdata, channel_plot.ydata, \ - label = "Channel", parent="inphase_channel", tag=series_tag) - bind_item_theme(series_tag, "constellation_series_theme") - -with window(label="Synchronized", width=560, height=400, pos=(1360,25)): - with synchronized_plot: - configure_item("synchronized_plot", width=-1, height=-1) + configure_item(time_plot.tag, width=-1, height=-1) - add_plot_axis(mvXAxis, label="In-Phase", tag="inphase_synchronized") - add_plot_axis(mvYAxis, label="Quadrature", tag="quadrature_synchronized") - - add_plot_legend() - set_axis_limits("inphase_synchronized", -2.5, 2.5) - set_axis_limits("quadrature_synchronized", -2.5, 2.5) - - series_tag = network_plots[synchronized_plot] - add_scatter_series(synchronized_plot.xdata, synchronized_plot.ydata, \ - label="Synchronized", parent="inphase_synchronized", tag=series_tag) - bind_item_theme(series_tag, "constellation_series_theme") - -with window(label="Equalized", width=560, height=400, pos=(800,425)): - with equalized_plot: - configure_item("equalized_plot", width=-1, height=-1) - - add_plot_legend() - add_plot_axis(mvXAxis, label="In-Phase", tag="inphase_equalized") - add_plot_axis(mvYAxis, label="Quadrature", tag="quadrature_equalized") - - add_plot_legend() - set_axis_limits("inphase_equalized", -1.5, 1.5) - set_axis_limits("quadrature_equalized", -1.5, 1.5) - - series_tag = network_plots[equalized_plot] - add_scatter_series(equalized_plot.xdata, equalized_plot.ydata, \ - label="Equalized", parent="inphase_equalized", tag=series_tag) - bind_item_theme(series_tag, "constellation_series_theme") - -with window(label="Locked", width=560, height=400, pos=(1360,425)): - with locked_plot: - configure_item("locked_plot", width=-1, height=-1) - - add_plot_legend() - add_plot_axis(mvXAxis, label="In-Phase", tag="inphase_locked") - add_plot_axis(mvYAxis, label="Quadrature", tag="quadrature_locked") - - add_plot_legend() - set_axis_limits("inphase_locked", -1.5, 1.5) - set_axis_limits("quadrature_locked", -1.5, 1.5) - - series_tag = network_plots[locked_plot] - add_scatter_series(locked_plot.xdata, locked_plot.ydata, \ - label="Locked", parent="inphase_locked", tag=series_tag) - bind_item_theme(series_tag, "constellation_series_theme") + add_plot_axis(mvXAxis, label="Time", tag=time_plot.xaxis_tag) + add_plot_axis(mvYAxis, label="Amplitude", tag=time_plot.yaxis_tag) + add_line_series(time_plot.xdata, time_plot.ydata, parent=time_plot.xaxis_tag, tag=time_plot.series_tag) #================================================ # Bit Error Rate Window #TO DO:BER von GNU Radio anzeigen -with theme(tag= "ber_window"): +with theme(tag="ber_window"): with theme_component(mvAll): add_theme_style(mvStyleVar_WindowTitleAlign, 0.5) add_theme_style(mvStyleVar_WindowRounding, 5) add_theme_style(mvStyleVar_WindowBorderSize, 1)#Rad ein und aus Schalten -with window(label="Bit Error Rate ", width=300, height=150, pos=(1200,875), no_title_bar = True, no_move=True, no_collapse= True) as ber_window : - - add_text("The Bit Error Rate is:", pos=(35,10)) - - with theme(tag= "button_ber"): +with window(label="Bit Error Rate ", width=300, height=150, pos=(200,875)) as ber_window: + add_text("The Bit Error Rate is:") + with theme(tag="button_ber"): with theme_component(mvButton): - add_theme_color(mvThemeCol_Button,(135, 206, 255))#Blau - add_theme_color(mvThemeCol_Text,(0,0,0))#Schwarz + add_theme_color(mvThemeCol_Button,(135, 206, 255)) #Blau + add_theme_color(mvThemeCol_Text,(0,0,0)) #Schwarz add_theme_style(mvStyleVar_FrameRounding, 5) add_button(label="BER", height=60, width=-1, tag="ber_value") @@ -267,8 +263,17 @@ ber_value = net.network_value(url="udp://localhost:31420", dtype=float, refresh_ #================================================ # Picture Window -with window(label="Picture", width=400, height=300, pos=(0,825)) as picture_window : - add_and_load_image("lena512color.png") #TO DO Problem lösen + +# def add_and_load_image(image_path): +# width, height, channels, data = load_image(image_path) +# +# with texture_registry() as reg_id: +# texture_id = add_static_texture(width, height, data, parent=reg_id) +# +# return add_image(texture_id) +# +# with window(label="Picture", width=400, height=300, pos=(0,825)) as picture_window : +# add_and_load_image("lena512color.png") #TO DO Problem lösen #================================================ # Start GUI and main loop diff --git a/src/gui/net.py b/src/gui/net.py index f836f42..820bc84 100644 --- a/src/gui/net.py +++ b/src/gui/net.py @@ -1,3 +1,4 @@ +import os import select import socket from urllib.parse import urlparse @@ -19,13 +20,30 @@ class udpsource: self.timeout = timeout self.blocksize = blocksize + if self.url.scheme == "udp": + self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + elif self.url.scheme == "file": + try: + os.unlink(self.url.path) + except OSError: + if os.path.exists(self.url.path): + raise + + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) + else: + raise NotImplemented + def __del__(self): self.sock.close() def bind(self): self.sock.setblocking(False) - self.sock.bind((self.url.hostname, self.url.port)) - # self.sock.listen() + if self.url.scheme == "udp": + self.sock.bind((self.url.hostname, self.url.port)) + elif self.url.scheme == "file": + self.sock.bind(self.url.path) + + # self.sock.listen(1) def read(self, nblocks): # TODO: run in a separate thread (it will be painful to implement) @@ -77,7 +95,7 @@ class network_plot(udpsource): """ Wraps a udpsource while at the same time intefacing with DearPyGUI as a plot element. """ - def __init__(self, url, dtype, nsamples , **kwargs): + def __init__(self, url, dtype, nsamples, **kwargs): udpsource.__init__(self, url, dtype) self.nsamples = nsamples @@ -96,6 +114,14 @@ class network_plot(udpsource): self.yvalues.extend(np.zeros(self.nsamples)) def _init_dpg_plot(self, **kwargs): + if "tag" in kwargs: + self.tag = kwargs["tag"] + + self.series_tag = f"{self.tag}_series" + self.xaxis_tag = f"{self.tag}_xaxis" + self.yaxis_tag = f"{self.tag}_yaxis" + self.window_tag = f"window_{self.tag}" + self.plot = dpg.plot(**kwargs) # Map `with' expressions to the underlying plot diff --git a/src/gui/res/pic/lena512color.png b/src/gui/res/pic/lena512color.png Binary files differnew file mode 100644 index 0000000..7d364e0 --- /dev/null +++ b/src/gui/res/pic/lena512color.png diff --git a/src/gui/lena512color.tiff b/src/gui/res/pic/lena512color.tiff Binary files differindex ffe5c83..ffe5c83 100644 --- a/src/gui/lena512color.tiff +++ b/src/gui/res/pic/lena512color.tiff diff --git a/src/gui/res/ttf/Hack-Bold.ttf b/src/gui/res/ttf/Hack-Bold.ttf Binary files differnew file mode 100644 index 0000000..7ff4975 --- /dev/null +++ b/src/gui/res/ttf/Hack-Bold.ttf diff --git a/src/gui/res/ttf/Hack-BoldItalic.ttf b/src/gui/res/ttf/Hack-BoldItalic.ttf Binary files differnew file mode 100644 index 0000000..3b137d9 --- /dev/null +++ b/src/gui/res/ttf/Hack-BoldItalic.ttf diff --git a/src/gui/res/ttf/Hack-Italic.ttf b/src/gui/res/ttf/Hack-Italic.ttf Binary files differnew file mode 100644 index 0000000..d26198a --- /dev/null +++ b/src/gui/res/ttf/Hack-Italic.ttf diff --git a/src/gui/res/ttf/Hack-Regular.ttf b/src/gui/res/ttf/Hack-Regular.ttf Binary files differnew file mode 100644 index 0000000..92a90cb --- /dev/null +++ b/src/gui/res/ttf/Hack-Regular.ttf |