Format param replaced with width and shift in usrp blocks.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10778 221aa14e-8319-0410-a670-987f0aec2ac5

4 files changed, 76 insertions, 48 deletions

diff --git a/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml b/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
index 639737de4..b76a561b7 100644
--- a/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
@@ -9,8 +9,8 @@
 	<key>usrp_dual_sink_x</key>
 	<import>from grc_gnuradio import usrp as grc_usrp</import>
 	<make>grc_usrp.dual_sink_$(type.fcn)(which=$which)
-#if $format.eval
-self.$(id).set_format(width=$format.width, shift=$format.shift)
+#if $width.eval
+self.$(id).set_format(width=$width, shift=$shift)
 #end if
 self.$(id).set_interp_rate($interpolation)
 self.$(id).set_frequency_a($frequency_a, verbose=True)
@@ -56,23 +56,30 @@ self.$(id).set_auto_tr_b(True)
 		</option>
 	</param>
 	<param>
-		<name>Format</name>
-		<key>format</key>
+		<name>Width</name>
+		<key>width</key>
 		<value></value>
 		<type>enum</type>
-		<hide>#if $format.eval then '' else 'part'#</hide>
+		<hide>#if $width.eval then 'none' else 'part'#</hide>
 		<option>
-			<name>16 Bits (Default)</name>
+			<name>Default</name>
 			<key></key>
-			<opt>width:16</opt>
-			<opt>shift:0</opt>
 		</option>
 		<option>
-			<name>8 Bits, Shift 8</name>
-			<key>w8_s8</key>
-			<opt>width:8</opt>
-			<opt>shift:8</opt>
+			<name>16 Bits</name>
+			<key>16</key>
 		</option>
+		<option>
+			<name>8 Bits</name>
+			<key>8</key>
+		</option>
+	</param>
+	<param>
+		<name>Shift</name>
+		<key>shift</key>
+		<value>8</value>
+		<type>int</type>
+		<hide>#if $width.eval then 'none' else 'all'#</hide>
 	</param>
 	<param>
 		<name>Unit Number</name>
diff --git a/grc/data/platforms/python/blocks/usrp_dual_source_x.xml b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
index 823850b52..980d1aa8e 100644
--- a/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
@@ -9,8 +9,8 @@
 	<key>usrp_dual_source_x</key>
 	<import>from grc_gnuradio import usrp as grc_usrp</import>
 	<make>grc_usrp.dual_source_$(type.fcn)(which=$which, rx_ant_a='$rx_ant_a', rx_ant_b='$rx_ant_b')
-#if $format.eval
-self.$(id).set_format(width=$format.width, shift=$format.shift)
+#if $width.eval
+self.$(id).set_format(width=$width, shift=$shift)
 #end if
 self.$(id).set_decim_rate($decimation)
 self.$(id).set_frequency_a($frequency_a, verbose=True)
@@ -38,23 +38,30 @@ self.$(id).set_gain_b($gain_b)</make>
 		</option>
 	</param>
 	<param>
-		<name>Format</name>
-		<key>format</key>
+		<name>Width</name>
+		<key>width</key>
 		<value></value>
 		<type>enum</type>
-		<hide>#if $format.eval then '' else 'part'#</hide>
+		<hide>#if $width.eval then 'none' else 'part'#</hide>
 		<option>
-			<name>16 Bits (Default)</name>
+			<name>Default</name>
 			<key></key>
-			<opt>width:16</opt>
-			<opt>shift:0</opt>
 		</option>
 		<option>
-			<name>8 Bits, Shift 8</name>
-			<key>w8_s8</key>
-			<opt>width:8</opt>
-			<opt>shift:8</opt>
+			<name>16 Bits</name>
+			<key>16</key>
 		</option>
+		<option>
+			<name>8 Bits</name>
+			<key>8</key>
+		</option>
+	</param>
+	<param>
+		<name>Shift</name>
+		<key>shift</key>
+		<value>8</value>
+		<type>int</type>
+		<hide>#if $width.eval then 'none' else 'all'#</hide>
 	</param>
 	<param>
 		<name>Unit Number</name>
