w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct the vertical scale of red curve, when nbpp>1. 

Change "double-click on callsign" so that you can click anywhere on the line,
and make it set TxFreq accordingly.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3025 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-02-28 23:35:04 +00:00
parent 00273a5540
commit 5c4503df99
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mainwindow.cpp
View File

@ -73,7 +73,7 @@ MainWindow::MainWindow(QWidget *parent) :
txMsgButtonGroup->addButton(ui->txrb6,6);
connect(txMsgButtonGroup,SIGNAL(buttonClicked(int)),SLOT(set_ntx(int)));
connect(ui->decodedTextBrowser,SIGNAL(selectCallsign(bool)),this,
SLOT(selectCall2(bool)));
SLOT(doubleClickOnCall(bool)));
setWindowTitle(Program_Title_Version);
connect(&soundInThread, SIGNAL(readyForFFT(int)),
@ -1253,31 +1253,25 @@ void MainWindow::on_txb6_clicked() //txb6
m_restart=true;
}
void MainWindow::selectCall2(bool ctrl) //selectCall2
void MainWindow::doubleClickOnCall(bool ctrl)
{
QString t = ui->decodedTextBrowser->toPlainText(); //Full contents
int i=ui->decodedTextBrowser->textCursor().position();
int i0=t.lastIndexOf(" ",i);
int i1=t.indexOf(" ",i);
QString hiscall=t.mid(i0+1,i1-i0-1);
if(hiscall!="") {
if(hiscall.length() < 13) doubleClickOnCall(hiscall, ctrl);
}
}
//doubleClickOnCall
void MainWindow::doubleClickOnCall(QString hiscall, bool ctrl)
{
ui->dxCallEntry->setText(hiscall);
QString t = ui->decodedTextBrowser->toPlainText(); //Full contents
int i2=ui->decodedTextBrowser->textCursor().position();
QString t1 = t.mid(0,i2); //contents up to \n on selected line
int i1=t1.lastIndexOf("\n") + 1; //points to first char of line
QString t2 = t1.mid(i1,i2-i1); //selected line
int i4=t.mid(i1).length();
if(i4>60) i4=60;
QString t3=t.mid(i1,i4);
QStringList t4=t3.split(" ",QString::SkipEmptyParts);
ui->TxFreqSpinBox->setValue(int(t4.at(4).toFloat()));
QString hiscall=t4.at(7);
ui->dxCallEntry->setText(hiscall);
int n = 60*t2.mid(0,2).toInt() + t2.mid(2,2).toInt();
int nmod=n%(m_TRperiod/30);
m_txFirst=(nmod!=0);
ui->txFirstCheckBox->setChecked(m_txFirst);
QString rpt=t2.mid(10,3);
QString rpt=t4.at(2);
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);

3
mainwindow.h
View File

@ -28,7 +28,7 @@ public slots:
void diskWriteFinished();
void freezeDecode(int n);
void guiUpdate();
void doubleClickOnCall(QString hiscall, bool ctrl);
void doubleClickOnCall(bool ctrl);
void readFromStdout();
void readFromStderr();
void jt9_error();
@ -85,7 +85,6 @@ private slots:
void on_addButton_clicked();
void on_dxCallEntry_textChanged(const QString &arg1);
void on_dxGridEntry_textChanged(const QString &arg1);
void selectCall2(bool ctrl);
void on_genStdMsgsPushButton_clicked();
void on_logQSOButton_clicked();
void on_actionErase_wsjtx_rx_log_triggered();

2
widegraph.cpp
View File

@ -119,7 +119,7 @@ void WideGraph::dataSink2(float s[], float red[], float df3, int ihsym,
rsum += red[i];
}
swide[j]=sum;
rwide[j]=rsum;
rwide[j]=rsum/nbpp;
// if(lstrong[1 + i/32]!=0) swide[j]=-smax; //Tag strong signals
}