kopia lustrzana https://gitlab.com/eliggett/wfview
Various fixes
rodzic
68205825bf
commit
ea91fc7c9e
|
@ -171,7 +171,7 @@ audioHandler::~audioHandler()
|
|||
// We "hopefully" now have a valid format that is supported so try connecting
|
||||
|
||||
converter = new audioConverter();
|
||||
converterThread = new QThread(this);
|
||||
converterThread = new QThread(this);
|
||||
if (setup.isinput) {
|
||||
converterThread->setObjectName("audioConvIn()");
|
||||
}
|
||||
|
|
32
cwsender.cpp
32
cwsender.cpp
|
@ -49,22 +49,6 @@ cwSender::cwSender(QWidget *parent) :
|
|||
queue->add(priorityImmediate,funcDashRatio);
|
||||
});
|
||||
|
||||
connect(this, &cwSender::setKeySpeed, tone,
|
||||
[=](const unsigned char& wpm) { tone->setSpeed(wpm); });
|
||||
|
||||
connect(this, &cwSender::setDashRatio, tone,
|
||||
[=](const unsigned char& ratio) { tone->setRatio(ratio); });
|
||||
|
||||
connect(this, &cwSender::setPitch, tone,
|
||||
[=](const unsigned char& pitch) { tone->setFrequency(pitch); });
|
||||
|
||||
connect(this, &cwSender::setLevel, tone,
|
||||
[=](const unsigned char& level) { tone->setLevel(level); });
|
||||
|
||||
connect(this, &cwSender::stopCW, tone,
|
||||
[=]() { tone->stopSending(); });
|
||||
|
||||
|
||||
}
|
||||
|
||||
cwSender::~cwSender()
|
||||
|
@ -333,6 +317,22 @@ void cwSender::on_sidetoneEnableChk_clicked(bool clicked)
|
|||
connect(tone, &cwSidetone::finished, this,
|
||||
[=]() { ui->sidetoneEnableChk->setEnabled(true); });
|
||||
|
||||
connect(this, &cwSender::setKeySpeed, tone,
|
||||
[=](const unsigned char& wpm) { tone->setSpeed(wpm); });
|
||||
|
||||
connect(this, &cwSender::setDashRatio, tone,
|
||||
[=](const unsigned char& ratio) { tone->setRatio(ratio); });
|
||||
|
||||
connect(this, &cwSender::setPitch, tone,
|
||||
[=](const unsigned char& pitch) { tone->setFrequency(pitch); });
|
||||
|
||||
connect(this, &cwSender::setLevel, tone,
|
||||
[=](const unsigned char& level) { tone->setLevel(level); });
|
||||
|
||||
connect(this, &cwSender::stopCW, tone,
|
||||
[=]() { tone->stopSending(); });
|
||||
|
||||
|
||||
emit initTone();
|
||||
|
||||
} else if (!clicked && toneThread != Q_NULLPTR) {
|
||||
|
|
|
@ -375,7 +375,7 @@ Commands\70\Command29=false
|
|||
Commands\71\Type=Send CW
|
||||
Commands\71\String=\\x17
|
||||
Commands\71\Min=0
|
||||
Commands\71\Max=0
|
||||
Commands\71\Max=30
|
||||
Commands\71\Command29=false
|
||||
Commands\72\Type=Power Control
|
||||
Commands\72\String=\\x18
|
||||
|
@ -824,7 +824,7 @@ Modes\8\Min=50
|
|||
Modes\8\Max=2700
|
||||
Modes\8\Name=RTTY-R
|
||||
Modes\9\Num=12
|
||||
Modes\9\Reg=11
|
||||
Modes\9\Reg=0
|
||||
Modes\9\Min=0
|
||||
Modes\9\Max=0
|
||||
Modes\9\Name=DV
|
||||
|
|
|
@ -400,7 +400,7 @@ Commands\75\Command29=true
|
|||
Commands\76\Type=Send CW
|
||||
Commands\76\String=\\x17
|
||||
Commands\76\Min=0
|
||||
Commands\76\Max=0
|
||||
Commands\76\Max=30
|
||||
Commands\76\Command29=false
|
||||
Commands\77\Type=Power Control
|
||||
Commands\77\String=\\x18
|
||||
|
|
|
@ -400,7 +400,7 @@ Commands\75\Command29=true
|
|||
Commands\76\Type=Send CW
|
||||
Commands\76\String=\\x17
|
||||
Commands\76\Min=0
|
||||
Commands\76\Max=0
|
||||
Commands\76\Max=30
|
||||
Commands\76\Command29=false
|
||||
Commands\77\Type=Power Control
|
||||
Commands\77\String=\\x18
|
||||
|
|
|
@ -355,7 +355,7 @@ Commands\66\Command29=false
|
|||
Commands\67\Type=Send CW
|
||||
Commands\67\String=\\x17
|
||||
Commands\67\Min=0
|
||||
Commands\67\Max=0
|
||||
Commands\67\Max=30
|
||||
Commands\67\Command29=false
|
||||
Commands\68\Type=Power Control
|
||||
Commands\68\String=\\x18
|
||||
|
@ -681,17 +681,17 @@ Modes\8\Min=50
|
|||
Modes\8\Max=2700
|
||||
Modes\8\Name=RTTY-R
|
||||
Modes\9\Num=17
|
||||
Modes\9\Reg=11
|
||||
Modes\9\Reg=0
|
||||
Modes\9\Min=0
|
||||
Modes\9\Max=0
|
||||
Modes\9\Name=DV
|
||||
Modes\10\Num=22
|
||||
Modes\10\Reg=16
|
||||
Modes\10\Reg=10
|
||||
Modes\10\Min=0
|
||||
Modes\10\Max=0
|
||||
Modes\10\Name=DD
|
||||
Modes\11\Num=23
|
||||
Modes\11\Reg=17
|
||||
Modes\11\Reg=11
|
||||
Modes\11\Min=0
|
||||
Modes\11\Max=0
|
||||
Modes\11\Name=ATV
|
||||
|
|
|
@ -375,7 +375,7 @@ Commands\70\Command29=false
|
|||
Commands\71\Type=Send CW
|
||||
Commands\71\String=\\x17
|
||||
Commands\71\Min=0
|
||||
Commands\71\Max=0
|
||||
Commands\71\Max=30
|
||||
Commands\71\Command29=false
|
||||
Commands\72\Type=Power Control
|
||||
Commands\72\String=\\x18
|
||||
|
@ -740,12 +740,12 @@ Modes\8\Min=50
|
|||
Modes\8\Max=2700
|
||||
Modes\8\Name=RTTY-R
|
||||
Modes\9\Num=12
|
||||
Modes\9\Reg=11
|
||||
Modes\9\Reg=0
|
||||
Modes\9\Min=0
|
||||
Modes\9\Max=0
|
||||
Modes\9\Name=DV
|
||||
Modes\10\Num=14
|
||||
Modes\10\Reg=16
|
||||
Modes\10\Reg=10
|
||||
Modes\10\Min=0
|
||||
Modes\10\Max=0
|
||||
Modes\10\Name=DD
|
||||
|
|
|
@ -1129,6 +1129,7 @@ void settingswidget::populateServerUsers()
|
|||
|
||||
void settingswidget::serverAddUserLine(int row, const QString &user, const QString &pass, const int &type)
|
||||
{
|
||||
Q_UNUSED(row)
|
||||
// migration TODO: Review these signals/slots
|
||||
ui->serverUsersTable->blockSignals(true);
|
||||
|
||||
|
@ -1876,12 +1877,14 @@ void settingswidget::on_audioInputCombo_currentIndexChanged(int index)
|
|||
/* Beginning of radio specific settings */
|
||||
void settingswidget::on_modInputCombo_activated(int index)
|
||||
{
|
||||
Q_UNUSED(index)
|
||||
prefs->inputSource[0]= ui->modInputCombo->currentData().value<rigInput>();
|
||||
emit changedRsPref(rs_dataOffMod);
|
||||
}
|
||||
|
||||
void settingswidget::on_modInputData1Combo_activated(int index)
|
||||
{
|
||||
Q_UNUSED(index)
|
||||
prefs->inputSource[1] = ui->modInputData1Combo->currentData().value<rigInput>();
|
||||
emit changedRsPref(rs_data1Mod);
|
||||
}
|
||||
|
@ -1889,6 +1892,7 @@ void settingswidget::on_modInputData1Combo_activated(int index)
|
|||
|
||||
void settingswidget::on_modInputData2Combo_activated(int index)
|
||||
{
|
||||
Q_UNUSED(index)
|
||||
prefs->inputSource[2] = ui->modInputData2Combo->currentData().value<rigInput>();
|
||||
emit changedRsPref(rs_data2Mod);
|
||||
}
|
||||
|
@ -1896,6 +1900,7 @@ void settingswidget::on_modInputData2Combo_activated(int index)
|
|||
|
||||
void settingswidget::on_modInputData3Combo_activated(int index)
|
||||
{
|
||||
Q_UNUSED(index)
|
||||
prefs->inputSource[3] = ui->modInputData3Combo->currentData().value<rigInput>();
|
||||
emit changedRsPref(rs_data3Mod);
|
||||
}
|
||||
|
|
|
@ -67,6 +67,7 @@ void tciServer::init(quint16 port) {
|
|||
|
||||
void tciServer::setupTxPacket(int length)
|
||||
{
|
||||
Q_UNUSED(length)
|
||||
}
|
||||
|
||||
tciServer::~tciServer()
|
||||
|
|
|
@ -1745,7 +1745,7 @@ void wfmain::loadSettings()
|
|||
|
||||
if (prefs.tciPort > 0 && tci == Q_NULLPTR) {
|
||||
|
||||
tci = new tciServer(this);
|
||||
tci = new tciServer();
|
||||
|
||||
tciThread = new QThread(this);
|
||||
tciThread->setObjectName("TCIServer()");
|
||||
|
|
Ładowanie…
Reference in New Issue