[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/06: grc: remove wxgui support from gener
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 03/06: grc: remove wxgui support from generator |
Date: |
Thu, 8 Sep 2016 19:45:30 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit edb67f4a69b2bf73adcce71f3449b7e65fab25a3
Author: Sebastian Koslowski <address@hidden>
Date: Mon Sep 5 20:15:38 2016 +0200
grc: remove wxgui support from generator
---
grc/core/generator/flow_graph.tmpl | 31 +++----------------------------
1 file changed, 3 insertions(+), 28 deletions(-)
diff --git a/grc/core/generator/flow_graph.tmpl
b/grc/core/generator/flow_graph.tmpl
index 4b275c0..2ae9f04 100644
--- a/grc/core/generator/flow_graph.tmpl
+++ b/grc/core/generator/flow_graph.tmpl
@@ -42,7 +42,7 @@ from distutils.version import StrictVersion
## Call XInitThreads as the _very_ first thing.
## After some Qt import, it's too late
-#if $generate_options in ('wx_gui', 'qt_gui')
+#if $generate_options == 'qt_gui'
if __name__ == '__main__':
import ctypes
import sys
@@ -76,25 +76,11 @@ $imp
##Create Class
## Write the class declaration for a top or hier block.
## The parameter names are the arguments to __init__.
-## Determine the absolute icon path (wx gui only).
## Setup the IO signature (hier block only).
########################################################
#set $class_name = $flow_graph.get_option('id')
#set $param_str = ', '.join(['self'] + ['%s=%s'%(param.get_id(),
param.get_make()) for param in $parameters])
-#if $generate_options == 'wx_gui'
- #import gtk
- #set $icon = gtk.IconTheme().lookup_icon('gnuradio-grc', 32, 0)
-
-
-class $(class_name)(grc_wxgui.top_block_gui):
-
- def __init__($param_str):
- grc_wxgui.top_block_gui.__init__(self, title="$title")
- #if $icon
- _icon_path = "$icon.get_filename()"
- self.SetIcon(wx.Icon(_icon_path, wx.BITMAP_TYPE_ANY))
- #end if
-#elif $generate_options == 'qt_gui'
+#if $generate_options == 'qt_gui'
class $(class_name)(gr.top_block, Qt.QWidget):
@@ -379,18 +365,7 @@ def main(top_block_cls=$(class_name), options=None):
print "Error: failed to enable real-time scheduling."
#end if
- #if $generate_options == 'wx_gui'
- tb = top_block_cls($(', '.join($params_eq_list)))
- #if $flow_graph.get_option('max_nouts')
- tb.Run($flow_graph.get_option('run'), $flow_graph.get_option('max_nouts'))
- #else
- tb.Start($flow_graph.get_option('run'))
- #for $m in $monitors
- (tb.$m.get_id()).start()
- #end for
- tb.Wait()
- #end if
- #elif $generate_options == 'qt_gui'
+ #if $generate_options == 'qt_gui'
if StrictVersion("4.5.0") <= StrictVersion(Qt.qVersion()) <
StrictVersion("5.0.0"):
style = gr.prefs().get_string('qtgui', 'style', 'raster')
Qt.QApplication.setGraphicsSystem(style)
- [Commit-gnuradio] [gnuradio] branch next updated (0924f3b -> 50dc314), git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'skoslowski/remove_wx_gen_mode' into next, git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 05/06: Merge branch 'master' into next, git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 04/06: grc: remove support for old msg queues, git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 02/06: grc: remove wxgui support from core, git, 2016/09/08
- [Commit-gnuradio] [gnuradio] 03/06: grc: remove wxgui support from generator,
git <=
- [Commit-gnuradio] [gnuradio] 01/06: grc: remove wxgui generate mode, git, 2016/09/08