[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8076 - in grc/branches/grc_reloaded: notes src/grc sr
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8076 - in grc/branches/grc_reloaded: notes src/grc src/grc_gnuradio src/grc_gnuradio/blks2 src/grc_gnuradio/blocks/conversions src/grc_gnuradio/blocks/misc src/grc_gnuradio/data src/grc_gnuradio/wxgui |
|
Date: |
Sat, 22 Mar 2008 21:41:41 -0600 (MDT) |
Author: jblum
Date: 2008-03-22 21:41:40 -0600 (Sat, 22 Mar 2008)
New Revision: 8076
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_chunks_to_symbols.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_packed_to_unpacked_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_unpacked_to_packed_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_head.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_nop.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/selector.xml
Removed:
grc/branches/grc_reloaded/notes/clean.sh
Modified:
grc/branches/grc_reloaded/src/grc/Constants.py
grc/branches/grc_reloaded/src/grc_gnuradio/Generator.py
grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_throttle.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/wx_gui.tmpl
grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/__init__.py
Log:
misc blocks, and misc conversions
Deleted: grc/branches/grc_reloaded/notes/clean.sh
Modified: grc/branches/grc_reloaded/src/grc/Constants.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/Constants.py 2008-03-23 02:28:03 UTC
(rev 8075)
+++ grc/branches/grc_reloaded/src/grc/Constants.py 2008-03-23 03:41:40 UTC
(rev 8076)
@@ -96,7 +96,7 @@
address@hidden
##misc window constraints @{
-REPORTS_WINDOW_HEIGHT = 80
+REPORTS_WINDOW_HEIGHT = 100
BLOCK_SELECTION_WINDOW_WIDTH = 250
BLOCK_SELECTION_WINDOW_HEIGHT = 250
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/Generator.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/Generator.py 2008-03-23
02:28:03 UTC (rev 8075)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/Generator.py 2008-03-23
03:41:40 UTC (rev 8076)
@@ -89,7 +89,7 @@
#build the template
t = Template(open(NO_GUI_TEMPLATE, 'r').read(),
namespace)
elif self._flow_graph.get_option('generate_options') ==
'wx_gui':
- imports.append('from grc_gnuradio.wxgui import
Controls')
+ imports.append('from grc_gnuradio import wxgui as
grc_wxgui')
imports.append('import wx')
imports = sorted(set(imports)) #unique and sorted
#separate variables with wx controls
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
2008-03-23 02:28:03 UTC (rev 8075)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
2008-03-23 03:41:40 UTC (rev 8076)
@@ -20,3 +20,6 @@
#Package for external gnuradio blocks.
address@hidden Josh Blum
+from selector import selector
+from packet import packet_mod, packet_demod
+
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_chunks_to_symbols.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_chunks_to_symbols.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_chunks_to_symbols.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Chunks to Symbols
+###################################################
+ -->
+<block>
+ <name>Chunks to Symbols</name>
+ <key>gr_chunks_to_symbols_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.chunks_to_symbols_$(in_type.fcn)$(out_type.fcn)($symbol_table,
$dimension)</make>
+ <param>
+ <name>Input Type</name>
+ <key>in_type</key>
+ <type>enum</type>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:i</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:s</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>fcn:b</opt>
+ </option>
+ </param>
+ <param>
+ <name>Output Type</name>
+ <key>out_type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:c</opt>
+ <opt>table:complex_vector</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ <opt>table:real_vector</opt>
+ </option>
+ </param>
+ <param>
+ <name>Symbol Table</name>
+ <key>symbol_table</key>
+ <type>$out_type.table</type>
+ </param>
+ <param>
+ <name>Dimension</name>
+ <key>dimension</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$in_type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$out_type</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_packed_to_unpacked_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_packed_to_unpacked_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_packed_to_unpacked_xx.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Packed to Unpacked
+###################################################
+ -->
+<block>
+ <name>Packed to Unpacked</name>
+ <key>gr_packed_to_unpacked_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.packed_to_unpacked_$(type.fcn)($bits_per_chunk,
$endianness)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>fcn:bb</opt>
+ </option>
+ </param>
+ <param>
+ <name>Bits per Chunk</name>
+ <key>bits_per_chunk</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Endianness</name>
+ <key>endianness</key>
+ <type>enum</type>
+ <option>
+ <name>MSB</name>
+ <key>gr.GR_MSB_FIRST</key>
+ </option>
+ <option>
+ <name>LSB</name>
+ <key>gr.GR_LSB_FIRST</key>
+ </option>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_unpacked_to_packed_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_unpacked_to_packed_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_unpacked_to_packed_xx.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Unpacked to Packed
+###################################################
+ -->
+<block>
+ <name>Unpacked to Packed</name>
+ <key>gr_unpacked_to_packed_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.unpacked_to_packed_$(type.fcn)($bits_per_chunk,
$endianness)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>fcn:bb</opt>
+ </option>
+ </param>
+ <param>
+ <name>Bits per Chunk</name>
+ <key>bits_per_chunk</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Endianness</name>
+ <key>endianness</key>
+ <type>enum</type>
+ <option>
+ <name>MSB</name>
+ <key>gr.GR_MSB_FIRST</key>
+ </option>
+ <option>
+ <name>LSB</name>
+ <key>gr.GR_LSB_FIRST</key>
+ </option>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_head.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_head.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_head.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Head
+###################################################
+ -->
+<block>
+ <name>Head</name>
+ <key>gr_head</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.head($type.size*$vlen, $num_items)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Items</name>
+ <key>num_items</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Kludge Copy
+###################################################
+ -->
+<block>
+ <name>Copy</name>
+ <key>gr_kludge_copy</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.kludge_copy($type.size*$vlen)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_nop.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_nop.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_nop.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Nop
+###################################################
+ -->
+<block>
+ <name>Nop</name>
+ <key>gr_nop</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.nop($type.size*$vlen)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Skip Head
+###################################################
+ -->
+<block>
+ <name>Skip Head</name>
+ <key>gr_skiphead</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.skiphead($type.size*$vlen, $num_items)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Items</name>
+ <key>num_items</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_throttle.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_throttle.xml
2008-03-23 02:28:03 UTC (rev 8075)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_throttle.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -58,7 +58,7 @@
<type>$type</type>
<vlen>$vlen</vlen>
</sink>
- <source>
+ <source>
<name>out</name>
<type>$type</type>
<vlen>$vlen</vlen>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/selector.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/selector.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/selector.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,95 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Selector:
+## Custom blks2 block
+###################################################
+ -->
+<block>
+ <name>Selector</name>
+ <key>selector</key>
+ <import>from grc_gnuradio import blks2 as grc_blks2</import>
+ <make>grc_blks2.selector(
+ item_size=$type.size*$vlen,
+ num_inputs=$num_inputs,
+ num_outputs=$num_outputs,
+ input_index=$input_index,
+ output_index=$output_index,
+)</make>
+ <callback>set_input_index($input_index)</callback>
+ <callback>set_output_index($output_index)</callback>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Num Outputs</name>
+ <key>num_outputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Input Index</name>
+ <key>input_index</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Output Index</name>
+ <key>output_index</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_outputs</nports>
+ </source>
+</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-23 02:28:03 UTC (rev 8075)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-23 03:41:40 UTC (rev 8076)
@@ -92,11 +92,11 @@
</cat>
<cat>
<name>Misc Conversions</name>
- <block>unpacked_to_packed</block>
- <block>packed_to_unpacked</block>
+ <block>gr_unpacked_to_packed_xx</block>
+ <block>gr_packed_to_unpacked_xx</block>
<block>unpack_kbits</block>
<block>binary_slicer</block>
- <block>chunks_to_symbols</block>
+ <block>gr_chunks_to_symbols_xx</block>
<block>map</block>
</cat>
<cat>
@@ -197,10 +197,11 @@
<block>gr_mute_xx</block>
<block>valve</block>
<block>selector</block>
- <block>head</block>
- <block>skip_head</block>
+ <block>gr_head</block>
+ <block>gr_skiphead</block>
<block>input_terminator</block>
- <block>copy</block>
+ <block>gr_kludge_copy</block>
<block>tun_tap</block>
+ <block>gr_nop</block>
</cat>
</block_tree>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/data/wx_gui.tmpl
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/data/wx_gui.tmpl 2008-03-23
02:28:03 UTC (rev 8075)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/wx_gui.tmpl 2008-03-23
03:41:40 UTC (rev 8076)
@@ -104,7 +104,7 @@
########################################################
#for $slider in $sliders
$make_callback($slider.get_id())
-slider = Controls.Slider(
+slider = grc_wxgui.Slider(
window=_frame,
callback=_callback,
title="$slider.get_id()",
@@ -121,7 +121,7 @@
########################################################
#for $chooser in $choosers
$make_callback($chooser.get_id())
-chooser = Controls.Chooser(
+chooser = grc_wxgui.Chooser(
window=_frame,
callback=_callback,
title="$chooser.get_id()",
@@ -137,7 +137,7 @@
########################################################
#for $button in $buttons
$make_callback($button.get_id())
-button = Controls.Button(
+button = grc_wxgui.Button(
window=_frame,
callback=_callback,
title="$button.get_id()",
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/__init__.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/__init__.py
2008-03-23 02:28:03 UTC (rev 8075)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/__init__.py
2008-03-23 03:41:40 UTC (rev 8076)
@@ -0,0 +1,24 @@
+"""
+Copyright 2008 Free Software Foundation, Inc.
+This file is part of GNU Radio
+
+GNU Radio Companion 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 2
+of the License, or (at your option) any later version.
+
+GNU Radio Companion 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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+"""
address@hidden grc_gnuradio.wxgui
+#Package for external gnuradio wxgui objects.
address@hidden Josh Blum
+
+from Controls import Button, Chooser, Slider
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8076 - in grc/branches/grc_reloaded: notes src/grc src/grc_gnuradio src/grc_gnuradio/blks2 src/grc_gnuradio/blocks/conversions src/grc_gnuradio/blocks/misc src/grc_gnuradio/data src/grc_gnuradio/wxgui,
jblum <=