diff options
| author | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-04-15 03:49:04 +0000 |
|---|---|---|
| committer | trondeau <trondeau@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-04-15 03:49:04 +0000 |
| commit | 322e065b19c922e2a9cc1710876e32d100453181 (patch) | |
| tree | acc0c5d9643fd647d128ca4215147eef79189af3 /gr-qtgui/src/lib/spectrumdisplayform.h | |
| parent | ae5fa9430882f5140a3c9a9b61e4a5f7c4ed9127 (diff) | |
Merging qtdevel2 branch -r10565:10849. This adds a lot of fixes and capabilities to the qtgui package. Most importantly, it allows interaction between PyQt and the C++ Qt routines in the gnuradio library.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10850 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-qtgui/src/lib/spectrumdisplayform.h')
| -rw-r--r-- | gr-qtgui/src/lib/spectrumdisplayform.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/gr-qtgui/src/lib/spectrumdisplayform.h b/gr-qtgui/src/lib/spectrumdisplayform.h index 6e57e2cec6..eba087bf5f 100644 --- a/gr-qtgui/src/lib/spectrumdisplayform.h +++ b/gr-qtgui/src/lib/spectrumdisplayform.h @@ -15,7 +15,7 @@ class SpectrumGUIClass; #include <QValidator> #include <vector> -class SpectrumDisplayForm : public QDialog, public Ui::SpectrumDisplayForm +class SpectrumDisplayForm : public QWidget, public Ui::SpectrumDisplayForm { Q_OBJECT @@ -23,13 +23,15 @@ class SpectrumDisplayForm : public QDialog, public Ui::SpectrumDisplayForm SpectrumDisplayForm(QWidget* parent = 0); ~SpectrumDisplayForm(); - void setSystem( SpectrumGUIClass * newSystem, const uint64_t numFFTDataPoints, const uint64_t numTimeDomainDataPoints ); + void setSystem( SpectrumGUIClass * newSystem, const uint64_t numFFTDataPoints, + const uint64_t numTimeDomainDataPoints ); int GetAverageCount(); void SetAverageCount( const int newCount ); void Reset(); void AverageDataReset(); - void ResizeBuffers( const uint64_t numFFTDataPoints, const uint64_t numTimeDomainDataPoints ); + void ResizeBuffers( const uint64_t numFFTDataPoints, + const uint64_t numTimeDomainDataPoints ); public slots: void resizeEvent( QResizeEvent * e ); @@ -40,7 +42,9 @@ public slots: void MinHoldResetBtn_clicked(); void MaxHoldResetBtn_clicked(); void PowerLineEdit_textChanged( const QString& valueString ); - void SetFrequencyRange( const double newStartFrequency, const double newStopFrequency, const double newCenterFrequency ); + void SetFrequencyRange( const double newStartFrequency, + const double newStopFrequency, + const double newCenterFrequency ); void closeEvent( QCloseEvent * e ); void WindowTypeChanged( int newItem ); void UseRFFrequenciesCB( bool useRFFlag ); @@ -54,6 +58,12 @@ public slots: void Waterfall3DAutoScaleBtnCB(); void FFTComboBoxSelectedCB(const QString&); + void ToggleTabFrequency(const bool state); + void ToggleTabWaterfall(const bool state); + void ToggleTabWaterfall3D(const bool state); + void ToggleTabTime(const bool state); + void ToggleTabConstellation(const bool state); + private slots: void newFrequencyData( const SpectrumUpdateEvent* ); @@ -84,6 +94,13 @@ private: double _peakAmplitude; static int _openGLWaterfall3DFlag; double _stopFrequency; + + // whether or not to use a particular display + int d_plot_fft; + int d_plot_waterfall; + int d_plot_waterfall3d; + int d_plot_time; + int d_plot_constellation; }; #endif /* SPECTRUM_DISPLAY_FORM_H */ |