commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 34/57: qtgui: work on ber sink for fecapi


From: git
Subject: [Commit-gnuradio] [gnuradio] 34/57: qtgui: work on ber sink for fecapi
Date: Wed, 21 May 2014 03:10:28 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 2363b40da02d21b0f04413bba8cfd7e3fceab69b
Author: Tom Rondeau <address@hidden>
Date:   Mon May 12 22:16:45 2014 -0400

    qtgui: work on ber sink for fecapi
---
 gr-qtgui/grc/qtgui_ber_sink_b.xml | 579 +++++++++++++++++++++++++++++++++++++-
 gr-qtgui/lib/ber_sink_b_impl.cc   |  58 ++--
 2 files changed, 599 insertions(+), 38 deletions(-)

diff --git a/gr-qtgui/grc/qtgui_ber_sink_b.xml 
b/gr-qtgui/grc/qtgui_ber_sink_b.xml
index c4869f3..da3fc6e 100644
--- a/gr-qtgui/grc/qtgui_ber_sink_b.xml
+++ b/gr-qtgui/grc/qtgui_ber_sink_b.xml
@@ -22,6 +22,30 @@
 self.$(id).set_update_time($update_time)
 self.$(id).set_y_axis($ymin, $ymax)
 self.$(id).set_x_axis($(esno)[0], $(esno)[-1])
+
+labels = [$label1, $label2, $label3, $label4, $label5,
+          $label6, $label7, $label8, $label9, $label10]
+widths = [$width1, $width2, $width3, $width4, $width5,
+          $width6, $width7, $width8, $width9, $width10]
+colors = [$color1, $color2, $color3, $color4, $color5,
+          $color6, $color7, $color8, $color9, $color10]
+styles = [$style1, $style2, $style3, $style4, $style5,
+          $style6, $style7, $style8, $style9, $style10]
+markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
+           $marker6, $marker7, $marker8, $marker9, $marker10]
+alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
+          $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
+for i in xrange($num_curves):
+    if len(labels[i]) == 0:
+        self.$(id).set_line_label(i, "Data {0}".format(i))
+    else:
+        self.$(id).set_line_label(i, labels[i])
+    self.$(id).set_line_width(i, widths[i])
+    self.$(id).set_line_color(i, colors[i])
+    self.$(id).set_line_style(i, styles[i])
+    self.$(id).set_line_marker(i, markers[i])
+    self.$(id).set_line_alpha(i, alphas[i])
+
 self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
 $(gui_hint()($win))</make>
 
@@ -33,14 +57,14 @@ $(gui_hint()($win))</make>
   </param>
 
   <param>
-    <name>BERMINERRORS</name>
+    <name>Min. BER Errs.</name>
     <key>berminerrors</key>
     <value>100</value>
     <type>int</type>
   </param>
 
   <param>
-    <name>BERLIMIT</name>
+    <name>BER Limit</name>
     <key>berlimit</key>
     <value>-7.0</value>
     <type>real</type>
@@ -93,6 +117,557 @@ $(gui_hint()($win))</make>
     <hide>part</hide>
   </param>
 
