[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8021 - in grc/branches/grc_reloaded/src/grc: . gui/el
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8021 - in grc/branches/grc_reloaded/src/grc: . gui/elements platforms/gnuradio_python/blocks/graphical_sinks platforms/gnuradio_python/blocks/operators platforms/gnuradio_python/blocks/sinks platforms/gnuradio_python/blocks/sources platforms/gnuradio_python/data |
|
Date: |
Fri, 14 Mar 2008 11:57:24 -0600 (MDT) |
Author: jblum
Date: 2008-03-14 11:57:20 -0600 (Fri, 14 Mar 2008)
New Revision: 8021
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_divide_xx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_nlog10_ff.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_sub_xx.xml
Modified:
grc/branches/grc_reloaded/src/grc/ParseXML.py
grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py
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/operators/gr_add_const_vxx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_add_vxx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_and_xx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_multiply_const_vxx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_multiply_vxx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_not_xx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_or_xx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_xor_xx.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_file_sink.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_null_sink.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_file_source.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_null_source.xml
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
Log:
xml safe chars, finished ops, fixed : issue in blocks
Modified: grc/branches/grc_reloaded/src/grc/ParseXML.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/ParseXML.py 2008-03-14 17:49:42 UTC
(rev 8020)
+++ grc/branches/grc_reloaded/src/grc/ParseXML.py 2008-03-14 17:57:20 UTC
(rev 8021)
@@ -49,6 +49,34 @@
def fatal(self, msg):
raise ValidationError('Fatal', msg, self.location())
+
+_SPECIAL_CHARS = (
+ ('&', '&'),
+ ('<', '<'),
+ ('>', '>'),
+ ('"', '"'),
+ ("'", '''),
+)
+
+def xml_encode(string):
+ """!
+ Encode a string into an xml safe string by replacing special characters.
+ @param string the input string
+ @return output string with safe characters
+ """
+ string = str(string)
+ for char, safe in _SPECIAL_CHARS: string = string.replace(char, safe)
+ return string
+
+def xml_decode(string):
+ """!
+ Decode an xml string into its original form by replacing special
characters.
+ @param string the input xml string
+ @return output string without safe characters
+ """
+ string = str(string)
+ for char, safe in reversed(_SPECIAL_CHARS): string =
string.replace(safe, char)
+ return string
def validate_dtd(file_path):
"""!
@@ -77,7 +105,7 @@
if len(doc.childNodes) == 0:
return odict({tag_name: ''})
elif len(doc.childNodes) == 1 and doc.firstChild.nodeValue:
- return odict({tag_name: str(doc.firstChild.nodeValue)})
+ return odict({tag_name: xml_decode(doc.firstChild.nodeValue)})
nested_data = odict()
for elem in filter(lambda elem: elem.localName, doc.childNodes):
key, value = _from_xml(elem).items()[0]
@@ -111,7 +139,7 @@
for key, elems in value.iteritems():
if type(elems) != type(list()): elems = [elems]
for elem in elems:
child.appendChild(_to_xml(odict({key: elem}), doc))
- elif value: child.appendChild(doc.createTextNode(value))
+ elif value: child.appendChild(doc.createTextNode(xml_encode(value)))
return child
def to_file(doc, file_path):
Modified: grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py
===================================================================
--- grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py 2008-03-14
17:49:42 UTC (rev 8020)
+++ grc/branches/grc_reloaded/src/grc/gui/elements/FlowGraph.py 2008-03-14
17:57:20 UTC (rev 8021)
@@ -179,8 +179,8 @@
@param direction DIR_LEFT or DIR_RIGHT
@return true if rotated, otherwise false.
"""
- if self.selected_element and self.selected_element.is_block()
or \
- self.selected_element.is_source() or
self.selected_element.is_sink():
+ if self.selected_element and (self.selected_element.is_block()
or \
+ self.selected_element.is_source() or
self.selected_element.is_sink()):
self.selected_element.rotate(direction)
self.draw()
return True
Modified:
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
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/graphical_sinks/wxgui_numbersink2.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -20,15 +20,15 @@
ref_level=$ref_level,
sample_rate=$samp_rate,
number_rate=$number_rate,
+ average=$options.average,
#if $avg_alpha.eval == 0
avg_alpha=None,
#else
avg_alpha=$avg_alpha,
#end if
label=$title,
+ peak_hold=$options.peak_hold,
)
-$(id).set_average($options.average)
-$(id).set_peak_hold($options.peak_hold)
$(id).set_show_gauge($show_gauge)
</make>
<param>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_add_const_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_add_const_vxx.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_add_const_vxx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -10,13 +10,13 @@
<name>Add Const</name>
<key>gr_add_const_vxx</key>
<import>from gnuradio import gr</import>
- <make>$(type.fcn)($const)</make>
+ <make>gr.add_const_v$(type.fcn)($const)</make>
<callback>set_k($const)</callback>
<param>
<name>Constant</name>
<key>const</key>
<value>0</value>
- <type>$type:const_type</type>
+ <type>$type.const_type</type>
</param>
<param>
<name>IO Type</name>
@@ -26,25 +26,25 @@
<name>Complex</name>
<key>complex</key>
<opt>const_type:complex_vector</opt>
- <opt>fcn:gr.add_const_vcc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>const_type:real_vector</opt>
- <opt>fcn:gr.add_const_vff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
<opt>const_type:int_vector</opt>
- <opt>fcn:gr.add_const_vii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
<opt>const_type:int_vector</opt>
- <opt>fcn:gr.add_const_vss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_add_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_add_vxx.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_add_vxx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -10,7 +10,7 @@
<name>Add</name>
<key>gr_add_vxx</key>
<import>from gnuradio import gr</import>
- <make>$(type.fcn)($vlen)</make>
+ <make>gr.add_v$(type.fcn)($vlen)</make>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
@@ -24,22 +24,22 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:gr.add_vcc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:gr.add_vff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:gr.add_vii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:gr.add_vss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_and_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_and_xx.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_and_xx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -9,7 +9,7 @@
<name>And</name>
<key>gr_and_xx</key>
<import>from gnuradio import gr</import>
- <make>$(type.fcn)()</make>
+ <make>gr.and_$(type.fcn)()</make>
<param>
<name>IO Type</name>
<key>type</key>
@@ -17,17 +17,17 @@
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:gr.and_ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:gr.and_ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:gr.and_bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<sink>
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_divide_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_divide_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_divide_xx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Divide Block:
+## all types, 1 output, 2 to inf inputs
+###################################################
+ -->
+<block>
+ <name>Divide</name>
+ <key>gr_divide_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.divide_$(type.fcn)()</make>
+ <param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ </param>
+ <check>$num_inputs >= 2</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+ <doc>
+output = input_0 / input_1 / input_2 / ...
+
+Divide across all input streams.
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_multiply_const_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_multiply_const_vxx.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_multiply_const_vxx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -10,13 +10,13 @@
<name>Multiply Const</name>
<key>gr_multiply_const_vxx</key>
<import>from gnuradio import gr</import>
- <make>$(type.fcn)($const)</make>
+ <make>gr.multiply_const_v$(type.fcn)($const)</make>
<callback>set_k($const)</callback>
<param>
<name>Constant</name>
<key>const</key>
<value>0</value>
- <type>$type:const_type</type>
+ <type>$type.const_type</type>
</param>
<param>
<name>IO Type</name>
@@ -26,25 +26,25 @@
<name>Complex</name>
<key>complex</key>
<opt>const_type:complex_vector</opt>
- <opt>fcn:gr.multiply_const_vcc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>const_type:real_vector</opt>
- <opt>fcn:gr.multiply_const_vff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
<opt>const_type:int_vector</opt>
- <opt>fcn:gr.multiply_const_vii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
<opt>const_type:int_vector</opt>
- <opt>fcn:gr.multiply_const_vss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_multiply_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_multiply_vxx.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_multiply_vxx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -10,7 +10,7 @@
<name>Multiply</name>
<key>gr_multiply_vxx</key>
<import>from gnuradio import gr</import>
- <make>$(type.fcn)($vlen)</make>
+ <make>gr.multiply_v$(type.fcn)($vlen)</make>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
@@ -24,22 +24,22 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:gr.multiply_vcc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:gr.multiply_vff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:gr.multiply_vii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:gr.multiply_vss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_nlog10_ff.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_nlog10_ff.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_nlog10_ff.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Log10 Block:
+## float in/ float out
+###################################################
+ -->
+<block>
+ <name>Log10</name>
+ <key>gr_nlog10_ff</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.nlog10_ff($n, $vlen, $k)</make>
+ <param>
+ <name>n</name>
+ <key>n</key>
+ <value>1</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>k</name>
+ <key>k</key>
+ <value>0</value>
+ <type>real</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>float</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ <vlen>$vlen</vlen>
+ </source>
+ <doc>
+output = n*log10(input) + k
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_not_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_not_xx.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_not_xx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -9,7 +9,7 @@
<name>Not</name>
<key>gr_not_xx</key>
<import>from gnuradio import gr</import>
- <make>$(type.fcn)()</make>
+ <make>gr.not_$(type.fcn)()</make>
<param>
<name>IO Type</name>
<key>type</key>
@@ -17,17 +17,17 @@
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:gr.not_ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:gr.not_ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:gr.not_bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<sink>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_or_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_or_xx.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_or_xx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -9,7 +9,7 @@
<name>Or</name>
<key>gr_or_xx</key>
<import>from gnuradio import gr</import>
- <make>$(type.fcn)()</make>
+ <make>gr.or_$(type.fcn)()</make>
<param>
<name>IO Type</name>
<key>type</key>
@@ -17,17 +17,17 @@
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:gr.or_ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:gr.or_ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:gr.or_bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<sink>
Added:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_sub_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_sub_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_sub_xx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Subtract Block:
+## all types, 1 output, 2 to inf inputs
+###################################################
+ -->
+<block>
+ <name>Subtract</name>
+ <key>gr_sub_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.sub_$(type.fcn)()</make>
+ <param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ </param>
+ <check>$num_inputs >= 2</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+ <doc>
+output = input_0 - input_1 - input_2 - ...
+
+Subtract across all input streams.
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_xor_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_xor_xx.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/operators/gr_xor_xx.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -9,7 +9,7 @@
<name>Xor</name>
<key>gr_xor_xx</key>
<import>from gnuradio impxort gr</import>
- <make>$(type.fcn)()</make>
+ <make>gr.xor_$(type.fcn)()</make>
<param>
<name>IO Type</name>
<key>type</key>
@@ -17,17 +17,17 @@
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:gr.xor_ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Shxort</name>
<key>short</key>
- <opt>fcn:gr.xor_ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:gr.xor_bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<sink>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_file_sink.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_file_sink.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_file_sink.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -9,7 +9,7 @@
<name>File Sink</name>
<key>gr_file_sink</key>
<import>from gnuradio import gr</import>
- <make>gr.file_sink($type:size*$vlen, $file)</make>
+ <make>gr.file_sink($type.size*$vlen, $file)</make>
<param>
<name>File</name>
<key>file</key>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_null_sink.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_null_sink.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sinks/gr_null_sink.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -9,7 +9,7 @@
<name>Null Sink</name>
<key>gr_null_sink</key>
<import>from gnuradio import gr</import>
- <make>gr.null_sink($type:size*$vlen)</make>
+ <make>gr.null_sink($type.size*$vlen)</make>
<param>
<name>Input Type</name>
<key>type</key>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_file_source.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_file_source.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_file_source.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -9,7 +9,7 @@
<name>File Source</name>
<key>gr_file_source</key>
<import>from gnuradio import gr</import>
- <make>gr.file_source($type:size*$vlen, $file, $repeat)</make>
+ <make>gr.file_source($type.size*$vlen, $file, $repeat)</make>
<param>
<name>File</name>
<key>file</key>
Modified:
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_null_source.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_null_source.xml
2008-03-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/blocks/sources/gr_null_source.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -9,7 +9,7 @@
<name>Null Source</name>
<key>gr_null_source</key>
<import>from gnuradio import gr</import>
- <make>gr.null_source($type:size*$vlen)</make>
+ <make>gr.null_source($type.size*$vlen)</make>
<param>
<name>Output Type</name>
<key>type</key>
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-14 17:49:42 UTC (rev 8020)
+++
grc/branches/grc_reloaded/src/grc/platforms/gnuradio_python/data/block_tree.xml
2008-03-14 17:57:20 UTC (rev 8021)
@@ -41,10 +41,10 @@
<cat>
<name>Operators</name>
<block>gr_add_vxx</block>
- <block>gr_subtract_xx</block>
+ <block>gr_sub_xx</block>
<block>gr_multiply_vxx</block>
<block>gr_divide_xx</block>
- <block>gr_nlog10_xx</block>
+ <block>gr_nlog10_ff</block>
<block>gr_add_const_vxx</block>
<block>gr_multiply_const_vxx</block>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8021 - in grc/branches/grc_reloaded/src/grc: . gui/elements platforms/gnuradio_python/blocks/graphical_sinks platforms/gnuradio_python/blocks/operators platforms/gnuradio_python/blocks/sinks platforms/gnuradio_python/blocks/sources platforms/gnuradio_python/data,
jblum <=