From 9ae8997e5f682bc16e58c0a0bba21794dbd705c5 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 6 Dec 2010 22:46:39 -0500
Subject: qtgui: created a forms module with a slider and text box, implemented
 in grc

---
 grc/python/flow_graph.tmpl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'grc/python/flow_graph.tmpl')

diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl
index 676da33b4..108e15ca0 100644
--- a/grc/python/flow_graph.tmpl
+++ b/grc/python/flow_graph.tmpl
@@ -60,11 +60,12 @@ class $(class_name)(grc_wxgui.top_block_gui):
 		self.SetIcon(wx.Icon(_icon_path, wx.BITMAP_TYPE_ANY))
 	#end if
 #elif $generate_options == 'qt_gui'
-class $(class_name)(gr.top_block):
+class $(class_name)(gr.top_block, QtGui.QWidget):
 
 	def __init__($param_str):
 		gr.top_block.__init__(self, "$title")
-		self.qapp = QtGui.QApplication(sys.argv)
+		QtGui.QWidget.__init__(self)
+		self.layout = QtGui.QBoxLayout(QtGui.QBoxLayout.TopToBottom, self)
 #elif $generate_options == 'no_gui'
 class $(class_name)(gr.top_block):
 
@@ -245,15 +246,19 @@ if __name__ == '__main__':
 	if gr.enable_realtime_scheduling() != gr.RT_OK:
 		print "Error: failed to enable realtime scheduling."
 	#end if
-	tb = $(class_name)($(', '.join($params_eq_list)))
 	#if $generate_options == 'wx_gui'
+	tb = $(class_name)($(', '.join($params_eq_list)))
 	tb.Run($flow_graph.get_option('run'))
 	#elif $generate_options == 'qt_gui'
+	qapp = QtGui.QApplication(sys.argv)
+	tb = $(class_name)($(', '.join($params_eq_list)))
 	tb.start()
-	tb.qapp.exec_()
+	tb.show()
+	qapp.exec_()
 	#elif $generate_options == 'no_gui'
 		#set $run_options = $flow_graph.get_option('run_options')
 		#if $run_options == 'prompt'
+	tb = $(class_name)($(', '.join($params_eq_list)))
 	tb.start()
 	raw_input('Press Enter to quit: ')
 	tb.stop()
-- 
cgit