From 27f54cb643a0105c2035284afd274865bd9e3238 Mon Sep 17 00:00:00 2001
From: Ron Economos <w6rz@comcast.net>
Date: Wed, 13 May 2020 00:32:12 -0700
Subject: [PATCH] gr-uhd: Fix Parameter block errors in GRC examples.

---
 gr-uhd/examples/grc/uhd_const_wave.grc        | 24 +++----
 gr-uhd/examples/grc/uhd_fft.grc               | 67 +++++++++----------
 gr-uhd/examples/grc/uhd_two_tone_loopback.grc | 50 +++++++-------
 3 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/gr-uhd/examples/grc/uhd_const_wave.grc b/gr-uhd/examples/grc/uhd_const_wave.grc
index d24475acf82..4a752ee035a 100644
--- a/gr-uhd/examples/grc/uhd_const_wave.grc
+++ b/gr-uhd/examples/grc/uhd_const_wave.grc
@@ -1,6 +1,7 @@
 options:
   parameters:
     author: Example
+    catch_exceptions: 'True'
     category: Custom
     cmake_opt: ''
     comment: ''
@@ -22,12 +23,11 @@ options:
     sizing_mode: fixed
     thread_safe_setters: ''
     title: UHD Constant Wave
-    window_size: 1280, 1024
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [10, 9]
+    coordinate: [8, 12.0]
     rotation: 0
     state: enabled
 
@@ -50,7 +50,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [170, 314]
+    coordinate: [168, 292.0]
     rotation: 0
     state: enabled
 - name: tun_freq
@@ -71,7 +71,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [31, 317]
+    coordinate: [32, 292.0]
     rotation: 0
     state: enabled
 - name: tun_gain
@@ -92,7 +92,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [302, 307]
+    coordinate: [304, 292.0]
     rotation: 0
     state: enabled
 - name: address
@@ -104,12 +104,12 @@ blocks:
     label: IP Address
     short_id: a
     type: ''
-    value: addr=192.168.10.2
+    value: '"addr=192.168.10.2"'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [188, 12]
+    coordinate: [184, 12.0]
     rotation: 0
     state: enabled
 - name: analog_const_source_x_0
@@ -126,7 +126,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [80, 220.0]
+    coordinate: [64, 204.0]
     rotation: 0
     state: enabled
 - name: freq
@@ -143,7 +143,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [468, 14]
+    coordinate: [456, 12.0]
     rotation: 0
     state: enabled
 - name: gain
@@ -160,7 +160,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [616, 13]
+    coordinate: [608, 12.0]
     rotation: 0
     state: enabled
 - name: samp_rate
@@ -177,7 +177,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [342, 14]
+    coordinate: [336, 12.0]
     rotation: 0
     state: enabled
 - name: uhd_usrp_sink_0
@@ -453,7 +453,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [312, 164.0]
+    coordinate: [304, 148.0]
     rotation: 0
     state: enabled
 
diff --git a/gr-uhd/examples/grc/uhd_fft.grc b/gr-uhd/examples/grc/uhd_fft.grc
index 5e59f61f3b7..f7808f4a99a 100644
--- a/gr-uhd/examples/grc/uhd_fft.grc
+++ b/gr-uhd/examples/grc/uhd_fft.grc
@@ -23,12 +23,11 @@ options:
     sizing_mode: fixed
     thread_safe_setters: ''
     title: UHD FFT
-    window_size: 1280, 1024
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [-1, -3]
+    coordinate: [8, 4.0]
     rotation: 0
     state: enabled
 
@@ -60,7 +59,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [664, 435]
+    coordinate: [704, 220.0]
     rotation: 0
     state: enabled
 - name: chan0_lo_locked
@@ -76,9 +75,9 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [888, 131]
+    coordinate: [880, 132.0]
     rotation: 0
-    state: enabled
+    state: disabled
 - name: current_freq_c
   id: variable_function_probe
   parameters:
@@ -92,9 +91,9 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [888, 267]
+    coordinate: [880, 252.0]
     rotation: 0
-    state: enabled
+    state: disabled
 - name: freq_c
   id: variable_qtgui_entry
   parameters:
@@ -107,7 +106,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [528, 347]
+    coordinate: [304, 220.0]
     rotation: 0
     state: enabled
 - name: gain_
