Commit 6e79cdb7 authored by DonLakeFlyer's avatar DonLakeFlyer

Fix lastSequenceNumber and mission item generation

parent 7058f175
...@@ -66,7 +66,7 @@ int CorridorScanComplexItem::lastSequenceNumber(void) const ...@@ -66,7 +66,7 @@ int CorridorScanComplexItem::lastSequenceNumber(void) const
{ {
int itemCount = _transectPoints.count(); // Each transpect point represents a waypoint item int itemCount = _transectPoints.count(); // Each transpect point represents a waypoint item
if (_cameraTriggerInTurnAroundFact.rawValue().toDouble()) { if (_cameraTriggerInTurnAroundFact.rawValue().toBool()) {
// Only one camera start and on camera stop // Only one camera start and on camera stop
itemCount += 2; itemCount += 2;
} else { } else {
...@@ -74,7 +74,7 @@ int CorridorScanComplexItem::lastSequenceNumber(void) const ...@@ -74,7 +74,7 @@ int CorridorScanComplexItem::lastSequenceNumber(void) const
itemCount += _transectCount() * 2; itemCount += _transectCount() * 2;
} }
return _sequenceNumber + itemCount; return _sequenceNumber + itemCount - 1;
} }
void CorridorScanComplexItem::save(QJsonArray& missionItems) void CorridorScanComplexItem::save(QJsonArray& missionItems)
...@@ -163,7 +163,7 @@ void CorridorScanComplexItem::appendMissionItems(QList<MissionItem*>& items, QOb ...@@ -163,7 +163,7 @@ void CorridorScanComplexItem::appendMissionItems(QList<MissionItem*>& items, QOb
{ {
int seqNum = _sequenceNumber; int seqNum = _sequenceNumber;
int pointIndex = 0; int pointIndex = 0;
bool imagesEverywhere = _cameraTriggerInTurnAroundFact.rawValue().toDouble(); bool imagesEverywhere = _cameraTriggerInTurnAroundFact.rawValue().toBool();
while (pointIndex < _transectPoints.count()) { while (pointIndex < _transectPoints.count()) {
if (_hasTurnaround()) { if (_hasTurnaround()) {
...@@ -182,7 +182,7 @@ void CorridorScanComplexItem::appendMissionItems(QList<MissionItem*>& items, QOb ...@@ -182,7 +182,7 @@ void CorridorScanComplexItem::appendMissionItems(QList<MissionItem*>& items, QOb
false, // isCurrentItem false, // isCurrentItem
missionItemParent); missionItemParent);
items.append(item); items.append(item);
if (imagesEverywhere) { if (imagesEverywhere && pointIndex == 1) {
item = new MissionItem(seqNum++, item = new MissionItem(seqNum++,
MAV_CMD_DO_SET_CAM_TRIGG_DIST, MAV_CMD_DO_SET_CAM_TRIGG_DIST,
MAV_FRAME_MISSION, MAV_FRAME_MISSION,
......
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