removed a bit more debug and added some focus-force code for the CW

window.
half-duplex
Elliott Liggett 2023-01-21 13:06:47 -08:00
rodzic 7a4f708e68
commit c5c01cf81d
3 zmienionych plików z 9 dodań i 5 usunięć

Wyświetl plik

@ -12,6 +12,7 @@ cwSender::cwSender(QWidget *parent) :
f.setStyleHint(QFont::TypeWriter); f.setStyleHint(QFont::TypeWriter);
ui->textToSendEdit->setFont(f); ui->textToSendEdit->setFont(f);
ui->transcriptText->setFont(f); ui->transcriptText->setFont(f);
ui->textToSendEdit->setFocus();
} }
cwSender::~cwSender() cwSender::~cwSender()
@ -63,6 +64,7 @@ void cwSender::on_sendBtn_clicked()
void cwSender::on_stopBtn_clicked() void cwSender::on_stopBtn_clicked()
{ {
emit stopCW(); emit stopCW();
ui->textToSendEdit->setFocus();
} }
void cwSender::on_textToSendEdit_returnPressed() void cwSender::on_textToSendEdit_returnPressed()
@ -74,6 +76,7 @@ void cwSender::on_breakinCombo_activated(int brkmode)
{ {
// 0 = off, 1 = semi, 2 = full // 0 = off, 1 = semi, 2 = full
emit setBreakInMode((unsigned char)brkmode); emit setBreakInMode((unsigned char)brkmode);
ui->textToSendEdit->setFocus();
} }
void cwSender::on_wpmSpin_valueChanged(int wpm) void cwSender::on_wpmSpin_valueChanged(int wpm)
@ -139,6 +142,7 @@ void cwSender::processMacroButton(int buttonNumber, QPushButton *btn)
} else { } else {
runMacroButton(buttonNumber); runMacroButton(buttonNumber);
} }
ui->textToSendEdit->setFocus();
} }
void cwSender::runMacroButton(int buttonNumber) void cwSender::runMacroButton(int buttonNumber)
@ -209,6 +213,7 @@ void cwSender::setMacroButtonText(QString btnText, QPushButton *btn)
void cwSender::on_sequenceSpin_valueChanged(int newSeq) void cwSender::on_sequenceSpin_valueChanged(int newSeq)
{ {
sequenceNumber = newSeq; sequenceNumber = newSeq;
ui->textToSendEdit->setFocus();
} }
QStringList cwSender::getMacroText() QStringList cwSender::getMacroText()

Wyświetl plik

@ -3118,20 +3118,20 @@ void rigCommander::parseWFData()
isSub = payloadIn.at(2)==0x01; isSub = payloadIn.at(2)==0x01;
freqSpan = parseFrequency(payloadIn, 6); freqSpan = parseFrequency(payloadIn, 6);
emit haveScopeSpan(freqSpan, isSub); emit haveScopeSpan(freqSpan, isSub);
qInfo(logRig()) << "Received 0x15 center span data: for frequency " << freqSpan.Hz; //qInfo(logRig()) << "Received 0x15 center span data: for frequency " << freqSpan.Hz;
//printHex(payloadIn, false, true); //printHex(payloadIn, false, true);
break; break;
case 0x16: case 0x16:
// read edge mode center in edge mode // read edge mode center in edge mode
emit haveScopeEdge((char)payloadIn[2]); emit haveScopeEdge((char)payloadIn[2]);
qInfo(logRig()) << "Received 0x16 edge in center mode:"; //qInfo(logRig()) << "Received 0x16 edge in center mode:";
printHex(payloadIn, false, true); printHex(payloadIn, false, true);
// [1] 0x16 // [1] 0x16
// [2] 0x01, 0x02, 0x03: Edge 1,2,3 // [2] 0x01, 0x02, 0x03: Edge 1,2,3
break; break;
case 0x17: case 0x17:
// Hold status (only 9700?) // Hold status (only 9700?)
qInfo(logRig()) << "Received 0x17 hold status - need to deal with this!"; qDebug(logRig()) << "Received 0x17 hold status - need to deal with this!";
printHex(payloadIn, false, true); printHex(payloadIn, false, true);
break; break;
case 0x19: case 0x19:

Wyświetl plik

@ -1081,8 +1081,7 @@ void wfmain::setupMainUI()
connect(this->cw, &cwSender::setKeySpeed, connect(this->cw, &cwSender::setKeySpeed,
[=](const unsigned char &wpm) { issueCmd(cmdSetKeySpeed, wpm);}); [=](const unsigned char &wpm) { issueCmd(cmdSetKeySpeed, wpm);});
connect(this->cw, &cwSender::getCWSettings, connect(this->cw, &cwSender::getCWSettings,
[=]() { qInfo(logSystem()) << "Getting CW Settings for CW Sender"; [=]() { issueDelayedCommand(cmdGetKeySpeed);
issueDelayedCommand(cmdGetKeySpeed);
issueDelayedCommand(cmdGetBreakMode);}); issueDelayedCommand(cmdGetBreakMode);});
} }