w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-26 18:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix report extraction from short code messages

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7826 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-07-09 20:45:45 +00:00
parent bd07faeec2
commit d899d11084
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
decodedtext.cpp
View File

@ -81,7 +81,7 @@ bool DecodedText::report(QString const& myBaseCall, QString const& dxBaseCall, /
{ {
QString msg=_string.mid(column_qsoText).trimmed(); QString msg=_string.mid(column_qsoText).trimmed();
if(msg.length() < 1) return false; if(msg.length() < 1) return false;
msg = msg.remove (QRegularExpression {"[<>]"}); msg = msg.left (22).remove (QRegularExpression {"[<>]"});
int i1=msg.indexOf('\r'); int i1=msg.indexOf('\r');
if (i1>0) if (i1>0)
msg=msg.left (i1-1); msg=msg.left (i1-1);

8
mainwindow.cpp
View File

@ -3099,6 +3099,11 @@ void MainWindow::guiUpdate()
auto t2 = QDateTime::currentDateTimeUtc ().toString ("hhmm"); auto t2 = QDateTime::currentDateTimeUtc ().toString ("hhmm");
icw[0] = 0; icw[0] = 0;
auto msg_parts = m_currentMessage.split (' ', QString::SkipEmptyParts); auto msg_parts = m_currentMessage.split (' ', QString::SkipEmptyParts);
if (msg_parts.size () > 2) {
// clean up short code forms
msg_parts[0].remove (QChar {'<'});
msg_parts[1].remove (QChar {'>'});
}
auto is_73 = message_is_73 (m_currentMessageType, msg_parts); auto is_73 = message_is_73 (m_currentMessageType, msg_parts);
m_sentFirst73 = is_73 m_sentFirst73 = is_73
&& !message_is_73 (m_lastMessageType, m_lastMessageSent.split (' ', QString::SkipEmptyParts)); && !message_is_73 (m_lastMessageType, m_lastMessageSent.split (' ', QString::SkipEmptyParts));
@ -3125,7 +3130,8 @@ void MainWindow::guiUpdate()
} }
} }
if (m_currentMessageType < 6 && msg_parts.length() >= 3 if ((m_currentMessageType < 6 || 7 == m_currentMessageType)
&& msg_parts.length() >= 3
&& (msg_parts[1] == m_config.my_callsign () || && (msg_parts[1] == m_config.my_callsign () ||
msg_parts[1] == m_baseCall)) msg_parts[1] == m_baseCall))
{ {