[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/04: qtgui: fixes problem of set name not
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/04: qtgui: fixes problem of set name not showing up. |
|
Date: |
Wed, 2 Jul 2014 22:12:36 +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 0812870ee8359a60c376f07cda3dbc6d73ebf36d
Author: Tom Rondeau <address@hidden>
Date: Wed Jul 2 17:52:38 2014 -0400
qtgui: fixes problem of set name not showing up.
Defaults to blank string now; a blank string does not set the title to save
vertical space. Any other value will now set the title of the plotter.
---
gr-qtgui/grc/qtgui_const_sink_x.xml | 5 ++++-
gr-qtgui/grc/qtgui_freq_sink_x.xml | 4 +++-
gr-qtgui/grc/qtgui_histogram_sink_x.xml | 4 +++-
gr-qtgui/grc/qtgui_sink_x.xml | 3 ++-
gr-qtgui/grc/qtgui_time_raster_x.xml | 5 ++++-
gr-qtgui/grc/qtgui_time_sink_x.xml | 5 ++++-
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 5 ++++-
gr-qtgui/lib/const_sink_c_impl.cc | 4 ++++
gr-qtgui/lib/freq_sink_c_impl.cc | 3 +++
gr-qtgui/lib/freq_sink_f_impl.cc | 3 +++
gr-qtgui/lib/histogram_sink_f_impl.cc | 3 +++
gr-qtgui/lib/time_raster_sink_b_impl.cc | 3 +++
gr-qtgui/lib/time_raster_sink_f_impl.cc | 3 +++
gr-qtgui/lib/time_sink_c_impl.cc | 3 +++
gr-qtgui/lib/time_sink_f_impl.cc | 3 +++
gr-qtgui/lib/waterfall_sink_c_impl.cc | 3 +++
gr-qtgui/lib/waterfall_sink_f_impl.cc | 3 +++
17 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml
b/gr-qtgui/grc/qtgui_const_sink_x.xml
index 3b549e2..0062bca 100644
--- a/gr-qtgui/grc/qtgui_const_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_const_sink_x.xml
@@ -66,12 +66,15 @@ $(gui_hint()($win))</make>
<option><name>Complex</name><key>complex</key><opt>fcn:const_sink_c</opt></option>
<!--<option><name>Float</name><key>float</key><opt>fcn:const_sink_f</opt></option>
-->
</param>
+
<param>
<name>Name</name>
<key>name</key>
- <value>QT GUI Plot</value>
+ <value>""</value>
<type>string</type>
+ <hide>#if len($name()) > 0 then 'none' else 'part'#</hide>
</param>
+
<param>
<name>Number of Points</name>
<key>size</key>
diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml
b/gr-qtgui/grc/qtgui_freq_sink_x.xml
index 68b4712..beed7fa 100644
--- a/gr-qtgui/grc/qtgui_freq_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml
@@ -63,11 +63,13 @@ $(gui_hint()($win))</make>
<option><name>Complex</name><key>complex</key><opt>fcn:freq_sink_c</opt></option>
<option><name>Float</name><key>float</key><opt>fcn:freq_sink_f</opt></option>
</param>
+
<param>
<name>Name</name>
<key>name</key>
- <value>QT GUI Plot</value>
+ <value>""</value>
<type>string</type>
+ <hide>#if len($name()) > 0 then 'none' else 'part'#</hide>
</param>
<param>
diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml
b/gr-qtgui/grc/qtgui_histogram_sink_x.xml
index 2540891..a7137ac 100644
--- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml
@@ -64,9 +64,11 @@ $(gui_hint()($win))</make>
<param>
<name>Name</name>
<key>name</key>
- <value>QT GUI Plot</value>
+ <value>""</value>
<type>string</type>
+ <hide>#if len($name()) > 0 then 'none' else 'part'#</hide>
</param>
+
<param>
<name>Number of Points</name>
<key>size</key>
diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml
index ab76403..618973e 100644
--- a/gr-qtgui/grc/qtgui_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_sink_x.xml
@@ -49,8 +49,9 @@ Qt.QObject.connect(self._$(id)_win,
Qt.SIGNAL("plotPointSelected(QPointF, int)")
<param>
<name>Name</name>
<key>name</key>
- <value>QT GUI Plot</value>
+ <value>""</value>
<type>string</type>
+ <hide>#if len($name()) > 0 then 'none' else 'part'#</hide>
</param>
<param>
<name>FFT Size</name>
diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml
b/gr-qtgui/grc/qtgui_time_raster_x.xml
index db878eb..d303e7f 100644
--- a/gr-qtgui/grc/qtgui_time_raster_x.xml
+++ b/gr-qtgui/grc/qtgui_time_raster_x.xml
@@ -60,12 +60,15 @@ $(gui_hint()($win))</make>
<option><name>Byte</name><key>byte</key><opt>fcn:time_raster_sink_b</opt></option>
<option><name>Float</name><key>float</key><opt>fcn:time_raster_sink_f</opt></option>
</param>
+
<param>
<name>Name</name>
<key>name</key>
- <value>QT GUI Plot</value>
+ <value>""</value>
<type>string</type>
+ <hide>#if len($name()) > 0 then 'none' else 'part'#</hide>
</param>
+
<param>
<name>Sample Rate</name>
<key>samp_rate</key>
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml
b/gr-qtgui/grc/qtgui_time_sink_x.xml
index 172da7a..f40487e 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -87,12 +87,15 @@ $(gui_hint()($win))</make>
<option><name>Complex</name><key>complex</key><opt>fcn:time_sink_c</opt></option>
<option><name>Float</name><key>float</key><opt>fcn:time_sink_f</opt></option>
</param>
+
<param>
<name>Name</name>
<key>name</key>
- <value>QT GUI Plot</value>
+ <value>""</value>
<type>string</type>
+ <hide>#if len($name()) > 0 then 'none' else 'part'#</hide>
</param>
+
<param>
<name>Number of Points</name>
<key>size</key>
diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
index 279cdc7..36df704 100644
--- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
@@ -59,12 +59,15 @@ $(gui_hint()($win))</make>
<option><name>Complex</name><key>complex</key><opt>fcn:waterfall_sink_c</opt></option>
<option><name>Float</name><key>float</key><opt>fcn:waterfall_sink_f</opt></option>
</param>
+
<param>
<name>Name</name>
<key>name</key>
- <value>QT GUI Plot</value>
+ <value>""</value>
<type>string</type>
+ <hide>#if len($name()) > 0 then 'none' else 'part'#</hide>
</param>
+
<param>
<name>FFT Size</name>
<key>fftsize</key>
diff --git a/gr-qtgui/lib/const_sink_c_impl.cc
b/gr-qtgui/lib/const_sink_c_impl.cc
index a703336..93986d8 100644
--- a/gr-qtgui/lib/const_sink_c_impl.cc
+++ b/gr-qtgui/lib/const_sink_c_impl.cc
@@ -129,6 +129,10 @@ namespace gr {
d_main_gui = new ConstellationDisplayForm(d_nconnections, d_parent);
d_main_gui->setNPoints(d_size);
+
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc
index cfff3ee..6e5822b 100644
--- a/gr-qtgui/lib/freq_sink_c_impl.cc
+++ b/gr-qtgui/lib/freq_sink_c_impl.cc
@@ -157,6 +157,9 @@ namespace gr {
set_fft_size(d_fftsize);
set_frequency_range(d_center_freq, d_bandwidth);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc
index d653057..0d12e0c 100644
--- a/gr-qtgui/lib/freq_sink_f_impl.cc
+++ b/gr-qtgui/lib/freq_sink_f_impl.cc
@@ -157,6 +157,9 @@ namespace gr {
set_fft_size(d_fftsize);
set_frequency_range(d_center_freq, d_bandwidth);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc
b/gr-qtgui/lib/histogram_sink_f_impl.cc
index dc3e63c..bd43f86 100644
--- a/gr-qtgui/lib/histogram_sink_f_impl.cc
+++ b/gr-qtgui/lib/histogram_sink_f_impl.cc
@@ -126,6 +126,9 @@ namespace gr {
d_main_gui->setNPoints(d_size);
d_main_gui->setXaxis(d_xmin, d_xmax);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc
b/gr-qtgui/lib/time_raster_sink_b_impl.cc
index a1189f4..ecd8ac3 100644
--- a/gr-qtgui/lib/time_raster_sink_b_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc
@@ -145,6 +145,9 @@ namespace gr {
d_rows, d_cols,
1, d_parent);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc
b/gr-qtgui/lib/time_raster_sink_f_impl.cc
index c8b865d..3a18985 100644
--- a/gr-qtgui/lib/time_raster_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc
@@ -143,6 +143,9 @@ namespace gr {
d_rows, d_cols,
1, d_parent);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 499529c..e053806 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -129,6 +129,9 @@ namespace gr {
d_main_gui->setNPoints(d_size);
d_main_gui->setSampleRate(d_samp_rate);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc
index e571654..8424702 100644
--- a/gr-qtgui/lib/time_sink_f_impl.cc
+++ b/gr-qtgui/lib/time_sink_f_impl.cc
@@ -131,6 +131,9 @@ namespace gr {
d_main_gui->setNPoints(d_size);
d_main_gui->setSampleRate(d_samp_rate);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc
b/gr-qtgui/lib/waterfall_sink_c_impl.cc
index b4d6b2c..ff3cf36 100644
--- a/gr-qtgui/lib/waterfall_sink_c_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc
@@ -156,6 +156,9 @@ namespace gr {
set_fft_size(d_fftsize);
set_frequency_range(d_center_freq, d_bandwidth);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}
diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc
b/gr-qtgui/lib/waterfall_sink_f_impl.cc
index 32f16eb..9facec4 100644
--- a/gr-qtgui/lib/waterfall_sink_f_impl.cc
+++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc
@@ -155,6 +155,9 @@ namespace gr {
set_fft_size(d_fftsize);
set_frequency_range(d_center_freq, d_bandwidth);
+ if(d_name.size() > 0)
+ set_title(d_name);
+
// initialize update time to 10 times a second
set_update_time(0.1);
}