VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-30 20:40:20 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1301 from srcejon/fix_spectrum_markers_dialog

Browse Source 
Spectrum markers dialog: Small fixes
This commit is contained in:
Edouard Griffiths 2022-06-23 14:36:28 +02:00 committed by GitHub
commit fc4b448f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdrgui/gui/spectrummarkersdialog.cpp
View File

@ -639,6 +639,18 @@ void SpectrumMarkersDialog::on_aMarkerShowStateAll_clicked()
} }
} }
// We don't get aMarkerText_editingFinished signal until after aMarkerToggleFrequency_toggled
// when that button is pressed, so save the text immediately when edited, so it isn't lost
// after call to displayAnnotationMarker
void SpectrumMarkersDialog::on_aMarkerText_textEdited()
{
if (m_annotationMarkers.size() == 0) {
return;
}
m_annotationMarkers[m_annotationMarkerIndex].m_text = ui->aMarkerText->text();
}
void SpectrumMarkersDialog::on_aMarkerText_editingFinished() void SpectrumMarkersDialog::on_aMarkerText_editingFinished()
{ {
if (m_annotationMarkers.size() == 0) { if (m_annotationMarkers.size() == 0) {
@ -795,7 +807,7 @@ void SpectrumMarkersDialog::on_aMarkersExport_clicked()
stream << marker.m_startFrequency << "," stream << marker.m_startFrequency << ","
<< marker.m_bandwidth << "," << marker.m_bandwidth << ","
<< marker.m_text << "," << marker.m_text << ","
<< (marker.m_show ? "1" : "0") << "," << ((int)marker.m_show) << ","
<< marker.m_markerColor.red() << "," << marker.m_markerColor.red() << ","
<< marker.m_markerColor.green() << "," << marker.m_markerColor.green() << ","
<< marker.m_markerColor.blue() << "\n"; << marker.m_markerColor.blue() << "\n";

1
sdrgui/gui/spectrummarkersdialog.h
View File

@ -101,6 +101,7 @@ private slots:
void on_aMarkerColor_clicked(); void on_aMarkerColor_clicked();
void on_aMarkerShowState_currentIndexChanged(int state); void on_aMarkerShowState_currentIndexChanged(int state);
void on_aMarkerShowStateAll_clicked(); void on_aMarkerShowStateAll_clicked();
void on_aMarkerText_textEdited();
void on_aMarkerText_editingFinished(); void on_aMarkerText_editingFinished();
void on_aMarker_valueChanged(int value); void on_aMarker_valueChanged(int value);
void on_aMarkerAdd_clicked(); void on_aMarkerAdd_clicked();