diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-02 09:15:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-02 09:15:05 -0700 |
| commit | d2a3192ec7c8143315002c123a20ccd63a9f737d (patch) | |
| tree | 6468e18318165c06f4f3409e464a5cd3b6865c00 | |
| parent | 0878c5c2eb72f05dfdcee8ae924fa31d1ee02bb3 (diff) | |
| parent | ce354379fee28872ea103eafa9164e6fc1ea54a1 (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gnuradio-runtime/lib/flat_flowgraph.cc | 9 | ||||
| -rwxr-xr-x | gnuradio-runtime/python/gnuradio/gr/qa_flowgraph.py | 58 | ||||
| -rw-r--r-- | gr-qtgui/lib/TimeDomainDisplayPlot.cc | 8 |
3 files changed, 71 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc index 434a92fb3d..b7e949127a 100644 --- a/gnuradio-runtime/lib/flat_flowgraph.cc +++ b/gnuradio-runtime/lib/flat_flowgraph.cc @@ -316,6 +316,15 @@ namespace gr { setup_buffer_alignment(block); } + // Connect message ports connetions + for(msg_edge_viter_t i = d_msg_edges.begin(); i != d_msg_edges.end(); i++) { + if(FLAT_FLOWGRAPH_DEBUG) + std::cout << boost::format("flat_fg connecting msg primitives: (%s, %s)->(%s, %s)\n") % + i->src().block() % i->src().port() % + i->dst().block() % i->dst().port(); + i->src().block()->message_port_sub(i->src().port(), pmt::cons(i->dst().block()->alias_pmt(), i->dst().port())); + } + // Now deal with the fact that the block details might have // changed numbers of inputs and outputs vs. in the old // flowgraph. diff --git a/gnuradio-runtime/python/gnuradio/gr/qa_flowgraph.py b/gnuradio-runtime/python/gnuradio/gr/qa_flowgraph.py new file mode 100755 index 0000000000..fa4fd4910e --- /dev/null +++ b/gnuradio-runtime/python/gnuradio/gr/qa_flowgraph.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python +# +# Copyright 2016 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +import time +import pmt +from gnuradio import gr, gr_unittest, blocks + +class test_flowgraph (gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block () + + def tearDown (self): + self.tb = None + + def test_000(self): + + self.tb.start() + self.tb.lock() + + rem = blocks.pdu_remove(pmt.intern('foo')) + dbg = blocks.message_debug() + self.tb.msg_connect((rem, 'pdus'), (dbg, 'store')) + + self.tb.unlock() + + msg = pmt.cons(pmt.PMT_NIL, pmt.init_u8vector(3, (1, 2, 3))) + rem.to_basic_block()._post(pmt.intern('pdus'), msg) + time.sleep(0.2) + + self.tb.stop() + + self.assertEqual(dbg.num_messages(), 1) + data = pmt.u8vector_elements(pmt.cdr(dbg.get_message(0))) + self.assertEqual((1, 2, 3), data) + +if __name__ == '__main__': + gr_unittest.run(test_flowgraph, 'test_flowgraph.xml') + diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index bc9f630235..51a1989a9a 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -343,9 +343,7 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, m->setXValue(sample_offset); m->setYValue(yval); - QBrush brush; - brush.setColor(QColor(0xC8, 0x2F, 0x1F)); - brush.setStyle(Qt::SolidPattern); + QBrush brush(getTagBackgroundColor(), getTagBackgroundStyle()); QPen pen; pen.setColor(Qt::black); @@ -367,8 +365,10 @@ TimeDomainDisplayPlot::plotNewData(const std::vector<double*> dataPoints, #else m->setSymbol(sym); #endif + QwtText tag_label(s.str().c_str()); + tag_label.setColor(getTagTextColor()); + m->setLabel(tag_label); - m->setLabel(QwtText(s.str().c_str())); m->attach(this); if(!(show && d_tag_markers_en[which])) { |