VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 10:05:46 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2096 from srcejon/freq_scanner

Browse Source 
Two bug fixes
This commit is contained in:
Edouard Griffiths 2024-04-30 15:28:52 +02:00 committed by GitHub
commit a31e83d43c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdrbase/util/ais.cpp
View File

@ -502,7 +502,7 @@ AISSafetyMessage::AISSafetyMessage(QByteArray ba) :
m_sequenceNumber = ba[4] & 0x3; m_sequenceNumber = ba[4] & 0x3;
m_destinationId = ((ba[5] & 0xff) << 22) | ((ba[6] & 0xff) << 14) | ((ba[7] & 0xff) << 6) | ((ba[8] >> 2) & 0x3f); m_destinationId = ((ba[5] & 0xff) << 22) | ((ba[6] & 0xff) << 14) | ((ba[7] & 0xff) << 6) | ((ba[8] >> 2) & 0x3f);
m_retransmitFlag = (ba[8] >> 1) & 0x1; m_retransmitFlag = (ba[8] >> 1) & 0x1;
m_safetyRelatedText = AISMessage::getString(ba, 9, 0, (ba.size() - 9) * 8 / 6); m_safetyRelatedText = AISMessage::getString(ba, 9, 8, (ba.size() - 9) * 8 / 6);
} }
QString AISSafetyMessage::toString() QString AISSafetyMessage::toString()
@ -518,7 +518,7 @@ AISSafetyAck::AISSafetyAck(QByteArray ba) :
AISSafetyBroadcast::AISSafetyBroadcast(QByteArray ba) : AISSafetyBroadcast::AISSafetyBroadcast(QByteArray ba) :
AISMessage(ba) AISMessage(ba)
{ {
m_safetyRelatedText = AISMessage::getString(ba, 5, 0, (ba.size() - 6) * 8 / 6); m_safetyRelatedText = AISMessage::getString(ba, 5, 8, (ba.size() - 5) * 8 / 6);
} }
QString AISSafetyBroadcast::toString() QString AISSafetyBroadcast::toString()

2
sdrgui/gui/valuedial.cpp
View File

@ -601,7 +601,7 @@ void ValueDial::keyPressEvent(QKeyEvent *value)
emit changed(m_valueNew); emit changed(m_valueNew);
m_cursor++; m_cursor++;
if (m_text[m_cursor] == m_groupSeparator) { if ((m_cursor >= 0) && (m_cursor < m_text.size()) && (m_text[m_cursor] == m_groupSeparator)) {
m_cursor++; m_cursor++;
} }