summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <tom@trondeau.com>2014-10-21 18:24:36 -0400
committerTom Rondeau <tom@trondeau.com>2014-10-21 18:24:36 -0400
commit3f318477ae779ff4cd46728dd223ed092c5b5b1b (patch)
tree01ddd9f37d07ea7576d3c27e4ab5cc3c320b6ca4
parentd26889831042e9df71f83b2e976f69546f990515 (diff)
qtgui: fixes issue of setting min/max when using qwt < 6.1.0.
-rw-r--r--gr-qtgui/grc/qtgui_number_sink.xml2
-rw-r--r--gr-qtgui/lib/numberdisplayform.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/gr-qtgui/grc/qtgui_number_sink.xml b/gr-qtgui/grc/qtgui_number_sink.xml
index e7b232e36f..46b58f6298 100644
--- a/gr-qtgui/grc/qtgui_number_sink.xml
+++ b/gr-qtgui/grc/qtgui_number_sink.xml
@@ -143,7 +143,7 @@ $(gui_hint()($win))</make>
<hide>part</hide>
</param>
<param>
- <name>max</name>
+ <name>Max</name>
<key>max</key>
<value>1</value>
<type>float</type>
diff --git a/gr-qtgui/lib/numberdisplayform.cc b/gr-qtgui/lib/numberdisplayform.cc
index 0dd433c62b..a199c35d4e 100644
--- a/gr-qtgui/lib/numberdisplayform.cc
+++ b/gr-qtgui/lib/numberdisplayform.cc
@@ -377,6 +377,9 @@ NumberDisplayForm::setScale(int which, int min, int max)
d_min[which] = min;
d_max[which] = max;
d_indicator[which]->setScale(min, max);
+#if QWT_VERSION < 0x060100
+ d_indicator[which]->setRange(min, max);
+#endif
}
void