+  <param>
+    <name>Line 1 Label</name>
+    <key>label1</key>
+    <type>string</type>
+    <hide>#if int($num_curves()) >= 1 then 'part' else 'all'#</hide>
+    <tab>Config</tab>
+  </param>
+
+  <param>
+    <name>Line 1 Width</name>
+    <key>width1</key>
+    <value>1</value>
+    <type>int</type>
+    <hide>#if int($num_curves()) >= 1 then 'part' else 'all'#</hide>
+    <tab>Config</tab>
+  </param>
+
+  <param>
+    <name>Line 1 Color</name>
+    <key>color1</key>
+    <type>enum</type>
+    <hide>#if int($num_curves()) >= 1 then 'part' else 'all'#</hide>
+    <option>
+      <name>Blue</name>
+      <key>"blue"</key>
+    </option>
+    <option>
+      <name>Red</name>
+      <key>"red"</key>
+    </option>
+    <option>
+      <name>Green</name>
+      <key>"green"</key>
+    </option>
+    <option>
+      <name>Black</name>
+      <key>"black"</key>
+    </option>
+    <option>
+      <name>Cyan</name>
+      <key>"cyan"</key>
+    </option>
+    <option>
+      <name>Magenta</name>
+      <key>"magenta"</key>
+    </option>
+    <option>
+      <name>Yellow</name>
+      <key>"yellow"</key>
+    </option>
+    <option>
+      <name>Dark Red</name>
+      <key>"dark red"</key>
+    </option>
+    <option>
+      <name>Dark Green</name>
+      <key>"dark green"</key>
+    </option>
+    <option>
+      <name>Dark Blue</name>
+      <key>"Dark Blue"</key>
+    </option>
+    <tab>Config</tab>
+  </param>
+
+  <param>
+    <name>Line 1 Style</name>
+    <key>style1</key>
+    <type>enum</type>
+    <hide>#if int($num_curves()) >= 1 then 'part' else 'all'#</hide>
+    <option>
+      <name>Solid</name>
+      <key>1</key>
+    </option>
+    <option>
+      <name>Dash</name>
+      <key>2</key>
+    </option>
+    <option>
+      <name>Dots</name>
+      <key>3</key>
+    </option>
+    <option>
+      <name>Dash-Dot</name>
+      <key>4</key>
+    </option>
+    <option>
+      <name>Dash-Dot-Dot</name>
+      <key>5</key>
+    </option>
+    <option>
+      <name>None</name>
+      <key>0</key>
+    </option>
+    <tab>Config</tab>
+  </param>
+
+  <param>
+    <name>Line 1 Marker</name>
+    <key>marker1</key>
+    <type>enum</type>
+    <hide>#if int($num_curves()) >= 1 then 'part' else 'all'#</hide>
+    <option>
+      <name>Circle</name>
+      <key>0</key>
+    </option>
+    <option>
+      <name>Rectangle</name>
+      <key>1</key>
+    </option>
+    <option>
+      <name>Diamond</name>
+      <key>2</key>
+    </option>
+    <option>
+      <name>Triangle</name>
+      <key>3</key>
+    </option>
+    <option>
+      <name>Down Triangle</name>
+      <key>4</key>
+    </option>
+    <option>
+      <name>Left Triangle</name>
+      <key>6</key>
+    </option>
+    <option>
+      <name>Right Triangle</name>
+      <key>7</key>
+    </option>
+    <option>
+      <name>Cross</name>
+      <key>8</key>
+    </option>
+    <option>
+      <name>X-Cross</name>
+      <key>9</key>
+    </option>
+    <option>
+      <name>None</name>
+      <key>-1</key>
+    </option>
+    <tab>Config</tab>
+  </param>
+
+  <param>
+    <name>Line 1 Alpha</name>
+    <key>alpha1</key>
+    <value>1.0</value>
+    <type>float</type>
+    <hide>#if int($num_curves()) >= 1 then 'part' else 'all'#</hide>
+    <tab>Config</tab>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 2 Label</name>
+    <key>label2</key>
+    <hide>#if int($num_curves()) >= 2 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 2 Width</name>
+    <key>width2</key>
+    <hide>#if int($num_curves()) >= 2 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 2 Color</name>
+    <key>color2</key>
+    <value>"red"</value>
+    <hide>#if int($num_curves()) >= 2 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 2 Style</name>
+    <key>style2</key>
+    <hide>#if int($num_curves()) >= 2 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 2 Marker</name>
+    <key>marker2</key>
+    <hide>#if int($num_curves()) >= 2 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 2 Alpha</name>
+    <key>alpha2</key>
+    <hide>#if int($num_curves()) >= 2 then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 3 Label</name>
+    <key>label3</key>
+    <hide>#if int($num_curves()) >= 3 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 3 Width</name>
+    <key>width3</key>
+    <hide>#if int($num_curves()) >= 3 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 3 Color</name>
+    <key>color3</key>
+    <value>"green"</value>
+    <hide>#if int($num_curves()) >= 3 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 3 Style</name>
+    <key>style3</key>
+    <hide>#if int($num_curves()) >= 3 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 3 Marker</name>
+    <key>marker3</key>
+    <hide>#if int($num_curves()) >= 3 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 3 Alpha</name>
+    <key>alpha3</key>
+    <hide>#if int($num_curves()) >= 3 then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 4 Label</name>
+    <key>label4</key>
+    <hide>#if int($num_curves()) >= 4 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 4 Width</name>
+    <key>width4</key>
+    <hide>#if int($num_curves()) >= 4 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 4 Color</name>
+    <key>color4</key>
+    <value>"black"</value>
+    <hide>#if int($num_curves()) >= 4 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 4 Style</name>
+    <key>style4</key>
+    <hide>#if int($num_curves()) >= 4 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 4 Marker</name>
+    <key>marker4</key>
+    <hide>#if int($num_curves()) >= 4 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 4 Alpha</name>
+    <key>alpha4</key>
+    <hide>#if int($num_curves()) >= 4 then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 5 Label</name>
+    <key>label5</key>
+    <hide>#if int($num_curves()) >= 5 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 5 Width</name>
+    <key>width5</key>
+    <hide>#if int($num_curves()) >= 5 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 5 Color</name>
+    <key>color5</key>
+    <value>"cyan"</value>
+    <hide>#if int($num_curves()) >= 5 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 5 Style</name>
+    <key>style5</key>
+    <hide>#if int($num_curves()) >= 5 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 5 Marker</name>
+    <key>marker5</key>
+    <hide>#if int($num_curves()) >= 5 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 5 Alpha</name>
+    <key>alpha5</key>
+    <hide>#if int($num_curves()) >= 5 then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 6 Label</name>
+    <key>label6</key>
+    <hide>#if int($num_curves()) >= 6 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 6 Width</name>
+    <key>width6</key>
+    <hide>#if int($num_curves()) >= 6 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 6 Color</name>
+    <key>color6</key>
+    <value>"magenta"</value>
+    <hide>#if int($num_curves()) >= 6 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 6 Style</name>
+    <key>style6</key>
+    <hide>#if int($num_curves()) >= 6 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 6 Marker</name>
+    <key>marker6</key>
+    <hide>#if int($num_curves()) >= 6 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 6 Alpha</name>
+    <key>alpha6</key>
+    <hide>#if int($num_curves()) >= 6 then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 7 Label</name>
+    <key>label7</key>
+    <hide>#if int($num_curves()) >= 7 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 7 Width</name>
+    <key>width7</key>
+    <hide>#if int($num_curves()) >= 7 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 7 Color</name>
+    <key>color7</key>
+    <value>"yellow"</value>
+    <hide>#if int($num_curves()) >= 7 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 7 Style</name>
+    <key>style7</key>
+    <hide>#if int($num_curves()) >= 7 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 7 Marker</name>
+    <key>marker7</key>
+    <hide>#if int($num_curves()) >= 7 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 7 Alpha</name>
+    <key>alpha7</key>
+    <hide>#if int($num_curves()) >= 7 then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 8 Label</name>
+    <key>label8</key>
+    <hide>#if int($num_curves()) >= 8 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 8 Width</name>
+    <key>width8</key>
+    <hide>#if int($num_curves()) >= 8 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 8 Color</name>
+    <key>color8</key>
+    <value>"dark red"</value>
+    <hide>#if int($num_curves()) >= 8 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 8 Style</name>
+    <key>style8</key>
+    <hide>#if int($num_curves()) >= 8 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 8 Marker</name>
+    <key>marker8</key>
+    <hide>#if int($num_curves()) >= 8 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 8 Alpha</name>
+    <key>alpha8</key>
+    <hide>#if int($num_curves()) >= 8 then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 9 Label</name>
+    <key>label9</key>
+    <hide>#if int($num_curves()) >= 9 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 9 Width</name>
+    <key>width9</key>
+    <hide>#if int($num_curves()) >= 9 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 9 Color</name>
+    <key>color9</key>
+    <value>"dark green"</value>
+    <hide>#if int($num_curves()) >= 9 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 9 Style</name>
+    <key>style9</key>
+    <hide>#if int($num_curves()) >= 9 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 9 Marker</name>
+    <key>marker9</key>
+    <hide>#if int($num_curves()) >= 9 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 9 Alpha</name>
+    <key>alpha9</key>
+    <hide>#if int($num_curves()) >= 9 then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 10 Label</name>
+    <key>label10</key>
+    <hide>#if int($num_curves()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 10 Width</name>
+    <key>width10</key>
+    <hide>#if int($num_curves()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 10 Color</name>
+    <key>color10</key>
+    <value>"dark blue"</value>
+    <hide>#if int($num_curves()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 10 Style</name>
+    <key>style10</key>
+    <hide>#if int($num_curves()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 10 Marker</name>
+    <key>marker10</key>
+    <hide>#if int($num_curves()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 10 Alpha</name>
+    <key>alpha10</key>
+    <hide>#if int($num_curves()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+
   <sink>
     <name>out</name>
     <type>byte</type>
