mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-08-04 23:22:26 -04:00
Improve ALL.TXT formatting for JT9/JT65. Thank you to Sandro, IW3RAB, for submitting this fix.
This commit is contained in:
parent
50eb2914af
commit
dc66304a65
@ -8656,7 +8656,23 @@ void MainWindow::write_all(QString txRx, QString message)
|
|||||||
{
|
{
|
||||||
QString line;
|
QString line;
|
||||||
QString t;
|
QString t;
|
||||||
QString msg=message.mid(6,-1);
|
QString msg;
|
||||||
|
QString mode_string;
|
||||||
|
|
||||||
|
if (message[4]==' ') {
|
||||||
|
msg=message.mid(4,-1);
|
||||||
|
} else {
|
||||||
|
msg=message.mid(6,-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (message[19]=='#') {
|
||||||
|
mode_string="JT65 ";
|
||||||
|
} else if (message[19]=='@') {
|
||||||
|
mode_string="JT9 ";
|
||||||
|
} else {
|
||||||
|
mode_string=m_mode.leftJustified(6,' ');
|
||||||
|
}
|
||||||
|
|
||||||
msg=msg.mid(0,15) + msg.mid(18,-1);
|
msg=msg.mid(0,15) + msg.mid(18,-1);
|
||||||
|
|
||||||
t.sprintf("%5d",ui->TxFreqSpinBox->value());
|
t.sprintf("%5d",ui->TxFreqSpinBox->value());
|
||||||
@ -8665,9 +8681,13 @@ void MainWindow::write_all(QString txRx, QString message)
|
|||||||
time = time.addSecs(-(time.time().second() % m_TRperiod));
|
time = time.addSecs(-(time.time().second() % m_TRperiod));
|
||||||
t.sprintf("%10.3f ",m_freqNominal/1.e6);
|
t.sprintf("%10.3f ",m_freqNominal/1.e6);
|
||||||
if (m_diskData) {
|
if (m_diskData) {
|
||||||
line=m_fileDateTime + t + txRx + " " + m_mode.leftJustified(6,' ') + msg;
|
if (m_fileDateTime.size()==11) {
|
||||||
|
line=m_fileDateTime + " " + t + txRx + " " + mode_string + msg;
|
||||||
} else {
|
} else {
|
||||||
line=time.toString("yyMMdd_hhmmss") + t + txRx + " " + m_mode.leftJustified(6,' ') + msg;
|
line=m_fileDateTime + t + txRx + " " + mode_string + msg;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
line=time.toString("yyMMdd_hhmmss") + t + txRx + " " + mode_string + msg;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString file_name="ALL.TXT";
|
QString file_name="ALL.TXT";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user