[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 07/11: gr-qtgui: Line 2 configurations adde
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 07/11: gr-qtgui: Line 2 configurations added for type Complex Message |
Date: |
Thu, 12 Jan 2017 20:33:15 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 11abb5f5e7d63b48258165b9505154ea15686ed8
Author: Kartik Patel <address@hidden>
Date: Sat Dec 31 02:12:52 2016 +0530
gr-qtgui: Line 2 configurations added for type Complex Message
---
gr-qtgui/grc/qtgui_time_sink_x.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml
b/gr-qtgui/grc/qtgui_time_sink_x.xml
index c0584b6..1ef49c0 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -46,8 +46,8 @@ markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
$alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
-#if($type() == "complex")
-for i in xrange(2*$nconnections):
+#if($type() == "complex" or $type() == "msg_complex")
+for i in xrange(#if $type.t == 'message' then 2 else 2*$nconnections#):
if len(labels[i]) == 0:
if(i % 2 == 0):
self.$(id).set_line_label(i, "Re{{Data {0}}}".format(i/2))
@@ -540,14 +540,14 @@ $(gui_hint()($win))</make>
<base_key>label1</base_key>
<name>Line 2 Label</name>
<key>label2</key>
- <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else
'all'#</hide>
</param>
<param>
<base_key>width1</base_key>
<name>Line 2 Width</name>
<key>width2</key>
- <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else
'all'#</hide>
</param>
<param>
@@ -555,28 +555,28 @@ $(gui_hint()($win))</make>
<name>Line 2 Color</name>
<key>color2</key>
<value>"red"</value>
- <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else
'all'#</hide>
</param>
<param>
<base_key>style1</base_key>
<name>Line 2 Style</name>
<key>style2</key>
- <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else
'all'#</hide>
</param>
<param>
<base_key>marker1</base_key>
<name>Line 2 Marker</name>
<key>marker2</key>
- <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else
'all'#</hide>
</param>
<param>
<base_key>alpha1</base_key>
<name>Line 2 Alpha</name>
<key>alpha2</key>
- <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
+ <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and
int($nconnections()) >= 1) or ($type() == "msg_complex")) then 'part' else
'all'#</hide>
</param>
- [Commit-gnuradio] [gnuradio] branch maint updated (588fe5e -> 5913693), git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 04/11: blocks: fix callback template for message_strobe_random, git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 01/11: cleaned up the way setup_rpc() is called, and now is called for all blocks, not just those with stream connections, git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 09/11: qtgui: Fix SIGSEGV for tag trigger with constellation sink, git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 05/11: Merge remote-tracking branch 'jgilbert/msg_rpc_init_fix' into maint, git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 10/11: Merge remote-tracking branch 'darekk/gr_tag_swig_warning_fix_maint' into maint, git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 08/11: runtime: fix numpy warning, git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 07/11: gr-qtgui: Line 2 configurations added for type Complex Message,
git <=
- [Commit-gnuradio] [gnuradio] 11/11: Merge remote-tracking branch 'skoslowski/xml_fixes' into maint, git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 02/11: gnuradio-runtime/swig/tags.i: Making swig ignore gr::tag_t::operator= so that the annoying compile-time warning messages go away., git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 06/11: digital: clarify documentation of clock_recovery_mm_xx, git, 2017/01/12
- [Commit-gnuradio] [gnuradio] 03/11: blocks: udp source/sink grc wrappers: removed callbacks to missing setter, git, 2017/01/12