@@ -128,7 +127,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [656, 211]
+    coordinate: [584, 220.0]
     rotation: 0
     state: enabled
 - name: lo_locked_probe
@@ -144,9 +143,9 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [528, 435]
+    coordinate: [880, 372.0]
     rotation: 0
-    state: enabled
+    state: disabled
 - name: samp_rate_
   id: variable_qtgui_entry
   parameters:
@@ -159,7 +158,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [680, 347]
+    coordinate: [456, 220.0]
     rotation: 0
     state: enabled
 - name: uhd_version_info
@@ -175,7 +174,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [536, 131]
+    coordinate: [456, 132.0]
     rotation: 0
     state: enabled
 - name: usrp_device_info
@@ -191,7 +190,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [712, 131]
+    coordinate: [632, 132.0]
     rotation: 0
     state: enabled
 - name: antenna
@@ -203,12 +202,12 @@ blocks:
     label: Antenna
     short_id: A
     type: ''
-    value: RX2
+    value: '"RX2"'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [792, 3]
+    coordinate: [784, 4.0]
     rotation: 0
     state: enabled
 - name: args
@@ -220,12 +219,12 @@ blocks:
     label: UHD device address args
     short_id: a
     type: ''
-    value: ''
+    value: '""'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [176, -5]
+    coordinate: [176, 4.0]
     rotation: 0
     state: enabled
 - name: display
@@ -259,7 +258,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [6, 178]
+    coordinate: [8, 180.0]
     rotation: 0
     state: enabled
 - name: fft_size
@@ -276,7 +275,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1104, -5]
+    coordinate: [1104, 4.0]
     rotation: 0
     state: enabled
 - name: freq
@@ -293,7 +292,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [478, 0]
+    coordinate: [464, 4.0]
     rotation: 0
     state: enabled
 - name: gain
@@ -310,7 +309,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [632, 3]
+    coordinate: [616, 4.0]
     rotation: 0
     state: enabled
 - name: import_0
@@ -323,7 +322,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [4, 105]
+    coordinate: [8, 124.0]
     rotation: 0
     state: enabled
 - name: qtgui_freq_sink_x_0
@@ -403,7 +402,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [56, 288.0]
+    coordinate: [64, 296.0]
     rotation: 180
     state: enabled
 - name: qtgui_time_sink_x_0
@@ -500,7 +499,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [336, 540.0]
+    coordinate: [336, 484.0]
     rotation: 0
     state: enabled
 - name: qtgui_waterfall_sink_x_0
@@ -561,7 +560,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [336, 432.0]
+    coordinate: [336, 360.0]
     rotation: 0
     state: enabled
 - name: samp_rate
@@ -578,7 +577,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [352, -5]
+    coordinate: [344, 4.0]
     rotation: 0
     state: enabled
 - name: spec
@@ -590,12 +589,12 @@ blocks:
     label: Subdev
     short_id: ''
     type: ''
-    value: ''
+    value: '""'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [888, -13]
+    coordinate: [888, 4.0]
     rotation: 0
     state: enabled
 - name: stream_args
@@ -607,12 +606,12 @@ blocks:
     label: Set additional stream args
     short_id: ''
     type: ''
-    value: ''
+    value: '""'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [176, 115]
+    coordinate: [176, 92.0]
     rotation: 0
     state: enabled
 - name: uhd_usrp_source_0
@@ -1000,7 +999,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1104, 107]
+    coordinate: [1104, 108.0]
     rotation: 0
     state: enabled
 - name: wire_format
@@ -1012,12 +1011,12 @@ blocks:
     label: Wire format
     short_id: ''
     type: ''
-    value: ''
+    value: '""'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [984, -5]
+    coordinate: [984, 4.0]
     rotation: 0
     state: enabled
 
diff --git a/gr-uhd/examples/grc/uhd_two_tone_loopback.grc b/gr-uhd/examples/grc/uhd_two_tone_loopback.grc
index 590b73c4b47..6156640f7d9 100644
--- a/gr-uhd/examples/grc/uhd_two_tone_loopback.grc
+++ b/gr-uhd/examples/grc/uhd_two_tone_loopback.grc
@@ -1,6 +1,7 @@
 options:
   parameters:
     author: Example
