w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 12:23:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

1. Fix for the locator being truncated on double click when the call was unexpectly long

Browse Source 
2. Removed commented code left over from previous edits in MainWindow::doubleClickOnCall()



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3584 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Murray Curtis 2013-09-28 03:56:43 +00:00
parent bc99eb2061
commit a7c36b7d5a
2 changed files with 16 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
displaytext.cpp
View File

@ -72,8 +72,13 @@ void DisplayText::_appendDXCCWorkedB4(/*mod*/DecodedText& t1, QString& bg, /*use
int charsAvail = _maxDisplayedCharacters;
// the decoder (seems) to always generate 40 chars. For a normal CQ call, the last five are spaces
t1 = t1.left(36); // reduce trailing white space TODO this magic 36 is also referenced in MainWindow::doubleClickOnCall()
charsAvail -= 36;
// TODO this magic 36 characters is also referenced in MainWindow::doubleClickOnCall()
int s3 = t1.indexOf(" ",35);
if (s3 < 35)
s3 = 35; // we always want at least the characters to position 35
s3 += 1; // convert the index into a character count
t1 = t1.left(s3); // reduce trailing white space
charsAvail -= s3;
if (charsAvail > 4)
{
if (!countryWorkedBefore) // therefore not worked call either

69
mainwindow.cpp
View File

@ -1936,7 +1936,15 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
decodedtext = t1.mid(i1,i2-i1); //selected line
if (decodedtext.indexOf(" CQ ") > 0)
decodedtext = decodedtext.left(39); // to remove DXCC entity and worked B4 status. TODO need a better way to do this
{
// TODO this magic 36 characters is also referenced in DisplayText::_appendDXCCWorkedB4()
int s3 = decodedtext.indexOf(" ",35);
if (s3 < 35)
s3 = 35; // we always want at least the characters to position 35
s3 += 1; // convert the index into a character count
decodedtext = decodedtext.left(s3); // remove DXCC entity and worked B4 status. TODO need a better way to do this
}
// if(decodedtext.indexOf("Tx")==6) return; //Ignore Tx line
int i4=t.mid(i1).length();
@ -1954,15 +1962,6 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
m_QSOText=decodedtext;
}
/*
int nfreq=t4.at(3).toInt();
if(t4.at(1)=="Tx") nfreq=t4.at(2).toInt();
m_wideGraph->setRxFreq(nfreq); //Set Rx freq
if(t4.at(1)=="Tx") {
if(ctrl) ui->TxFreqSpinBox->setValue(nfreq); //Set Tx freq
return;
}
*/
int frequency = decodedtext.frequencyOffset();
m_wideGraph->setRxFreq(frequency); //Set Rx freq
@ -1973,34 +1972,12 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
return;
}
/*
QString firstcall=t4.at(5);
// Don't change Tx freq if a station is calling me, unless m_lockTxFreq
// is true or CTRL is held down or
if((firstcall!=m_myCall) or m_lockTxFreq or ctrl) {
ui->TxFreqSpinBox->setValue(nfreq);
}
*/
QString firstcall = decodedtext.call();
// Don't change Tx freq if a station is calling me, unless m_lockTxFreq
// is true or CTRL is held down
if ((firstcall!=m_myCall) or m_lockTxFreq or ctrl)
ui->TxFreqSpinBox->setValue(frequency);
/*
if(t4.at(4)=="@") {
m_modeTx="JT9";
ui->pbTxMode->setText("Tx JT9 @");
m_wideGraph->setModeTx(m_modeTx);
}
if(t4.at(4)=="#") {
m_modeTx="JT65";
ui->pbTxMode->setText("Tx JT65 #");
m_wideGraph->setModeTx(m_modeTx);
}
*/
if (decodedtext.isJT9())
{
m_modeTx="JT9";
@ -2014,16 +1991,6 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
ui->pbTxMode->setText("Tx JT65 #");
m_wideGraph->setModeTx(m_modeTx);
}
/*
QString hiscall=t4.at(6);
QString hisgrid="";
if(t4.length()>=8) hisgrid=t4.at(7);
if(hiscall!=ui->dxCallEntry->text()) ui->dxGridEntry->setText("");
ui->dxCallEntry->setText(hiscall);
if(gridOK(hisgrid)) ui->dxGridEntry->setText(hisgrid);
if(ui->dxGridEntry->text()=="") lookup();
m_hisGrid=ui->dxGridEntry->text();
*/
QString hiscall;
QString hisgrid;
@ -2037,29 +2004,11 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
lookup();
m_hisGrid = ui->dxGridEntry->text();
/*
int n = 60*decodedtext.mid(0,2).toInt() + decodedtext.mid(2,2).toInt();
int nmod=n%(m_TRperiod/30);
m_txFirst=(nmod!=0);
ui->txFirstCheckBox->setChecked(m_txFirst);
*/
int n = decodedtext.timeInSeconds();
int nmod=n%(m_TRperiod/30);
m_txFirst=(nmod!=0);
ui->txFirstCheckBox->setChecked(m_txFirst);
/*
QString rpt=t4.at(1);
if(rpt.indexOf(" ")==0) rpt="+" + rpt.mid(2,2);
if(rpt.indexOf(" -")==0) rpt=rpt.mid(1,2);
if(rpt.indexOf(" ")==0) rpt="+" + rpt.mid(1,2);
int nr=rpt.toInt();
if(nr<-50) rpt="-50";
if(nr>49) rpt="+49";
if(nr>=-9 and nr<=-1) rpt="-0" + rpt.mid(1);
if(nr>=0 and nr<=9) rpt="+0" + rpt;
if(nr>=10) rpt="+" + rpt;
*/
QString rpt = decodedtext.report();
ui->rptSpinBox->setValue(rpt.toInt());
genStdMsgs(rpt);