projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into dfsg-orig
[debian/gnuradio]
/
gr-qtgui
/
src
/
lib
/
SpectrumGUIClass.cc
diff --git
a/gr-qtgui/src/lib/SpectrumGUIClass.cc
b/gr-qtgui/src/lib/SpectrumGUIClass.cc
index f196d7c5f28d03bdb7a951578f8eeec06172d653..8c1b3670300f16bc5ec230a11898c8482b07bcc2 100644
(file)
--- a/
gr-qtgui/src/lib/SpectrumGUIClass.cc
+++ b/
gr-qtgui/src/lib/SpectrumGUIClass.cc
@@
-30,7
+30,6
@@
SpectrumGUIClass::SpectrumGUIClass(const uint64_t maxDataSize,
_startFrequency = newStartFrequency;
_stopFrequency = newStopFrequency;
_startFrequency = newStartFrequency;
_stopFrequency = newStopFrequency;
-#warning SPECIFY THIS LATER...
_windowType = 5;
timespec_reset(&_lastGUIUpdateTime);
_windowType = 5;
timespec_reset(&_lastGUIUpdateTime);
@@
-112,7
+111,7
@@
SpectrumGUIClass::OpenSpectrumWindow(QWidget* parent,
timespec_reset(&_lastGUIUpdateTime);
// Draw Blank Display
timespec_reset(&_lastGUIUpdateTime);
// Draw Blank Display
- UpdateWindow(false, NULL, 0, NULL, 0, NULL, 0,
1.0,
get_highres_clock(), true);
+ UpdateWindow(false, NULL, 0, NULL, 0, NULL, 0, get_highres_clock(), true);
// Set up the initial frequency axis settings
SetFrequencyRange(_centerFrequency, _startFrequency, _stopFrequency);
// Set up the initial frequency axis settings
SetFrequencyRange(_centerFrequency, _startFrequency, _stopFrequency);
@@
-221,7
+220,6
@@
SpectrumGUIClass::UpdateWindow(const bool updateDisplayFlag,
const uint64_t realTimeDomainDataSize,
const float* complexTimeDomainData,
const uint64_t complexTimeDomainDataSize,
const uint64_t realTimeDomainDataSize,
const float* complexTimeDomainData,
const uint64_t complexTimeDomainDataSize,
- const double timePerFFT,
const timespec timestamp,
const bool lastOfMultipleFFTUpdateFlag)
{
const timespec timestamp,
const bool lastOfMultipleFFTUpdateFlag)
{
@@
-278,7
+276,7
@@
SpectrumGUIClass::UpdateWindow(const bool updateDisplayFlag,
const timespec currentTime = get_highres_clock();
const timespec lastUpdateGUITime = GetLastGUIUpdateTime();
const timespec currentTime = get_highres_clock();
const timespec lastUpdateGUITime = GetLastGUIUpdateTime();
- if((diff_timespec(currentTime, lastUpdateGUITime) > (4*
timePerFFT
)) &&
+ if((diff_timespec(currentTime, lastUpdateGUITime) > (4*
_updateTime
)) &&
(GetPendingGUIUpdateEvents() > 0) && !timespec_empty(&lastUpdateGUITime)) {
// Do not update the display if too much data is pending to be displayed
_droppedEntriesCount++;
(GetPendingGUIUpdateEvents() > 0) && !timespec_empty(&lastUpdateGUITime)) {
// Do not update the display if too much data is pending to be displayed
_droppedEntriesCount++;
@@
-291,7
+289,7
@@
SpectrumGUIClass::UpdateWindow(const bool updateDisplayFlag,
_realTimeDomainPoints,
_imagTimeDomainPoints,
timeDomainBufferSize,
_realTimeDomainPoints,
_imagTimeDomainPoints,
timeDomainBufferSize,
- time
PerFFT, time
stamp,
+ timestamp,
repeatDataFlag,
lastOfMultipleFFTUpdateFlag,
currentTime,
repeatDataFlag,
lastOfMultipleFFTUpdateFlag,
currentTime,
@@
-449,10
+447,24
@@
SpectrumGUIClass::SetConstellationAxis(double xmin, double xmax,
}
}
+void
+SpectrumGUIClass::SetConstellationPenSize(int size){
+ _spectrumDisplayForm->SetConstellationPenSize(size);
+}
+
+
void
SpectrumGUIClass::SetFrequencyAxis(double min, double max)
{
_spectrumDisplayForm->SetFrequencyAxis(min, max);
}
void
SpectrumGUIClass::SetFrequencyAxis(double min, double max)
{
_spectrumDisplayForm->SetFrequencyAxis(min, max);
}
+void
+SpectrumGUIClass::SetUpdateTime(double t)
+{
+ _updateTime = t;
+ _spectrumDisplayForm->SetUpdateTime(_updateTime);
+}
+
+
#endif /* SPECTRUM_GUI_CLASS_CPP */
#endif /* SPECTRUM_GUI_CLASS_CPP */