Merge branch 'maint'

author: Johnathan Corgan <johnathan@corganlabs.com> 2017-01-30 05:25:03 -0800
committer: Johnathan Corgan <johnathan@corganlabs.com> 2017-01-30 05:25:03 -0800
commit: a32010b52bbafd82b4f66ef508457fe1b6f8031f (patch)
tree: b10f20dd1a9a4cccb285cc791d5711cbffc071dd
parent: a6323e35d0caa7fb4403aa86b222dee8919da133 (diff)
parent: 884eddf41e1f35606d563c128e4070f930a4d2ab (diff)
6 files changed, 71 insertions, 64 deletions
diff --git a/gr-blocks/grc/blocks_xor_xx.xml b/gr-blocks/grc/blocks_xor_xx.xml
index d2886a4e02..87cb8864ca 100644
--- a/gr-blocks/grc/blocks_xor_xx.xml
+++ b/gr-blocks/grc/blocks_xor_xx.xml
@@ -19,7 +19,7 @@
 			<opt>fcn:ii</opt>
 		</option>
 		<option>
-			<name>Shxort</name>
+			<name>Short</name>
 			<key>short</key>
 			<opt>fcn:ss</opt>
 		</option>
diff --git a/gr-blocks/lib/peak_detector2_fb_impl.cc b/gr-blocks/lib/peak_detector2_fb_impl.cc
index dc13e66dbe..f361ea18bb 100644
--- a/gr-blocks/lib/peak_detector2_fb_impl.cc
+++ b/gr-blocks/lib/peak_detector2_fb_impl.cc
@@ -27,6 +27,7 @@
 #include "peak_detector2_fb_impl.h"
 #include <gnuradio/io_signature.h>
 #include <string.h>
