summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Morman <mormjb@gmail.com>2020-04-24 08:03:54 -0400
committerJosh Morman <mormjb@gmail.com>2020-06-04 10:05:48 -0400
commitcbdb4e084cdfe9dbb65bbaf0e55eb2e965e8d839 (patch)
tree8ef471dc542a64d6dee471461e623a296151ec2f
parent83d875ca46d14e0641957a7cf03dd6172d1a680b (diff)
qtgui: add parent parameter to make function in yaml
-rw-r--r--gr-qtgui/grc/qtgui_ber_sink_b.block.yml3
-rw-r--r--gr-qtgui/grc/qtgui_const_sink_x.block.yml3
-rw-r--r--gr-qtgui/grc/qtgui_freq_sink_x.block.yml3
-rw-r--r--gr-qtgui/grc/qtgui_histogram_sink_x.block.yml3
-rw-r--r--gr-qtgui/grc/qtgui_number_sink.block.yml3
-rw-r--r--gr-qtgui/grc/qtgui_sink_x.block.yml3
-rw-r--r--gr-qtgui/grc/qtgui_time_sink_x.block.yml3
-rw-r--r--gr-qtgui/grc/qtgui_time_sink_x.block.yml.py3
-rw-r--r--gr-qtgui/grc/qtgui_vector_sink_f.block.yml3
-rw-r--r--gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml5
10 files changed, 21 insertions, 11 deletions
diff --git a/gr-qtgui/grc/qtgui_ber_sink_b.block.yml b/gr-qtgui/grc/qtgui_ber_sink_b.block.yml
index f2b1964321..46c279719f 100644
--- a/gr-qtgui/grc/qtgui_ber_sink_b.block.yml
+++ b/gr-qtgui/grc/qtgui_ber_sink_b.block.yml
@@ -336,7 +336,8 @@ templates:
${num_curves}, #number of curves
${berminerrors}, #ensure at least
${berlimit}, #cutoff
- ${curvenames} #indiv. curve names
+ ${curvenames}, #indiv. curve names
+ None # parent
)
self.${id}.set_update_time(${update_time})
self.${id}.set_y_axis(${ymin}, ${ymax})
diff --git a/gr-qtgui/grc/qtgui_const_sink_x.block.yml b/gr-qtgui/grc/qtgui_const_sink_x.block.yml
index db1c8c9432..78cff1d1a5 100644
--- a/gr-qtgui/grc/qtgui_const_sink_x.block.yml
+++ b/gr-qtgui/grc/qtgui_const_sink_x.block.yml
@@ -409,7 +409,8 @@ templates:
qtgui.${type.fcn}(
${size}, #size
${name}, #name
- ${0 if type.startswith('msg') else nconnections} #number of inputs
+ ${0 if type.startswith('msg') else nconnections}, #number of inputs
+ None # parent
)
self.${id}.set_update_time(${update_time})
self.${id}.set_y_axis(${ymin}, ${ymax})
diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.block.yml b/gr-qtgui/grc/qtgui_freq_sink_x.block.yml
index 7950fa6a89..d7f7203206 100644
--- a/gr-qtgui/grc/qtgui_freq_sink_x.block.yml
+++ b/gr-qtgui/grc/qtgui_freq_sink_x.block.yml
@@ -405,7 +405,8 @@ templates:
${fc}, #fc
${bw}, #bw
${name}, #name
- ${ 0 if (type == 'msg_complex' or type == 'msg_float') else nconnections }
+ ${ 0 if (type == 'msg_complex' or type == 'msg_float') else nconnections },
+ None # parent
)
self.${id}.set_update_time(${update_time})
self.${id}.set_y_axis(${ymin}, ${ymax})
diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.block.yml b/gr-qtgui/grc/qtgui_histogram_sink_x.block.yml
index 1159c2733a..8d1dda6146 100644
--- a/gr-qtgui/grc/qtgui_histogram_sink_x.block.yml
+++ b/gr-qtgui/grc/qtgui_histogram_sink_x.block.yml
@@ -376,7 +376,8 @@ templates:
${xmin},
${xmax},
${name},
- ${ 0 if type.startswith('msg') else nconnections}
+ ${ 0 if type.startswith('msg') else nconnections},
+ None # parent
)
self.${id}.set_update_time(${update_time})
diff --git a/gr-qtgui/grc/qtgui_number_sink.block.yml b/gr-qtgui/grc/qtgui_number_sink.block.yml
index b672592102..ecfad56905 100644
--- a/gr-qtgui/grc/qtgui_number_sink.block.yml
+++ b/gr-qtgui/grc/qtgui_number_sink.block.yml
@@ -249,7 +249,8 @@ templates:
${type.size},
${avg},
${graph_type},
- ${nconnections}
+ ${nconnections},
+ None # parent
)
self.${id}.set_update_time(${update_time})
self.${id}.set_title(${name})
diff --git a/gr-qtgui/grc/qtgui_sink_x.block.yml b/gr-qtgui/grc/qtgui_sink_x.block.yml
index 0424769169..0fc10e53ea 100644
--- a/gr-qtgui/grc/qtgui_sink_x.block.yml
+++ b/gr-qtgui/grc/qtgui_sink_x.block.yml
@@ -120,7 +120,8 @@ templates:
${plotfreq}, #plotfreq
${plotwaterfall}, #plotwaterfall
${plottime}, #plottime
- ${plotconst} #plotconst
+ ${plotconst} #plotconst,
+ None # parent
)
self.${id}.set_update_time(1.0/${rate})
${win} = sip.wrapinstance(self.${id}.pyqwidget(), Qt.QWidget)
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.block.yml b/gr-qtgui/grc/qtgui_time_sink_x.block.yml
index e512f98e19..8287b9bfad 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.block.yml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.block.yml
@@ -1016,7 +1016,8 @@ templates:
${size}, #size
${srate}, #samp_rate
${name}, #name
- ${0 if type.startswith('msg') else nconnections} #number of inputs
+ ${0 if type.startswith('msg') else nconnections}, #number of inputs
+ None # parent
)
self.${id}.set_update_time(${update_time})
self.${id}.set_y_axis(${ymin}, ${ymax})
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py b/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py
index 05f206b958..ef87a64559 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py
+++ b/gr-qtgui/grc/qtgui_time_sink_x.block.yml.py
@@ -275,7 +275,8 @@ templates:
${size}, #size
${srate}, #samp_rate
${name}, #name
- ${0 if type.startswith('msg') else nconnections} #number of inputs
+ ${0 if type.startswith('msg') else nconnections}, #number of inputs
+ None # parent
)
self.${id}.set_update_time(${update_time})
self.${id}.set_y_axis(${ymin}, ${ymax})
diff --git a/gr-qtgui/grc/qtgui_vector_sink_f.block.yml b/gr-qtgui/grc/qtgui_vector_sink_f.block.yml
index 401957421b..0e16ff5879 100644
--- a/gr-qtgui/grc/qtgui_vector_sink_f.block.yml
+++ b/gr-qtgui/grc/qtgui_vector_sink_f.block.yml
@@ -312,7 +312,8 @@ templates:
${x_axis_label},
${y_axis_label},
${name},
- ${nconnections} # Number of inputs
+ ${nconnections}, # Number of inputs
+ None # parent
)
self.${id}.set_update_time(${update_time})
self.${id}.set_y_axis(${ymin}, ${ymax})
diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml b/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml
index 7c67dee149..dfb9e44098 100644
--- a/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml
+++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.block.yml
@@ -32,7 +32,7 @@ parameters:
hide: ${ ('part' if type == "float" or type == "msg_float" else 'all') }
- id: wintype
label: Window Type
- dtype: int
+ dtype: enum
default: firdes.WIN_BLACKMAN_hARRIS
options: [firdes.WIN_BLACKMAN_hARRIS, firdes.WIN_HAMMING, firdes.WIN_HANN, firdes.WIN_BLACKMAN,
firdes.WIN_RECTANGULAR, firdes.WIN_KAISER, firdes.WIN_FLATTOP]
@@ -266,7 +266,8 @@ templates:
${fc}, #fc
${bw}, #bw
${name}, #name
- ${ (0 if type.startswith('msg') else nconnections) } #number of inputs
+ ${ (0 if type.startswith('msg') else nconnections) }, #number of inputs
+ None # parent
)
self.${id}.set_update_time(${update_time})
self.${id}.enable_grid(${grid})