[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: qtgui: fixes issue of setting min/ma
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: qtgui: fixes issue of setting min/max when using qwt < 6.1.0. |
Date: |
Tue, 21 Oct 2014 22:27:15 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch maint
in repository gnuradio.
commit 3f318477ae779ff4cd46728dd223ed092c5b5b1b
Author: Tom Rondeau <address@hidden>
Date: Tue Oct 21 18:24:36 2014 -0400
qtgui: fixes issue of setting min/max when using qwt < 6.1.0.
---
gr-qtgui/grc/qtgui_number_sink.xml | 2 +-
gr-qtgui/lib/numberdisplayform.cc | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/gr-qtgui/grc/qtgui_number_sink.xml
b/gr-qtgui/grc/qtgui_number_sink.xml
index e7b232e..46b58f6 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 0dd433c..a199c35 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