Commit eecef884 authored by Don Gagne's avatar Don Gagne

parent 0a205d71
...@@ -466,12 +466,17 @@ void CorridorScanComplexItem::_rebuildTransectsPhase2(void) ...@@ -466,12 +466,17 @@ void CorridorScanComplexItem::_rebuildTransectsPhase2(void)
_complexDistance += _visualTransectPoints[i].value<QGeoCoordinate>().distanceTo(_visualTransectPoints[i+1].value<QGeoCoordinate>()); _complexDistance += _visualTransectPoints[i].value<QGeoCoordinate>().distanceTo(_visualTransectPoints[i+1].value<QGeoCoordinate>());
} }
double triggerDistance = _cameraCalc.adjustedFootprintFrontal()->rawValue().toDouble();
if (triggerDistance == 0) {
_cameraShots = 0;
} else {
if (_cameraTriggerInTurnAroundFact.rawValue().toBool()) { if (_cameraTriggerInTurnAroundFact.rawValue().toBool()) {
_cameraShots = qCeil(_complexDistance / _cameraCalc.adjustedFootprintFrontal()->rawValue().toDouble()); _cameraShots = qCeil(_complexDistance / triggerDistance);
} else { } else {
int singleTransectImageCount = qCeil(_corridorPolyline.length() / _cameraCalc.adjustedFootprintFrontal()->rawValue().toDouble()); int singleTransectImageCount = qCeil(_corridorPolyline.length() / triggerDistance);
_cameraShots = singleTransectImageCount * _transectCount(); _cameraShots = singleTransectImageCount * _transectCount();
} }
}
_coordinate = _visualTransectPoints.count() ? _visualTransectPoints.first().value<QGeoCoordinate>() : QGeoCoordinate(); _coordinate = _visualTransectPoints.count() ? _visualTransectPoints.first().value<QGeoCoordinate>() : QGeoCoordinate();
_exitCoordinate = _visualTransectPoints.count() ? _visualTransectPoints.last().value<QGeoCoordinate>() : QGeoCoordinate(); _exitCoordinate = _visualTransectPoints.count() ? _visualTransectPoints.last().value<QGeoCoordinate>() : QGeoCoordinate();
......
...@@ -433,6 +433,12 @@ void StructureScanComplexItem::_rebuildFlightPolygon(void) ...@@ -433,6 +433,12 @@ void StructureScanComplexItem::_rebuildFlightPolygon(void)
void StructureScanComplexItem::_recalcCameraShots(void) void StructureScanComplexItem::_recalcCameraShots(void)
{ {
double triggerDistance = _cameraCalc.adjustedFootprintSide()->rawValue().toDouble();
if (triggerDistance == 0) {
_setCameraShots(0);
return;
}
if (_flightPolygon.count() < 3) { if (_flightPolygon.count() < 3) {
_setCameraShots(0); _setCameraShots(0);
return; return;
...@@ -450,7 +456,7 @@ void StructureScanComplexItem::_recalcCameraShots(void) ...@@ -450,7 +456,7 @@ void StructureScanComplexItem::_recalcCameraShots(void)
return; return;
} }
int cameraShots = distance / _cameraCalc.adjustedFootprintSide()->rawValue().toDouble(); int cameraShots = distance / triggerDistance;
_setCameraShots(cameraShots * _layersFact.rawValue().toInt()); _setCameraShots(cameraShots * _layersFact.rawValue().toInt());
} }
......
...@@ -1289,6 +1289,9 @@ void SurveyComplexItem::_rebuildTransectsPhase2(void) ...@@ -1289,6 +1289,9 @@ void SurveyComplexItem::_rebuildTransectsPhase2(void)
_complexDistance += _visualTransectPoints[i].value<QGeoCoordinate>().distanceTo(_visualTransectPoints[i+1].value<QGeoCoordinate>()); _complexDistance += _visualTransectPoints[i].value<QGeoCoordinate>().distanceTo(_visualTransectPoints[i+1].value<QGeoCoordinate>());
} }
if (triggerDistance() == 0) {
_cameraShots = 0;
} else {
if (_cameraTriggerInTurnAroundFact.rawValue().toBool()) { if (_cameraTriggerInTurnAroundFact.rawValue().toBool()) {
_cameraShots = qCeil(_complexDistance / triggerDistance()); _cameraShots = qCeil(_complexDistance / triggerDistance());
} else { } else {
...@@ -1305,6 +1308,7 @@ void SurveyComplexItem::_rebuildTransectsPhase2(void) ...@@ -1305,6 +1308,7 @@ void SurveyComplexItem::_rebuildTransectsPhase2(void)
_cameraShots += qCeil(firstCameraCoord.distanceTo(lastCameraCoord) / triggerDistance()); _cameraShots += qCeil(firstCameraCoord.distanceTo(lastCameraCoord) / triggerDistance());
} }
} }
}
_coordinate = _visualTransectPoints.count() ? _visualTransectPoints.first().value<QGeoCoordinate>() : QGeoCoordinate(); _coordinate = _visualTransectPoints.count() ? _visualTransectPoints.first().value<QGeoCoordinate>() : QGeoCoordinate();
_exitCoordinate = _visualTransectPoints.count() ? _visualTransectPoints.last().value<QGeoCoordinate>() : QGeoCoordinate(); _exitCoordinate = _visualTransectPoints.count() ? _visualTransectPoints.last().value<QGeoCoordinate>() : QGeoCoordinate();
......
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