diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-10 13:48:07 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-10 13:48:07 -0700 |
| commit | f1f49ff9b18d5e4ebbee4ddd279244f562672e0f (patch) | |
| tree | c1007ecc2ccc3fac97f72176a38b6a21cf4fa3e7 | |
| parent | 0dc807264759c24b3fa1cb53da637185575f391d (diff) | |
| parent | 6fb0ff274a05daf2f2677af14337704fb88081f7 (diff) | |
Merge remote-tracking branch 'gnuradio-wg-grc/next_grcwg' into next
| -rw-r--r-- | grc/blocks/parameter.xml | 2 | ||||
| -rw-r--r-- | grc/core/Element.pyi | 54 | ||||
| -rw-r--r-- | grc/core/generator/flow_graph.tmpl | 7 | ||||
| -rw-r--r-- | grc/test/.cache/v/cache/lastfailed | 3 |
4 files changed, 63 insertions, 3 deletions
diff --git a/grc/blocks/parameter.xml b/grc/blocks/parameter.xml index 0c10da48cc..b0713218fd 100644 --- a/grc/blocks/parameter.xml +++ b/grc/blocks/parameter.xml @@ -55,7 +55,7 @@ </option> <option> <name>String</name> - <key>string</key> + <key>str</key> <opt>type:string</opt> </option> <!-- Do not forget to add option value type handler import into diff --git a/grc/core/Element.pyi b/grc/core/Element.pyi new file mode 100644 index 0000000000..c81180a33e --- /dev/null +++ b/grc/core/Element.pyi @@ -0,0 +1,54 @@ +# Copyright 2008, 2009, 2015, 2016 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 + +from . import Platform, FlowGraph, Block + +def lazy_property(func): + return func + + +class Element(object): + + def __init__(self, parent=None): + ... + + @property + def parent(self): + ... + + def get_parent_by_type(self, cls): + parent = self.parent + if parent is None: + return None + elif isinstance(parent, cls): + return parent + else: + return parent.get_parent_by_type(cls) + + @lazy_property + def parent_platform(self): -> Platform.Platform + ... + + @lazy_property + def parent_flowgraph(self): -> FlowGraph.FlowGraph + ... + + @lazy_property + def parent_block(self): -> Block.Block + ... + + diff --git a/grc/core/generator/flow_graph.tmpl b/grc/core/generator/flow_graph.tmpl index 38b113fe90..436e3bbf0d 100644 --- a/grc/core/generator/flow_graph.tmpl +++ b/grc/core/generator/flow_graph.tmpl @@ -347,8 +347,11 @@ def argument_parser(): #if $type #silent $params_eq_list.append('%s=options.%s'%($param.get_id(), $param.get_id())) parser.add_argument( - "$make_short_id($param)", "--$param.get_id().replace('_', '-')", dest="$param.get_id()", type=$type, default=$make_default($type, $param), - help="Set $($param.get_param('label').get_evaluated() or $param.get_id()) [default=%default]") + #if $make_short_id($param) + "$make_short_id($param)", #slurp + #end if + "--$param.get_id().replace('_', '-')", dest="$param.get_id()", type=$type, default=$make_default($type, $param), + help="Set $($param.get_param('label').get_evaluated() or $param.get_id()) [default=%(default)r]") #end if #end for return parser diff --git a/grc/test/.cache/v/cache/lastfailed b/grc/test/.cache/v/cache/lastfailed new file mode 100644 index 0000000000..9c73bf7055 --- /dev/null +++ b/grc/test/.cache/v/cache/lastfailed @@ -0,0 +1,3 @@ +{ + "test_no_re_cheetah_find.py::test_nested": true +}
\ No newline at end of file |