mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-03-31 16:38:35 -04:00
Pwr control refinements
Set tune power with SHIFT + "Pwr" slider. SHIFT + "Pwr" slider to top cancels separate power level for tune. Smarter tool tip for "Pwr" slider. Needs User Guide update if change is acceptable. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6284 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
9af174642b
commit
523ee92a70
@ -16,6 +16,8 @@
|
|||||||
#include <QProgressDialog>
|
#include <QProgressDialog>
|
||||||
#include <QHostInfo>
|
#include <QHostInfo>
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
|
#include <QCursor>
|
||||||
|
#include <QToolTip>
|
||||||
|
|
||||||
#include "revision_utils.hpp"
|
#include "revision_utils.hpp"
|
||||||
#include "qt_helpers.hpp"
|
#include "qt_helpers.hpp"
|
||||||
@ -120,6 +122,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
|
|||||||
m_tune {false},
|
m_tune {false},
|
||||||
m_tune_attenuation {0},
|
m_tune_attenuation {0},
|
||||||
m_tune_attenuation_restore {0},
|
m_tune_attenuation_restore {0},
|
||||||
|
m_block_pwr_tooltip {false},
|
||||||
m_lastMonitoredFrequency {default_frequency},
|
m_lastMonitoredFrequency {default_frequency},
|
||||||
m_toneSpacing {0.},
|
m_toneSpacing {0.},
|
||||||
m_firstDecode {0},
|
m_firstDecode {0},
|
||||||
@ -3991,7 +3994,12 @@ void MainWindow::on_tuneButton_clicked (bool checked)
|
|||||||
itone[0]=0;
|
itone[0]=0;
|
||||||
on_monitorButton_clicked (true);
|
on_monitorButton_clicked (true);
|
||||||
m_tune_attenuation_restore = ui->outAttenuation->value();
|
m_tune_attenuation_restore = ui->outAttenuation->value();
|
||||||
ui->outAttenuation->setValue(m_tune_attenuation);
|
if (m_tune_attenuation)
|
||||||
|
{
|
||||||
|
m_block_pwr_tooltip = true;
|
||||||
|
ui->outAttenuation->setValue(m_tune_attenuation);
|
||||||
|
m_block_pwr_tooltip = false;
|
||||||
|
}
|
||||||
m_tune=true;
|
m_tune=true;
|
||||||
}
|
}
|
||||||
Q_EMIT tune (checked);
|
Q_EMIT tune (checked);
|
||||||
@ -4003,13 +4011,14 @@ void MainWindow::stop_tuning ()
|
|||||||
ui->tuneButton->setChecked (false);
|
ui->tuneButton->setChecked (false);
|
||||||
m_bTxTime=false;
|
m_bTxTime=false;
|
||||||
m_tune=false;
|
m_tune=false;
|
||||||
|
m_block_pwr_tooltip = true;
|
||||||
ui->outAttenuation->setValue(m_tune_attenuation_restore);
|
ui->outAttenuation->setValue(m_tune_attenuation_restore);
|
||||||
|
m_block_pwr_tooltip = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::stopTuneATU()
|
void MainWindow::stopTuneATU()
|
||||||
{
|
{
|
||||||
on_tuneButton_clicked(false);
|
on_tuneButton_clicked(false);
|
||||||
m_tune=false;
|
|
||||||
m_bTxTime=false;
|
m_bTxTime=false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4264,11 +4273,32 @@ void MainWindow::transmit (double snr)
|
|||||||
|
|
||||||
void MainWindow::on_outAttenuation_valueChanged (int a)
|
void MainWindow::on_outAttenuation_valueChanged (int a)
|
||||||
{
|
{
|
||||||
if (m_tune) {
|
QString tt_str;
|
||||||
m_tune_attenuation = a;
|
qreal dBAttn {a / 10.}; // slider interpreted as dB / 100
|
||||||
}
|
if (m_tune && Qt::ShiftModifier == QGuiApplication::keyboardModifiers ())
|
||||||
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");
|
// special attenuation value for Tune button
|
||||||
|
m_tune_attenuation = a;
|
||||||
|
if (a)
|
||||||
|
{
|
||||||
|
tt_str = tr ("Tune digital gain ")
|
||||||
|
+ (a ? QString::number (-dBAttn, 'f', 1) : "0") + "dB\n"
|
||||||
|
"Set at top to cancel";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tt_str = tr ("Tune power = Tx power");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
tt_str = tr ("Transmit digital gain ")
|
||||||
|
+ (a ? QString::number (-dBAttn, 'f', 1) : "0") + "dB";
|
||||||
|
}
|
||||||
|
if (!m_block_pwr_tooltip)
|
||||||
|
{
|
||||||
|
QToolTip::showText (QCursor::pos (), tt_str, ui->outAttenuation);
|
||||||
|
}
|
||||||
Q_EMIT outAttenuationChanged (dBAttn);
|
Q_EMIT outAttenuationChanged (dBAttn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -508,6 +508,7 @@ private:
|
|||||||
bool m_tune;
|
bool m_tune;
|
||||||
int m_tune_attenuation;
|
int m_tune_attenuation;
|
||||||
int m_tune_attenuation_restore;
|
int m_tune_attenuation_restore;
|
||||||
|
bool m_block_pwr_tooltip;
|
||||||
Frequency m_lastMonitoredFrequency;
|
Frequency m_lastMonitoredFrequency;
|
||||||
double m_toneSpacing;
|
double m_toneSpacing;
|
||||||
int m_firstDecode;
|
int m_firstDecode;
|
||||||
|
Loading…
Reference in New Issue
Block a user