diff --git a/gr-qtgui/lib/ber_sink_b_impl.cc b/gr-qtgui/lib/ber_sink_b_impl.cc
index bd4739e..c371a73 100644
--- a/gr-qtgui/lib/ber_sink_b_impl.cc
+++ b/gr-qtgui/lib/ber_sink_b_impl.cc
@@ -47,33 +47,33 @@ namespace gr {
 
     int
     ber_sink_b_impl::compBER(unsigned char *inBuffer1, unsigned char 
*inBuffer2,int buffSize)
-    { 
+    {
       int i,totalDiff=0;
       int popCnt[256] =
-        { 
-          0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 
-          1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 
-          1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 
-          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 
-          1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 
-          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 
-          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 
-          3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 
-          1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 
-          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 
-          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 
-          3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 
-          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 
-          3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 
-          3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 
+        {
+          0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
+          1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+          1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+          1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+          3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+          1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+          3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+          2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+          3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+          3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
           4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
         };
-      
-      
+
+
       for (i=0;i<buffSize;i++)
         {
-          totalDiff += popCnt[inBuffer1[i]^inBuffer2[i]];        
-      
+          totalDiff += popCnt[inBuffer1[i]^inBuffer2[i]];
+
         }
 
       return totalDiff;
@@ -354,17 +354,6 @@ namespace gr {
         return -1;
       }
 
-      /*
-      for(int i = 0; i < d_nconnections; ++i) {
-        printf("%f, ", d_residbufs_imag[0][i]);
-      }
-      printf("\n");
-      for(int i = 0; i < d_nconnections; ++i) {
-        printf("%f, ", d_residbufs_real[0][i]);
-      }
-      printf("\n");
-      */
-
       for(unsigned int i = 0; i < ninput_items.size(); i += 2) {
         if((d_totalErrors[i >> 1] < d_berminerrors) && 
(log10(((double)d_berminerrors)/(d_total[i >> 1] * 8.0)) >= d_berLimit)) {
           int items = ninput_items[i] <= ninput_items[i+1] ? ninput_items[i] : 
ninput_items[i+1];
@@ -384,10 +373,9 @@ namespace gr {
 
           if(d_totalErrors[i >> 1] >= d_berminerrors) {
             printf("    %u over %d\n", d_totalErrors[i >> 1], d_total[i >> 1] 
* 8);
-            //outBuffer[0] = log10(((double)d_totalErrors)/(d_total * 8.0));
           }
           else if(log10(((double)d_berminerrors)/(d_total[i >> 1] * 8.0)) < 
d_berLimit) {
-            printf("crapout\n");
+            printf("BER Limit Reached\n");
             d_residbufs_imag[i/(d_nconnections * 2)][(i%(d_nconnections * 2)) 
>> 1] = d_berLimit;
             d_totalErrors[i >> 1] = d_berminerrors + 1;
           }
@@ -404,5 +392,3 @@ namespace gr {
 
   } /* namespace qtgui */
 } /* namespace gr */
-
-



reply via email to

[Prev in Thread] Current Thread [Next in Thread]