w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-10-02 01:56:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix the saving of "m_rptRcvd", which got broken a few revisions ago.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3153 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-04-10 20:01:17 +00:00
parent fc65d318dd
commit a4a1510e26
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//-------------------------------------------------------------- MainWindow //--------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "devsetup.h" #include "devsetup.h"
@ -1231,12 +1231,13 @@ void MainWindow::readFromStdout() //readFromStdout
ui->decodedTextBrowser2->setTextCursor(cursor); ui->decodedTextBrowser2->setTextCursor(cursor);
} }
QString msg=t.mid(34,22); QString msg=t.mid(34);
bool b=stdmsg_(msg.toAscii().constData(),22); int i1=msg.indexOf("\r");
if(i1>0) msg=msg.mid(0,i1-1) + " ";
bool b=stdmsg_(msg.mid(0,22).toAscii().constData(),22);
QStringList w=msg.split(" ",QString::SkipEmptyParts); QStringList w=msg.split(" ",QString::SkipEmptyParts);
if(b and w[0]==m_myCall) { if(b and w[0]==m_myCall) {
QString tt=w[2]; QString tt=w[2];
int i1;
bool ok; bool ok;
i1=tt.toInt(&ok); i1=tt.toInt(&ok);
if(ok and i1>=-50 and i1<50) { if(ok and i1>=-50 and i1<50) {
@ -1249,6 +1250,7 @@ void MainWindow::readFromStdout() //readFromStdout
} }
} }
} }
qDebug() << b << w[0] << w[1] << w[2] << tt << i1 << ok << m_rptRcvd;
} }
#ifdef WIN32 #ifdef WIN32
@ -1723,7 +1725,7 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
if(nr>=10) rpt="+" + rpt; if(nr>=10) rpt="+" + rpt;
ui->rptSpinBox->setValue(rpt.toInt()); ui->rptSpinBox->setValue(rpt.toInt());
genStdMsgs(rpt); genStdMsgs(rpt);
if(t2.indexOf(m_myCall)>0) { if(t2.indexOf(m_myCall)>=0) {
m_ntx=2; m_ntx=2;
ui->txrb2->setChecked(true); ui->txrb2->setChecked(true);
if(ui->tabWidget->currentIndex()==1) { if(ui->tabWidget->currentIndex()==1) {
@ -1737,6 +1739,7 @@ void MainWindow::doubleClickOnCall(bool shift, bool ctrl)
if(ui->tabWidget->currentIndex()==1) { if(ui->tabWidget->currentIndex()==1) {
ui->genMsg->setText(ui->tx1->text()); ui->genMsg->setText(ui->tx1->text());
m_ntx=7; m_ntx=7;
ui->rbGenMsg->setChecked(true);
} }
} }
if(m_quickCall) { if(m_quickCall) {

4
mainwindow.ui
View File

@ -300,7 +300,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>QSO</string> <string>QSO Frequency</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@ -1962,7 +1962,7 @@ p, li { white-space: pre-wrap; }
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>711</width> <width>711</width>
<height>26</height> <height>21</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">