mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-10-31 15:47:10 -04:00
Fix two problems: sometime incorrect setting of RxFreq in WideGraph, and incorrect timestamp for FST4W-120 and FST4W-300 decodes in ALL.TXT.
This commit is contained in:
parent
542ffe8311
commit
9fe2fc6de0
@ -1893,8 +1893,12 @@ void MainWindow::on_monitorButton_clicked (bool checked)
|
||||
setXIT (ui->TxFreqSpinBox->value ());
|
||||
}
|
||||
// ensure FreqCal triggers
|
||||
if(m_mode=="FST4W") {
|
||||
on_sbFST4W_RxFreq_valueChanged(ui->sbFST4W_RxFreq->value());
|
||||
} else {
|
||||
on_RxFreqSpinBox_valueChanged (ui->RxFreqSpinBox->value ());
|
||||
}
|
||||
}
|
||||
//Get Configuration in/out of strict split and mode checking
|
||||
m_config.sync_transceiver (true, checked);
|
||||
} else {
|
||||
@ -3022,6 +3026,8 @@ void MainWindow::decode() //decode()
|
||||
dec_data.params.nutc=dec_data.params.nutc/100;
|
||||
}
|
||||
if(dec_data.params.nagain==0 && dec_data.params.newdat==1 && (!m_diskData)) {
|
||||
qint64 nperiods=now.toMSecsSinceEpoch()/(1000.0*m_TRperiod);
|
||||
m_dateTimeSeqStart=QDateTime::fromMSecsSinceEpoch(qint64(1000.0*nperiods*m_TRperiod)).toUTC();
|
||||
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
|
||||
int imin=ms/60000;
|
||||
int ihr=imin/60;
|
||||
@ -9101,13 +9107,8 @@ void MainWindow::write_all(QString txRx, QString message)
|
||||
t = t.asprintf("%5d",ui->TxFreqSpinBox->value());
|
||||
if (txRx=="Tx") msg=" 0 0.0" + t + " " + message;
|
||||
auto time = QDateTime::currentDateTimeUtc ();
|
||||
if( txRx=="Rx" ) {
|
||||
double tdec = fmod(double(time.time().second()),m_TRperiod);
|
||||
if( "MSK144" != m_mode && tdec < 0.5*m_TRperiod ) {
|
||||
tdec+=m_TRperiod;
|
||||
}
|
||||
time = time.addSecs(-tdec);
|
||||
}
|
||||
if( txRx=="Rx" ) time=m_dateTimeSeqStart;
|
||||
|
||||
t = t.asprintf("%10.3f ",m_freqNominal/1.e6);
|
||||
if (m_diskData) {
|
||||
if (m_fileDateTime.size()==11) {
|
||||
|
@ -660,6 +660,7 @@ private:
|
||||
QDateTime m_dateTimeSentTx3;
|
||||
QDateTime m_dateTimeRcvdRR73;
|
||||
QDateTime m_dateTimeBestSP;
|
||||
QDateTime m_dateTimeSeqStart; //Nominal start time of Rx sequence about to be decoded
|
||||
|
||||
QSharedMemory *mem_jt9;
|
||||
QString m_QSOText;
|
||||
|
@ -547,7 +547,8 @@ void CPlotter::DrawOverlay() //DrawOverlay()
|
||||
x1=XfromFreq(m_rxFreq-m_tol);
|
||||
x2=XfromFreq(m_rxFreq+m_tol);
|
||||
painter0.drawLine(x1,26,x2,26); // Mark the Tol range
|
||||
} }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(m_mode=="JT9" or m_mode=="JT65" or m_mode=="JT9+JT65" or
|
||||
|
Loading…
Reference in New Issue
Block a user