mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-10-01 01:06:35 -04:00
Merge pull request #1565 from srcejon/reset_measurements_button
Add reset measurements button to Spectrum GUI
This commit is contained in:
commit
8f4148d4e5
@ -240,6 +240,7 @@ void GLSpectrumGUI::displaySettings()
|
|||||||
ui->linscale->setChecked(m_settings.m_linear);
|
ui->linscale->setChecked(m_settings.m_linear);
|
||||||
setAveragingToolitp();
|
setAveragingToolitp();
|
||||||
ui->calibration->setChecked(m_settings.m_useCalibration);
|
ui->calibration->setChecked(m_settings.m_useCalibration);
|
||||||
|
ui->resetMeasurements->setVisible(m_settings.m_measurement >= SpectrumSettings::MeasurementChannelPower);
|
||||||
displayGotoMarkers();
|
displayGotoMarkers();
|
||||||
displayControls();
|
displayControls();
|
||||||
|
|
||||||
@ -1119,8 +1120,18 @@ void GLSpectrumGUI::on_measure_clicked(bool checked)
|
|||||||
measurementsDialog.exec();
|
measurementsDialog.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GLSpectrumGUI::on_resetMeasurements_clicked(bool checked)
|
||||||
|
{
|
||||||
|
(void) checked;
|
||||||
|
|
||||||
|
if (m_glSpectrum) {
|
||||||
|
m_glSpectrum->getMeasurements()->reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GLSpectrumGUI::updateMeasurements()
|
void GLSpectrumGUI::updateMeasurements()
|
||||||
{
|
{
|
||||||
|
ui->resetMeasurements->setVisible(m_settings.m_measurement >= SpectrumSettings::MeasurementChannelPower);
|
||||||
if (m_glSpectrum)
|
if (m_glSpectrum)
|
||||||
{
|
{
|
||||||
m_glSpectrum->setMeasurementsVisible(m_settings.m_measurement != SpectrumSettings::MeasurementNone);
|
m_glSpectrum->setMeasurementsVisible(m_settings.m_measurement != SpectrumSettings::MeasurementNone);
|
||||||
|
@ -129,6 +129,7 @@ private slots:
|
|||||||
void on_showAllControls_toggled(bool checked);
|
void on_showAllControls_toggled(bool checked);
|
||||||
|
|
||||||
void on_measure_clicked(bool checked);
|
void on_measure_clicked(bool checked);
|
||||||
|
void on_resetMeasurements_clicked(bool checked);
|
||||||
|
|
||||||
void handleInputMessages();
|
void handleInputMessages();
|
||||||
void openWebsocketSpectrumSettingsDialog(const QPoint& p);
|
void openWebsocketSpectrumSettingsDialog(const QPoint& p);
|
||||||
|
@ -1116,6 +1116,20 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="resetMeasurements">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Reset measurements</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../resources/res.qrc">
|
||||||
|
<normaloff>:/bin.png</normaloff>:/bin.png</iconset>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="ButtonSwitch" name="calibration">
|
<widget class="ButtonSwitch" name="calibration">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
|
Loading…
Reference in New Issue
Block a user