diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-06-24 16:06:38 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-06-24 16:06:38 -0400 |
| commit | d97764ce6040aff8023b43323b4bc048a907a1fd (patch) | |
| tree | dda4ba74128454fd271ffe7dcbe673f2ae0b4c08 /grc/python/Param.py | |
| parent | b142f64573b8b7b15a94fc9c64e2f26264a5b144 (diff) | |
| parent | bf8700a226091c5ce0130a3819a4c12b9d9981a6 (diff) | |
Merge branch 'master' into my_qtsink
Conflicts:
gr-qtgui/include/qtgui_sink_c.h
gr-qtgui/include/qtgui_sink_f.h
gr-qtgui/include/qtgui_util.h
gr-qtgui/lib/ConstellationDisplayPlot.cc
gr-qtgui/lib/FrequencyDisplayPlot.cc
gr-qtgui/lib/SpectrumGUIClass.cc
gr-qtgui/lib/TimeDomainDisplayPlot.cc
gr-qtgui/lib/WaterfallDisplayPlot.cc
gr-qtgui/lib/qtgui_sink_c.cc
gr-qtgui/lib/qtgui_sink_f.cc
gr-qtgui/lib/spectrumdisplayform.cc
Diffstat (limited to 'grc/python/Param.py')
| -rw-r--r-- | grc/python/Param.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/grc/python/Param.py b/grc/python/Param.py index 2a7258dc71..2caca48024 100644 --- a/grc/python/Param.py +++ b/grc/python/Param.py @@ -335,7 +335,7 @@ class Param(_Param, _GUIParam): # Stream ID Type ######################### elif t == 'stream_id': - #get a list of all stream ids used in the virtual sinks + #get a list of all stream ids used in the virtual sinks ids = [param.get_value() for param in filter( lambda p: p.get_parent().is_virtual_sink(), self.get_all_params(t), |