Skip to content

Q
qgroundcontrol
Commit 86d211ee authored by Lorenz Meier's avatar Lorenz Meier
Browse files
Options

Merge pull request #616 from gefink/master 

Mavlink Inspector array bug
parents 4ac07c37 ef33588a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
src/ui/QGCMAVLinkInspector.cc
View file @ 86d211ee
...@@ -224,7 +224,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -224,7 +224,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
...@@ -246,7 +246,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -246,7 +246,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
...@@ -268,7 +268,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -268,7 +268,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
...@@ -290,7 +290,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -290,7 +290,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
...@@ -312,7 +312,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -312,7 +312,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
...@@ -334,9 +334,9 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -334,9 +334,9 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
item->setData(2, Qt::DisplayRole, QString("float[%1]").arg(messageInfo[msgid].fields[fieldid].array_length)); item->setData(2, Qt::DisplayRole, QString("float[%1]").arg(messageInfo[msgid].fields[fieldid].array_length));
item->setData(1, Qt::DisplayRole, string); item->setData(1, Qt::DisplayRole, string);
...@@ -356,7 +356,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -356,7 +356,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
...@@ -378,7 +378,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -378,7 +378,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
...@@ -400,7 +400,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i ...@@ -400,7 +400,7 @@ void QGCMAVLinkInspector::updateField(int msgid, int fieldid, QTreeWidgetItem* i
// Enforce null termination // Enforce null termination
QString tmp("%1, "); QString tmp("%1, ");
QString string; QString string;
for (unsigned int j = 0; j < messageInfo[msgid].fields[j].array_length; ++j) for (unsigned int j = 0; j < messageInfo[msgid].fields[fieldid].array_length; ++j)
{ {
string += tmp.arg(nums[j]); string += tmp.arg(nums[j]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment