[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8482 - in grc/trunk/src/grc_gnuradio: . blocks/graphi
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8482 - in grc/trunk/src/grc_gnuradio: . blocks/graphical_sinks data |
|
Date: |
Thu, 22 May 2008 20:58:25 -0600 (MDT) |
Author: jblum
Date: 2008-05-22 20:58:24 -0600 (Thu, 22 May 2008)
New Revision: 8482
Modified:
grc/trunk/src/grc_gnuradio/Generator.py
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
grc/trunk/src/grc_gnuradio/data/no_gui.tmpl
grc/trunk/src/grc_gnuradio/data/wx_gui.tmpl
Log:
template update
Modified: grc/trunk/src/grc_gnuradio/Generator.py
===================================================================
--- grc/trunk/src/grc_gnuradio/Generator.py 2008-05-22 16:55:59 UTC (rev
8481)
+++ grc/trunk/src/grc_gnuradio/Generator.py 2008-05-23 02:58:24 UTC (rev
8482)
@@ -99,8 +99,6 @@
sliders = filter(lambda v: v.get_key() ==
'variable_slider', variables)
choosers = filter(lambda v: v.get_key() ==
'variable_chooser', variables)
variable_sinks = filter(lambda v: v.get_key() ==
'variable_sink', blocks)
- #graphical sinks
- graphical_sinks = filter(lambda b:
b.get_key().startswith('wxgui'), blocks)
#all callbacks
callbacks = list()
for block in blocks:
callbacks.extend(block.get_callbacks())
@@ -113,7 +111,6 @@
'choosers': choosers,
'variable_sinks': variable_sinks,
'blocks': blocks,
- 'graphical_sinks': graphical_sinks,
'connections':
self._flow_graph.get_connections(),
'callbacks': callbacks,
}
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
2008-05-22 16:55:59 UTC (rev 8481)
+++
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
2008-05-23 02:58:24 UTC (rev 8482)
@@ -15,7 +15,9 @@
sample_rate=$samp_rate,
frame_decim=$frame_decim,
)
-$(id).win.$(marker)()</make>
+$(id).win.$(marker)()
+#set $grid_pos = $grid_pos.eval
+tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])</make>
<callback>set_sample_rate($samp_rate)</callback>
<param>
<name>Title</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
2008-05-22 16:55:59 UTC (rev 8481)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
2008-05-23 02:58:24 UTC (rev 8482)
@@ -26,7 +26,9 @@
#end if
title=$title,
peak_hold=$peak_hold,
-)</make>
+)
+#set $grid_pos = $grid_pos.eval
+tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])</make>
<param>
<name>Type</name>
<key>type</key>
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
2008-05-22 16:55:59 UTC (rev 8481)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
2008-05-23 02:58:24 UTC (rev 8482)
@@ -30,7 +30,8 @@
peak_hold=$options.peak_hold,
)
$(id).set_show_gauge($show_gauge)
-</make>
+#set $grid_pos = $grid_pos.eval
+tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])</make>
<param>
<name>Type</name>
<key>type</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
2008-05-22 16:55:59 UTC (rev 8481)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
2008-05-23 02:58:24 UTC (rev 8482)
@@ -23,7 +23,9 @@
t_scale=$t_scale,
num_inputs=$num_inputs,
)
-$(id).win.$(marker)()</make>
+$(id).win.$(marker)()
+#set $grid_pos = $grid_pos.eval
+tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])</make>
<!--
$(id).win.info.scopesink.set_trigger_channel($(trigger_channel))
$(id).win.info.scopesink.set_trigger_mode(gr.$(trigger_mode)) -->
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
2008-05-22 16:55:59 UTC (rev 8481)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
2008-05-23 02:58:24 UTC (rev 8482)
@@ -24,7 +24,9 @@
avg_alpha=$avg_alpha,
#end if
title=$title,
-)</make>
+)
+#set $grid_pos = $grid_pos.eval
+tb.GridAdd($(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])</make>
<param>
<name>Type</name>
<key>type</key>
Modified: grc/trunk/src/grc_gnuradio/data/no_gui.tmpl
===================================================================
--- grc/trunk/src/grc_gnuradio/data/no_gui.tmpl 2008-05-22 16:55:59 UTC (rev
8481)
+++ grc/trunk/src/grc_gnuradio/data/no_gui.tmpl 2008-05-23 02:58:24 UTC (rev
8482)
@@ -9,28 +9,50 @@
address@hidden connections the connections
########################################################
#import time
-$('#'*50)
+#set $DIVIDER = '#'*50
+$DIVIDER
# Gnuradio Python Flow Graph (no gui)
$('# Title: %s'%$flow_graph.get_option('title'))
$('# Author: %s'%$flow_graph.get_option('author'))
$('# Description: %s'%$flow_graph.get_option('description'))
$('# Generated: %s'%time.ctime())
-$('#'*50)
+$DIVIDER
+########################################################
+## Create Imports
+########################################################
#for $imp in $imports
$imp
#end for
+tb = gr.top_block()
+
+########################################################
+## Create Variables
+########################################################
+$DIVIDER
+# Variables
+$DIVIDER
#for $var in $variables
$("%s = %s"%($var.get_id(), $var.get_make()))
#end for
+########################################################
+## Create Blocks
+########################################################
+$DIVIDER
+# Blocks
+$DIVIDER
#for $blk in filter(lambda b: b.get_make(), $blocks)
$("%s = %s"%($blk.get_id(), $blk.get_make()))
#end for
-tb = gr.top_block()
-
+########################################################
+## Create Connections
+########################################################
+$DIVIDER
+# Connections
+$DIVIDER
#for $con in $connections
#set $source = $con.get_source()
#set $sink = $con.get_sink()
Modified: grc/trunk/src/grc_gnuradio/data/wx_gui.tmpl
===================================================================
--- grc/trunk/src/grc_gnuradio/data/wx_gui.tmpl 2008-05-22 16:55:59 UTC (rev
8481)
+++ grc/trunk/src/grc_gnuradio/data/wx_gui.tmpl 2008-05-23 02:58:24 UTC (rev
8482)
@@ -11,24 +11,24 @@
address@hidden choosers variable blocks for choosers
address@hidden variable_sinks blocks for variable sinks
address@hidden callbacks the block callback strings
address@hidden graphical_sinks the graphical sink blocks
########################################################
#import time
#import os
#from grc.Constants import MAIN_WINDOW_PREFIX,DATA_DIR
+#set $DIVIDER = '#'*50
##set the icon for the wx app
#set $WX_APP_ICON = '"%s"'%os.path.abspath($DATA_DIR + '/grc-icon-32.png')
##>>> platform dependency! wx under cygwin has issues with icon paths
#if sys.platform == 'cygwin'
#set $WX_APP_ICON = None
#end if
-$('#'*50)
+$DIVIDER
# Gnuradio Python Flow Graph (wx gui)
$('# Title: %s'%$flow_graph.get_option('title'))
$('# Author: %s'%$flow_graph.get_option('author'))
$('# Description: %s'%$flow_graph.get_option('description'))
$('# Generated: %s'%time.ctime())
-$('#'*50)
+$DIVIDER
########################################################
## Create Imports
@@ -45,6 +45,9 @@
########################################################
## Create Variables
########################################################
+$DIVIDER
+# Variables
+$DIVIDER
#for $var in $variables
$("%s = %s"%($var.get_id(), $var.get_make()))
#end for
@@ -52,6 +55,9 @@
########################################################
## Create Blocks
########################################################
+$DIVIDER
+# Blocks
+$DIVIDER
#for $blk in filter(lambda b: b.get_make(), $blocks)
$("%s = %s"%($blk.get_id(), $blk.get_make()))
#end for
@@ -59,6 +65,9 @@
########################################################
## Create Connections
########################################################
+$DIVIDER
+# Connections
+$DIVIDER
#for $con in $connections
#set $source = $con.get_source()
#set $sink = $con.get_sink()
@@ -70,15 +79,7 @@
)
)
#end for
-
########################################################
-## Graphical Sinks
-########################################################
-#for $graphical_sink in $graphical_sinks
- #set $grid_pos = $graphical_sink.get_param('grid_pos').evaluate()
-tb.GridAdd($(graphical_sink.get_id()).win, $grid_pos[0], $grid_pos[1],
$grid_pos[2], $grid_pos[3])
-#end for
-########################################################
## Create Controls
########################################################
#for $control in $sliders + $choosers + $variable_sinks
@@ -89,9 +90,9 @@
#end if
#set $my_callbacks = filter(lambda c: id in ''.join(c.split('(')[1:]),
$callbacks)
-$('#'*50)
-# Create control for $id
-$('#'*50)
+$DIVIDER
+# Control for $id
+$DIVIDER
def _set_$(id)(_$id):
global $id
$id = _$id
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8482 - in grc/trunk/src/grc_gnuradio: . blocks/graphical_sinks data,
jblum <=