diff options
author | Tom Rondeau <tom@trondeau.com> | 2014-03-15 18:54:44 +0100 |
---|---|---|
committer | Tom Rondeau <tom@trondeau.com> | 2014-03-17 16:35:46 -0400 |
commit | 1975b524c6b7ee61156cde49586bec1957022dce (patch) | |
tree | bfe3b149b5927dafb5dad45ea7a306e47c7e9197 | |
parent | 6423d40841676735f3a6087a4486aafe6a5d7dce (diff) |
qtgui: adding a 'config' tab to qtgui sinks to set display/line config options (style, width, colors, etc.)
-rw-r--r-- | gr-qtgui/grc/qtgui_const_sink_x.xml | 1609 | ||||
-rw-r--r-- | gr-qtgui/grc/qtgui_freq_sink_x.xml | 785 | ||||
-rw-r--r-- | gr-qtgui/grc/qtgui_histogram_sink_x.xml | 1475 | ||||
-rw-r--r-- | gr-qtgui/grc/qtgui_number_sink.xml | 387 | ||||
-rw-r--r-- | gr-qtgui/grc/qtgui_time_raster_x.xml | 415 | ||||
-rw-r--r-- | gr-qtgui/grc/qtgui_time_sink_x.xml | 1794 | ||||
-rw-r--r-- | gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 438 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 2 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/number_sink.h | 13 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h | 9 | ||||
-rw-r--r-- | gr-qtgui/lib/freqdisplayform.cc | 1 | ||||
-rw-r--r-- | gr-qtgui/lib/number_sink_impl.cc | 52 | ||||
-rw-r--r-- | gr-qtgui/lib/number_sink_impl.h | 13 | ||||
-rw-r--r-- | gr-qtgui/lib/numberdisplayform.cc | 44 | ||||
-rw-r--r-- | gr-qtgui/lib/timerasterdisplayform.cc | 5 |
15 files changed, 6674 insertions, 368 deletions
diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml b/gr-qtgui/grc/qtgui_const_sink_x.xml index c751c89437..52c8bde489 100644 --- a/gr-qtgui/grc/qtgui_const_sink_x.xml +++ b/gr-qtgui/grc/qtgui_const_sink_x.xml @@ -5,12 +5,12 @@ ################################################### --> <block> - <name>QT GUI Constellation Sink</name> - <key>qtgui_const_sink_x</key> - <import>from PyQt4 import Qt</import> - <import>from gnuradio import qtgui</import> - <import>import sip</import> - <make>#set $win = 'self._%s_win'%$id + <name>QT GUI Constellation Sink</name> + <key>qtgui_const_sink_x</key> + <import>from PyQt4 import Qt</import> + <import>from gnuradio import qtgui</import> + <import>import sip</import> + <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( $size, \#size $name, \#name @@ -19,89 +19,1526 @@ qtgui.$(type.fcn)( self.$(id).set_update_time($update_time) self.$(id).set_y_axis($ymin, $ymax) self.$(id).set_x_axis($xmin, $xmax) +self.$(id).enable_autoscale($autoscale) + +labels = [$label1, $label2, $label3, $label4, $label5, + $label6, $label7, $label8, $label9] +widths = [$width1, $width2, $width3, $width4, $width5, + $width6, $width7, $width8, $width9] +colors = [$color1, $color2, $color3, $color4, $color5, + $color6, $color7, $color8, $color9] +styles = [$style1, $style2, $style3, $style4, $style5, + $style6, $style7, $style8, $style9] +markers = [$marker1, $marker2, $marker3, $marker4, $marker5, + $marker6, $marker7, $marker8, $marker9] +alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5, + $alpha6, $alpha7, $alpha8, $alpha9] +for i in xrange($nconnections): + if len(labels[i]) == 0: + self.$(id).set_line_label(i, "Data {0}".format(i)) + else: + self.$(id).set_line_label(i, labels[i]) + self.$(id).set_line_width(i, widths[i]) + self.$(id).set_line_color(i, colors[i]) + self.$(id).set_line_style(i, styles[i]) + self.$(id).set_line_marker(i, markers[i]) + self.$(id).set_line_alpha(i, alphas[i]) + self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> - <callback>set_resize($width, $height)</callback> - <callback>set_update_time($update_time)</callback> - <callback>set_title($which, $title)</callback> - <callback>set_color($which, $color)</callback> - <param> - <name>Type</name> - <key>type</key> - <value>complex</value> - <type>enum</type> - <option><name>Complex</name><key>complex</key><opt>fcn:const_sink_c</opt></option> -<!-- <option><name>Float</name><key>float</key><opt>fcn:const_sink_f</opt></option> --> - </param> - <param> - <name>Name</name> - <key>name</key> - <value>QT GUI Plot</value> - <type>string</type> - </param> - <param> - <name>Number of Points</name> - <key>size</key> - <value>1024</value> - <type>int</type> - </param> - <param> - <name>Y min</name> - <key>ymin</key> - <value>-2</value> - <type>real</type> - <hide>part</hide> - </param> - <param> - <name>Y max</name> - <key>ymax</key> - <value>2</value> - <type>real</type> - <hide>part</hide> - </param> - <param> - <name>X min</name> - <key>xmin</key> - <value>-2</value> - <type>real</type> - <hide>part</hide> - </param> - <param> - <name>X max</name> - <key>xmax</key> - <value>2</value> - <type>real</type> - <hide>part</hide> - </param> - <param> - <name>Number of Inputs</name> - <key>nconnections</key> - <value>1</value> - <type>int</type> - <hide>part</hide> - </param> - <param> - <name>Update Period</name> - <key>update_time</key> - <value>0.10</value> - <type>real</type> - <hide>part</hide> - </param> - <param> - <name>GUI Hint</name> - <key>gui_hint</key> - <value></value> - <type>gui_hint</type> - <hide>part</hide> - </param> - <sink> - <name>in</name> - <type>$type</type> - <nports>$nconnections</nports> - </sink> - <doc> + <callback>set_resize($width, $height)</callback> + <callback>set_update_time($update_time)</callback> + <callback>set_title($which, $title)</callback> + <callback>set_color($which, $color)</callback> + + <param> + <name>Type</name> + <key>type</key> + <value>complex</value> + <type>enum</type> + <option><name>Complex</name><key>complex</key><opt>fcn:const_sink_c</opt></option> +<!--<option><name>Float</name><key>float</key><opt>fcn:const_sink_f</opt></option> --> + </param> + <param> + <name>Name</name> + <key>name</key> + <value>QT GUI Plot</value> + <type>string</type> + </param> + <param> + <name>Number of Points</name> + <key>size</key> + <value>1024</value> + <type>int</type> + </param> + + <param> + <name>Autoscale</name> + <key>autoscale</key> + <value>False</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> + <name>Y min</name> + <key>ymin</key> + <value>-2</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>Y max</name> + <key>ymax</key> + <value>2</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>X min</name> + <key>xmin</key> + <value>-2</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>X max</name> + <key>xmax</key> + <value>2</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>Number of Inputs</name> + <key>nconnections</key> + <value>1</value> + <type>int</type> + <hide>part</hide> + </param> + <param> + <name>Update Period</name> + <key>update_time</key> + <value>0.10</value> + <type>real</type> + <hide>part</hide> + </param> + <param> + <name>GUI Hint</name> + <key>gui_hint</key> + <value></value> + <type>gui_hint</type> + <hide>part</hide> + </param> + + <param> + <name>Line 1 Label</name> + <key>label1</key> + <type>string</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Width</name> + <key>width1</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Color</name> + <key>color1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Style</name> + <key>style1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Marker</name> + <key>marker1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Alpha</name> + <key>alpha1</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 2 Label</name> + <key>label2</key> + <type>string</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Width</name> + <key>width2</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Color</name> + <key>color2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Style</name> + <key>style2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Marker</name> + <key>marker2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Alpha</name> + <key>alpha2</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 3 Label</name> + <key>label3</key> + <type>string</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Width</name> + <key>width3</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Color</name> + <key>color3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Style</name> + <key>style3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Marker</name> + <key>marker3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Alpha</name> + <key>alpha3</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 4 Label</name> + <key>label4</key> + <type>string</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Width</name> + <key>width4</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Color</name> + <key>color4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Style</name> + <key>style4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Marker</name> + <key>marker4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Alpha</name> + <key>alpha4</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 5 Label</name> + <key>label5</key> + <type>string</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Width</name> + <key>width5</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Color</name> + <key>color5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Style</name> + <key>style5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Marker</name> + <key>marker5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Alpha</name> + <key>alpha5</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 6 Label</name> + <key>label6</key> + <type>string</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Width</name> + <key>width6</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Color</name> + <key>color6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Style</name> + <key>style6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Marker</name> + <key>marker6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Alpha</name> + <key>alpha6</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 7 Label</name> + <key>label7</key> + <type>string</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Width</name> + <key>width7</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Color</name> + <key>color7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Style</name> + <key>style7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Marker</name> + <key>marker7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Alpha</name> + <key>alpha7</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 8 Label</name> + <key>label8</key> + <type>string</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Width</name> + <key>width8</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Color</name> + <key>color8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Style</name> + <key>style8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Marker</name> + <key>marker8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Alpha</name> + <key>alpha8</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 9 Label</name> + <key>label9</key> + <type>string</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Width</name> + <key>width9</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Color</name> + <key>color9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Style</name> + <key>style9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>0</key> + </option> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Marker</name> + <key>marker9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <option> + <name>None</name> + <key>-1</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Alpha</name> + <key>alpha9</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <sink> + <name>in</name> + <type>$type</type> + <nports>$nconnections</nports> + </sink> + <doc> The GUI hint can be used to position the widget within the application. \ The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \ Both the tab specification and the grid position are optional. - </doc> + </doc> </block> diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml b/gr-qtgui/grc/qtgui_freq_sink_x.xml index 6a61a05e0f..a9315c1128 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.xml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml @@ -5,13 +5,13 @@ ################################################### --> <block> - <name>QT GUI Frequency Sink</name> - <key>qtgui_freq_sink_x</key> - <import>from PyQt4 import Qt</import> - <import>from gnuradio import qtgui</import> - <import>from gnuradio.filter import firdes</import> - <import>import sip</import> - <make>#set $win = 'self._%s_win'%$id + <name>QT GUI Frequency Sink</name> + <key>qtgui_freq_sink_x</key> + <import>from PyQt4 import Qt</import> + <import>from gnuradio import qtgui</import> + <import>from gnuradio.filter import firdes</import> + <import>import sip</import> + <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( $fftsize, \#size $wintype, \#wintype @@ -22,26 +22,52 @@ qtgui.$(type.fcn)( ) self.$(id).set_update_time($update_time) self.$(id).set_y_axis($ymin, $ymax) +self.$(id).enable_autoscale($autoscale) + +labels = [$label1, $label2, $label3, $label4, $label5, + $label6, $label7, $label8, $label9] +widths = [$width1, $width2, $width3, $width4, $width5, + $width6, $width7, $width8, $width9] +colors = [$color1, $color2, $color3, $color4, $color5, + $color6, $color7, $color8, $color9] +alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5, + $alpha6, $alpha7, $alpha8, $alpha9] +for i in xrange($nconnections): + if len(labels[i]) == 0: + self.$(id).set_line_label(i, "Data {0}".format(i)) + else: + self.$(id).set_line_label(i, labels[i]) + self.$(id).set_line_width(i, widths[i]) + self.$(id).set_line_color(i, colors[i]) + self.$(id).set_line_alpha(i, alphas[i]) + self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> - <callback>set_frequency_range($fc, $bw)</callback> - <callback>set_update_time($update_time)</callback> - <callback>set_title($which, $title)</callback> - <callback>set_color($which, $color)</callback> - <param> - <name>Type</name> - <key>type</key> - <value>complex</value> - <type>enum</type> - <option><name>Complex</name><key>complex</key><opt>fcn:freq_sink_c</opt></option> - <option><name>Float</name><key>float</key><opt>fcn:freq_sink_f</opt></option> - </param> - <param> - <name>Name</name> - <key>name</key> - <value>QT GUI Plot</value> - <type>string</type> - </param> + <callback>set_frequency_range($fc, $bw)</callback> + <callback>set_update_time($update_time)</callback> + <callback>set_title($which, $title)</callback> + <callback>set_color($which, $color)</callback> + + <param_tab_order> + <tab>General</tab> + <tab>Config</tab> + </param_tab_order> + + <param> + <name>Type</name> + <key>type</key> + <value>complex</value> + <type>enum</type> + <option><name>Complex</name><key>complex</key><opt>fcn:freq_sink_c</opt></option> + <option><name>Float</name><key>float</key><opt>fcn:freq_sink_f</opt></option> + </param> + <param> + <name>Name</name> + <key>name</key> + <value>QT GUI Plot</value> + <type>string</type> + </param> + <param> <name>FFT Size</name> <key>fftsize</key> @@ -52,7 +78,7 @@ $(gui_hint()($win))</make> <name>Window Type</name> <key>wintype</key> <value>firdes.WIN_BLACKMAN_hARRIS</value> - <type>int</type> + <type>enum</type> <hide>part</hide> <option> <name>Blackman-harris</name> @@ -95,6 +121,22 @@ $(gui_hint()($win))</make> <value>samp_rate</value> <type>real</type> </param> + + <param> + <name>Autoscale</name> + <key>autoscale</key> + <value>False</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + <param> <name>Y min</name> <key>ymin</key> @@ -130,14 +172,691 @@ $(gui_hint()($win))</make> <type>gui_hint</type> <hide>part</hide> </param> - <sink> - <name>in</name> - <type>$type</type> - <nports>$nconnections</nports> - </sink> - <doc> + + + <param> + <name>Line 1 Label</name> + <key>label1</key> + <type>string</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Width</name> + <key>width1</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Color</name> + <key>color1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Alpha</name> + <key>alpha1</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 2 Label</name> + <key>label2</key> + <type>string</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Width</name> + <key>width2</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Color</name> + <key>color2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Alpha</name> + <key>alpha2</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + + <param> + <name>Line 3 Label</name> + <key>label3</key> + <type>string</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Width</name> + <key>width3</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Color</name> + <key>color3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Alpha</name> + <key>alpha3</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 4 Label</name> + <key>label4</key> + <type>string</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Width</name> + <key>width4</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Color</name> + <key>color4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Alpha</name> + <key>alpha4</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 5 Label</name> + <key>label5</key> + <type>string</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Width</name> + <key>width5</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Color</name> + <key>color5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Alpha</name> + <key>alpha5</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 6 Label</name> + <key>label6</key> + <type>string</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Width</name> + <key>width6</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Color</name> + <key>color6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Alpha</name> + <key>alpha6</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 7 Label</name> + <key>label7</key> + <type>string</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Width</name> + <key>width7</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Color</name> + <key>color7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Alpha</name> + <key>alpha7</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 8 Label</name> + <key>label8</key> + <type>string</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Width</name> + <key>width8</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Color</name> + <key>color8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Alpha</name> + <key>alpha8</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 9 Label</name> + <key>label9</key> + <type>string</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Width</name> + <key>width9</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Color</name> + <key>color9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Alpha</name> + <key>alpha9</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <sink> + <name>in</name> + <type>$type</type> + <nports>$nconnections</nports> + </sink> + <doc> The GUI hint can be used to position the widget within the application. \ The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \ Both the tab specification and the grid position are optional. - </doc> + </doc> </block> diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml b/gr-qtgui/grc/qtgui_histogram_sink_x.xml index 8a810abab7..3f50d10256 100644 --- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml +++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml @@ -19,7 +19,34 @@ qtgui.histogram_sink_f( $name, $nconnections ) + self.$(id).set_update_time($update_time) +self.$(id).enable_autoscale($autoscale) +self.$(id).enable_accumulate($accum) + +labels = [$label1, $label2, $label3, $label4, $label5, + $label6, $label7, $label8, $label9] +widths = [$width1, $width2, $width3, $width4, $width5, + $width6, $width7, $width8, $width9] +colors = [$color1, $color2, $color3, $color4, $color5, + $color6, $color7, $color8, $color9] +styles = [$style1, $style2, $style3, $style4, $style5, + $style6, $style7, $style8, $style9] +markers = [$marker1, $marker2, $marker3, $marker4, $marker5, + $marker6, $marker7, $marker8, $marker9] +alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5, + $alpha6, $alpha7, $alpha8, $alpha9] +for i in xrange($nconnections): + if len(labels[i]) == 0: + self.$(id).set_line_label(i, "Data {0}".format(i)) + else: + self.$(id).set_line_label(i, labels[i]) + self.$(id).set_line_width(i, widths[i]) + self.$(id).set_line_color(i, colors[i]) + self.$(id).set_line_style(i, styles[i]) + self.$(id).set_line_marker(i, markers[i]) + self.$(id).set_line_alpha(i, alphas[i]) + self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> <callback>set_update_time($update_time)</callback> @@ -27,6 +54,12 @@ $(gui_hint()($win))</make> <callback>set_color($which, $color)</callback> <callback>set_bins($bins)</callback> <callback>set_x_axis($bins)</callback> + + <param_tab_order> + <tab>General</tab> + <tab>Config</tab> + </param_tab_order> + <param> <name>Name</name> <key>name</key> @@ -45,6 +78,37 @@ $(gui_hint()($win))</make> <value>100</value> <type>int</type> </param> + + <param> + <name>Autoscale</name> + <key>autoscale</key> + <value>True</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> + <name>Accumulate</name> + <key>accum</key> + <value>False</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + <param> <name>Min x-axis</name> <key>xmin</key> @@ -78,14 +142,1411 @@ $(gui_hint()($win))</make> <type>gui_hint</type> <hide>part</hide> </param> - <sink> - <name>in</name> - <type>float</type> - <nports>$nconnections</nports> - </sink> - <doc> + + + <param> + <name>Line 1 Label</name> + <key>label1</key> + <type>string</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Width</name> + <key>width1</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Color</name> + <key>color1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Style</name> + <key>style1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Marker</name> + <key>marker1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Alpha</name> + <key>alpha1</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 2 Label</name> + <key>label2</key> + <type>string</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Width</name> + <key>width2</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Color</name> + <key>color2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Style</name> + <key>style2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Marker</name> + <key>marker2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Alpha</name> + <key>alpha2</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 3 Label</name> + <key>label3</key> + <type>string</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Width</name> + <key>width3</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Color</name> + <key>color3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Style</name> + <key>style3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Marker</name> + <key>marker3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Alpha</name> + <key>alpha3</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 4 Label</name> + <key>label4</key> + <type>string</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Width</name> + <key>width4</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Color</name> + <key>color4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Style</name> + <key>style4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Marker</name> + <key>marker4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Alpha</name> + <key>alpha4</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 5 Label</name> + <key>label5</key> + <type>string</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Width</name> + <key>width5</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Color</name> + <key>color5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Style</name> + <key>style5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Marker</name> + <key>marker5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Alpha</name> + <key>alpha5</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 6 Label</name> + <key>label6</key> + <type>string</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Width</name> + <key>width6</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Color</name> + <key>color6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Style</name> + <key>style6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Marker</name> + <key>marker6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Alpha</name> + <key>alpha6</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 7 Label</name> + <key>label7</key> + <type>string</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Width</name> + <key>width7</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Color</name> + <key>color7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Style</name> + <key>style7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Marker</name> + <key>marker7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Alpha</name> + <key>alpha7</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 8 Label</name> + <key>label8</key> + <type>string</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Width</name> + <key>width8</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Color</name> + <key>color8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Style</name> + <key>style8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Marker</name> + <key>marker8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Alpha</name> + <key>alpha8</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 9 Label</name> + <key>label9</key> + <type>string</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Width</name> + <key>width9</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Color</name> + <key>color9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Style</name> + <key>style9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Marker</name> + <key>marker9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Alpha</name> + <key>alpha9</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <sink> + <name>in</name> + <type>float</type> + <nports>$nconnections</nports> + </sink> + <doc> The GUI hint can be used to position the widget within the application. \ The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \ Both the tab specification and the grid position are optional. - </doc> + </doc> </block> diff --git a/gr-qtgui/grc/qtgui_number_sink.xml b/gr-qtgui/grc/qtgui_number_sink.xml index 4471d708b9..e277e7fbdf 100644 --- a/gr-qtgui/grc/qtgui_number_sink.xml +++ b/gr-qtgui/grc/qtgui_number_sink.xml @@ -13,16 +13,32 @@ <make>#set $win = 'self._%s_win'%$id qtgui.number_sink( $type.size, - $name, $avg, $graph_type, $nconnections ) self.$(id).set_update_time($update_time) + +labels = [$label1, $label2, $label3, $label4, $label5, + $label6, $label7, $label8, $label9] +colors = [$color1, $color2, $color3, $color4, $color5, + $color6, $color7, $color8, $color9] +for i in xrange($nconnections): + self.$(id).set_min(i, $min) + self.$(id).set_max(i, $max) + self.$(id).set_label(i, labels[i]) + self.$(id).set_color(i, colors[i][0], colors[i][1]) + +self.$(id).enable_autoscale($autoscale) self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> <callback>set_update_time($update_time)</callback> + <param_tab_order> + <tab>General</tab> + <tab>Config</tab> + </param_tab_order> + <param> <name>Input Type</name> <key>type</key> @@ -47,13 +63,22 @@ $(gui_hint()($win))</make> <key>byte</key> <opt>size:gr.sizeof_char</opt> </option> + <tab>General</tab> </param> <param> - <name>Name</name> - <key>name</key> - <value>QT GUI Plot</value> - <type>string</type> + <name>Autoscale</name> + <key>autoscale</key> + <value>False</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> </param> <param> @@ -61,6 +86,7 @@ $(gui_hint()($win))</make> <key>avg</key> <value>0</value> <type>float</type> + <tab>General</tab> </param> <param> @@ -79,6 +105,7 @@ $(gui_hint()($win))</make> <name>None</name> <key>qtgui.NUM_GRAPH_NONE</key> </option> + <tab>General</tab> </param> <param> @@ -87,6 +114,22 @@ $(gui_hint()($win))</make> <value>1</value> <type>int</type> <hide>part</hide> + <tab>General</tab> + </param> + + <param> + <name>Min</name> + <key>min</key> + <value>-1</value> + <type>float</type> + <hide>part</hide> + </param> + <param> + <name>max</name> + <key>max</key> + <value>1</value> + <type>float</type> + <hide>part</hide> </param> <param> @@ -95,6 +138,7 @@ $(gui_hint()($win))</make> <value>0.10</value> <type>float</type> <hide>part</hide> + <tab>General</tab> </param> <param> @@ -103,6 +147,339 @@ $(gui_hint()($win))</make> <value></value> <type>gui_hint</type> <hide>part</hide> + <tab>General</tab> + </param> + + <param> + <name>Line 1 Label</name> + <key>label1</key> + <type>string</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Color</name> + <key>color1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> + </param> + + + <param> + <name>Line 2 Label</name> + <key>label2</key> + <type>string</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Color</name> + <key>color2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> + </param> + + + <param> + <name>Line 3 Label</name> + <key>label3</key> + <type>string</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Color</name> + <key>color3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> + </param> + + + <param> + <name>Line 4 Label</name> + <key>label4</key> + <type>string</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Color</name> + <key>color4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> + </param> + + + <param> + <name>Line 5 Label</name> + <key>label5</key> + <type>string</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Color</name> + <key>color5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> + </param> + + + <param> + <name>Line 6 Label</name> + <key>label6</key> + <type>string</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Color</name> + <key>color6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> + </param> + + + <param> + <name>Line 7 Label</name> + <key>label7</key> + <type>string</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Color</name> + <key>color7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> + </param> + + + <param> + <name>Line 8 Label</name> + <key>label8</key> + <type>string</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Color</name> + <key>color8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> + </param> + + + <param> + <name>Line 9 Label</name> + <key>label9</key> + <type>string</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Color</name> + <key>color9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>("black", "black")</key> + </option> + <option> + <name>Blue-Red</name> + <key>("blue", "red")</key> + </option> + <option> + <name>White Hot</name> + <key>("black", "white")</key> + </option> + <option> + <name>Black Hot</name> + <key>("white", "black")</key> + </option> + <option> + <name>Black-Red</name> + <key>("black", "red")</key> + </option> + <tab>Config</tab> </param> <sink> diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml b/gr-qtgui/grc/qtgui_time_raster_x.xml index 7d880ab084..201ab90603 100644 --- a/gr-qtgui/grc/qtgui_time_raster_x.xml +++ b/gr-qtgui/grc/qtgui_time_raster_x.xml @@ -20,7 +20,23 @@ qtgui.$(type.fcn)( $name, $nconnections, ) + self.$(id).set_update_time($update_time) + +labels = [$label1, $label2, $label3, $label4, $label5, + $label6, $label7, $label8, $label9] +colors = [$color1, $color2, $color3, $color4, $color5, + $color6, $color7, $color8, $color9] +alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5, + $alpha6, $alpha7, $alpha8, $alpha9] +for i in xrange($nconnections): + if len(labels[i]) == 0: + self.$(id).set_line_label(i, "Data {0}".format(i)) + else: + self.$(id).set_line_label(i, labels[i]) + self.$(id).set_color_map(i, colors[i]) + self.$(id).set_line_alpha(i, alphas[i]) + self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> <callback>set_num_rows($nrows)</callback> @@ -30,6 +46,12 @@ $(gui_hint()($win))</make> <callback>set_update_time($update_time)</callback> <callback>set_title($which, $title)</callback> <callback>set_color($which, $color)</callback> + + <param_tab_order> + <tab>General</tab> + <tab>Config</tab> + </param_tab_order> + <param> <name>Type</name> <key>type</key> @@ -95,14 +117,393 @@ $(gui_hint()($win))</make> <type>gui_hint</type> <hide>part</hide> </param> - <sink> - <name>in</name> - <type>$type</type> - <nports>$nconnections</nports> - </sink> - <doc> + + + <param> + <name>Line 1 Label</name> + <key>label1</key> + <type>string</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Color</name> + <key>color1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Alpha</name> + <key>alpha1</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 2 Label</name> + <key>label2</key> + <type>string</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Color</name> + <key>color2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Alpha</name> + <key>alpha2</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 3 Label</name> + <key>label3</key> + <type>string</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Color</name> + <key>color3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Alpha</name> + <key>alpha3</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 4 Label</name> + <key>label4</key> + <type>string</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Color</name> + <key>color4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Alpha</name> + <key>alpha4</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 5 Label</name> + <key>label5</key> + <type>string</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Color</name> + <key>color5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Alpha</name> + <key>alpha5</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 6 Label</name> + <key>label6</key> + <type>string</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Color</name> + <key>color6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Alpha</name> + <key>alpha6</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 7 Label</name> + <key>label7</key> + <type>string</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Color</name> + <key>color7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Alpha</name> + <key>alpha7</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 8 Label</name> + <key>label8</key> + <type>string</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Color</name> + <key>color8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Alpha</name> + <key>alpha8</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 9 Label</name> + <key>label9</key> + <type>string</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Color</name> + <key>color9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Alpha</name> + <key>alpha9</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <sink> + <name>in</name> + <type>$type</type> + <nports>$nconnections</nports> + </sink> + <doc> The GUI hint can be used to position the widget within the application. \ The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \ Both the tab specification and the grid position are optional. - </doc> + </doc> </block> diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml index 3da87a9d29..57e1cc9367 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -5,13 +5,13 @@ ################################################### --> <block> - <name>QT GUI Time Sink</name> - <key>qtgui_time_sink_x</key> - <import>from PyQt4 import Qt</import> - <import>from gnuradio import qtgui</import> - <import>from gnuradio.filter import firdes</import> - <import>import sip</import> - <make>#set $win = 'self._%s_win'%$id + <name>QT GUI Time Sink</name> + <key>qtgui_time_sink_x</key> + <import>from PyQt4 import Qt</import> + <import>from gnuradio import qtgui</import> + <import>from gnuradio.filter import firdes</import> + <import>import sip</import> + <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( $size, \#size $srate, \#samp_rate @@ -22,174 +22,1624 @@ self.$(id).set_update_time($update_time) self.$(id).set_y_axis($ymin, $ymax) self.$(id).enable_tags(-1, $entags) self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, $tr_delay, $tr_chan, $tr_tag) +self.$(id).enable_autoscale($autoscale) + +labels = [$label1, $label2, $label3, $label4, $label5, + $label6, $label7, $label8, $label9] +widths = [$width1, $width2, $width3, $width4, $width5, + $width6, $width7, $width8, $width9] +colors = [$color1, $color2, $color3, $color4, $color5, + $color6, $color7, $color8, $color9] +styles = [$style1, $style2, $style3, $style4, $style5, + $style6, $style7, $style8, $style9] +markers = [$marker1, $marker2, $marker3, $marker4, $marker5, + $marker6, $marker7, $marker8, $marker9] +alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5, + $alpha6, $alpha7, $alpha8, $alpha9] +for i in xrange($nconnections): + if len(labels[i]) == 0: + self.$(id).set_line_label(i, "Data {0}".format(i)) + else: + self.$(id).set_line_label(i, labels[i]) + self.$(id).set_line_width(i, widths[i]) + self.$(id).set_line_color(i, colors[i]) + self.$(id).set_line_style(i, styles[i]) + self.$(id).set_line_marker(i, markers[i]) + self.$(id).set_line_alpha(i, alphas[i]) + self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> - <callback>set_time_domain_axis($min, $max)</callback> - <callback>set_update_time($update_time)</callback> - <callback>set_title($which, $title)</callback> - <callback>set_color($which, $color)</callback> - <callback>set_y_axis($ymin, $ymax)</callback> - <callback>set_samp_rate($srate)</callback> - <param> - <name>Type</name> - <key>type</key> - <value>complex</value> - <type>enum</type> - <option><name>Complex</name><key>complex</key><opt>fcn:time_sink_c</opt></option> - <option><name>Float</name><key>float</key><opt>fcn:time_sink_f</opt></option> - </param> - <param> - <name>Name</name> - <key>name</key> - <value>QT GUI Plot</value> - <type>string</type> - </param> - <param> - <name>Number of Points</name> - <key>size</key> - <value>1024</value> - <type>int</type> - </param> - <param> - <name>Sample Rate</name> - <key>srate</key> - <value>samp_rate</value> - <type>float</type> - </param> - <param> - <name>Y min</name> - <key>ymin</key> - <value>-1</value> - <type>float</type> - <hide>part</hide> - </param> - <param> - <name>Y max</name> - <key>ymax</key> - <value>1</value> - <type>float</type> - <hide>part</hide> - </param> - <param> - <name>Number of Inputs</name> - <key>nconnections</key> - <value>1</value> - <type>int</type> - <hide>part</hide> - </param> - <param> - <name>Update Period</name> - <key>update_time</key> - <value>0.10</value> - <type>float</type> - <hide>part</hide> - </param> - - <param> - <name>Trigger Mode</name> - <key>tr_mode</key> - <value>qtgui.TRIG_MODE_FREE</value> - <type>enum</type> - <hide>part</hide> - <option> - <name>Free</name> - <key>qtgui.TRIG_MODE_FREE</key> - </option> - <option> - <name>Auto</name> - <key>qtgui.TRIG_MODE_AUTO</key> - </option> - <option> - <name>Normal</name> - <key>qtgui.TRIG_MODE_NORM</key> - </option> - <option> - <name>Tag</name> - <key>qtgui.TRIG_MODE_TAG</key> - </option> - </param> - - <param> - <name>Trigger Slope</name> - <key>tr_slope</key> - <value>qtgui.TRIG_MODE_POS</value> - <type>enum</type> - <hide>part</hide> - <option> - <name>Positive</name> - <key>qtgui.TRIG_SLOPE_POS</key> - </option> - <option> - <name>Negative</name> - <key>qtgui.TRIG_SLOPE_NEG</key> - </option> - </param> - - <param> - <name>Trigger Level</name> - <key>tr_level</key> - <value>0.0</value> - <type>float</type> - <hide>part</hide> - </param> - - <param> - <name>Trigger Delay</name> - <key>tr_delay</key> - <value>0</value> - <type>float</type> - <hide>part</hide> - </param> - - <param> - <name>Trigger Channel</name> - <key>tr_chan</key> - <value>0</value> - <type>int</type> - <hide>part</hide> - </param> - - <param> - <name>Trigger Tag Key</name> - <key>tr_tag</key> - <value>""</value> - <type>string</type> - <hide>part</hide> - </param> - - <param> - <name>Disp. Tags</name> - <key>entags</key> - <value>True</value> - <type>enum</type> - <hide>part</hide> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - <param> - <name>GUI Hint</name> - <key>gui_hint</key> - <value></value> - <type>gui_hint</type> - <hide>part</hide> - </param> - - <check>$tr_chan < 2*$nconnections</check> - - <sink> - <name>in</name> - <type>$type</type> - <nports>$nconnections</nports> - </sink> - <doc> + <callback>set_time_domain_axis($min, $max)</callback> + <callback>set_update_time($update_time)</callback> + <callback>set_title($which, $title)</callback> + <callback>set_color($which, $color)</callback> + <callback>set_y_axis($ymin, $ymax)</callback> + <callback>set_samp_rate($srate)</callback> + + <param_tab_order> + <tab>General</tab> + <tab>Trigger</tab> + <tab>Config</tab> + </param_tab_order> + + <param> + <name>Type</name> + <key>type</key> + <value>complex</value> + <type>enum</type> + <option><name>Complex</name><key>complex</key><opt>fcn:time_sink_c</opt></option> + <option><name>Float</name><key>float</key><opt>fcn:time_sink_f</opt></option> + </param> + <param> + <name>Name</name> + <key>name</key> + <value>QT GUI Plot</value> + <type>string</type> + </param> + <param> + <name>Number of Points</name> + <key>size</key> + <value>1024</value> + <type>int</type> + </param> + <param> + <name>Sample Rate</name> + <key>srate</key> + <value>samp_rate</value> + <type>float</type> + </param> + + <param> + <name>Autoscale</name> + <key>autoscale</key> + <value>False</value> + <type>enum</type> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + + <param> + <name>Y min</name> + <key>ymin</key> + <value>-1</value> + <type>float</type> + <hide>part</hide> + </param> + <param> + <name>Y max</name> + <key>ymax</key> + <value>1</value> + <type>float</type> + <hide>part</hide> + </param> + <param> + <name>Number of Inputs</name> + <key>nconnections</key> + <value>1</value> + <type>int</type> + <hide>part</hide> + </param> + <param> + <name>Update Period</name> + <key>update_time</key> + <value>0.10</value> + <type>float</type> + <hide>part</hide> + </param> + <param> + <name>Disp. Tags</name> + <key>entags</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + </param> + <param> + <name>GUI Hint</name> + <key>gui_hint</key> + <value></value> + <type>gui_hint</type> + <hide>part</hide> + </param> + + + <param> + <name>Trigger Mode</name> + <key>tr_mode</key> + <value>qtgui.TRIG_MODE_FREE</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Free</name> + <key>qtgui.TRIG_MODE_FREE</key> + </option> + <option> + <name>Auto</name> + <key>qtgui.TRIG_MODE_AUTO</key> + </option> + <option> + <name>Normal</name> + <key>qtgui.TRIG_MODE_NORM</key> + </option> + <option> + <name>Tag</name> + <key>qtgui.TRIG_MODE_TAG</key> + </option> + <tab>Trigger</tab> + </param> + + <param> + <name>Trigger Slope</name> + <key>tr_slope</key> + <value>qtgui.TRIG_MODE_POS</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Positive</name> + <key>qtgui.TRIG_SLOPE_POS</key> + </option> + <option> + <name>Negative</name> + <key>qtgui.TRIG_SLOPE_NEG</key> + </option> + <tab>Trigger</tab> + </param> + + <param> + <name>Trigger Level</name> + <key>tr_level</key> + <value>0.0</value> + <type>float</type> + <hide>part</hide> + <tab>Trigger</tab> + </param> + + <param> + <name>Trigger Delay</name> + <key>tr_delay</key> + <value>0</value> + <type>float</type> + <hide>part</hide> + <tab>Trigger</tab> + </param> + + <param> + <name>Trigger Channel</name> + <key>tr_chan</key> + <value>0</value> + <type>int</type> + <hide>part</hide> + <tab>Trigger</tab> + </param> + + <param> + <name>Trigger Tag Key</name> + <key>tr_tag</key> + <value>""</value> + <type>string</type> + <hide>part</hide> + <tab>Trigger</tab> + </param> + + + + <param> + <name>Line 1 Label</name> + <key>label1</key> + <type>string</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Width</name> + <key>width1</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Color</name> + <key>color1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Style</name> + <key>style1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Marker</name> + <key>marker1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Alpha</name> + <key>alpha1</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 2 Label</name> + <key>label2</key> + <type>string</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Width</name> + <key>width2</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Color</name> + <key>color2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Style</name> + <key>style2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Marker</name> + <key>marker2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Alpha</name> + <key>alpha2</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 3 Label</name> + <key>label3</key> + <type>string</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Width</name> + <key>width3</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Color</name> + <key>color3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Style</name> + <key>style3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Marker</name> + <key>marker3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Alpha</name> + <key>alpha3</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 4 Label</name> + <key>label4</key> + <type>string</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Width</name> + <key>width4</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Color</name> + <key>color4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Style</name> + <key>style4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Marker</name> + <key>marker4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Alpha</name> + <key>alpha4</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 5 Label</name> + <key>label5</key> + <type>string</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Width</name> + <key>width5</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Color</name> + <key>color5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Style</name> + <key>style5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Marker</name> + <key>marker5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Alpha</name> + <key>alpha5</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 6 Label</name> + <key>label6</key> + <type>string</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Width</name> + <key>width6</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Color</name> + <key>color6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Style</name> + <key>style6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Marker</name> + <key>marker6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Alpha</name> + <key>alpha6</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 7 Label</name> + <key>label7</key> + <type>string</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Width</name> + <key>width7</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Color</name> + <key>color7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Style</name> + <key>style7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Marker</name> + <key>marker7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Alpha</name> + <key>alpha7</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 8 Label</name> + <key>label8</key> + <type>string</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Width</name> + <key>width8</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Color</name> + <key>color8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Style</name> + <key>style8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Marker</name> + <key>marker8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Alpha</name> + <key>alpha8</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 9 Label</name> + <key>label9</key> + <type>string</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Width</name> + <key>width9</key> + <value>1</value> + <type>int</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Color</name> + <key>color9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Dark Green</name> + <key>"dark green"</key> + </option> + <option> + <name>Dark Blue</name> + <key>"Dark Blue"</key> + </option> + <option> + <name>Blue</name> + <key>"blue"</key> + </option> + <option> + <name>Red</name> + <key>"red"</key> + </option> + <option> + <name>Green</name> + <key>"green"</key> + </option> + <option> + <name>Black</name> + <key>"black"</key> + </option> + <option> + <name>Cyan</name> + <key>"cyan"</key> + </option> + <option> + <name>Magenta</name> + <key>"magenta"</key> + </option> + <option> + <name>Yellow</name> + <key>"yellow"</key> + </option> + <option> + <name>Dark Red</name> + <key>"dark red"</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Style</name> + <key>style9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Solid</name> + <key>1</key> + </option> + <option> + <name>Dash</name> + <key>2</key> + </option> + <option> + <name>Dots</name> + <key>3</key> + </option> + <option> + <name>Dash-Dot</name> + <key>4</key> + </option> + <option> + <name>Dash-Dot-Dot</name> + <key>5</key> + </option> + <option> + <name>None</name> + <key>0</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Marker</name> + <key>marker9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>None</name> + <key>-1</key> + </option> + <option> + <name>Circle</name> + <key>0</key> + </option> + <option> + <name>Rectangle</name> + <key>1</key> + </option> + <option> + <name>Diamond</name> + <key>2</key> + </option> + <option> + <name>Triangle</name> + <key>3</key> + </option> + <option> + <name>Down Triangle</name> + <key>4</key> + </option> + <option> + <name>Left Triangle</name> + <key>6</key> + </option> + <option> + <name>Right Triangle</name> + <key>7</key> + </option> + <option> + <name>Cross</name> + <key>8</key> + </option> + <option> + <name>X-Cross</name> + <key>9</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Alpha</name> + <key>alpha9</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <check>$tr_chan < 2*$nconnections</check> + + <sink> + <name>in</name> + <type>$type</type> + <nports>$nconnections</nports> + </sink> + <doc> The GUI hint can be used to position the widget within the application. \ The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \ Both the tab specification and the grid position are optional. - </doc> + </doc> </block> diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml index ac08450730..0d71024fb2 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml @@ -5,13 +5,13 @@ ################################################### --> <block> - <name>QT GUI Waterfall Sink</name> - <key>qtgui_waterfall_sink_x</key> - <import>from PyQt4 import Qt</import> - <import>from gnuradio import qtgui</import> - <import>from gnuradio.filter import firdes</import> - <import>import sip</import> - <make>#set $win = 'self._%s_win'%$id + <name>QT GUI Waterfall Sink</name> + <key>qtgui_waterfall_sink_x</key> + <import>from PyQt4 import Qt</import> + <import>from gnuradio import qtgui</import> + <import>from gnuradio.filter import firdes</import> + <import>import sip</import> + <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( $fftsize, \#size $wintype, \#wintype @@ -21,12 +21,33 @@ qtgui.$(type.fcn)( $nconnections \#number of inputs ) self.$(id).set_update_time($update_time) + +labels = [$label1, $label2, $label3, $label4, $label5, + $label6, $label7, $label8, $label9] +colors = [$color1, $color2, $color3, $color4, $color5, + $color6, $color7, $color8, $color9] +alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5, + $alpha6, $alpha7, $alpha8, $alpha9] +for i in xrange($nconnections): + if len(labels[i]) == 0: + self.$(id).set_line_label(i, "Data {0}".format(i)) + else: + self.$(id).set_line_label(i, labels[i]) + self.$(id).set_color_map(i, colors[i]) + self.$(id).set_line_alpha(i, alphas[i]) + self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) $(gui_hint()($win))</make> - <callback>set_frequency_range($fc, $bw)</callback> - <callback>set_update_time($update_time)</callback> - <callback>set_title($which, $title)</callback> - <callback>set_color($which, $color)</callback> + <callback>set_frequency_range($fc, $bw)</callback> + <callback>set_update_time($update_time)</callback> + <callback>set_title($which, $title)</callback> + <callback>set_color($which, $color)</callback> + + <param_tab_order> + <tab>General</tab> + <tab>Config</tab> + </param_tab_order> + <param> <name>Type</name> <key>type</key> @@ -115,14 +136,395 @@ $(gui_hint()($win))</make> <type>gui_hint</type> <hide>part</hide> </param> - <sink> - <name>in</name> - <type>$type</type> - <nports>$nconnections</nports> - </sink> - <doc> + + + + <param> + <name>Line 1 Label</name> + <key>label1</key> + <type>string</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Color</name> + <key>color1</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 1 Alpha</name> + <key>alpha1</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 1 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 2 Label</name> + <key>label2</key> + <type>string</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Color</name> + <key>color2</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 2 Alpha</name> + <key>alpha2</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 3 Label</name> + <key>label3</key> + <type>string</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Color</name> + <key>color3</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 3 Alpha</name> + <key>alpha3</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 4 Label</name> + <key>label4</key> + <type>string</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Color</name> + <key>color4</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 4 Alpha</name> + <key>alpha4</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 5 Label</name> + <key>label5</key> + <type>string</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Color</name> + <key>color5</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 5 Alpha</name> + <key>alpha5</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 6 Label</name> + <key>label6</key> + <type>string</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Color</name> + <key>color6</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 6 Alpha</name> + <key>alpha6</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 7 Label</name> + <key>label7</key> + <type>string</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Color</name> + <key>color7</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 7 Alpha</name> + <key>alpha7</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 8 Label</name> + <key>label8</key> + <type>string</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Color</name> + <key>color8</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 8 Alpha</name> + <key>alpha8</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <param> + <name>Line 9 Label</name> + <key>label9</key> + <type>string</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Color</name> + <key>color9</key> + <type>enum</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <option> + <name>Multi Color</name> + <key>0</key> + </option> + <option> + <name>White Hot</name> + <key>1</key> + </option> + <option> + <name>Black Hot</name> + <key>2</key> + </option> + <option> + <name>Incandescent</name> + <key>3</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Line 9 Alpha</name> + <key>alpha9</key> + <value>1.0</value> + <type>float</type> + <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide> + <tab>Config</tab> + </param> + + + <sink> + <name>in</name> + <type>$type</type> + <nports>$nconnections</nports> + </sink> + <doc> The GUI hint can be used to position the widget within the application. \ The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \ Both the tab specification and the grid position are optional. - </doc> + </doc> </block> diff --git a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index d0a4a3dba0..8c2a0d08e5 100644 --- a/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -34,7 +34,7 @@ namespace gr { namespace qtgui { - + /*! * \brief A graphical sink to display multiple signals in frequency. * \ingroup instrumentation_blk diff --git a/gr-qtgui/include/gnuradio/qtgui/number_sink.h b/gr-qtgui/include/gnuradio/qtgui/number_sink.h index 5532a96c8b..c3829a1072 100644 --- a/gr-qtgui/include/gnuradio/qtgui/number_sink.h +++ b/gr-qtgui/include/gnuradio/qtgui/number_sink.h @@ -61,14 +61,12 @@ namespace gr { * \brief Build a number sink * * \param itemsize Size of input item stream - * \param name title for the plot * \param average Averaging coefficient (0 - 1) * \param graph_type Type of graph to use (number_sink::graph_t) * \param nconnections number of signals connected to sink * \param parent a QWidget parent object, if any */ static sptr make(size_t itemsize, - const std::string &name, float average=0, graph_t graph_type=NUM_GRAPH_HORIZ, int nconnections=1, @@ -81,7 +79,6 @@ namespace gr { #endif virtual void set_update_time(double t) = 0; - virtual void set_title(const std::string &title) = 0; virtual void set_average(const float avg) = 0; virtual void set_graph_type(const graph_t type) = 0; virtual void set_color(int which, @@ -89,15 +86,19 @@ namespace gr { const std::string &max) = 0; virtual void set_color(int which, int min, int max) = 0; virtual void set_label(int which, const std::string &label) = 0; + virtual void set_min(int which, float min) = 0; + virtual void set_max(int which, float max) = 0; - virtual std::string title() = 0; virtual float average() const = 0; virtual graph_t graph_type() const = 0; - virtual std::string color_min() const = 0; - virtual std::string color_max() const = 0; + virtual std::string color_min(int which) const = 0; + virtual std::string color_max(int which) const = 0; virtual std::string label(int which) const = 0; + virtual float min(int which) const = 0; + virtual float max(int which) const = 0; virtual void enable_menu(bool en=true) = 0; + virtual void enable_autoscale(bool en=true) = 0; virtual void reset() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h index 0bdda95b97..b752ad39bd 100644 --- a/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/numberdisplayform.h @@ -45,11 +45,13 @@ class NumberDisplayForm : public QWidget ~NumberDisplayForm(); gr::qtgui::graph_t graphType() const; - QColor colorMin() const; - QColor colorMax() const; + QColor colorMin(int which) const; + QColor colorMax(int which) const; std::string label(int which) const; float average() const; float updateTime() const; + int scaleMin(int which); + int scaleMax(int which); public slots: void mousePressEvent(QMouseEvent * e); @@ -66,6 +68,9 @@ public slots: void setUpdateTime(const float time); void setUpdateTime(QString time); void saveFigure(); + void setScale(int which, int min, int max); + void setScaleMin(int which, int min); + void setScaleMax(int which, int max); void autoScale(bool on); private slots: diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 2ea01f33b6..16576b387b 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -173,6 +173,7 @@ FreqDisplayForm::autoScale(bool en) d_autoscale_state = false; } + d_autoscale_act->setChecked(en); getPlot()->setAutoScale(d_autoscale_state); getPlot()->replot(); } diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index faf7ad4a15..a2a7d67e59 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -36,19 +36,17 @@ namespace gr { number_sink::sptr number_sink::make(size_t itemsize, - const std::string &name, float average, graph_t graph_type, int nconnections, QWidget *parent) { return gnuradio::get_initial_sptr - (new number_sink_impl(itemsize, name, average, + (new number_sink_impl(itemsize, average, graph_type, nconnections, parent)); } number_sink_impl::number_sink_impl(size_t itemsize, - const std::string &name, float average, graph_t graph_type, int nconnections, @@ -56,7 +54,7 @@ namespace gr { : sync_block("number_sink", io_signature::make(nconnections, nconnections, itemsize), io_signature::make(0, 0, 0)), - d_itemsize(itemsize), d_name(name), d_average(average), + d_itemsize(itemsize), d_average(average), d_type(graph_type), d_nconnections(nconnections), d_parent(parent), d_avg_value(nconnections), d_iir(nconnections) { @@ -146,12 +144,6 @@ namespace gr { } void - number_sink_impl::set_title(const std::string &title) - { - //d_main_gui->setTitle(title.c_str()); - } - - void number_sink_impl::set_average(const float avg) { d_average = avg; @@ -189,11 +181,16 @@ namespace gr { d_main_gui->setLabel(which, label); } - std::string - number_sink_impl::title() + void + number_sink_impl::set_min(int which, float min) { - //return d_main_gui->title().toStdString(); - return ""; + d_main_gui->setScaleMin(which, min); + } + + void + number_sink_impl::set_max(int which, float max) + { + return d_main_gui->setScaleMax(which, max); } float @@ -209,16 +206,15 @@ namespace gr { } std::string - number_sink_impl::color_min() const + number_sink_impl::color_min(int which) const { - //return d_main_gui->colorMin(); - return "min color"; + return d_main_gui->colorMin(which).name().toStdString(); } std::string - number_sink_impl::color_max() const + number_sink_impl::color_max(int which) const { - return d_main_gui->colorMax().name().toStdString(); + return d_main_gui->colorMax(which).name().toStdString(); } std::string @@ -227,6 +223,18 @@ namespace gr { return d_main_gui->label(which); } + float + number_sink_impl::min(int which) const + { + return d_main_gui->scaleMin(which); + } + + float + number_sink_impl::max(int which) const + { + return d_main_gui->scaleMax(which); + } + void number_sink_impl::enable_menu(bool en) { @@ -234,6 +242,12 @@ namespace gr { } void + number_sink_impl::enable_autoscale(bool en) + { + d_main_gui->autoScale(en); + } + + void number_sink_impl::reset() { gr::thread::scoped_lock lock(d_mutex); diff --git a/gr-qtgui/lib/number_sink_impl.h b/gr-qtgui/lib/number_sink_impl.h index c453923a17..ca1ad0f880 100644 --- a/gr-qtgui/lib/number_sink_impl.h +++ b/gr-qtgui/lib/number_sink_impl.h @@ -40,7 +40,6 @@ namespace gr { gr::thread::mutex d_mutex; size_t d_itemsize; - std::string d_name; float d_average; graph_t d_type; int d_nconnections; @@ -66,7 +65,6 @@ namespace gr { public: number_sink_impl(size_t itemsize, - const std::string &name, float average=0, graph_t graph_type=NUM_GRAPH_HORIZ, int nconnections=1, @@ -83,7 +81,6 @@ namespace gr { #endif void set_update_time(double t); - void set_title(const std::string &title); void set_average(const float avg); void set_graph_type(const graph_t type); void set_color(int which, @@ -91,15 +88,19 @@ namespace gr { const std::string &max); void set_color(int which, int min, int max); void set_label(int which, const std::string &label); + void set_min(int which, float min); + void set_max(int which, float max); - std::string title(); float average() const; graph_t graph_type() const; - std::string color_min() const; - std::string color_max() const; + std::string color_min(int which) const; + std::string color_max(int which) const; std::string label(int which) const; + float min(int which) const; + float max(int which) const; void enable_menu(bool en); + void enable_autoscale(bool en=true); void reset(); diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc index d22acd0e60..599310c5b0 100644 --- a/gr-qtgui/lib/numberdisplayform.cc +++ b/gr-qtgui/lib/numberdisplayform.cc @@ -285,13 +285,13 @@ NumberDisplayForm::setColor(int which, const QColor &min, const QColor &max) void NumberDisplayForm::setColorMin(int which, QString min) { - setColor(which, QColor(min), colorMax()); + setColor(which, QColor(min), colorMax(which)); } void NumberDisplayForm::setColorMax(int which, QString max) { - setColor(which, colorMin(), QColor(max)); + setColor(which, colorMin(which), QColor(max)); } void @@ -324,6 +324,26 @@ NumberDisplayForm::setUpdateTime(QString time) setUpdateTime(time.toFloat()); } +void +NumberDisplayForm::setScale(int which, int min, int max) +{ + d_min[which] = min; + d_max[which] = max; + d_indicator[which]->setScale(min, max); +} + +void +NumberDisplayForm::setScaleMin(int which, int min) +{ + setScale(which, min, d_max[which]); +} + +void +NumberDisplayForm::setScaleMax(int which, int max) +{ + setScale(which, d_min[which], max); +} + gr::qtgui::graph_t NumberDisplayForm::graphType() const { @@ -331,16 +351,16 @@ NumberDisplayForm::graphType() const } QColor -NumberDisplayForm::colorMin() const +NumberDisplayForm::colorMin(int which) const { - QwtLinearColorMap *map = static_cast<QwtLinearColorMap*>(d_indicator[0]->colorMap()); + QwtLinearColorMap *map = static_cast<QwtLinearColorMap*>(d_indicator[which]->colorMap()); return map->color1(); } QColor -NumberDisplayForm::colorMax() const +NumberDisplayForm::colorMax(int which) const { - QwtLinearColorMap *map = static_cast<QwtLinearColorMap*>(d_indicator[0]->colorMap()); + QwtLinearColorMap *map = static_cast<QwtLinearColorMap*>(d_indicator[which]->colorMap()); return map->color2(); } @@ -362,6 +382,18 @@ NumberDisplayForm::updateTime() const return d_update_time; } +int +NumberDisplayForm::scaleMin(int which) +{ + return d_min[which]; +} + +int +NumberDisplayForm::scaleMax(int which) +{ + return d_max[which]; +} + void NumberDisplayForm::autoScale(bool on) { diff --git a/gr-qtgui/lib/timerasterdisplayform.cc b/gr-qtgui/lib/timerasterdisplayform.cc index 0121e2f544..382e91607c 100644 --- a/gr-qtgui/lib/timerasterdisplayform.cc +++ b/gr-qtgui/lib/timerasterdisplayform.cc @@ -61,6 +61,11 @@ TimeRasterDisplayForm::TimeRasterDisplayForm(int nplots, // Now create our own menus for(int i = 0; i < nplots; i++) { + d_line_title_act.push_back(new LineTitleAction(i, this)); + connect(d_line_title_act[i], SIGNAL(whichTrigger(int, const QString&)), + this, SLOT(setLineLabel(int, const QString&))); + d_lines_menu[i]->addAction(d_line_title_act[i]); + ColorMapMenu *colormap = new ColorMapMenu(i, this); connect(colormap, SIGNAL(whichTrigger(int, const int, const QColor&, const QColor&)), this, SLOT(setColorMap(int, const int, const QColor&, const QColor&))); |