+#include <limits>
 
 namespace gr {
   namespace blocks {
@@ -109,7 +110,7 @@ namespace gr {
             sigout[i]=d_avg;
           if(iptr[i] > d_avg * (1.0f + d_threshold_factor_rise)) {
             d_found = true;
-            d_peak_val = -(float)INFINITY;
+            d_peak_val = std::numeric_limits<float>::min();
             set_output_multiple(d_look_ahead);
             return i;
           }
diff --git a/gr-blocks/lib/peak_detector_XX_impl.cc.t b/gr-blocks/lib/peak_detector_XX_impl.cc.t
index 6846a02df0..3ad5f3c8fe 100644
--- a/gr-blocks/lib/peak_detector_XX_impl.cc.t
+++ b/gr-blocks/lib/peak_detector_XX_impl.cc.t
@@ -29,6 +29,7 @@
 #include "@NAME_IMPL@.h"
 #include <gnuradio/io_signature.h>
 #include <string.h>
+#include <limits>
 
 namespace gr {
   namespace blocks {
@@ -70,7 +71,7 @@ namespace gr {
 
       memset(optr, 0, noutput_items*sizeof(char));
 
-      @I_TYPE@ peak_val = -(@I_TYPE@)INFINITY;
+      @I_TYPE@ peak_val = std::numeric_limits<@I_TYPE@>::min();
       int peak_ind = 0;
       unsigned char state = 0;
       int i = 0;
diff --git a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
index 135d622eef..1a347d3d8d 100644
--- a/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
+++ b/gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc
@@ -25,6 +25,7 @@
 #include <gnuradio/io_signature.h>
 #include "dvbt_ofdm_sym_acquisition_impl.h"
 #include <complex>
+#include <limits>
 #include <gnuradio/math.h>
 #include <gnuradio/expj.h>
 #include <volk/volk.h>
@@ -37,8 +38,8 @@ namespace gr {
     {
       d_avg_alpha = alpha;
       d_threshold_factor_rise = threshold_factor_rise;
-      d_avg_max = - (float)INFINITY;
-      d_avg_min =   (float)INFINITY;
+      d_avg_max = std::numeric_limits<float>::min();
+      d_avg_min = std::numeric_limits<float>::max();
 
       return (0);
     }
@@ -54,7 +55,7 @@ namespace gr {
       peak_pos_length = 1; 
       if (datain_length >= d_fft_length) {
         float min = datain[(peak_index + d_fft_length / 2) % d_fft_length];
-        if (d_avg_min == (float)INFINITY) {
+        if (d_avg_min == std::numeric_limits<float>::max()) {
           d_avg_min = min;
         }
         else {
@@ -62,7 +63,7 @@ namespace gr {
         }
       }
 
-      if (d_avg_max == -(float)INFINITY) {
+      if (d_avg_max == std::numeric_limits<float>::min()) {
         // Initialize d_avg_max with the first value. 
         d_avg_max = datain[peak_index];
       }
diff --git a/gr-fec/include/gnuradio/fec/CMakeLists.txt b/gr-fec/include/gnuradio/fec/CMakeLists.txt
index 57594b47d8..3a1a3cf659 100644
--- a/gr-fec/include/gnuradio/fec/CMakeLists.txt
+++ b/gr-fec/include/gnuradio/fec/CMakeLists.txt
@@ -60,7 +60,11 @@ install(FILES
     polar_decoder_sc_list.h
     polar_decoder_common.h
     polar_encoder_systematic.h
-    polar_decoder_sc_systematic.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec
+    polar_decoder_sc_systematic.h
+    maxstar.h
+    tpc_common.h
+    tpc_decoder.h
+    tpc_encoder.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec
     COMPONENT "fec_devel"
 )
 
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml
index 784dbeda88..fbee4ca483 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" or $type == "msg_complex")
-for i in xrange(#if $type.t == 'message' then 2 else 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) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) and (not $type() == "msg_float") 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) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) and (not $type() == "msg_float") 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) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) and (not $type() == "msg_float") 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) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) and (not $type() == "msg_float") 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) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) and (not $type() == "msg_float") 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) or ($type == "msg_complex")) then 'part' else 'all'#</hide>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and int($nconnections()) >= 1) or ($type() == "msg_complex")) and (not $type() == "msg_float") then 'part' else 'all'#</hide>
   </param>
 
 
@@ -584,14 +584,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 3 Width</name>
     <key>width3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -599,28 +599,28 @@ $(gui_hint()($win))</make>
     <name>Line 3 Color</name>
     <key>color3</key>
     <value>"green"</value>
-    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 3 Style</name>
     <key>style3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 3 Marker</name>
     <key>marker3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 3 Alpha</name>
     <key>alpha3</key>
-    <hide>#if (int($nconnections()) >= 3 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 3 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
 
@@ -628,14 +628,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 4 Width</name>
     <key>width4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -643,28 +643,28 @@ $(gui_hint()($win))</make>
     <name>Line 4 Color</name>
     <key>color4</key>
     <value>"black"</value>
-    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 4 Style</name>
     <key>style4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 4 Marker</name>
     <key>marker4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 4 Alpha</name>
     <key>alpha4</key>
-    <hide>#if (int($nconnections()) >= 4 or ($type == "complex" and int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 4 or ($type() == "complex" and int($nconnections()) >= 2)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
 
@@ -672,14 +672,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 5 Width</name>
     <key>width5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -687,28 +687,28 @@ $(gui_hint()($win))</make>
     <name>Line 5 Color</name>
     <key>color5</key>
     <value>"cyan"</value>
-    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 5 Style</name>
     <key>style5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 5 Marker</name>
     <key>marker5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 5 Alpha</name>
     <key>alpha5</key>
-    <hide>#if (int($nconnections()) >= 5 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 5 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
 
@@ -716,14 +716,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 6 Width</name>
     <key>width6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -731,28 +731,28 @@ $(gui_hint()($win))</make>
     <name>Line 6 Color</name>
     <key>color6</key>
     <value>"magenta"</value>
-    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 6 Style</name>
     <key>style6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 6 Marker</name>
     <key>marker6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 6 Alpha</name>
     <key>alpha6</key>
-    <hide>#if (int($nconnections()) >= 6 or ($type == "complex" and int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 6 or ($type() == "complex" and int($nconnections()) >= 3)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
 
@@ -760,14 +760,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 7 Width</name>
     <key>width7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -775,28 +775,28 @@ $(gui_hint()($win))</make>
     <name>Line 7 Color</name>
     <key>color7</key>
     <value>"yellow"</value>
-    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 7 Style</name>
     <key>style7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 7 Marker</name>
     <key>marker7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 7 Alpha</name>
     <key>alpha7</key>
-    <hide>#if (int($nconnections()) >= 7 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 7 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
 
@@ -804,14 +804,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 8 Width</name>
     <key>width8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -819,28 +819,28 @@ $(gui_hint()($win))</make>
     <name>Line 8 Color</name>
     <key>color8</key>
     <value>"dark red"</value>
-    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 8 Style</name>
     <key>style8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 8 Marker</name>
     <key>marker8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 8 Alpha</name>
     <key>alpha8</key>
-    <hide>#if (int($nconnections()) >= 8 or ($type == "complex" and int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 8 or ($type() == "complex" and int($nconnections()) >= 4)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
 
@@ -848,14 +848,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 9 Width</name>
     <key>width9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -863,28 +863,28 @@ $(gui_hint()($win))</make>
     <name>Line 9 Color</name>
     <key>color9</key>
     <value>"dark green"</value>
-    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 9 Style</name>
     <key>style9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 9 Marker</name>
     <key>marker9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 9 Alpha</name>
     <key>alpha9</key>
-    <hide>#if (int($nconnections()) >= 9 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 9 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
 
@@ -892,14 +892,14 @@ $(gui_hint()($win))</make>
     <base_key>label1</base_key>
     <name>Line 10 Label</name>
     <key>label10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>width1</base_key>
     <name>Line 10 Width</name>
     <key>width10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
@@ -907,28 +907,28 @@ $(gui_hint()($win))</make>
     <name>Line 10 Color</name>
     <key>color10</key>
     <value>"dark blue"</value>
-    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>style1</base_key>
     <name>Line 10 Style</name>
     <key>style10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>marker1</base_key>
     <name>Line 10 Marker</name>
     <key>marker10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <param>
     <base_key>alpha1</base_key>
     <name>Line 10 Alpha</name>
     <key>alpha10</key>
-    <hide>#if (int($nconnections()) >= 10 or ($type == "complex" and int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+    <hide>#if ((int($nconnections()) >= 10 or ($type() == "complex" and int($nconnections()) >= 5)) and not $type.t == "message") then 'part' else 'all'#</hide>
   </param>
 
   <sink>
author	Johnathan Corgan <johnathan@corganlabs.com>	2017-01-30 05:25:03 -0800
committer	Johnathan Corgan <johnathan@corganlabs.com>	2017-01-30 05:25:03 -0800
commit	a32010b52bbafd82b4f66ef508457fe1b6f8031f (patch)
tree	b10f20dd1a9a4cccb285cc791d5711cbffc071dd
parent	a6323e35d0caa7fb4403aa86b222dee8919da133 (diff)
parent	884eddf41e1f35606d563c128e4070f930a4d2ab (diff)