[Commit-gnuradio] [gnuradio] 02/06: grc: remove wxgui support from core

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 9b8372ff397efd92e4b421343071538e32c89234
Author: Sebastian Koslowski <address@hidden>
Date:   Mon Sep 5 20:17:25 2016 +0200

    grc: remove wxgui support from core
---
 grc/blocks/options.xml          | 52 ++++---------------------------
 grc/core/Block.py               |  3 +-
 grc/core/Constants.py           |  1 -
 grc/core/Param.py               | 68 ++---------------------------------------
 grc/core/generator/Generator.py |  4 ---
 5 files changed, 9 insertions(+), 119 deletions(-)

diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index 806fe85..252a0b2 100644
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -11,11 +11,7 @@
        <key>options</key>
        <import>from gnuradio import gr</import>
        <import>from gnuradio.filter import firdes</import>
-       <import>#if $generate_options() == 'wx_gui'
-from grc_gnuradio import wxgui as grc_wxgui
-import wx
-#end if
-#if $generate_options() == 'qt_gui'
+       <import>#if $generate_options() == 'qt_gui'
 from PyQt5 import Qt
 import sys
 #end if
@@ -104,17 +100,7 @@ else: self.stop(); self.wait()</callback>
                <key>run</key>
                <value>True</value>
                <type>bool</type>
-               <hide>
-#if $generate_options() in ('qt_gui', 'wx_gui')
-       #if $run()
-               part
-       #else
-               none
-       #end if
-#else
-       all
-#end if
-               </hide>
+               <hide>#if $generate_options() == 'qt_gui' then ('part' if 
$run() else 'none') else 'all'#</hide>
                <option>
                        <name>Autostart</name>
                        <key>True</key>
@@ -129,26 +115,14 @@ else: self.stop(); self.wait()</callback>
                <key>max_nouts</key>
                <value>0</value>
                <type>int</type>
-               <hide>#if $generate_options().startswith('hb')
-all#slurp
-#elif $max_nouts()
-none#slurp
-#else
-part#slurp
-#end if</hide>
+               <hide>#if $generate_options().startswith('hb') then 'all' else 
('none' if $max_nouts() else 'part')#</hide>
        </param>
        <param>
                <name>Realtime Scheduling</name>
                <key>realtime_scheduling</key>
                <value></value>
                <type>enum</type>
-               <hide>#if $generate_options().startswith('hb')
-all#slurp
-#elif $realtime_scheduling()
-none#slurp
-#else
-part#slurp
-#end if</hide>
+               <hide>#if $generate_options().startswith('hb') then 'all' else 
('none' if $realtime_scheduling() else 'part')#</hide>
                <option>
                        <name>Off</name>
                        <key></key>
@@ -163,17 +137,7 @@ part#slurp
                <key>qt_qss_theme</key>
                <value></value>
                <type>file_open</type>
-               <hide>
-#if $generate_options() in ('qt_gui',)
-       #if $qt_qss_theme()
-               none
-       #else
-               part
-       #end if
-#else
-       all
-#end if
-</hide>
+               <hide>#if $generate_options() == 'qt_gui' then ('none' if 
$qt_qss_theme() else 'part') else 'all'#</hide>
        </param>
        <param>
                <name>Thread-safe setters</name>
@@ -196,11 +160,7 @@ part#slurp
                <key>run_command</key>
                <value>{python} -u {filename}</value>
                <type>string</type>
-               <hide>#if $generate_options().startswith('hb')
-all#slurp
-#else
-part#slurp
-#end if</hide>
+               <hide>#if $generate_options().startswith('hb') then 'all' else 
'part'</hide>
                <tab>Advanced</tab>
        </param>
        <param>
diff --git a/grc/core/Block.py b/grc/core/Block.py
index 8a683a2..de1d83e 100644
--- a/grc/core/Block.py
+++ b/grc/core/Block.py
@@ -24,7 +24,7 @@ from Cheetah.Template import Template
 
 from .utils import epy_block_io, odict
 from . Constants import (
-    BLOCK_FLAG_NEED_QT_GUI, BLOCK_FLAG_NEED_WX_GUI,
+    BLOCK_FLAG_NEED_QT_GUI,
     ADVANCED_PARAM_TAB, DEFAULT_PARAM_TAB,
     BLOCK_FLAG_THROTTLE, BLOCK_FLAG_DISABLE_BYPASS,
     BLOCK_FLAG_DEPRECATED,
@@ -275,7 +275,6 @@ class Block(Element):
                 self.add_error_message("Can't generate this block in mode: {} 
".format(
                                        repr(current_generate_option)))
 
-        check_generate_mode('WX GUI', BLOCK_FLAG_NEED_WX_GUI, ('wx_gui',))
         check_generate_mode('QT GUI', BLOCK_FLAG_NEED_QT_GUI, ('qt_gui', 
'hb_qt_gui'))
         if self._epy_reload_error:
             
self.get_param('_source_code').add_error_message(str(self._epy_reload_error))
diff --git a/grc/core/Constants.py b/grc/core/Constants.py
index 61a44d0..64487b5 100644
--- a/grc/core/Constants.py
+++ b/grc/core/Constants.py
@@ -48,7 +48,6 @@ DEFAULT_DOMAIN = GR_STREAM_DOMAIN
 BLOCK_FLAG_THROTTLE = 'throttle'
 BLOCK_FLAG_DISABLE_BYPASS = 'disable_bypass'
 BLOCK_FLAG_NEED_QT_GUI = 'need_qt_gui'
