w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 00:51:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remember power level setting used for tune

Browse Source 
Patch provided by Mike W9MDB, thanks.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6281 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-12-16 15:32:11 +00:00
parent b87c77ddf1
commit 2aea76777a
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainwindow.cpp
View File

@ -118,6 +118,8 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
m_monitoring {false}, m_monitoring {false},
m_transmitting {false}, m_transmitting {false},
m_tune {false}, m_tune {false},
m_tune_attenuation {0},
m_tune_attenuation_restore {0},
m_lastMonitoredFrequency {default_frequency}, m_lastMonitoredFrequency {default_frequency},
m_toneSpacing {0.}, m_toneSpacing {0.},
m_firstDecode {0}, m_firstDecode {0},
@ -680,6 +682,7 @@ void MainWindow::writeSettings()
m_settings->setValue("FastMode",m_bFastMode); m_settings->setValue("FastMode",m_bFastMode);
m_settings->setValue("Fast9",m_bFast9); m_settings->setValue("Fast9",m_bFast9);
m_settings->setValue("CQRxfreq",m_freqCQ); m_settings->setValue("CQRxfreq",m_freqCQ);
m_settings->setValue("TuneAttenuation",m_tune_attenuation);
m_settings->endGroup(); m_settings->endGroup();
} }
@ -752,6 +755,7 @@ void MainWindow::readSettings()
ui->band_hopping_group_box->setChecked (m_settings->value ("BandHopping", false).toBool()); ui->band_hopping_group_box->setChecked (m_settings->value ("BandHopping", false).toBool());
// setup initial value of tx attenuator // setup initial value of tx attenuator
ui->outAttenuation->setValue (m_settings->value ("OutAttenuation", 0).toInt ()); ui->outAttenuation->setValue (m_settings->value ("OutAttenuation", 0).toInt ());
m_tune_attenuation = m_settings->value ("TuneAttenuation", 0).toInt ();
on_outAttenuation_valueChanged (ui->outAttenuation->value ()); on_outAttenuation_valueChanged (ui->outAttenuation->value ());
m_freqCQ=m_settings->value("CQRxFreq",285).toInt(); m_freqCQ=m_settings->value("CQRxFreq",285).toInt();
ui->sbCQRxFreq->setValue(m_freqCQ); ui->sbCQRxFreq->setValue(m_freqCQ);
@ -3986,6 +3990,8 @@ void MainWindow::on_tuneButton_clicked (bool checked)
m_repeatMsg=0; m_repeatMsg=0;
itone[0]=0; itone[0]=0;
on_monitorButton_clicked (true); on_monitorButton_clicked (true);
m_tune_attenuation_restore = ui->outAttenuation->value();
ui->outAttenuation->setValue(m_tune_attenuation);
m_tune=true; m_tune=true;
} }
Q_EMIT tune (checked); Q_EMIT tune (checked);
@ -3997,6 +4003,7 @@ void MainWindow::stop_tuning ()
ui->tuneButton->setChecked (false); ui->tuneButton->setChecked (false);
m_bTxTime=false; m_bTxTime=false;
m_tune=false; m_tune=false;
ui->outAttenuation->setValue(m_tune_attenuation_restore);
} }
void MainWindow::stopTuneATU() void MainWindow::stopTuneATU()
@ -4257,6 +4264,9 @@ void MainWindow::transmit (double snr)
void MainWindow::on_outAttenuation_valueChanged (int a) void MainWindow::on_outAttenuation_valueChanged (int a)
{ {
if (m_tune) {
m_tune_attenuation = a;
}
qreal dBAttn (a / 10.); // slider interpreted as hundredths of a dB qreal dBAttn (a / 10.); // slider interpreted as hundredths of a dB
ui->outAttenuation->setToolTip (tr ("Transmit digital gain ") + (a ? QString::number (-dBAttn, 'f', 1) : "0") + "dB"); ui->outAttenuation->setToolTip (tr ("Transmit digital gain ") + (a ? QString::number (-dBAttn, 'f', 1) : "0") + "dB");
Q_EMIT outAttenuationChanged (dBAttn); Q_EMIT outAttenuationChanged (dBAttn);

2
mainwindow.h
View File

@ -506,6 +506,8 @@ private:
bool m_monitoring; bool m_monitoring;
bool m_transmitting; bool m_transmitting;
bool m_tune; bool m_tune;
int m_tune_attenuation;
int m_tune_attenuation_restore;
Frequency m_lastMonitoredFrequency; Frequency m_lastMonitoredFrequency;
double m_toneSpacing; double m_toneSpacing;
int m_firstDecode; int m_firstDecode;