summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-07-02 17:52:38 -0400
committerTom Rondeau <tom@trondeau.com>2014-07-02 18:10:50 -0400
commit0812870ee8359a60c376f07cda3dbc6d73ebf36d (patch)
tree0928ef19666f2d0b235dedadca0f6febcbe44aaa
parent11fd45d36db4f0cb0609534f70b031c937d542a0 (diff)
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.
Diffstat
-rw-r--r--gr-qtgui/grc/qtgui_const_sink_x.xml5
-rw-r--r--gr-qtgui/grc/qtgui_freq_sink_x.xml4
-rw-r--r--gr-qtgui/grc/qtgui_histogram_sink_x.xml4
-rw-r--r--gr-qtgui/grc/qtgui_sink_x.xml3
-rw-r--r--gr-qtgui/grc/qtgui_time_raster_x.xml5
-rw-r--r--gr-qtgui/grc/qtgui_time_sink_x.xml5
-rw-r--r--gr-qtgui/grc/qtgui_waterfall_sink_x.xml5
-rw-r--r--gr-qtgui/lib/const_sink_c_impl.cc4
-rw-r--r--gr-qtgui/lib/freq_sink_c_impl.cc3
-rw-r--r--gr-qtgui/lib/freq_sink_f_impl.cc3
-rw-r--r--gr-qtgui/lib/histogram_sink_f_impl.cc3
-rw-r--r--gr-qtgui/lib/time_raster_sink_b_impl.cc3
-rw-r--r--gr-qtgui/lib/time_raster_sink_f_impl.cc3
-rw-r--r--gr-qtgui/lib/time_sink_c_impl.cc3
-rw-r--r--gr-qtgui/lib/time_sink_f_impl.cc3
-rw-r--r--gr-qtgui/lib/waterfall_sink_c_impl.cc3
-rw-r--r--gr-qtgui/lib/waterfall_sink_f_impl.cc3
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 3b549e2d31..0062bcaba8 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 68b47122a9..beed7fa921 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 254089181b..a7137ac6a1 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 ab76403472..618973ed59 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 db878eb379..d303e7f42a 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 172da7a02d..f40487e61f 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 279cdc75b4..36df704a3e 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 a703336a61..93986d84c7 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 cfff3ee8b7..6e5822bb92 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 d653057690..0d12e0c200 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 dc3e63cb01..bd43f8645c 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 a1189f4413..ecd8ac319a 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 c8b865d55d..3a18985b2d 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 499529c57d..e053806fd2 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 e571654615..8424702bc1 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 b4d6b2c52a..ff3cf36944 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 32f16eb7ef..9facec48bd 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);
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 08:15:37 +0000