diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-03-28 18:31:31 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-03-28 18:31:31 -0700 |
| commit | 28ba7e49108f7401d8ead67267a515149c2a47b5 (patch) | |
| tree | cfae99167d6aba2dbc1c2bd5f6494a7dfbfd3e8a | |
| parent | ebae0c45e3fae1ab4838136a060763c5c34ff889 (diff) | |
| parent | 48b29c4db8bcd73ddf8b270d6689f4118674a61b (diff) | |
Merge branch 'maint'
| -rw-r--r-- | gr-qtgui/grc/qtgui_tab_widget.xml | 5 | ||||
| -rw-r--r-- | gr-qtgui/lib/FrequencyDisplayPlot.cc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/gr-qtgui/grc/qtgui_tab_widget.xml b/gr-qtgui/grc/qtgui_tab_widget.xml index 5a99377367..1bbadc8e51 100644 --- a/gr-qtgui/grc/qtgui_tab_widget.xml +++ b/gr-qtgui/grc/qtgui_tab_widget.xml @@ -10,7 +10,10 @@ <import>from PyQt4 import Qt</import> <make>#set $win = 'self.%s'%$id Qt.QTabWidget() -#set $all_labels = [$label0, $label1, $label2, $label3, $label4][:int($num_tabs())] +#set $all_labels = [$label0, $label1, $label2, $label3, $label4, + $label5, $label6, $label7, $label8, $label9, + $label10, $label11, $label12, $label13, $label14, + $label15, $label16, $label17, $label18, $label19][:int($num_tabs())] #for i, label in enumerate($all_labels) self.$(id)_widget_$(i) = Qt.QWidget() self.$(id)_layout_$(i) = Qt.QBoxLayout(Qt.QBoxLayout.TopToBottom, self.$(id)_widget_$(i)) diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index 384ec8d633..8005be191b 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -395,10 +395,10 @@ FrequencyDisplayPlot::plotNewData(const std::vector<double*> dataPoints, for(int64_t point = 0; point < _npoints_in; point++) { if(dataPoints[n][point] < d_min_fft_data[point]) { - d_min_fft_data[point] = dataPoints[n][point]; + d_min_fft_data[point] = dataPoints[n][point+_in_index]; } if(dataPoints[n][point] > d_max_fft_data[point]) { - d_max_fft_data[point] = dataPoints[n][point]; + d_max_fft_data[point] = dataPoints[n][point+_in_index]; } // Find overall top and bottom values in plot. |