diff --git a/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
index e88fcd7e4..c183ddb9f 100644
--- a/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
@@ -9,8 +9,8 @@
 	<key>usrp_simple_sink_x</key>
 	<import>from grc_gnuradio import usrp as grc_usrp</import>
 	<make>grc_usrp.simple_sink_$(type.fcn)(which=$which, side='$side')
-#if $format.eval
-self.$(id).set_format(width=$format.width, shift=$format.shift)
+#if $width.eval
+self.$(id).set_format(width=$width, shift=$shift)
 #end if
 self.$(id).set_interp_rate($interpolation)
 self.$(id).set_frequency($frequency, verbose=True)
@@ -40,23 +40,30 @@ self.$(id).set_auto_tr(True)
 		</option>
 	</param>
 	<param>
-		<name>Format</name>
-		<key>format</key>
+		<name>Width</name>
+		<key>width</key>
 		<value></value>
 		<type>enum</type>
-		<hide>#if $format.eval then '' else 'part'#</hide>
+		<hide>#if $width.eval then 'none' else 'part'#</hide>
 		<option>
-			<name>16 Bits (Default)</name>
+			<name>Default</name>
 			<key></key>
-			<opt>width:16</opt>
-			<opt>shift:0</opt>
 		</option>
 		<option>
-			<name>8 Bits, Shift 8</name>
-			<key>w8_s8</key>
-			<opt>width:8</opt>
-			<opt>shift:8</opt>
+			<name>16 Bits</name>
+			<key>16</key>
 		</option>
+		<option>
+			<name>8 Bits</name>
+			<key>8</key>
+		</option>
+	</param>
+	<param>
+		<name>Shift</name>
+		<key>shift</key>
+		<value>8</value>
+		<type>int</type>
+		<hide>#if $width.eval then 'none' else 'all'#</hide>
 	</param>
 	<param>
 		<name>Unit Number</name>
diff --git a/grc/data/platforms/python/blocks/usrp_simple_source_x.xml b/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
index d7f5475a6..521ba91d3 100644
--- a/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
@@ -9,8 +9,8 @@
 	<key>usrp_simple_source_x</key>
 	<import>from grc_gnuradio import usrp as grc_usrp</import>
 	<make>grc_usrp.simple_source_$(type.fcn)(which=$which, side='$side', rx_ant='$rx_ant'#if $hb_filters.eval then ', no_hb=True' else ''#)
-#if $format.eval
-self.$(id).set_format(width=$format.width, shift=$format.shift)
+#if $width.eval
+self.$(id).set_format(width=$width, shift=$shift)
 #end if
 self.$(id).set_decim_rate($decimation)
 self.$(id).set_frequency($frequency, verbose=True)
@@ -34,23 +34,30 @@ self.$(id).set_gain($gain)</make>
 		</option>
 	</param>
 	<param>
-		<name>Format</name>
-		<key>format</key>
+		<name>Width</name>
+		<key>width</key>
 		<value></value>
 		<type>enum</type>
-		<hide>#if $format.eval then '' else 'part'#</hide>
+		<hide>#if $width.eval then 'none' else 'part'#</hide>
 		<option>
-			<name>16 Bits (Default)</name>
+			<name>Default</name>
 			<key></key>
-			<opt>width:16</opt>
-			<opt>shift:0</opt>
 		</option>
 		<option>
-			<name>8 Bits, Shift 8</name>
-			<key>w8_s8</key>
-			<opt>width:8</opt>
-			<opt>shift:8</opt>
+			<name>16 Bits</name>
+			<key>16</key>
 		</option>
+		<option>
+			<name>8 Bits</name>
+			<key>8</key>
+		</option>
+	</param>
+	<param>
+		<name>Shift</name>
+		<key>shift</key>
+		<value>8</value>
+		<type>int</type>
+		<hide>#if $width.eval then 'none' else 'all'#</hide>
 	</param>
 	<param>
 		<name>Unit Number</name>