w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 04:42:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

For Q65, Ctrl+Click on a call in ActiveStations leaves m_freqNominal unchanged.

Browse Source
This commit is contained in:
Joe Taylor 2023-02-28 14:30:50 -05:00
parent 2375e2000c
commit b54d7f2335
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
widgets/activeStations.cpp
View File

@ -106,7 +106,8 @@ void ActiveStations::on_textEdit_clicked()
cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor); cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
text = cursor.selectedText(); text = cursor.selectedText();
if(text!="") { if(text!="") {
int nline=text.left(2).toInt()-1; int nline=text.left(2).toInt();
if(QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier)) nline=-nline;
emit callSandP(nline); emit callSandP(nline);
} }
} }

11
widgets/mainwindow.cpp
View File

@ -3764,6 +3764,9 @@ void MainWindow::ARRL_Digi_Display()
void MainWindow::callSandP2(int n) void MainWindow::callSandP2(int n)
{ {
bool bHoldFreq = (n<0);
n=qAbs(n)-1;
qDebug() << "aa" << n << bHoldFreq;
if(m_mode!="Q65" and m_ready2call[n]=="") return; if(m_mode!="Q65" and m_ready2call[n]=="") return;
QStringList w=m_ready2call[n].split(' ', SkipEmptyParts); QStringList w=m_ready2call[n].split(' ', SkipEmptyParts);
if(m_mode=="Q65" and m_specOp==SpecOp::Q65_PILEUP and n <= m_callers->size()) { if(m_mode=="Q65" and m_specOp==SpecOp::Q65_PILEUP and n <= m_callers->size()) {
@ -3784,9 +3787,11 @@ void MainWindow::callSandP2(int n)
} }
if(m_mode=="Q65") { if(m_mode=="Q65") {
double kHz=w[1].toDouble(); if(!bHoldFreq) {
int nMHz=m_freqNominal/1000000; double kHz=w[1].toDouble();
m_freqNominal=(nMHz*1000 + kHz)* 1000; int nMHz=m_freqNominal/1000000;
m_freqNominal=(nMHz*1000 + kHz)* 1000;
}
m_deCall=w[3]; m_deCall=w[3];
m_deGrid=w[4]; m_deGrid=w[4];
m_txFirst=(w[5]=="0"); m_txFirst=(w[5]=="0");