From f123fd990783b7e6ed24a12763cb2a766860d133 Mon Sep 17 00:00:00 2001 From: trondeau Date: Tue, 11 Aug 2009 22:02:56 +0000 Subject: [PATCH] Cleaning up Qt code. This mostly reformats the code to be more consistent with our style. It also changes the layout to use Qt layouts for proper resizing of the GUI. Only the QwtPlots need to be resized manually. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11572 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-qtgui/src/lib/ConstellationDisplayPlot.cc | 22 +- gr-qtgui/src/lib/ConstellationDisplayPlot.h | 9 +- gr-qtgui/src/lib/FrequencyDisplayPlot.cc | 8 +- gr-qtgui/src/lib/FrequencyDisplayPlot.h | 2 + gr-qtgui/src/lib/TimeDomainDisplayPlot.cc | 13 +- gr-qtgui/src/lib/TimeDomainDisplayPlot.h | 3 + gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc | 91 +- gr-qtgui/src/lib/Waterfall3DDisplayPlot.h | 29 +- gr-qtgui/src/lib/WaterfallDisplayPlot.cc | 149 +- gr-qtgui/src/lib/WaterfallDisplayPlot.h | 3 + gr-qtgui/src/lib/spectrumdisplayform.cc | Bin 30549 -> 27246 bytes gr-qtgui/src/lib/spectrumdisplayform.h | 2 +- gr-qtgui/src/lib/spectrumdisplayform.ui | 1388 +++++++++--------- 13 files changed, 972 insertions(+), 747 deletions(-) diff --git a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc index 10355f9f..792096de 100644 --- a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc @@ -32,7 +32,9 @@ protected: } }; -ConstellationDisplayPlot::ConstellationDisplayPlot(QWidget* parent):QwtPlot(parent){ +ConstellationDisplayPlot::ConstellationDisplayPlot(QWidget* parent) + : QwtPlot(parent) +{ timespec_reset(&_lastReplot); resize(parent->width(), parent->height()); @@ -106,7 +108,8 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(QWidget* parent):QwtPlot(pare this, SLOT( LegendEntryChecked(QwtPlotItem *, bool ) )); } -ConstellationDisplayPlot::~ConstellationDisplayPlot(){ +ConstellationDisplayPlot::~ConstellationDisplayPlot() +{ delete[] _realDataPoints; delete[] _imagDataPoints; @@ -149,7 +152,16 @@ void ConstellationDisplayPlot::replot(){ } } -void ConstellationDisplayPlot::PlotNewData(const double* realDataPoints, const double* imagDataPoints, const int64_t numDataPoints){ +void +ConstellationDisplayPlot::resizeSlot( QSize *s ) +{ + resize(s->width(), s->height()); +} + +void ConstellationDisplayPlot::PlotNewData(const double* realDataPoints, + const double* imagDataPoints, + const int64_t numDataPoints) +{ if(numDataPoints > 0){ if(numDataPoints != _numPoints){ @@ -177,7 +189,9 @@ void ConstellationDisplayPlot::PlotNewData(const double* realDataPoints, const d } } -void ConstellationDisplayPlot::LegendEntryChecked(QwtPlotItem* plotItem, bool on){ +void +ConstellationDisplayPlot::LegendEntryChecked(QwtPlotItem* plotItem, bool on) +{ plotItem->setVisible(!on); } diff --git a/gr-qtgui/src/lib/ConstellationDisplayPlot.h b/gr-qtgui/src/lib/ConstellationDisplayPlot.h index 612cd2b3..1b73e7cc 100644 --- a/gr-qtgui/src/lib/ConstellationDisplayPlot.h +++ b/gr-qtgui/src/lib/ConstellationDisplayPlot.h @@ -14,14 +14,16 @@ #include #include -class ConstellationDisplayPlot:public QwtPlot{ +class ConstellationDisplayPlot : public QwtPlot +{ Q_OBJECT public: ConstellationDisplayPlot(QWidget*); virtual ~ConstellationDisplayPlot(); - void PlotNewData(const double* realDataPoints, const double* imagDataPoints, + void PlotNewData(const double* realDataPoints, + const double* imagDataPoints, const int64_t numDataPoints); virtual void replot(); @@ -31,6 +33,9 @@ public: void set_axis(double xmin, double xmax, double ymin, double ymax); +public slots: + void resizeSlot( QSize *s ); + protected slots: void LegendEntryChecked(QwtPlotItem *plotItem, bool on); diff --git a/gr-qtgui/src/lib/FrequencyDisplayPlot.cc b/gr-qtgui/src/lib/FrequencyDisplayPlot.cc index e299157f..7deff854 100644 --- a/gr-qtgui/src/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/src/lib/FrequencyDisplayPlot.cc @@ -93,7 +93,7 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(QWidget* parent) timespec_reset(&_lastReplot); resize(parent->width(), parent->height()); - + _displayIntervalTime = (1.0/10.0); // 1/10 of a second between updates _useCenterFrequencyFlag = false; @@ -314,6 +314,12 @@ FrequencyDisplayPlot::replot() _displayIntervalTime = differenceTime; } } + +void +FrequencyDisplayPlot::resizeSlot( QSize *s ) +{ + resize(s->width(), s->height()); +} void FrequencyDisplayPlot::PlotNewData(const double* dataPoints, const int64_t numDataPoints, diff --git a/gr-qtgui/src/lib/FrequencyDisplayPlot.h b/gr-qtgui/src/lib/FrequencyDisplayPlot.h index 5e828296..785efe69 100644 --- a/gr-qtgui/src/lib/FrequencyDisplayPlot.h +++ b/gr-qtgui/src/lib/FrequencyDisplayPlot.h @@ -43,12 +43,14 @@ public: void set_yaxis(double min, double max); public slots: + void resizeSlot( QSize *e ); void SetLowerIntensityLevel(const double); void SetUpperIntensityLevel(const double); protected: private: + void _resetXAxisPoints(); double _startFrequency; diff --git a/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc index 6d8ef6ee..cb18b441 100644 --- a/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc @@ -141,8 +141,8 @@ TimeDomainDisplayPlot::set_xaxis(double min, double max) } -void TimeDomainDisplayPlot::replot(){ - +void TimeDomainDisplayPlot::replot() +{ const timespec startTime = get_highres_clock(); QwtPlot::replot(); @@ -156,9 +156,16 @@ void TimeDomainDisplayPlot::replot(){ } } +void +TimeDomainDisplayPlot::resizeSlot( QSize *s ) +{ + resize(s->width(), s->height()); +} + void TimeDomainDisplayPlot::PlotNewData(const double* realDataPoints, const double* imagDataPoints, - const int64_t numDataPoints){ + const int64_t numDataPoints) +{ if(numDataPoints > 0){ if(numDataPoints != _numPoints){ diff --git a/gr-qtgui/src/lib/TimeDomainDisplayPlot.h b/gr-qtgui/src/lib/TimeDomainDisplayPlot.h index 56d44539..8d98abac 100644 --- a/gr-qtgui/src/lib/TimeDomainDisplayPlot.h +++ b/gr-qtgui/src/lib/TimeDomainDisplayPlot.h @@ -30,6 +30,9 @@ public: void set_yaxis(double min, double max); void set_xaxis(double min, double max); +public slots: + void resizeSlot( QSize *s ); + protected slots: void LegendEntryChecked(QwtPlotItem *plotItem, bool on); diff --git a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc index 1b665061..f676cb4a 100644 --- a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc +++ b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc @@ -15,15 +15,21 @@ Waterfall3DColorMap::~Waterfall3DColorMap(){ } -Qwt3D::RGBA Waterfall3DColorMap::operator()(double, double, double z)const{ +Qwt3D::RGBA +Waterfall3DColorMap::operator()(double, double, double z) const +{ return Qwt3D::RGBA(Qwt3D::Qt2GL(color(_interval, z))); } -void Waterfall3DColorMap::SetInterval(const double minValue, const double maxValue){ +void +Waterfall3DColorMap::SetInterval(const double minValue, const double maxValue) +{ _interval.setInterval(minValue, maxValue); } -Qwt3D::ColorVector& Waterfall3DColorMap::createVector(Qwt3D::ColorVector& vec) { +Qwt3D::ColorVector& +Waterfall3DColorMap::createVector(Qwt3D::ColorVector& vec) +{ // Generate 100 interval values and then return those Qwt3D::ColorVector colorVec; for(unsigned int number = 0; number < 100; number++){ @@ -41,7 +47,8 @@ const int Waterfall3DDisplayPlot::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT; const int Waterfall3DDisplayPlot::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT; const int Waterfall3DDisplayPlot::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED; -Waterfall3DDisplayPlot::Waterfall3DDisplayPlot(QWidget* parent):Qwt3D::SurfacePlot(parent){ +Waterfall3DDisplayPlot::Waterfall3DDisplayPlot(QWidget* parent):Qwt3D::SurfacePlot(parent) +{ _startFrequency = 0; _stopFrequency = 4000; @@ -76,11 +83,14 @@ Waterfall3DDisplayPlot::Waterfall3DDisplayPlot(QWidget* parent):Qwt3D::SurfacePl enableMouse(true); } -Waterfall3DDisplayPlot::~Waterfall3DDisplayPlot(){ +Waterfall3DDisplayPlot::~Waterfall3DDisplayPlot() +{ delete _waterfallData; } -void Waterfall3DDisplayPlot::Init(){ +void +Waterfall3DDisplayPlot::Init() +{ if(!_initialized && initializedGL()){ resize(parentWidget()->width(), parentWidget()->height()); @@ -97,7 +107,9 @@ void Waterfall3DDisplayPlot::Init(){ } } -void Waterfall3DDisplayPlot::Reset(){ +void +Waterfall3DDisplayPlot::Reset() +{ _waterfallData->ResizeData(_startFrequency, _stopFrequency, _numPoints); _waterfallData->Reset(); @@ -116,7 +128,8 @@ Waterfall3DDisplayPlot::SetFrequencyRange(const double constStartFreq, const double constStopFreq, const double constCenterFreq, const bool useCenterFrequencyFlag, - const double units, const std::string &strunits) + const double units, + const std::string &strunits) { double startFreq = constStartFreq / units; double stopFreq = constStopFreq / units; @@ -138,8 +151,10 @@ Waterfall3DDisplayPlot::SetFrequencyRange(const double constStartFreq, } } -bool Waterfall3DDisplayPlot::loadFromData(double** data, unsigned int columns, unsigned int rows - ,double minx, double maxx, double miny, double maxy){ +bool +Waterfall3DDisplayPlot::loadFromData(double** data, unsigned int columns, unsigned int rows + ,double minx, double maxx, double miny, double maxy) +{ Qwt3D::GridData* gridPtr = (Qwt3D::GridData*)actualData_p; @@ -196,15 +211,25 @@ bool Waterfall3DDisplayPlot::loadFromData(double** data, unsigned int columns, u return true; } -double Waterfall3DDisplayPlot::GetStartFrequency()const{ +double +Waterfall3DDisplayPlot::GetStartFrequency() const +{ return _startFrequency; } -double Waterfall3DDisplayPlot::GetStopFrequency()const{ +double +Waterfall3DDisplayPlot::GetStopFrequency() const +{ return _stopFrequency; } -void Waterfall3DDisplayPlot::PlotNewData(const double* dataPoints, const int64_t numDataPoints, const double timePerFFT, const timespec timestamp, const int droppedFrames){ +void +Waterfall3DDisplayPlot::PlotNewData(const double* dataPoints, + const int64_t numDataPoints, + const double timePerFFT, + const timespec timestamp, + const int droppedFrames) +{ if(numDataPoints > 0){ if(numDataPoints != _numPoints){ _numPoints = numDataPoints; @@ -238,7 +263,10 @@ void Waterfall3DDisplayPlot::PlotNewData(const double* dataPoints, const int64_t } } -void Waterfall3DDisplayPlot::SetIntensityRange(const double minIntensity, const double maxIntensity){ +void +Waterfall3DDisplayPlot::SetIntensityRange(const double minIntensity, + const double maxIntensity) +{ _waterfallData->SetFloorValue(minIntensity); _waterfallData->setMinZ(0); _waterfallData->setMaxZ(maxIntensity-minIntensity); @@ -248,11 +276,14 @@ void Waterfall3DDisplayPlot::SetIntensityRange(const double minIntensity, const emit UpdatedLowerIntensityLevel(minIntensity); emit UpdatedUpperIntensityLevel(maxIntensity); - SetIntensityColorMapType(_intensityColorMapType, _userDefinedLowIntensityColor, _userDefinedLowIntensityColor, true); + SetIntensityColorMapType(_intensityColorMapType, + _userDefinedLowIntensityColor, + _userDefinedLowIntensityColor, true); } -void Waterfall3DDisplayPlot::replot(){ - +void +Waterfall3DDisplayPlot::replot() +{ if(!_initialized){ Init(); } @@ -283,11 +314,25 @@ void Waterfall3DDisplayPlot::replot(){ } } -int Waterfall3DDisplayPlot::GetIntensityColorMapType()const{ +void +Waterfall3DDisplayPlot::resizeSlot( QSize *s ) +{ + resize(s->width(), s->height()); +} + +int +Waterfall3DDisplayPlot::GetIntensityColorMapType() const +{ return _intensityColorMapType; } -void Waterfall3DDisplayPlot::SetIntensityColorMapType(const int newType, const QColor lowColor, const QColor highColor, const bool forceFlag, const bool noReplotFlag){ +void +Waterfall3DDisplayPlot::SetIntensityColorMapType(const int newType, + const QColor lowColor, + const QColor highColor, + const bool forceFlag, + const bool noReplotFlag) +{ if(((_intensityColorMapType != newType) || forceFlag) || ((newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) && (lowColor.isValid() && highColor.isValid()))){ @@ -350,11 +395,15 @@ void Waterfall3DDisplayPlot::SetIntensityColorMapType(const int newType, const Q } } -const QColor Waterfall3DDisplayPlot::GetUserDefinedLowIntensityColor()const{ +const QColor +Waterfall3DDisplayPlot::GetUserDefinedLowIntensityColor() const +{ return _userDefinedLowIntensityColor; } -const QColor Waterfall3DDisplayPlot::GetUserDefinedHighIntensityColor()const{ +const QColor +Waterfall3DDisplayPlot::GetUserDefinedHighIntensityColor() const +{ return _userDefinedHighIntensityColor; } diff --git a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h index f46f260e..272bdf69 100644 --- a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h +++ b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h @@ -10,7 +10,8 @@ #include #include -class Waterfall3DColorMap:public Qwt3D::Color, public QwtLinearColorMap{ +class Waterfall3DColorMap: public Qwt3D::Color, public QwtLinearColorMap +{ public: Waterfall3DColorMap(); virtual ~Waterfall3DColorMap(); @@ -75,12 +76,14 @@ class Waterfall3DDisplayPlot:public Qwt3D::SurfacePlot{ virtual QString ticLabel(unsigned int idx) const{ if (idx_dataTimestamp, -(_plot->_timePerFFT) * majors_p[idx]); + const timespec markerTime = timespec_add(_plot->_dataTimestamp, + -(_plot->_timePerFFT) * majors_p[idx]); struct tm timeTm; gmtime_r(&markerTime.tv_sec, &timeTm); char* timeBuffer = new char[128]; - snprintf(timeBuffer, 128, "%02d:%02d:%02d.%03ld", timeTm.tm_hour, timeTm.tm_min, timeTm.tm_sec, (markerTime.tv_nsec / 1000000)); + snprintf(timeBuffer, 128, "%02d:%02d:%02d.%03ld", timeTm.tm_hour, + timeTm.tm_min, timeTm.tm_sec, (markerTime.tv_nsec / 1000000)); QString returnBuffer(timeBuffer); delete[] timeBuffer; return returnBuffer; @@ -100,10 +103,14 @@ class Waterfall3DDisplayPlot:public Qwt3D::SurfacePlot{ double _centerFrequency; bool _useCenterFrequencyFlag; public: - FrequencyScale(bool useCenterFrequencyFlag, double centerFrequency):_centerFrequency(centerFrequency),_useCenterFrequencyFlag(useCenterFrequencyFlag){} + FrequencyScale(bool useCenterFrequencyFlag, double centerFrequency) + : _centerFrequency(centerFrequency),_useCenterFrequencyFlag(useCenterFrequencyFlag) + {} + virtual ~FrequencyScale(){} - virtual QString ticLabel(unsigned int idx) const{ + virtual QString ticLabel(unsigned int idx) const + { if (idx 0){ if(numDataPoints != _numPoints){ _numPoints = numDataPoints; @@ -363,7 +397,10 @@ void WaterfallDisplayPlot::PlotNewData(const double* dataPoints, const int64_t n } } -void WaterfallDisplayPlot::SetIntensityRange(const double minIntensity, const double maxIntensity){ +void +WaterfallDisplayPlot::SetIntensityRange(const double minIntensity, + const double maxIntensity) +{ _waterfallData->setRange(QwtDoubleInterval(minIntensity, maxIntensity)); emit UpdatedLowerIntensityLevel(minIntensity); @@ -372,7 +409,9 @@ void WaterfallDisplayPlot::SetIntensityRange(const double minIntensity, const do _UpdateIntensityRangeDisplay(); } -void WaterfallDisplayPlot::replot(){ +void +WaterfallDisplayPlot::replot() +{ const timespec startTime = get_highres_clock(); QwtTimeScaleDraw* timeScale = (QwtTimeScaleDraw*)axisScaleDraw(QwtPlot::yLeft); @@ -406,11 +445,23 @@ void WaterfallDisplayPlot::replot(){ } } -int WaterfallDisplayPlot::GetIntensityColorMapType()const{ +void +WaterfallDisplayPlot::resizeSlot( QSize *s ) +{ + resize(s->width(), s->height()); +} + +int +WaterfallDisplayPlot::GetIntensityColorMapType() const +{ return _intensityColorMapType; } -void WaterfallDisplayPlot::SetIntensityColorMapType(const int newType, const QColor lowColor, const QColor highColor){ +void +WaterfallDisplayPlot::SetIntensityColorMapType(const int newType, + const QColor lowColor, + const QColor highColor) +{ if((_intensityColorMapType != newType) || ((newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) && (lowColor.isValid() && highColor.isValid()))){ @@ -458,15 +509,21 @@ void WaterfallDisplayPlot::SetIntensityColorMapType(const int newType, const QCo } } -const QColor WaterfallDisplayPlot::GetUserDefinedLowIntensityColor()const{ +const QColor +WaterfallDisplayPlot::GetUserDefinedLowIntensityColor() const +{ return _userDefinedLowIntensityColor; } -const QColor WaterfallDisplayPlot::GetUserDefinedHighIntensityColor()const{ +const QColor +WaterfallDisplayPlot::GetUserDefinedHighIntensityColor() const +{ return _userDefinedHighIntensityColor; } -void WaterfallDisplayPlot::_UpdateIntensityRangeDisplay(){ +void +WaterfallDisplayPlot::_UpdateIntensityRangeDisplay() +{ QwtScaleWidget *rightAxis = axisWidget(QwtPlot::yRight); rightAxis->setTitle("Intensity (dB)"); rightAxis->setColorBarEnabled(true); diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.h b/gr-qtgui/src/lib/WaterfallDisplayPlot.h index fbbb69a5..bb87fb09 100644 --- a/gr-qtgui/src/lib/WaterfallDisplayPlot.h +++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.h @@ -45,6 +45,9 @@ public: static const int INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3; static const int INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4; +public slots: + void resizeSlot( QSize *s ); + signals: void UpdatedLowerIntensityLevel(const double); void UpdatedUpperIntensityLevel(const double); diff --git a/gr-qtgui/src/lib/spectrumdisplayform.cc b/gr-qtgui/src/lib/spectrumdisplayform.cc index 36097d9758344fc48f3fd7816c33e1999c5d540c..6d4329e4482afd74496848e1cde609fbf3770991 100644 GIT binary patch delta 1048 zcmaizPfrs;7{=XAHB$eP5bUOiydf!>C9SkkJV*k8Dq=!Rv7#3evvjB3O?G$a?6kG0 z;pD;dd;;UaD`684n)v4%c+k6N5A`cJGc3|2wC-tk=6!$jJTvqB>}kCp+WxGbI%6)R z`Iob|`NwJ|+ST{9Cy%V4fl)CJ^TndM04Kk>IjCX=R8|40!*Ux_OANQkb7)&$3qzd} zABw<;B%}clwNX9KKZx8X23-U_Dk(2*<1%!8xmktxi{9ghI36gOKqsC8kL zT0R~^`d3-;2!E5is^$61+_k0uaz*(Nf!ta#&L4@CKNtIe>1g)y>+$i8s=JFJl)}Rs zA!f=g|E6V)!eZR2T&YFnpMTXR#tMslC;;rcOl**y2nDSwM4_2bv?ZZ`^vqyrPd845 z{w_^r1_4L)Au6xvr>orXj8Te{I^~PJaBLs(t-@rs-+g>I%0E-fV+sH93H74jC~S&i^$%D9y9$V)C9%zqfU zsUlN$WSVRwAAcMoGyOtbmPlHhuQF)`45@1Vb{R#Vmfq`YGD|W-zD$A4k1aWrv_hG_ mnk8bUBGz%40}nUX*9G!W#=W*k5|UFg;=E~JkKU~u-1-aexlVQf delta 3356 zcmb7H&2Jk;6j$8DsZCK7q%^p3!X#0g-8P%Xi5+N5UD7t86|vGZ7UlwIZBOGBo84ef z5(gA5XATi`)GHF4I3a|kUf{wBi3>$4|3*$+M?@ ze?9B_@nVb)&0cBOV!!p#^QeNUxGT z-9!h5RkIIJ12>J&FfvFJPHLn+hbnsnSvKKEb!=?c3BYY`F)a%pu)hk{3d~AT=edod z&LKFm%^H`g^TJF~)oaZ3K5jaoy}FMrf-q4e%1IlcS~hCim|VRoqT&`x1``kh5adw8 zrpc2i=@nEK84w$R2XFu?Tf4YQ8hbmX!(9w2T0sCQ@3Z(KLY7BvyxQ_Yq^l3s8u-)O zMswHH4-xnis7XZUhSG0K7a<2)ZZ4UC55eaPJy+Qr_@aO2E(}Tl21a*h2OZC_n-wG~ z%2BlUF)znG`v5o4dc{P#RYU8Bh0$uwV2$IFb-jX3t*`^?;ofOVE}Peu7IP}nn7V@- zQr~SZq|qgZr9AJOZ~|VL(^LFp-;#d7jc3v6$zcVHtXNif3*^4Cza5!5oWDfgxrJpG zkFR{-urUBiv#g^!AaiCGUi`f(n_F0LJ$U+^`3949VB!>2%Z9Tp>Mh>iqG6$G9ald= z6}yF-P!EvYf$_V=4sY5m*@Dn%OQelq?7nlW*})cs zJWed#{{M^t)Tm}jx*R13_Ld-oWwk=kx~sX^QB+mN zuAj!+-t60$9QRiw1mQ#k(Tl#JUAeYaLR;|8L$~amiVasE-ZnUKr;E3ji} zI?%|Fl9cn8n%i(K&v(45EV;;U93L*b&;!mFbrAVo_ff&h7W5Uk7EJ!06L&m&(N$T- z^0t5YW?C@z-|QG?YzRy|jNvsXFYk`uY%+cQMe(2#@<8Q+hY^-XN&4tcy8VsvI6;5U zXK8AA{ET4{T38+}!^NiX4U3TRK-t&LJ&Xz{4{xE*Ay@W^v+L}P{hPqP6K^Vbf0S^G uC{v&?C83V!AFCq++>#F8ooRo+_(P07&5hFITrviC`;&7M?O*ag<^BU%sK8bL diff --git a/gr-qtgui/src/lib/spectrumdisplayform.h b/gr-qtgui/src/lib/spectrumdisplayform.h index dbbf2567..51ca365e 100644 --- a/gr-qtgui/src/lib/spectrumdisplayform.h +++ b/gr-qtgui/src/lib/spectrumdisplayform.h @@ -36,7 +36,7 @@ class SpectrumDisplayForm : public QWidget, public Ui::SpectrumDisplayForm public slots: void resizeEvent( QResizeEvent * e ); void customEvent( QEvent * e ); - void AvgLineEdit_textChanged( const QString & valueString ); + void AvgLineEdit_valueChanged( int valueString ); void MaxHoldCheckBox_toggled( bool newState ); void MinHoldCheckBox_toggled( bool newState ); void MinHoldResetBtn_clicked(); diff --git a/gr-qtgui/src/lib/spectrumdisplayform.ui b/gr-qtgui/src/lib/spectrumdisplayform.ui index 9324f150..1458488a 100644 --- a/gr-qtgui/src/lib/spectrumdisplayform.ui +++ b/gr-qtgui/src/lib/spectrumdisplayform.ui @@ -5,687 +5,758 @@ 0 0 - 633 - 436 + 657 + 536 Spectrum Display - - - - 10 - 385 - 180 - 20 - - - - Display RF Frequencies - - - - - - 105 - 410 - 170 - 20 - - - - - 9 - - - - - Hamming - - - - - Hann - - - - - Blackman - - - - - Rectangular - - - - - Kaiser - - - - - Blackman-harris - - - - - - - 10 - 410 - 90 - 17 - - - - Window: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - 405 - 385 - 116 - 20 - - - - FFT Size: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - 525 - 385 - 100 - 20 - - - - - 1024 - - - - - 2048 - - - - - 4096 - - - - - 8192 - - - - - 16384 - - - - - 32768 - - - - - - - 0 - 0 - 630 - 380 - - - - 0 - - - - Frequency Display - - - - - 480 - 320 - 60 - 20 - - - - 1 - - - - - - 10 - 325 - 95 - 20 - - - - Min Hold - - - false - - - - - - 545 - 300 - 72 - 20 - - - - Average - - - Qt::AlignCenter - - - false - - - - - - 105 - 325 - 61 - 20 - - - - Reset - - - - - - 550 - 320 - 60 - 20 - - - - 0 - - - - - - 475 - 300 - 72 - 20 - - - - Power - - - Qt::AlignCenter - - - false - - - - - - 105 - 300 - 61 - 20 - - - - Reset - - - - - - 10 - 300 - 95 - 20 - - - - Max Hold - - - false - - - - - - 5 - 5 - 620 - 290 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - Waterfall Display - - - - - 5 - 0 - 85 - 21 - - - - <font size="-2">Intensity Display:</font> - - - false - - - - - - 90 - 0 - 121 - 25 - + + + + + + 0 + 0 + + + + + 120 + 16777215 + - Color + 1024 - White Hot + 2048 - Black Hot + 4096 - Incandescent + 8192 - User Defined + 16384 + + + + + 32768 - - - - 215 - 0 - 335 - 24 - - - - true - - - Qt::WheelFocus - - - true - - - 200.000000000000000 - - - 20.000000000000000 - - - 0.000000000000000 - - - - - - 563 - 3 - 55 - 21 - - - - 100 dB - - - false - - - - - - 5 - 30 - 615 - 295 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - 215 - 325 - 335 - 24 - - - - true - - - 200.000000000000000 - - - 20.000000000000000 - - - 0.000000000000000 - - - - - - 565 - 325 - 55 - 20 - - - - -100 dB - - - false - - - - - - 0 - 325 - 135 - 21 - - - - Scales the Intensity to the current data extremes. - - - Auto Scale - - - - - - 3D Waterfall Display - - - - - 5 - 0 - 85 - 21 - - + + + - <font size="-2">Intensity Display:</font> + FFT Size: - - false - - - - - - 563 - 3 - 55 - 21 - - - - 100 dB + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter false - - - - 0 - 325 - 135 - 21 - - - - Scales the Intensity to the current data extremes. - - - Auto Scale - - - - - - 215 - 325 - 335 - 24 - - - - true - - - 200.000000000000000 - - - 20.000000000000000 - - - 0.000000000000000 - - - - - - 565 - 325 - 55 - 20 - - + + + - -100 dB - - - false + Display RF Frequencies - - - - 5 - 30 - 615 - 295 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - 90 - 0 - 121 - 25 - - - - - Color - - - - - White Hot - - - - - Black Hot - - + + + - - Incandescent - + + + + 0 + 0 + + + + Window: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + - - User Defined - + + + + 0 + 0 + + + + + 120 + 0 + + + + + 120 + 16777215 + + + + + 9 + + + + + Hamming + + + + + Hann + + + + + Blackman + + + + + Rectangular + + + + + Kaiser + + + + + Blackman-harris + + + + + + + + + 0 + + + + Frequency Display + + + + + + + + + 0 + 0 + + + + + 615 + 332 + + + + + 1 + 1 + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + + Max Hold + + + false + + + + + + + Min Hold + + + false + + + + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + Power + + + Qt::AlignCenter + + + false + + + + + + + + 0 + 0 + + + + + 25 + 0 + + + + Reset + + + + + + + + 0 + 0 + + + + + 62 + 0 + + + + Average + + + Qt::AlignCenter + + + false + + + + + + + Reset + + + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + 1 + + + + + + + Qt::Horizontal + + + + 325 + 20 + + + + + + + + + + + + + Waterfall Display + + + + + + + 100 + 16777215 + + + + Intensity Display: + + + false + + + + + + + + 200 + 0 + + + + true + + + Qt::WheelFocus + + + true + + + 200.000000000000000 + + + 20.000000000000000 + + + 0.000000000000000 + + + + + + + + 100 + 16777215 + + + + 100 dB + + + false + + + + + + + + 617 + 338 + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + 200 + 0 + + + + true + + + 200.000000000000000 + + + 20.000000000000000 + + + 0.000000000000000 + + + + + + + + 100 + 16777215 + + + + -100 dB + + + false + + + + + + + + 80 + 16777215 + + + + Scales the Intensity to the current data extremes. + + + Auto Scale + + + + + + + + 100 + 16777215 + + + + + Color + + + + + White Hot + + + + + Black Hot + + + + + Incandescent + + + + + User Defined + + + + + + textLabel1 + WaterfallMaximumIntensityWheel + WaterfallMaximumIntensityLabel + WaterfallPlotDisplayFrame + WaterfallMinimumIntensityWheel + WaterfallMinimumIntensityLabel + WaterfallAutoScaleBtn + WaterfallIntensityComboBox + + + + 3D Waterfall Display + + + + + + + 0 + 0 + + + + + 100 + 16777215 + + + + Intensity Display: + + + false + + + + + + + + 100 + 16777215 + + + + + Color + + + + + White Hot + + + + + Black Hot + + + + + Incandescent + + + + + User Defined + + + + + + + + + 200 + 0 + + + + true + + + Qt::WheelFocus + + + true + + + 200.000000000000000 + + + 20.000000000000000 + + + 0.000000000000000 + + + + + + + + 100 + 16777215 + + + + 100 dB + + + false + + + + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + 0 + 0 + + + + + 80 + 16777215 + + + + + 0 + 0 + + + + Scales the Intensity to the current data extremes. + + + Auto Scale + + + + + + + + 200 + 0 + + + + true + + + 200.000000000000000 + + + 20.000000000000000 + + + 0.000000000000000 + + + + + + + + 100 + 16777215 + + + + -100 dB + + + false + + + + + + + + Time Domain Display + + + + + + + 617 + 404 + + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + Constellation Display + + + + + + + 617 + 406 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + + - - - - 215 - 0 - 335 - 24 - - - - true - - - Qt::WheelFocus - - - true - - - 200.000000000000000 - - - 20.000000000000000 - - - 0.000000000000000 - - - - - - Time Domain Display - - - - - 5 - 5 - 620 - 340 - - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - Constellation Display - - - - - 5 - 5 - 620 - 340 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - + + qPixmapFromMimeSource @@ -698,14 +769,7 @@ SpectrumTypeTab - MaxHoldCheckBox - MaxHoldResetBtn - MinHoldCheckBox - MinHoldResetBtn - PowerLineEdit - AvgLineEdit UseRFFrequenciesCheckBox - WindowComboBox FFTSizeComboBox WaterfallMaximumIntensityWheel WaterfallMinimumIntensityWheel @@ -786,22 +850,6 @@ - - AvgLineEdit - textChanged(QString) - SpectrumDisplayForm - AvgLineEdit_textChanged(QString) - - - 552 - 344 - - - 20 - 20 - - - PowerLineEdit textChanged(QString) @@ -1010,5 +1058,21 @@ + + AvgLineEdit + valueChanged(int) + SpectrumDisplayForm + AvgLineEdit_valueChanged(int) + + + 604 + 421 + + + 328 + 260 + + + -- 2.30.2