diff options
-rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.cc | 6 | ||||
-rw-r--r-- | gr-qtgui/lib/spectrumdisplayform.ui | 22 | ||||
-rw-r--r-- | gr-qtgui/lib/waterfalldisplayform.cc | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index d5e6b68a8f..8d7caebda8 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -59,9 +59,9 @@ SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) _noiseFloorAmplitude = -HUGE_VAL; - connect(_waterfallDisplayPlot, SIGNAL(UpdatedLowerIntensityLevel(const double)), + connect(_waterfallDisplayPlot, SIGNAL(updatedLowerIntensityLevel(const double)), _frequencyDisplayPlot, SLOT(setLowerIntensityLevel(const double))); - connect(_waterfallDisplayPlot, SIGNAL(UpdatedUpperIntensityLevel(const double)), + connect(_waterfallDisplayPlot, SIGNAL(updatedUpperIntensityLevel(const double)), _frequencyDisplayPlot, SLOT(setUpperIntensityLevel(const double))); _frequencyDisplayPlot->setLowerIntensityLevel(-200); @@ -84,7 +84,7 @@ SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) // Create a timer to update plots at the specified rate displayTimer = new QTimer(this); - connect(displayTimer, SIGNAL(timeout()), this, SLOT(UpdateGuiTimer())); + connect(displayTimer, SIGNAL(timeout()), this, SLOT(updateGuiTimer())); // Connect double click signals up connect(_frequencyDisplayPlot, SIGNAL(plotPointSelected(const QPointF)), diff --git a/gr-qtgui/lib/spectrumdisplayform.ui b/gr-qtgui/lib/spectrumdisplayform.ui index 9b06f44f0d..f1e1f08f98 100644 --- a/gr-qtgui/lib/spectrumdisplayform.ui +++ b/gr-qtgui/lib/spectrumdisplayform.ui @@ -536,7 +536,7 @@ <sender>MaxHoldCheckBox</sender> <signal>toggled(bool)</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>MaxHoldCheckBox_toggled(bool)</slot> + <slot>maxHoldCheckBox_toggled(bool)</slot> <hints> <hint type="sourcelabel"> <x>22</x> @@ -552,7 +552,7 @@ <sender>MaxHoldResetBtn</sender> <signal>clicked()</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>MaxHoldResetBtn_clicked()</slot> + <slot>maxHoldResetBtn_clicked()</slot> <hints> <hint type="sourcelabel"> <x>107</x> @@ -568,7 +568,7 @@ <sender>MinHoldCheckBox</sender> <signal>toggled(bool)</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>MinHoldCheckBox_toggled(bool)</slot> + <slot>minHoldCheckBox_toggled(bool)</slot> <hints> <hint type="sourcelabel"> <x>22</x> @@ -584,7 +584,7 @@ <sender>MinHoldResetBtn</sender> <signal>clicked()</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>MinHoldResetBtn_clicked()</slot> + <slot>minHoldResetBtn_clicked()</slot> <hints> <hint type="sourcelabel"> <x>107</x> @@ -600,7 +600,7 @@ <sender>WindowComboBox</sender> <signal>activated(int)</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>WindowTypeChanged(int)</slot> + <slot>windowTypeChanged(int)</slot> <hints> <hint type="sourcelabel"> <x>20</x> @@ -616,7 +616,7 @@ <sender>UseRFFrequenciesCheckBox</sender> <signal>toggled(bool)</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>UseRFFrequenciesCB(bool)</slot> + <slot>useRFFrequenciesCB(bool)</slot> <hints> <hint type="sourcelabel"> <x>20</x> @@ -664,7 +664,7 @@ <sender>FFTSizeComboBox</sender> <signal>activated(QString)</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>FFTComboBoxSelectedCB(QString)</slot> + <slot>fftComboBoxSelectedCB(QString)</slot> <hints> <hint type="sourcelabel"> <x>20</x> @@ -680,7 +680,7 @@ <sender>WaterfallAutoScaleBtn</sender> <signal>clicked()</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>WaterfallAutoScaleBtnCB()</slot> + <slot>waterfallAutoScaleBtnCB()</slot> <hints> <hint type="sourcelabel"> <x>22</x> @@ -696,7 +696,7 @@ <sender>WaterfallIntensityComboBox</sender> <signal>activated(int)</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>WaterfallIntensityColorTypeChanged(int)</slot> + <slot>waterfallIntensityColorTypeChanged(int)</slot> <hints> <hint type="sourcelabel"> <x>92</x> @@ -712,7 +712,7 @@ <sender>SpectrumTypeTab</sender> <signal>currentChanged(int)</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>TabChanged(int)</slot> + <slot>tabChanged(int)</slot> <hints> <hint type="sourcelabel"> <x>314</x> @@ -728,7 +728,7 @@ <sender>AvgLineEdit</sender> <signal>valueChanged(int)</signal> <receiver>SpectrumDisplayForm</receiver> - <slot>AvgLineEdit_valueChanged(int)</slot> + <slot>avgLineEdit_valueChanged(int)</slot> <hints> <hint type="sourcelabel"> <x>604</x> diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index 4bc429c807..e8e78ea3de 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -46,7 +46,7 @@ WaterfallDisplayForm::WaterfallDisplayForm(int nplots, QWidget* parent) QAction *autoscale_act = new QAction("Auto Scale", this); autoscale_act->setStatusTip(tr("Autoscale intensity range")); - connect(autoscale_act, SIGNAL(triggered()), this, SLOT(AutoScale())); + connect(autoscale_act, SIGNAL(triggered()), this, SLOT(autoScale())); FFTSizeMenu *sizemenu = new FFTSizeMenu(this); FFTAverageMenu *avgmenu = new FFTAverageMenu(this); @@ -58,13 +58,13 @@ WaterfallDisplayForm::WaterfallDisplayForm(int nplots, QWidget* parent) _menu->addMenu(colormenu); _menu->addAction(autoscale_act); connect(sizemenu, SIGNAL(whichTrigger(int)), - this, SLOT(SetFFTSize(const int))); + this, SLOT(setFFTSize(const int))); connect(avgmenu, SIGNAL(whichTrigger(float)), - this, SLOT(SetFFTAverage(const float))); + this, SLOT(setFFTAverage(const float))); connect(winmenu, SIGNAL(whichTrigger(gr::filter::firdes::win_type)), - this, SLOT(SetFFTWindowType(const gr::filter::firdes::win_type))); + this, SLOT(setFFTWindowType(const gr::filter::firdes::win_type))); connect(colormenu, SIGNAL(whichTrigger(const int, const QColor&, const QColor&)), - this, SLOT(SetColorMap(const int, const QColor&, const QColor&))); + this, SLOT(setColorMap(const int, const QColor&, const QColor&))); Reset(); |