From 85ad87bbed48950dd1df4a63fe9c3496b17f47db Mon Sep 17 00:00:00 2001
From: Thomas Gubler <thomasgubler@gmail.com>
Date: Sun, 19 Aug 2018 11:51:43 +0200
Subject: [PATCH] [Survey transects generation] move some of the logic handling
 out of function that handles only one polygon

---
 src/MissionManager/SurveyComplexItem.cc | 24 +++++++++++++-----------
 src/MissionManager/SurveyComplexItem.h  |  3 ++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/MissionManager/SurveyComplexItem.cc b/src/MissionManager/SurveyComplexItem.cc
index 769d94666..f083533ed 100644
--- a/src/MissionManager/SurveyComplexItem.cc
+++ b/src/MissionManager/SurveyComplexItem.cc
@@ -1067,11 +1067,6 @@ void SurveyComplexItem::_rebuildTransectsPhase1(void)
 }
 
 void SurveyComplexItem::_rebuildTransectsPhase1Worker(bool refly)
-{
-    _rebuildTranscetsFromPolygon(refly);
-}
-
-void SurveyComplexItem::_rebuildTranscetsFromPolygon(bool refly)
 {
     if (_ignoreRecalc) {
         return;
@@ -1112,6 +1107,19 @@ void SurveyComplexItem::_rebuildTranscetsFromPolygon(bool refly)
         qCDebug(SurveyComplexItemLog) << "_rebuildTransectsPhase1 vertex:x:y" << vertex << polygonPoints.last().x() << polygonPoints.last().y();
     }
 
+    // convert into QPolygonF
+    QPolygonF polygon;
+    for (int i=0; i<polygonPoints.count(); i++) {
+        qCDebug(SurveyComplexItemLog) << "Vertex" << polygonPoints[i];
+        polygon << polygonPoints[i];
+    }
+    polygon << polygonPoints[0];
+
+    _rebuildTranscetsFromPolygon(refly, polygon, tangentOrigin);
+}
+
+void SurveyComplexItem::_rebuildTranscetsFromPolygon(bool refly, const QPolygonF& polygon, const QGeoCoordinate& tangentOrigin)
+{
     // Generate transects
 
     double gridAngle = _gridAngleFact.rawValue().toDouble();
@@ -1126,12 +1134,6 @@ void SurveyComplexItem::_rebuildTranscetsFromPolygon(bool refly)
     // Convert polygon to bounding rect
 
     qCDebug(SurveyComplexItemLog) << "_rebuildTransectsPhase1 Polygon";
-    QPolygonF polygon;
-    for (int i=0; i<polygonPoints.count(); i++) {
-        qCDebug(SurveyComplexItemLog) << "Vertex" << polygonPoints[i];
-        polygon << polygonPoints[i];
-    }
-    polygon << polygonPoints[0];
     QRectF boundingRect = polygon.boundingRect();
     QPointF boundingCenter = boundingRect.center();
     qCDebug(SurveyComplexItemLog) << "Bounding rect" << boundingRect.topLeft().x() << boundingRect.topLeft().y() << boundingRect.bottomRight().x() << boundingRect.bottomRight().y();
diff --git a/src/MissionManager/SurveyComplexItem.h b/src/MissionManager/SurveyComplexItem.h
index 2d63a8b52..85cf34df6 100644
--- a/src/MissionManager/SurveyComplexItem.h
+++ b/src/MissionManager/SurveyComplexItem.h
@@ -111,7 +111,8 @@ private:
     bool _loadV3(const QJsonObject& complexObject, int sequenceNumber, QString& errorString);
     bool _loadV4(const QJsonObject& complexObject, int sequenceNumber, QString& errorString);
     void _rebuildTransectsPhase1Worker(bool refly);
-    void _rebuildTranscetsFromPolygon(bool refly); ///< Adds to the _transects array from one polygon
+    /// Adds to the _transects array from one polygon
+    void _rebuildTranscetsFromPolygon(bool refly, const QPolygonF& polygon, const QGeoCoordinate& tangentOrigin);
 
     QMap<QString, FactMetaData*> _metaDataMap;
 
-- 
2.22.0