[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8017 - in grc/branches/grc_reloaded: . src/grc/platfo
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8017 - in grc/branches/grc_reloaded: . src/grc/platforms/gnuradio_python/blocks/graphical_sinks src/grc/platforms/gnuradio_python/blocks/misc src/grc/platforms/gnuradio_python/blocks/sources src/grc/platforms/gnuradio_python/data |
|
Date: |
Thu, 13 Mar 2008 17:06:07 -0600 (MDT) |
Author: jblum
Date: 2008-03-13 17:06:07 -0600 (Thu, 13 Mar 2008)
New Revision: 8017
Added:
grc/branches/grc_reloaded/Makefile
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_numbersink2.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_waterfallsink2.xml
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_constellationsink2.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_scopesink2.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/misc/gr_throttle.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_sig_source_x.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/wx_gui.tmpl
Log:
finished with wxgui
Added: grc/branches/grc_reloaded/Makefile
===================================================================
--- grc/branches/grc_reloaded/Makefile (rev 0)
+++ grc/branches/grc_reloaded/Makefile 2008-03-13 23:06:07 UTC (rev 8017)
@@ -0,0 +1,37 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+all:
+ @echo Options: build, rebuild, install, reinstall, or clean
+
+build:
+ python setup.py build
+
+rebuild: clean build
+
+install: build
+ python setup.py install
+
+reinstall: rebuild install
+
+clean:
+ rm -rf build
+
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_constellationsink2.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_constellationsink2.xml
2008-03-13 22:55:54 UTC (rev 8016)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_constellationsink2.xml
2008-03-13 23:06:07 UTC (rev 8017)
@@ -14,7 +14,8 @@
title=$title,
sample_rate=$samp_rate,
frame_decim=$frame_decim,
-)</make>
+)
+$(id).win.$(marker)()</make>
<callback>set_sample_rate($samp_rate)</callback>
<param>
<name>Title</name>
@@ -35,6 +36,24 @@
<type>int</type>
</param>
<param>
+ <name>Marker</name>
+ <key>marker</key>
+ <value>set_format_plus</value>
+ <type>enum</type>
+ <option>
+ <name>Line</name>
+ <key>set_format_line</key>
+ </option>
+ <option>
+ <name>Dot</name>
+ <key>set_format_dot</key>
+ </option>
+ <option>
+ <name>Plus</name>
+ <key>set_format_plus</key>
+ </option>
+ </param>
+ <param>
<name>Grid Position</name>
<key>grid_pos</key>
<value>0, 0, 1, 1</value>
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_numbersink2.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_numbersink2.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_numbersink2.xml
2008-03-13 23:06:07 UTC (rev 8017)
@@ -0,0 +1,170 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Number Sink
+###################################################
+ -->
+<block>
+ <name>Number Sink</name>
+ <key>wxgui_numbersink2</key>
+ <import>from gnuradio.wxgui import numbersink2</import>
+ <make>numbersink2.$(type.fcn)(
+ _frame,
+ unit=$units,
+ base_value=$base_value,
+ minval=$min_value,
+ maxval=$max_value,
+ factor=$factor,
+ decimal_places=$decimal_places,
+ ref_level=$ref_level,
+ sample_rate=$samp_rate,
+ number_rate=$number_rate,
+#if $avg_alpha.eval == 0
+ avg_alpha=None,
+#else
+ avg_alpha=$avg_alpha,
+#end if
+ label=$title,
+)
+$(id).set_average($options.average)
+$(id).set_peak_hold($options.peak_hold)
+$(id).set_show_gauge($show_gauge)
+</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <value>complex</value>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:number_sink_c</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:number_sink_f</opt>
+ </option>
+ </param>
+ <param>
+ <name>Title</name>
+ <key>title</key>
+ <value>Number Plot</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Units</name>
+ <key>units</key>
+ <value>Units</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Sample Rate</name>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Base Value</name>
+ <key>base_value</key>
+ <value>0.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Min Value</name>
+ <key>min_value</key>
+ <value>-100</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Max Value</name>
+ <key>max_value</key>
+ <value>100</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Factor</name>
+ <key>factor</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Decimal Places</name>
+ <key>decimal_places</key>
+ <value>10</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Reference Level</name>
+ <key>ref_level</key>
+ <value>50</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Number Rate</name>
+ <key>number_rate</key>
+ <value>15</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Average Alpha</name>
+ <key>avg_alpha</key>
+ <value>0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Options</name>
+ <key>options</key>
+ <value>none</value>
+ <type>enum</type>
+ <option>
+ <name>None</name>
+ <key>none</key>
+ <opt>peak_hold:False</opt>
+ <opt>average:False</opt>
+ </option>
+ <option>
+ <name>Average</name>
+ <key>average</key>
+ <opt>peak_hold:False</opt>
+ <opt>average:True</opt>
+ </option>
+ <option>
+ <name>Peak Hold</name>
+ <key>peak_hold</key>
+ <opt>peak_hold:True</opt>
+ <opt>average:False</opt>
+ </option>
+ </param>
+ <param>
+ <name>Show Gauge</name>
+ <key>show_gauge</key>
+ <value>True</value>
+ <type>enum</type>
+ <option>
+ <name>Show</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>Hide</name>
+ <key>False</key>
+ </option>
+ </param>
+ <param>
+ <name>Grid Position</name>
+ <key>grid_pos</key>
+ <value>0, 0, 1, 1</value>
+ <type>grid_pos</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$num_inputs</nports>
+ </sink>
+ <doc>
+Set Average Alpha to 0 for automatic setting.
+
+Use the Grid Position (row, column, row span, column span) to position the
graphical element in the window.
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_scopesink2.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_scopesink2.xml
2008-03-13 22:55:54 UTC (rev 8016)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_scopesink2.xml
2008-03-13 23:06:07 UTC (rev 8017)
@@ -9,6 +9,7 @@
<name>Scope Sink</name>
<key>wxgui_scopesink2</key>
<import>from gnuradio.wxgui import scopesink2</import>
+ <import>from gnuradio import gr</import>
<make>scopesink2.$(type.fcn)(
_frame,
title=$title,
@@ -21,7 +22,11 @@
#end if
t_scale=$t_scale,
num_inputs=$num_inputs,
-)</make>
+)
+$(id).win.$(marker)()</make>
+<!--
+$(id).win.info.scopesink.set_trigger_channel($(trigger_channel))
+$(id).win.info.scopesink.set_trigger_mode(gr.$(trigger_mode)) -->
<callback>set_sample_rate($samp_rate)</callback>
<param>
<name>Type</name>
@@ -70,6 +75,48 @@
<type>real</type>
</param>
<param>
+ <name>Marker</name>
+ <key>marker</key>
+ <value>set_format_line</value>
+ <type>enum</type>
+ <option>
+ <name>Line</name>
+ <key>set_format_line</key>
+ </option>
+ <option>
+ <name>Dot</name>
+ <key>set_format_dot</key>
+ </option>
+ <option>
+ <name>Plus</name>
+ <key>set_format_plus</key>
+ </option>
+ </param>
+ <!-- <param>
+ <name>Trigger Channel</name>
+ <key>trigger_channel</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Trigger Mode</name>
+ <key>trigger_mode</key>
+ <value>gr_TRIG_AUTO</value>
+ <type>enum</type>
+ <option>
+ <name>Auto</name>
+ <key>gr_TRIG_AUTO</key>
+ </option>
+ <option>
+ <name>Positive Slope</name>
+ <key>gr_TRIG_POS_SLOPE</key>
+ </option>
+ <option>
+ <name>Negative Slope</name>
+ <key>gr_TRIG_NEG_SLOPE</key>
+ </option>
+ </param> -->
+ <param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>1</value>
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_waterfallsink2.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_waterfallsink2.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_waterfallsink2.xml
2008-03-13 23:06:07 UTC (rev 8017)
@@ -0,0 +1,130 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Waterfall Sink
+###################################################
+ -->
+<block>
+ <name>Waterfall Sink</name>
+ <key>wxgui_waterfallsink2</key>
+ <import>from gnuradio.wxgui import waterfallsink2</import>
+ <make>waterfallsink2.$(type.fcn)(
+ _frame,
+ baseband_freq=$baseband_freq,
+ y_per_div=$y_per_div,
+ ref_level=$ref_level,
+ sample_rate=$samp_rate,
+ fft_size=$fft_size,
+ fft_rate=$fft_rate,
+ average=$options.average,
+#if $avg_alpha.eval == 0
+ avg_alpha=None,
+#else
+ avg_alpha=$avg_alpha,
+#end if
+ title=$title,
+)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <value>complex</value>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:waterfall_sink_c</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:waterfall_sink_f</opt>
+ </option>
+ </param>
+ <param>
+ <name>Title</name>
+ <key>title</key>
+ <value>Waterfall Plot</value>
+ <type>string</type>
+ </param>
+ <param>
+ <name>Sample Rate</name>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Baseband Freq</name>
+ <key>baseband_freq</key>
+ <value>0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Y per Div</name>
+ <key>y_per_div</key>
+ <value>10</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Reference Level</name>
+ <key>ref_level</key>
+ <value>50</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>FFT Size</name>
+ <key>fft_size</key>
+ <value>512</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>FFT Rate</name>
+ <key>fft_rate</key>
+ <value>15</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Average Alpha</name>
+ <key>avg_alpha</key>
+ <value>0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Options</name>
+ <key>options</key>
+ <value>none</value>
+ <type>enum</type>
+ <option>
+ <name>None</name>
+ <key>none</key>
+ <opt>average:False</opt>
+ </option>
+ <option>
+ <name>Average</name>
+ <key>average</key>
+ <opt>average:True</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Grid Position</name>
+ <key>grid_pos</key>
+ <value>0, 0, 1, 1</value>
+ <type>grid_pos</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$num_inputs</nports>
+ </sink>
+ <doc>
+Set Average Alpha to 0 for automatic setting.
+
+Use the Grid Position (row, column, row span, column span) to position the
graphical element in the window.
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/misc/gr_throttle.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/misc/gr_throttle.xml
2008-03-13 22:55:54 UTC (rev 8016)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/misc/gr_throttle.xml
2008-03-13 23:06:07 UTC (rev 8017)
@@ -9,7 +9,7 @@
<name>Throttle</name>
<key>gr_throttle</key>
<import>from gnuradio import gr</import>
- <make>gr.throttle($type:size*$vlen, $samples_per_second)</make>
+ <make>gr.throttle($type.size*$vlen, $samples_per_second)</make>
<param>
<name>Type</name>
<key>type</key>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_sig_source_x.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_sig_source_x.xml
2008-03-13 22:55:54 UTC (rev 8016)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_sig_source_x.xml
2008-03-13 23:06:07 UTC (rev 8017)
@@ -55,23 +55,23 @@
<key>gr.GR_CONST_WAVE</key>
</option>
<option>
- <name>Constant</name>
+ <name>Sine</name>
<key>gr.GR_SIN_WAVE</key>
</option>
<option>
- <name>Constant</name>
+ <name>Cosine</name>
<key>gr.GR_COS_WAVE</key>
</option>
<option>
- <name>Constant</name>
+ <name>Square</name>
<key>gr.GR_SQR_WAVE</key>
</option>
<option>
- <name>Constant</name>
+ <name>Triangle</name>
<key>gr.GR_TRI_WAVE</key>
</option>
<option>
- <name>Constant</name>
+ <name>Saw Tooth</name>
<key>gr.GR_SAW_WAVE</key>
</option>
</param>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
2008-03-13 22:55:54 UTC (rev 8016)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
2008-03-13 23:06:07 UTC (rev 8017)
@@ -32,11 +32,11 @@
</cat>
<cat>
<name>Graphical Sinks</name>
- <block>number_sink</block>
+ <block>wxgui_numbersink2</block>
<block>wxgui_scopesink2</block>
<block>wxgui_fftsink2</block>
<block>wxgui_constellationsink2</block>
- <block>waterfall_sink</block>
+ <block>wxgui_waterfallsink2</block>
</cat>
<cat>
<name>Operators</name>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/wx_gui.tmpl
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/wx_gui.tmpl
2008-03-13 22:55:54 UTC (rev 8016)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/wx_gui.tmpl
2008-03-13 23:06:07 UTC (rev 8017)
@@ -48,7 +48,6 @@
def _callback(_val): pass#slurp
#end if
#end def
-
########################################################
## Create Imports
########################################################
@@ -100,7 +99,6 @@
#set $grid_pos = $graphical_sink.get_param('grid_pos').evaluate()
_grid.Add($(graphical_sink.get_id()).win, wx.GBPosition($grid_pos[0],
$grid_pos[1]), wx.GBSpan($grid_pos[2], $grid_pos[3]))
#end for
-
########################################################
## Create Sliders
########################################################
@@ -118,7 +116,6 @@
#set $grid_pos = $slider.get_param('grid_pos').evaluate()
_grid.Add(slider, wx.GBPosition($grid_pos[0], $grid_pos[1]),
wx.GBSpan($grid_pos[2], $grid_pos[3]))
#end for
-
########################################################
## Create Chooser
########################################################
@@ -135,7 +132,6 @@
#set $grid_pos = $chooser.get_param('grid_pos').evaluate()
_grid.Add(chooser, wx.GBPosition($grid_pos[0], $grid_pos[1]),
wx.GBSpan($grid_pos[2], $grid_pos[3]))
#end for
-
########################################################
## Create Buttons
########################################################
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8017 - in grc/branches/grc_reloaded: . src/grc/platforms/gnuradio_python/blocks/graphical_sinks src/grc/platforms/gnuradio_python/blocks/misc src/grc/platforms/gnuradio_python/blocks/sources src/grc/platforms/gnuradio_python/data,
jblum <=