rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-04-10 02:02:21 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/msmith/OP-597' into next

Browse Source
This commit is contained in:
James Cotton 2011-12-10 14:11:11 -06:00
commit 4c7919d319
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,3 +1,5 @@
# Exclude temporary and system files
.DS_Store
# /flight/ # /flight/
/flight/*.pnproj /flight/*.pnproj

8
ground/uavobjgenerator/uavobjectparser.cpp
View File

@ -111,6 +111,11 @@ int UAVObjectParser::getNumBytes(int objIndex)
} }
} }
bool fieldTypeLessThan(const FieldInfo* f1, const FieldInfo* f2)
{
return f1->numBytes > f2->numBytes;
}
/** /**
* Parse supplied XML file * Parse supplied XML file
* @param xml The xml text * @param xml The xml text
@ -200,6 +205,9 @@ QString UAVObjectParser::parseXML(QString& xml, QString& filename)
// Get next element // Get next element
childNode = childNode.nextSibling(); childNode = childNode.nextSibling();
} }
// Sort all fields according to size
qStableSort(info->fields.begin(), info->fields.end(), fieldTypeLessThan);
// Make sure that required elements were found // Make sure that required elements were found
if ( !accessFound ) if ( !accessFound )