diff --git a/src/configuration.h b/src/configuration.h index 4ccd351b176422c1240e9c179ff29b3e6ce6d0da..014266f37ab98202e717e5aa7fe137259cd08974 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -12,7 +12,7 @@ #define WITH_TEXT_TO_SPEECH 1 #define QGC_APPLICATION_NAME "QGroundControl" -#define QGC_APPLICATION_VERSION "v. 1.0.0 (Alpha RC3)" +#define QGC_APPLICATION_VERSION "v. 1.0.0 (Alpha RC16)" namespace QGC diff --git a/src/libs/opmapcontrol/src/core/pureimagecache.cpp b/src/libs/opmapcontrol/src/core/pureimagecache.cpp index be38fcbfa1a84a55d4d8173ee27b0fdf79b2d793..de648fb276cf0f97acca787819ec63452daaa717 100644 --- a/src/libs/opmapcontrol/src/core/pureimagecache.cpp +++ b/src/libs/opmapcontrol/src/core/pureimagecache.cpp @@ -226,31 +226,25 @@ namespace core { qDebug()<<"Cache dir="<sysid, QString("%1.%2").arg(name).arg(j), fieldType, nums[j], time); + emit valueChanged(msg->sysid, QString("%1.%2").arg(name).arg(j), fieldType, (quint64) nums[j], time); } } else @@ -255,7 +255,7 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 // Single value uint64_t n = *((uint64_t*)(m+messageInfo[msgid].fields[fieldid].wire_offset)); fieldType = "uint64_t"; - emit valueChanged(msg->sysid, name, fieldType, n, time); + emit valueChanged(msg->sysid, name, fieldType, (quint64) n, time); } break; case MAVLINK_TYPE_INT64_T: @@ -265,7 +265,7 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 fieldType = QString("int64_t[%1]").arg(messageInfo[msgid].fields[fieldid].array_length); for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) { - emit valueChanged(msg->sysid, QString("%1.%2").arg(name).arg(j), fieldType, nums[j], time); + emit valueChanged(msg->sysid, QString("%1.%2").arg(name).arg(j), fieldType, (qint64) nums[j], time); } } else @@ -273,7 +273,7 @@ void MAVLinkDecoder::emitFieldValue(mavlink_message_t* msg, int fieldid, quint64 // Single value int64_t n = *((int64_t*)(m+messageInfo[msgid].fields[fieldid].wire_offset)); fieldType = "int64_t"; - emit valueChanged(msg->sysid, name, fieldType, n, time); + emit valueChanged(msg->sysid, name, fieldType, (qint64) n, time); } break; } diff --git a/src/ui/QGCMAVLinkInspector.cc b/src/ui/QGCMAVLinkInspector.cc index 3a13ed5ebf2e71955a1381f85d396cf3f6a5fcaa..eb99b89cbf4073a78d96c6e6250b82bce78dd24f 100644 --- a/src/ui/QGCMAVLinkInspector.cc +++ b/src/ui/QGCMAVLinkInspector.cc @@ -298,7 +298,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i // Single value uint64_t n = *((uint64_t*)(m+messageInfo[msgid].fields[fieldid].wire_offset)); item->setData(2, Qt::DisplayRole, "uint64_t"); - item->setData(1, Qt::DisplayRole, n); + item->setData(1, Qt::DisplayRole, (quint64) n); } break; case MAVLINK_TYPE_INT64_T: @@ -320,7 +320,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i // Single value int64_t n = *((int64_t*)(m+messageInfo[msgid].fields[fieldid].wire_offset)); item->setData(2, Qt::DisplayRole, "int64_t"); - item->setData(1, Qt::DisplayRole, n); + item->setData(1, Qt::DisplayRole, (qint64) n); } break; }