-BLOCK_FLAG_NEED_WX_GUI = 'need_wx_gui'
 BLOCK_FLAG_DEPRECATED = 'deprecated'
 
 # Block States
diff --git a/grc/core/Param.py b/grc/core/Param.py
index 201032d..d0af979 100644
--- a/grc/core/Param.py
+++ b/grc/core/Param.py
@@ -30,7 +30,7 @@ from .utils import odict
 import __builtin__
 
 
-ID_BLACKLIST = ['self', 'options', 'gr', 'blks2', 'wxgui', 'wx', 'math', 
'forms', 'firdes'] + dir(__builtin__)
+ID_BLACKLIST = ['self', 'options', 'gr', 'blks2', 'math', 'firdes'] + 
dir(__builtin__)
 try:
     from gnuradio import gr
     ID_BLACKLIST.extend(attr for attr in dir(gr.top_block()) if not 
attr.startswith('_'))
@@ -215,7 +215,7 @@ class Param(Element):
             'hex', 'string', 'bool',
             'file_open', 'file_save', '_multiline', 
'_multiline_python_external',
             'id', 'stream_id',
-            'grid_pos', 'notebook', 'gui_hint',
+            'gui_hint',
             'import',
         )
 
@@ -317,8 +317,6 @@ class Param(Element):
                 'string': Constants.BYTE_VECTOR_COLOR_SPEC,
                 'id': Constants.ID_COLOR_SPEC,
                 'stream_id': Constants.ID_COLOR_SPEC,
-                'grid_pos': Constants.INT_VECTOR_COLOR_SPEC,
-                'notebook': Constants.INT_VECTOR_COLOR_SPEC,
                 'raw': Constants.WILDCARD_COLOR_SPEC,
             }[self.get_type()]
         except:
@@ -354,9 +352,6 @@ class Param(Element):
                     return 'part'
             except:
                 pass
-        # Hide empty grid positions
-        if self.get_key() in ('grid_pos', 'notebook') and not self.get_value():
-            return 'part'
         return hide
 
     def validate(self):
@@ -551,65 +546,6 @@ class Param(Element):
                     return self._ws
             return GuiHint(widget_str)
         #########################
-        # Grid Position Type
-        #########################
-        elif t == 'grid_pos':
-            if not v:
-                # Allow for empty grid pos
-                return ''
-            e = self.get_parent().get_parent().evaluate(v)
-            if not isinstance(e, (list, tuple)) or len(e) != 4 or not 
all([isinstance(ei, int) for ei in e]):
-                raise Exception('A grid position must be a list of 4 
integers.')
-            row, col, row_span, col_span = e
-            # Check row, col
-            if row < 0 or col < 0:
-                raise Exception('Row and column must be non-negative.')
-            # Check row span, col span
-            if row_span <= 0 or col_span <= 0:
-                raise Exception('Row and column span must be greater than 
zero.')
-            # Get hostage cell parent
-            try:
-                my_parent = self.get_parent().get_param('notebook').evaluate()
-            except:
-                my_parent = ''
-            # Calculate hostage cells
-            for r in range(row_span):
-                for c in range(col_span):
-                    self._hostage_cells.append((my_parent, (row+r, col+c)))
-            # Avoid collisions
-            params = filter(lambda p: p is not self, 
self.get_all_params('grid_pos'))
-            for param in params:
-                for parent, cell in param._hostage_cells:
-                    if (parent, cell) in self._hostage_cells:
-                        raise Exception('Another graphical element is using 
parent "{}", cell "{}".'.format(str(parent), str(cell)))
-            return e
-        #########################
-        # Notebook Page Type
-        #########################
-        elif t == 'notebook':
-            if not v:
-                # Allow for empty notebook
-                return ''
-
-            # Get a list of all notebooks
-            notebook_blocks = filter(lambda b: b.get_key() == 'notebook', 
self.get_parent().get_parent().get_enabled_blocks())
-            # Check for notebook param syntax
-            try:
-                notebook_id, page_index = map(str.strip, v.split(','))
-            except:
-                raise Exception('Bad notebook page format.')
-            # Check that the notebook id is valid
-            try:
-                notebook_block = filter(lambda b: b.get_id() == notebook_id, 
notebook_blocks)[0]
-            except:
-                raise Exception('Notebook id "{}" is not an existing notebook 
id.'.format(notebook_id))
-
-            # Check that page index exists
-            if int(page_index) not in 
range(len(notebook_block.get_param('labels').evaluate())):
-                raise Exception('Page index "{}" is not a valid index 
number.'.format(page_index))
-            return notebook_id, page_index
-
-        #########################
         # Import Type
         #########################
         elif t == 'import':
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py
index 3062440..be570ee 100644
--- a/grc/core/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@ -133,10 +133,6 @@ class TopBlockGenerator(object):
         def _get_block_sort_text(block):
             code = block.get_make().replace(block.get_id(), ' ')
             try:
-                code += block.get_param('notebook').get_value()  # Older gui 
markup w/ wxgui
-            except:
-                pass
-            try:
                 code += block.get_param('gui_hint').get_value()  # Newer gui 
markup w/ qtgui
             except:
                 pass