w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 04:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Increased NetworkMessage schema number and Qt serialization format

Browse Source 
The Qt_5_0  QDataStream serialization  format is  buggy, moved  to the
Qt_5_2 format.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5231 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-04-16 22:17:14 +00:00
parent 84cd4b7036
commit 26137ac1b1
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NetworkMessage.cpp
View File

@ -25,7 +25,7 @@ namespace NetworkMessage
{ {
*this << magic; *this << magic;
*this << schema_number; *this << schema_number;
setVersion (QDataStream::Qt_5_0); // Qt schema version setVersion (QDataStream::Qt_5_2); // Qt schema version
*this << static_cast<quint32> (type) << id.toUtf8 (); *this << static_cast<quint32> (type) << id.toUtf8 ();
} }
@ -49,6 +49,10 @@ namespace NetworkMessage
{ {
parent->setVersion (QDataStream::Qt_5_0); parent->setVersion (QDataStream::Qt_5_0);
} }
else if (schema_ <= 2)
{
parent->setVersion (QDataStream::Qt_5_2);
}
quint32 type; quint32 type;
*parent >> type >> id_; *parent >> type >> id_;
if (type >= maximum_message_type_) if (type >= maximum_message_type_)

23
NetworkMessage.hpp
View File

@ -6,7 +6,9 @@
* ====================== * ======================
* *
* All messages are written or read using the QDataStream derivatives * All messages are written or read using the QDataStream derivatives
* defined below. * defined below, note that we are using the default for floating
* point precision which means all are double precision i.e. 64-bit
* IEEE format.
* *
* Message is big endian format * Message is big endian format
* *
@ -22,7 +24,20 @@
* *
* http://doc.qt.io/qt-5/datastreamformat.html * http://doc.qt.io/qt-5/datastreamformat.html
* *
* for the serialization details for each type. * for the serialization details for each type, at the time of
* writing the above document is for Qt_5_0 format which is buggy
* so we use Qt_5_2 format, differences are:
*
* QDateTime:
* QDate qint64 Julian day number
* QTime quint32 Milli-seconds since midnight
* timespec quint8 0=local, 1=UTC, 2=Offset from UTC
* (seconds)
* 3=time zone
* offset qint32 only present if timespec=2
* timezone several-fields only present if timespec=3
*
* we will avoid using QDateTime fields with time zones for simplicity.
* *
* Type utf8 is a utf-8 byte string formatted as a QByteArray for * Type utf8 is a utf-8 byte string formatted as a QByteArray for
* serialization purposes (currently a quint32 size followed by size * serialization purposes (currently a quint32 size followed by size
@ -49,7 +64,7 @@
* New bool * New bool
* Time QTime * Time QTime
* snr qint32 * snr qint32
* Delta time (S) float * Delta time (S) float (serialized as double)
* Delta frequency (Hz) quint32 * Delta frequency (Hz) quint32
* Mode utf8 * Mode utf8
* Message utf8 * Message utf8
@ -124,7 +139,7 @@ namespace NetworkMessage
// increment this if a newer Qt schema is required and add decode // increment this if a newer Qt schema is required and add decode
// logic to InputMessageStream below // logic to InputMessageStream below
static quint32 constexpr schema_number {1}; static quint32 constexpr schema_number {2};
explicit Builder (QIODevice *, Type, QString const& id); explicit Builder (QIODevice *, Type, QString const& id);
explicit Builder (QByteArray *, Type, QString const& id); explicit Builder (QByteArray *, Type, QString const& id);