summaryrefslogtreecommitdiff
path: root/grc/python
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2015-12-07 16:03:50 -0800
committerJohnathan Corgan <johnathan@corganlabs.com>2015-12-07 16:03:50 -0800
commit7ec5e1385a70a7ddafa2fbdf9bd023757feedad9 (patch)
tree5b0aae2c2c60ef16ce0b01b2bfb05d09b5fce4a7 /grc/python
parent6f31b6e1dbb8f2474f6d95418d09145b0ceeecac (diff)
parent9587f5b34914f8ccbb05db093a024cf117b60a44 (diff)
Merge branch 'master' into next
Diffstat (limited to 'grc/python')
-rw-r--r--grc/python/FlowGraph.py35
-rw-r--r--grc/python/Generator.py40
-rw-r--r--grc/python/Param.py2
-rw-r--r--grc/python/flow_graph.tmpl5
4 files changed, 53 insertions, 29 deletions
diff --git a/grc/python/FlowGraph.py b/grc/python/FlowGraph.py
index 9b55cb6d43..686dae70fa 100644
--- a/grc/python/FlowGraph.py
+++ b/grc/python/FlowGraph.py
@@ -16,11 +16,13 @@ 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
"""
+import re
+import imp
+from operator import methodcaller
-import expr_utils
+from . import expr_utils
from .. base.FlowGraph import FlowGraph as _FlowGraph
from .. gui.FlowGraph import FlowGraph as _GUIFlowGraph
-import re
_variable_matcher = re.compile('^(variable\w*)$')
_parameter_matcher = re.compile('^(parameter)$')
@@ -181,8 +183,8 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph):
Returns:
a sorted list of variable blocks in order of dependency (indep -> dep)
"""
- variables = filter(lambda b: _variable_matcher.match(b.get_key()), self.get_enabled_blocks())
- return expr_utils.sort_objects(variables, lambda v: v.get_id(), lambda v: v.get_var_make())
+ variables = filter(lambda b: _variable_matcher.match(b.get_key()), self.iter_enabled_blocks())
+ return expr_utils.sort_objects(variables, methodcaller('get_id'), methodcaller('get_var_make'))
def get_parameters(self):
"""
@@ -191,16 +193,22 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph):
Returns:
a list of paramterized variables
"""
- parameters = filter(lambda b: _parameter_matcher.match(b.get_key()), self.get_enabled_blocks())
+ parameters = filter(lambda b: _parameter_matcher.match(b.get_key()), self.iter_enabled_blocks())
return parameters
def get_monitors(self):
"""
Get a list of all ControlPort monitors
"""
- monitors = filter(lambda b: _monitors_searcher.search(b.get_key()), self.get_enabled_blocks())
+ monitors = filter(lambda b: _monitors_searcher.search(b.get_key()),
+ self.iter_enabled_blocks())
return monitors
+ def get_python_modules(self):
+ """Iterate over custom code block ID and Source"""
+ for block in self.iter_enabled_blocks():
+ if block.get_key() == 'epy_module':
+ yield block.get_id(), block.get_param('source_code').get_value()
def get_bussink(self):
bussink = filter(lambda b: _bussink_searcher.search(b.get_key()), self.get_enabled_blocks())
@@ -212,8 +220,6 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph):
return False
-
-
def get_bussrc(self):
bussrc = filter(lambda b: _bussrc_searcher.search(b.get_key()), self.get_enabled_blocks())
@@ -277,9 +283,18 @@ class FlowGraph(_FlowGraph, _GUIFlowGraph):
#reload namespace
n = dict()
#load imports
- for imp in self.get_imports():
- try: exec imp in n
+ for code in self.get_imports():
+ try: exec code in n
except: pass
+
+ for id, code in self.get_python_modules():
+ try:
+ module = imp.new_module(id)
+ exec code in module.__dict__
+ n[id] = module
+ except:
+ pass
+
#load parameters
np = dict()
for parameter in self.get_parameters():
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index f064c7528f..d688beba15 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -24,6 +24,7 @@ import tempfile
import shlex
import codecs
from distutils.spawn import find_executable
+
from Cheetah.Template import Template
from .. gui import Messages
@@ -152,11 +153,12 @@ class TopBlockGenerator(object):
"""
output = list()
- title = self._flow_graph.get_option('title') or self._flow_graph.get_option('id').replace('_', ' ').title()
- imports = self._flow_graph.get_imports()
- variables = self._flow_graph.get_variables()
- parameters = self._flow_graph.get_parameters()
- monitors = self._flow_graph.get_monitors()
+ fg = self._flow_graph
+ title = fg.get_option('title') or fg.get_option('id').replace('_', ' ').title()
+ imports = fg.get_imports()
+ variables = fg.get_variables()
+ parameters = fg.get_parameters()
+ monitors = fg.get_monitors()
# list of blocks not including variables and imports and parameters and disabled
def _get_block_sort_text(block):
@@ -172,28 +174,32 @@ class TopBlockGenerator(object):
return code
blocks = expr_utils.sort_objects(
- filter(lambda b: b.get_enabled() and not b.get_bypassed(), self._flow_graph.iter_blocks()),
+ filter(lambda b: b.get_enabled() and not b.get_bypassed(), fg.iter_blocks()),
lambda b: b.get_id(), _get_block_sort_text
)
# List of regular blocks (all blocks minus the special ones)
blocks = filter(lambda b: b not in (imports + parameters), blocks)
for block in blocks:
- if block.get_key() == 'epy_block':
- file_path = os.path.join(self._dirname, block.get_id() + '.py')
+ key = block.get_key()
+ file_path = os.path.join(self._dirname, block.get_id() + '.py')
+ if key == 'epy_block':
src = block.get_param('_source_code').get_value()
output.append((file_path, src))
+ elif key == 'epy_module':
+ src = block.get_param('source_code').get_value()
+ output.append((file_path, src))
# Filter out virtual sink connections
cf = lambda c: not (c.is_bus() or c.is_msg() or c.get_sink().get_parent().is_virtual_sink())
- connections = filter(cf, self._flow_graph.get_enabled_connections())
+ connections = filter(cf, fg.get_enabled_connections())
- # Get the virtual blocks and resolve their conenctions
+ # Get the virtual blocks and resolve their connections
virtual = filter(lambda c: c.get_source().get_parent().is_virtual_source(), connections)
for connection in virtual:
source = connection.get_source().resolve_virtual_source()
sink = connection.get_sink()
- resolved = self._flow_graph.get_parent().Connection(flow_graph=self._flow_graph, porta=source, portb=sink)
+ resolved = fg.get_parent().Connection(flow_graph=fg, porta=source, portb=sink)
connections.append(resolved)
# Remove the virtual connection
connections.remove(connection)
@@ -203,7 +209,7 @@ class TopBlockGenerator(object):
# that bypass the selected block and remove the existing ones. This allows adjacent
# bypassed blocks to see the newly created connections to downstream blocks,
# allowing them to correctly construct bypass connections.
- bypassed_blocks = self._flow_graph.get_bypassed_blocks()
+ bypassed_blocks = fg.get_bypassed_blocks()
for block in bypassed_blocks:
# Get the upstream connection (off of the sink ports)
# Use *connections* not get_connections()
@@ -222,7 +228,7 @@ class TopBlockGenerator(object):
# Ignore disabled connections
continue
sink_port = sink.get_sink()
- connection = self._flow_graph.get_parent().Connection(flow_graph=self._flow_graph, porta=source_port, portb=sink_port)
+ connection = fg.get_parent().Connection(flow_graph=fg, porta=source_port, portb=sink_port)
connections.append(connection)
# Remove this sink connection
connections.remove(sink)
@@ -235,8 +241,8 @@ class TopBlockGenerator(object):
c.get_source().get_parent().get_id(), c.get_sink().get_parent().get_id()
))
- connection_templates = self._flow_graph.get_parent().get_connection_templates()
- msgs = filter(lambda c: c.is_msg(), self._flow_graph.get_enabled_connections())
+ connection_templates = fg.get_parent().get_connection_templates()
+ msgs = filter(lambda c: c.is_msg(), fg.get_enabled_connections())
# list of variable names
var_ids = [var.get_id() for var in parameters + variables]
# prepend self.
@@ -244,7 +250,7 @@ class TopBlockGenerator(object):
# list of callbacks
callbacks = [
expr_utils.expr_replace(cb, replace_dict)
- for cb in sum([block.get_callbacks() for block in self._flow_graph.get_enabled_blocks()], [])
+ for cb in sum([block.get_callbacks() for block in fg.get_enabled_blocks()], [])
]
# map var id to callbacks
var_id2cbs = dict([
@@ -255,7 +261,7 @@ class TopBlockGenerator(object):
namespace = {
'title': title,
'imports': imports,
- 'flow_graph': self._flow_graph,
+ 'flow_graph': fg,
'variables': variables,
'parameters': parameters,
'monitors': monitors,
diff --git a/grc/python/Param.py b/grc/python/Param.py
index 746f677e46..e60f613f00 100644
--- a/grc/python/Param.py
+++ b/grc/python/Param.py
@@ -31,7 +31,7 @@ from Constants import VECTOR_TYPES, COMPLEX_TYPES, REAL_TYPES, INT_TYPES
from gnuradio import eng_notation
_check_id_matcher = re.compile('^[a-z|A-Z]\w*$')
-_show_id_matcher = re.compile('^(variable\w*|parameter|options|notebook)$')
+_show_id_matcher = re.compile('^(variable\w*|parameter|options|notebook|epy_module)$')
#blacklist certain ids, its not complete, but should help
diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 99390067fe..509c2d0612 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -68,7 +68,6 @@ sys.path.append(os.environ.get('GRC_HIER_PATH', os.path.expanduser('~/.grc_gnura
##$(imp.replace(" # grc-generated hier_block", ""))
$imp
#end for
-
########################################################
##Create Class
## Write the class declaration for a top or hier block.
@@ -82,6 +81,7 @@ $imp
#import gtk
#set $icon = gtk.IconTheme().lookup_icon('gnuradio-grc', 32, 0)
+
class $(class_name)(grc_wxgui.top_block_gui):
def __init__($param_str):
@@ -92,6 +92,7 @@ class $(class_name)(grc_wxgui.top_block_gui):
#end if
#elif $generate_options == 'qt_gui'
+
class $(class_name)(gr.top_block, Qt.QWidget):
def __init__($param_str):
@@ -118,6 +119,7 @@ class $(class_name)(gr.top_block, Qt.QWidget):
self.restoreGeometry(self.settings.value("geometry").toByteArray())
#elif $generate_options == 'no_gui'
+
class $(class_name)(gr.top_block):
def __init__($param_str):
@@ -126,6 +128,7 @@ class $(class_name)(gr.top_block):
#set $in_sigs = $flow_graph.get_hier_block_stream_io('in')
#set $out_sigs = $flow_graph.get_hier_block_stream_io('out')
+
#if $generate_options == 'hb_qt_gui'
class $(class_name)(gr.hier_block2, Qt.QWidget):
#else
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-16 09:54:31 +0000