port and type controller modify logic out of gui

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10442 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/grc/src/platforms/base/Block.py b/grc/src/platforms/base/Block.py
index 8cbcad5a707c8a53b30419eb1f758bc71343cfd4..bc9b58a5e13a0b6977bf7a9a6557ceb94194ac17 100644 (file)
--- a/grc/src/platforms/base/Block.py
+++ b/grc/src/platforms/base/Block.py
@@ -195,6 +195,42 @@ class Block(Element):
                try: return str(Template(tmpl, n))
                except Exception, e: return "-------->\n%s: %s\n<--------"%(e, tmpl)
 
+       ##############################################
+       # Controller Modify
+       ##############################################
+       def type_controller_modify(self, direction):
+               """
+               Change the type controller.
+               @param direction +1 or -1
+               @return true for change
+               """
+               changed = False
+               type_param = None
+               for param in filter(lambda p: p.is_enum(), self.get_params()):
+                       children = self.get_ports() + self.get_params()
+                       #priority to the type controller
+                       if param.get_key() in ' '.join(map(lambda p: p._type, children)): type_param = param
+                       #use param if type param is unset
+                       if not type_param: type_param = param
+               if type_param:
+                       #try to increment the enum by direction
+                       try:
+                               keys = type_param.get_option_keys()
+                               old_index = keys.index(type_param.get_value())
+                               new_index = (old_index + direction + len(keys))%len(keys)
+                               type_param.set_value(keys[new_index])
+                               changed = True
+                       except: pass
+               return changed
+
+       def port_controller_modify(self, direction):
+               """
+               Change the port controller.
+               @param direction +1 or -1
+               @return true for change
+               """
+               return False
+
        ##############################################
        ## Import/Export Methods
        ##############################################

diff --git a/grc/src/platforms/gui/FlowGraph.py b/grc/src/platforms/gui/FlowGraph.py
index 546bdf452f497ce9ebd5f6b5cd4fbb075146a4c0..cc2e271635466280e1bee92c28673b2a1da064fa 100644 (file)
--- a/grc/src/platforms/gui/FlowGraph.py
+++ b/grc/src/platforms/gui/FlowGraph.py
@@ -176,25 +176,7 @@ class FlowGraph(Element):
                @param direction +1 or -1
                @return true for change
                """
-               changed = False
-               for selected_block in self.get_selected_blocks():
-                       type_param = None
-                       for param in filter(lambda p: p.is_enum(), selected_block.get_params()):
-                               children = param.get_parent().get_ports() + param.get_parent().get_params()
-                               #priority to the type controller
-                               if param.get_key() in ' '.join(map(lambda p: p._type, children)): type_param = param
-                               #use param if type param is unset
-                               if not type_param: type_param = param
-                       if type_param:
-                               #try to increment the enum by direction
-                               try:
-                                       keys = type_param.get_option_keys()
-                                       old_index = keys.index(type_param.get_value())
-                                       new_index = (old_index + direction + len(keys))%len(keys)
-                                       type_param.set_value(keys[new_index])
-                                       changed = True
-                               except: pass
-               return changed
+               return any([sb.type_controller_modify(direction) for sb in self.get_selected_blocks()])
 
        def port_controller_modify_selected(self, direction):
                """
@@ -202,32 +184,15 @@ class FlowGraph(Element):
                @param direction +1 or -1
                @return true for changed
                """
-               changed = False
-               for selected_block in self.get_selected_blocks():
-                       for ports in (selected_block.get_sinks(), selected_block.get_sources()):
-                               if ports and hasattr(ports[0], 'get_nports') and ports[0].get_nports():
-                                       #find the param that controls port0
-                                       for param in selected_block.get_params():
-                                               if param.get_key() in ports[0]._nports:
-                                                       #try to increment the port controller by direction
-                                                       try:
-                                                               value = param.evaluate()
-                                                               value = value + direction
-                                                               assert 0 < value
-                                                               param.set_value(value)
-                                                               changed = True
-                                                       except: pass
-               return changed
+               return any([sb.port_controller_modify(direction) for sb in self.get_selected_blocks()])
 
        def param_modify_selected(self):
                """
                Create and show a param modification dialog for the selected block.
                @return true if parameters were changed
                """
-               if self.get_selected_block():
-                       signal_block_params_dialog = ParamsDialog(self.get_selected_block())
-                       return signal_block_params_dialog.run()
-               return False
+               if not self.get_selected_block(): return False
+               return ParamsDialog(self.get_selected_block()).run()
 
        def enable_selected(self, enable):
                """

diff --git a/grc/src/platforms/python/Block.py b/grc/src/platforms/python/Block.py
index 91b86cc85f2fe3db3ef71e48f43bbe6db41c0d11..3c45117a3fa2d82136419b5625bacd1ddf3e2387 100644 (file)
--- a/grc/src/platforms/python/Block.py
+++ b/grc/src/platforms/python/Block.py
@@ -104,6 +104,28 @@ class Block(_Block):
                                        ports[key] = port
                                continue
 
+       def port_controller_modify(self, direction):
+               """
+               Change the port controller.
+               @param direction +1 or -1
+               @return true for change
+               """
+               changed = False
+               for ports in (self.get_sinks(), self.get_sources()):
+                       if ports and ports[0].get_nports():
+                               #find the param that controls port0
+                               for param in self.get_params():
+                                       if not param.is_enum() and param.get_key() in ports[0]._nports:
+                                               #try to increment the port controller by direction
+                                               try:
+                                                       value = param.evaluate()
+                                                       value = value + direction
+                                                       assert 0 < value
+                                                       param.set_value(value)
+                                                       changed = True
+                                               except: pass
+               return changed
+
        def get_doc(self):
                doc = self._doc.strip('\n').replace('\\\n', '')
                #merge custom doc with doxygen docs