diff options
| author | Johnathan Corgan | 2011-07-01 11:35:37 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-07-01 11:35:37 -0700 |
| commit | 0a24c0b23396c6adefcc61b2d16658ab2b56974c (patch) | |
| tree | 31827489b4fadcbdc32a655482bb75438c29374a /grc | |
| parent | b9d297910b0a04fc567e929cf4d80d0c61a8f885 (diff) | |
| parent | 2cdc48643f354589acfcc6bd65f65dd5792ff508 (diff) | |
| download | gnuradio-0a24c0b23396c6adefcc61b2d16658ab2b56974c.tar.gz gnuradio-0a24c0b23396c6adefcc61b2d16658ab2b56974c.tar.bz2 gnuradio-0a24c0b23396c6adefcc61b2d16658ab2b56974c.zip | |
Merge branch 'master' into next
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/gr_quadrature_demod_cf.xml | 1 | ||||
| -rw-r--r-- | grc/python/flow_graph.tmpl | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/grc/blocks/gr_quadrature_demod_cf.xml b/grc/blocks/gr_quadrature_demod_cf.xml index a0e630c7e..fad0b3879 100644 --- a/grc/blocks/gr_quadrature_demod_cf.xml +++ b/grc/blocks/gr_quadrature_demod_cf.xml @@ -9,6 +9,7 @@ <key>gr_quadrature_demod_cf</key> <import>from gnuradio import gr</import> <make>gr.quadrature_demod_cf($gain)</make> + <callback>set_gain($gain)</callback> <param> <name>Gain</name> <key>gain</key> diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl index d5e53b52b..0878be4ba 100644 --- a/grc/python/flow_graph.tmpl +++ b/grc/python/flow_graph.tmpl @@ -65,9 +65,18 @@ class $(class_name)(gr.top_block, Qt.QWidget): Qt.QWidget.__init__(self) self.setWindowTitle("$title") self.setWindowIcon(Qt.QIcon.fromTheme('gnuradio-grc')) - self.top_layout = Qt.QVBoxLayout(self) + self.top_scroll_layout = Qt.QVBoxLayout() + self.setLayout(self.top_scroll_layout) + self.top_scroll = Qt.QScrollArea() + self.top_scroll.setFrameStyle(Qt.QFrame.NoFrame) + self.top_scroll_layout.addWidget(self.top_scroll) + self.top_scroll.setWidgetResizable(True) + self.top_widget = Qt.QWidget() + self.top_scroll.setWidget(self.top_widget) + self.top_layout = Qt.QVBoxLayout(self.top_widget) self.top_grid_layout = Qt.QGridLayout() self.top_layout.addLayout(self.top_grid_layout) + #elif $generate_options == 'no_gui' class $(class_name)(gr.top_block): |