diff options
Diffstat (limited to 'gr-qtgui')
| -rw-r--r-- | gr-qtgui/lib/ConstellationDisplayPlot.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/SpectrumGUIClass.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.cc | 20 | ||||
| -rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.h | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index a9c64d274..e01c99b74 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc @@ -217,6 +217,8 @@ void ConstellationDisplayPlot::PlotNewData(const double* realDataPoints, memcpy(_realDataPoints, realDataPoints, numDataPoints*sizeof(double)); memcpy(_imagDataPoints, imagDataPoints, numDataPoints*sizeof(double)); + replot(); + _lastReplot = gruel::high_res_timer_now(); } } diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc index 026c1986c..f71f457d9 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/lib/SpectrumGUIClass.cc @@ -106,7 +106,7 @@ SpectrumGUIClass::OpenSpectrumWindow(QWidget* parent, _spectrumDisplayForm->ToggleTabFrequency(frequency); //_spectrumDisplayForm->ToggleTabWaterfall(waterfall); _spectrumDisplayForm->ToggleTabTime(time); - //_spectrumDisplayForm->ToggleTabConstellation(constellation); + _spectrumDisplayForm->ToggleTabConstellation(constellation); _windowOpennedFlag = true; diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 8c9cc085f..6f82c03ff 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -36,7 +36,7 @@ SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) _frequencyDisplayPlot = new FrequencyDisplayPlot(FrequencyPlotDisplayFrame); //_waterfallDisplayPlot = new WaterfallDisplayPlot(WaterfallPlotDisplayFrame); _timeDomainDisplayPlot = new TimeDomainDisplayPlot(2, TimeDomainDisplayFrame); - //_constellationDisplayPlot = new ConstellationDisplayPlot(ConstellationDisplayFrame); + _constellationDisplayPlot = new ConstellationDisplayPlot(ConstellationDisplayFrame); _numRealDataPoints = 1024; _realFFTDataPoints = new double[_numRealDataPoints]; _averagedValues = new double[_numRealDataPoints]; @@ -78,7 +78,7 @@ SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) ToggleTabFrequency(false); //ToggleTabWaterfall(false); ToggleTabTime(false); - //ToggleTabConstellation(false); + ToggleTabConstellation(false); _historyEntry = 0; _historyEntryCount = 0; @@ -97,8 +97,8 @@ SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) connect(_timeDomainDisplayPlot, SIGNAL(plotPointSelected(const QPointF)), this, SLOT(onTimePlotPointSelected(const QPointF))); - //connect(_constellationDisplayPlot, SIGNAL(plotPointSelected(const QPointF)), - // this, SLOT(onConstPlotPointSelected(const QPointF))); + connect(_constellationDisplayPlot, SIGNAL(plotPointSelected(const QPointF)), + this, SLOT(onConstPlotPointSelected(const QPointF))); } SpectrumDisplayForm::~SpectrumDisplayForm() @@ -242,7 +242,6 @@ SpectrumDisplayForm::newFrequencyData( const SpectrumUpdateEvent* spectrumUpdate numTimeDomainDataPoints, d_update_time); } - /* if(tabindex == d_plot_constellation) { _constellationDisplayPlot->PlotNewData(realTimeDomainDataPoints, imagTimeDomainDataPoints, @@ -250,6 +249,7 @@ SpectrumDisplayForm::newFrequencyData( const SpectrumUpdateEvent* spectrumUpdate d_update_time); } + /* // Don't update the repeated data for the waterfall if(!repeatDataFlag){ if(tabindex == d_plot_waterfall) { @@ -284,11 +284,11 @@ SpectrumDisplayForm::resizeEvent( QResizeEvent *e ) s.setWidth(WaterfallPlotDisplayFrame->width()); s.setHeight(WaterfallPlotDisplayFrame->height()); emit _waterfallDisplayPlot->resizeSlot(&s); + */ s.setWidth(ConstellationDisplayFrame->width()); s.setHeight(ConstellationDisplayFrame->height()); emit _constellationDisplayPlot->resizeSlot(&s); - */ } void @@ -337,7 +337,7 @@ SpectrumDisplayForm::UpdateGuiTimer() _frequencyDisplayPlot->canvas()->update(); //_waterfallDisplayPlot->canvas()->update(); _timeDomainDisplayPlot->canvas()->update(); - //_constellationDisplayPlot->canvas()->update(); + _constellationDisplayPlot->canvas()->update(); } @@ -700,7 +700,6 @@ SpectrumDisplayForm::ToggleTabTime(const bool state) void SpectrumDisplayForm::ToggleTabConstellation(const bool state) { - /* if(state == true) { if(d_plot_constellation == -1) { SpectrumTypeTab->addTab(ConstellationPage, "Constellation Display"); @@ -711,7 +710,6 @@ SpectrumDisplayForm::ToggleTabConstellation(const bool state) SpectrumTypeTab->removeTab(SpectrumTypeTab->indexOf(ConstellationPage)); d_plot_constellation = -1; } - */ } @@ -725,13 +723,13 @@ void SpectrumDisplayForm::SetConstellationAxis(double xmin, double xmax, double ymin, double ymax) { - //_constellationDisplayPlot->set_axis(xmin, xmax, ymin, ymax); + _constellationDisplayPlot->set_axis(xmin, xmax, ymin, ymax); } void SpectrumDisplayForm::SetConstellationPenSize(int size) { - //_constellationDisplayPlot->set_pen_size( size ); + _constellationDisplayPlot->set_pen_size( size ); } void diff --git a/gr-qtgui/lib/spectrumdisplayform.h b/gr-qtgui/lib/spectrumdisplayform.h index 061ce63a1..8ee450daf 100644 --- a/gr-qtgui/lib/spectrumdisplayform.h +++ b/gr-qtgui/lib/spectrumdisplayform.h @@ -32,7 +32,7 @@ class SpectrumGUIClass; #include <FrequencyDisplayPlot.h> //#include <WaterfallDisplayPlot.h> #include <TimeDomainDisplayPlot.h> -//#include <ConstellationDisplayPlot.h> +#include <ConstellationDisplayPlot.h> #include <QValidator> #include <QTimer> #include <vector> @@ -114,7 +114,7 @@ private: FrequencyDisplayPlot* _frequencyDisplayPlot; //WaterfallDisplayPlot* _waterfallDisplayPlot; TimeDomainDisplayPlot* _timeDomainDisplayPlot; - //ConstellationDisplayPlot* _constellationDisplayPlot; + ConstellationDisplayPlot* _constellationDisplayPlot; SpectrumGUIClass* _system; bool _systemSpecifiedFlag; double _centerFrequency; @@ -130,7 +130,7 @@ private: int d_plot_fft; //int d_plot_waterfall; int d_plot_time; - //int d_plot_constellation; + int d_plot_constellation; QTimer *displayTimer; double d_update_time; |