root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-10-06 06:43:22 +02:00
Code Issues Projects Releases Activity

Refactoring

Browse Source
This commit is contained in:
Martin Tůma 2016-11-03 07:37:17 +01:00
parent 4b66aaa78b
commit 62ff4bb7c4
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/fitparser.cpp
View File

@ -106,16 +106,16 @@ bool FITParser::parseDefinitionMessage(quint8 header)
_endian = def->endian; _endian = def->endian;
// global message number // global message number
if (!readValue(def->global_id)) if (!readValue(def->globalId))
return false; return false;
// number of records // number of records
if (!readValue(def->num_fields)) if (!readValue(def->numFields))
return false; return false;
// definition records // definition records
def->fields = new Field[def->num_fields]; def->fields = new Field[def->numFields];
for (i = 0; i < def->num_fields; i++) { for (i = 0; i < def->numFields; i++) {
if (!readData((char*)&(def->fields[i]), sizeof(def->fields[i]))) if (!readData((char*)&(def->fields[i]), sizeof(def->fields[i])))
return false; return false;
_len -= sizeof(def->fields[i]); _len -= sizeof(def->fields[i]);
@ -180,14 +180,14 @@ bool FITParser::parseData(MessageDefinition *def, quint8 offset)
_endian = def->endian; _endian = def->endian;
for (i = 0; i < def->num_fields; i++) { for (i = 0; i < def->numFields; i++) {
field = &def->fields[i]; field = &def->fields[i];
if (!readField(field, val)) if (!readField(field, val))
return false; return false;
if (field->id == TIMESTAMP_FIELD) if (field->id == TIMESTAMP_FIELD)
_timestamp = timestamp = val; _timestamp = timestamp = val;
else if (def->global_id == RECORD_MESSAGE) { else if (def->globalId == RECORD_MESSAGE) {
switch (field->id) { switch (field->id) {
case 0: case 0:
if (val != 0x7fffffff) if (val != 0x7fffffff)
@ -222,7 +222,7 @@ bool FITParser::parseData(MessageDefinition *def, quint8 offset)
} }
} }
if (def->global_id == RECORD_MESSAGE) { if (def->globalId == RECORD_MESSAGE) {
if (trackpoint.coordinates().isValid()) { if (trackpoint.coordinates().isValid()) {
trackpoint.setTimestamp(QDateTime::fromTime_t(timestamp trackpoint.setTimestamp(QDateTime::fromTime_t(timestamp
+ 631065600)); + 631065600));
@ -290,9 +290,9 @@ bool FITParser::parseHeader()
return false; return false;
} }
_len = qFromLittleEndian(hdr.data_size); _len = qFromLittleEndian(hdr.dataSize);
if (hdr.header_size > sizeof(hdr)) if (hdr.headerSize > sizeof(hdr))
if (!readData((char *)&crc, sizeof(crc))) if (!readData((char *)&crc, sizeof(crc)))
return false; return false;

12
src/fitparser.h
View File

@ -16,10 +16,10 @@ public:
private: private:
typedef struct { typedef struct {
quint8 header_size; quint8 headerSize;
quint8 protocol_version; quint8 protocolVersion;
quint16 profile_version; quint16 profileVersion;
quint32 data_size; quint32 dataSize;
quint32 magic; quint32 magic;
} FileHeader; } FileHeader;
@ -31,8 +31,8 @@ private:
typedef struct { typedef struct {
quint8 endian; quint8 endian;
quint16 global_id; quint16 globalId;
quint8 num_fields; quint8 numFields;
Field *fields; Field *fields;
} MessageDefinition; } MessageDefinition;