mirror of https://github.com/saitohirga/WSJT-X.git
Add instructional labels to Tab 2.
Reset m_repeatMsg=0 on Tx Halt, etc. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3171 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
parent
9c1533dab9
commit
6cbb7a504b
|
|
@ -42,7 +42,7 @@ subroutine decoder(ss,c0)
|
|||
else if(ntrMinutes.eq.5) then
|
||||
nsps=40960
|
||||
df3=1500.0/6144.0
|
||||
fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22)'
|
||||
fmt='(i4.4,i4,i5,f6.1,f8.1,i4,3x,a22)'
|
||||
else if(ntrMinutes.eq.10) then
|
||||
nsps=82944
|
||||
df3=1500.0/12288.0
|
||||
|
|
@ -56,6 +56,7 @@ subroutine decoder(ss,c0)
|
|||
|
||||
kstep=nsps/2
|
||||
tstep=kstep/12000.0
|
||||
tstep=0.5*tstep
|
||||
idf=ntol/df3 + 0.999
|
||||
|
||||
do nqd=1,0,-1
|
||||
|
|
@ -122,8 +123,6 @@ subroutine decoder(ss,c0)
|
|||
|
||||
call timer('decode9 ',0)
|
||||
call decode9(i1SoftSymbols,limit,nlim,msg)
|
||||
! write(69,3300) nqd,i,f+1000.0,ccflim,ccfred(i),limit,nlim,msg(1:18)
|
||||
!3300 format(i1,i6,f10.3,2f8.1,2i9,2x,a18)
|
||||
call timer('decode9 ',1)
|
||||
|
||||
sync=(syncpk+1)/4.0
|
||||
|
|
@ -135,6 +134,8 @@ subroutine decoder(ss,c0)
|
|||
if(msg.ne.' ') then
|
||||
write(*,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg
|
||||
write(13,fmt) nutc,nsync,nsnr,xdt,freq,ndrift,msg
|
||||
! write(14,1014) nutc,nsync,nsnr,xdt,freq,ndrift,ccfred(i),nlim,msg
|
||||
!1014 format(i4.4,i4,i5,f6.1,f8.0,i4,f9.1,i9,3x,a22)
|
||||
fgood=f
|
||||
nsynced=1
|
||||
ndecoded=1
|
||||
|
|
@ -151,7 +152,7 @@ subroutine decoder(ss,c0)
|
|||
1010 format('<DecodeFinished>',2i4)
|
||||
call flush(6)
|
||||
close(13)
|
||||
! call flush(69)
|
||||
! call flush(14)
|
||||
|
||||
call timer('decoder ',1)
|
||||
if(nstandalone.eq.0) call timer('decoder ',101)
|
||||
|
|
|
|||
|
|
@ -176,6 +176,7 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
|
|||
m_sent73=false;
|
||||
m_watchdogLimit=5;
|
||||
m_tune=false;
|
||||
m_repeatMsg=0;
|
||||
decodeBusy(false);
|
||||
|
||||
ui->xThermo->setFillBrush(Qt::green);
|
||||
|
|
@ -704,6 +705,7 @@ void MainWindow::on_autoButton_clicked() //Auto
|
|||
btxok=false;
|
||||
ui->autoButton->setStyleSheet("");
|
||||
on_monitorButton_clicked();
|
||||
m_repeatMsg=0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -712,6 +714,7 @@ void MainWindow::on_stopTxButton_clicked() //Stop Tx
|
|||
if(m_tune) on_tuneButton_clicked();
|
||||
if(m_auto) on_autoButton_clicked();
|
||||
btxok=false;
|
||||
m_repeatMsg=0;
|
||||
}
|
||||
|
||||
void MainWindow::keyPressEvent( QKeyEvent *e ) //keyPressEvent
|
||||
|
|
@ -2403,6 +2406,7 @@ void MainWindow::on_bandComboBox_currentIndexChanged(int index)
|
|||
QString t=m_dFreq[index];
|
||||
m_dialFreq=t.toDouble();
|
||||
dialFreqChanged2(m_dialFreq);
|
||||
m_repeatMsg=0;
|
||||
if(m_catEnabled) {
|
||||
int nHz=int(1000000.0*m_dialFreq + 0.5);
|
||||
QString cmnd1,cmnd3;
|
||||
|
|
|
|||
|
|
@ -365,7 +365,7 @@ void morse_(char* msg, int* icw, int* ncw, int len);
|
|||
|
||||
//void rig_control(int nrig, int verbose);
|
||||
|
||||
void rigOpen(int nrig, int verbose);
|
||||
int rigOpen(int nrig, int verbose);
|
||||
void rigSetFreq(int fHz);
|
||||
int rigFreq();
|
||||
|
||||
|
|
|
|||
|
|
@ -1805,48 +1805,69 @@ p, li { white-space: pre-wrap; }
|
|||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="0">
|
||||
<item row="1" column="0">
|
||||
<widget class="QPushButton" name="pbCallCQ">
|
||||
<property name="text">
|
||||
<string>Call CQ</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<item row="2" column="0">
|
||||
<widget class="QPushButton" name="pbAnswerCaller">
|
||||
<property name="text">
|
||||
<string>Answer Caller</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<item row="2" column="1">
|
||||
<widget class="QPushButton" name="pbAnswerCQ">
|
||||
<property name="text">
|
||||
<string>Answer CQ</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<item row="3" column="0">
|
||||
<widget class="QPushButton" name="pbSendRRR">
|
||||
<property name="text">
|
||||
<string>Send RRR</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<item row="3" column="1">
|
||||
<widget class="QPushButton" name="pbSendReport">
|
||||
<property name="text">
|
||||
<string>Send Report</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<item row="4" column="0" colspan="2">
|
||||
<widget class="QPushButton" name="pbSend73">
|
||||
<property name="text">
|
||||
<string>Send 73</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="text">
|
||||
<string>Call CQ and
|
||||
answer callers</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="label_10">
|
||||
<property name="text">
|
||||
<string>Answering CQ</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
|
|
|
|||
Loading…
Reference in New Issue