From b54d7f23355912ee83536a1e3bea9b576e86ec14 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Tue, 28 Feb 2023 14:30:50 -0500 Subject: [PATCH] For Q65, Ctrl+Click on a call in ActiveStations leaves m_freqNominal unchanged. --- widgets/activeStations.cpp | 3 ++- widgets/mainwindow.cpp | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/widgets/activeStations.cpp b/widgets/activeStations.cpp index 619a710dd..f78bc99e6 100644 --- a/widgets/activeStations.cpp +++ b/widgets/activeStations.cpp @@ -106,7 +106,8 @@ void ActiveStations::on_textEdit_clicked() cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor); text = cursor.selectedText(); 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); } } diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 5b815a3af..142dbd5ee 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -3764,6 +3764,9 @@ void MainWindow::ARRL_Digi_Display() 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; QStringList w=m_ready2call[n].split(' ', SkipEmptyParts); 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") { - double kHz=w[1].toDouble(); - int nMHz=m_freqNominal/1000000; - m_freqNominal=(nMHz*1000 + kHz)* 1000; + if(!bHoldFreq) { + double kHz=w[1].toDouble(); + int nMHz=m_freqNominal/1000000; + m_freqNominal=(nMHz*1000 + kHz)* 1000; + } m_deCall=w[3]; m_deGrid=w[4]; m_txFirst=(w[5]=="0");