+    catch_exceptions: 'True'
     category: Custom
     cmake_opt: ''
     comment: ''
@@ -22,12 +23,11 @@ options:
     sizing_mode: fixed
     thread_safe_setters: ''
     title: UHD Loopback - 2 Tone
-    window_size: 1280, 1024
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1, 0]
+    coordinate: [8, 4.0]
     rotation: 0
     state: enabled
 
@@ -50,7 +50,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [0, 283]
+    coordinate: [8, 252.0]
     rotation: 0
     state: enabled
 - name: tone1
@@ -71,7 +71,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1, 131]
+    coordinate: [8, 124.0]
     rotation: 0
     state: enabled
 - name: tone2
@@ -92,7 +92,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [126, 132]
+    coordinate: [136, 124.0]
     rotation: 0
     state: enabled
 - name: tone_ampl
@@ -113,7 +113,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [152, 286]
+    coordinate: [144, 252.0]
     rotation: 0
     state: enabled
 - name: tun_freq
@@ -134,7 +134,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [80, 431]
+    coordinate: [8, 380.0]
     rotation: 0
     state: enabled
 - name: tun_rx_gain
@@ -155,7 +155,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [120, 571]
+    coordinate: [144, 380.0]
     rotation: 0
     state: enabled
 - name: tun_tx_gain
@@ -176,7 +176,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [-1, 573]
+    coordinate: [264, 380.0]
     rotation: 0
     state: enabled
 - name: address0
@@ -188,12 +188,12 @@ blocks:
     label: IP Address, Dev 0
     short_id: ''
     type: ''
-    value: addr=192.168.10.2
+    value: '"addr=192.168.10.2"'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [177, 0]
+    coordinate: [176, 4.0]
     rotation: 0
     state: enabled
 - name: address1
@@ -205,12 +205,12 @@ blocks:
     label: IP Address, Dev 1
     short_id: ''
     type: ''
-    value: addr=192.168.10.2
+    value: '"addr=192.168.10.2"'
   states:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [337, 0]
+    coordinate: [328, 4.0]
     rotation: 0
     state: enabled
 - name: analog_noise_source_x_0
@@ -229,7 +229,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [488, 396.0]
+    coordinate: [488, 388.0]
     rotation: 0
     state: enabled
 - name: analog_sig_source_x_0
@@ -251,7 +251,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [464, 140.0]
+    coordinate: [464, 132.0]
     rotation: 0
     state: enabled
 - name: analog_sig_source_x_1
@@ -273,7 +273,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [464, 268.0]
+    coordinate: [464, 260.0]
     rotation: 0
     state: enabled
 - name: blocks_add_xx
@@ -291,7 +291,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [728, 184.0]
+    coordinate: [728, 176.0]
     rotation: 0
     state: enabled
 - name: freq
@@ -308,7 +308,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [649, 0]
+    coordinate: [600, 4.0]
     rotation: 0
     state: enabled
 - name: freq_offset
@@ -325,7 +325,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [804, 0]
+    coordinate: [752, 4.0]
     rotation: 0
     state: enabled
 - name: qtgui_freq_sink_x_0
@@ -405,7 +405,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1000, 368.0]
+    coordinate: [1008, 376.0]
     rotation: 0
     state: enabled
 - name: rx_gain
@@ -422,7 +422,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [1123, 0]
+    coordinate: [1048, 4.0]
     rotation: 0
     state: enabled
 - name: samp_rate
@@ -439,7 +439,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [523, 0]
+    coordinate: [480, 4.0]
     rotation: 0
     state: enabled
 - name: tx_gain
@@ -456,7 +456,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [983, 0]
+    coordinate: [912, 4.0]
     rotation: 0
     state: enabled
 - name: uhd_usrp_sink_0
@@ -732,7 +732,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [824, 148.0]
+    coordinate: [864, 140.0]
     rotation: 0
     state: enabled
 - name: uhd_usrp_source_0
@@ -1103,7 +1103,7 @@ blocks:
     bus_sink: false
     bus_source: false
     bus_structure: null
-    coordinate: [728, 308.0]
+    coordinate: [736, 316.0]
     rotation: 0
     state: enabled