w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-03 21:40:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Pwr control refinements

Browse Source 
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:
Bill Somerville 2015-12-16 20:55:19 +00:00
parent 79a9fff0c8
commit 466d8451f9
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
mainwindow.cpp
View File

@ -16,6 +16,8 @@
#include <QProgressDialog>
#include <QHostInfo>
#include <QVector>
#include <QCursor>
#include <QToolTip>
#include "revision_utils.hpp"
#include "qt_helpers.hpp"
@ -120,6 +122,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
m_tune {false},
m_tune_attenuation {0},
m_tune_attenuation_restore {0},
m_block_pwr_tooltip {false},
m_lastMonitoredFrequency {default_frequency},
m_toneSpacing {0.},
m_firstDecode {0},
@ -3991,7 +3994,12 @@ void MainWindow::on_tuneButton_clicked (bool checked)
itone[0]=0;
on_monitorButton_clicked (true);
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;
}
Q_EMIT tune (checked);
@ -4003,13 +4011,14 @@ void MainWindow::stop_tuning ()
ui->tuneButton->setChecked (false);
m_bTxTime=false;
m_tune=false;
m_block_pwr_tooltip = true;
ui->outAttenuation->setValue(m_tune_attenuation_restore);
m_block_pwr_tooltip = false;
}
void MainWindow::stopTuneATU()
{
on_tuneButton_clicked(false);
m_tune=false;
m_bTxTime=false;
}
@ -4264,11 +4273,32 @@ void MainWindow::transmit (double snr)
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
ui->outAttenuation->setToolTip (tr ("Transmit digital gain ") + (a ? QString::number (-dBAttn, 'f', 1) : "0") + "dB");
QString tt_str;
qreal dBAttn {a / 10.}; // slider interpreted as dB / 100
if (m_tune && Qt::ShiftModifier == QGuiApplication::keyboardModifiers ())
{
// 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);
}

1
mainwindow.h
View File

@ -508,6 +508,7 @@ private:
bool m_tune;
int m_tune_attenuation;
int m_tune_attenuation_restore;
bool m_block_pwr_tooltip;
Frequency m_lastMonitoredFrequency;
double m_toneSpacing;
int m_firstDecode;