Browse Source

Fix circular polyons (#9132)

QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
2968b6a20f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/MissionManager/QGCMapPolygonVisuals.qml
  2. 2
      src/MissionManager/TransectStyleComplexItem.cc

2
src/MissionManager/QGCMapPolygonVisuals.qml

@ -145,7 +145,7 @@ Item { @@ -145,7 +145,7 @@ Item {
var width = initialVertices[0].distanceTo(initialVertices[1])
var height = initialVertices[1].distanceTo(initialVertices[2])
var radius = Math.min(width, height) / 2
var center = initialVertices[4]
var center = initialVertices[0].atDistanceAndAzimuth(width / 2, 90).atDistanceAndAzimuth(height / 2, 180)
_createCircularPolygon(center, radius)
}

2
src/MissionManager/TransectStyleComplexItem.cc

@ -628,7 +628,7 @@ TransectStyleComplexItem::ReadyForSaveState TransectStyleComplexItem::readyForSa @@ -628,7 +628,7 @@ TransectStyleComplexItem::ReadyForSaveState TransectStyleComplexItem::readyForSa
terrainReady = true;
}
bool polygonNotReady = !_surveyAreaPolygon.isValid();
qDebug() << polygonNotReady << _wizardMode << terrainReady;
//qDebug() << polygonNotReady << _wizardMode << terrainReady;
return (polygonNotReady || _wizardMode) ?
NotReadyForSaveData :
(terrainReady ? ReadyForSave : NotReadyForSaveTerrain);

Loading…
Cancel
Save