Corrected the logic for when Tx freq is changed after double-clicking on

a decoded texdt line.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3142 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-09 17:52:44 +00:00
parent e0a8592fcd
commit ac6f986dc9
2 changed files with 6 additions and 7 deletions

Binary file not shown.

View File

@ -663,6 +663,7 @@ void MainWindow::on_monitorButton_clicked() //Monitor
soundInThread.setMonitoring(true); soundInThread.setMonitoring(true);
m_diskData=false; m_diskData=false;
} }
void MainWindow::on_actionLinrad_triggered() //Linrad palette void MainWindow::on_actionLinrad_triggered() //Linrad palette
{ {
if(g_pWideGraph != NULL) g_pWideGraph->setPalette("Linrad"); if(g_pWideGraph != NULL) g_pWideGraph->setPalette("Linrad");
@ -1693,13 +1694,11 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
if(i5>0) t3=t3.mid(0,i5+3) + "_" + t3.mid(i5+4); //Make it "CQ_DX" (one word) if(i5>0) t3=t3.mid(0,i5+3) + "_" + t3.mid(i5+4); //Make it "CQ_DX" (one word)
QStringList t4=t3.split(" ",QString::SkipEmptyParts); QStringList t4=t3.split(" ",QString::SkipEmptyParts);
if(t4.length() <5) return; //Skip the rest if no decoded text if(t4.length() <5) return; //Skip the rest if no decoded text
QString firstcall=t4.at(4);
//Don't change freqs if Shift key down or a station is calling me.
if(!shift and (firstcall!=m_myCall or ctrl)) {
int nfreq=int(t4.at(3).toFloat()); int nfreq=int(t4.at(3).toFloat());
ui->TxFreqSpinBox->setValue(nfreq); g_pWideGraph->setQSOfreq(nfreq); //Set Rx freq
g_pWideGraph->setQSOfreq(nfreq); QString firstcall=t4.at(4);
} //Don't change freqs if a station is calling me, unless CTRL is held down
if(firstcall!=m_myCall or ctrl) ui->TxFreqSpinBox->setValue(nfreq);
QString hiscall=t4.at(5); QString hiscall=t4.at(5);
QString hisgrid=""; QString hisgrid="";
if(t4.length()>=7) if(t4.length()>=7)