From 5a8dce08ae766c58565eb3584642ce3176d836c7 Mon Sep 17 00:00:00 2001
From: Valentin Platzgummer <valentin.platzgummer@nt.tuwien.ac.at>
Date: Thu, 6 Feb 2020 14:13:25 +0100
Subject: [PATCH] WimaController::fetchContainerData() changed

---
 src/Wima/WimaController.cc    | 37 +++++++++++++++--------------------
 src/Wima/WimaDataContainer.cc |  5 +++++
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/Wima/WimaController.cc b/src/Wima/WimaController.cc
index 5803ed372..ee9c4a693 100644
--- a/src/Wima/WimaController.cc
+++ b/src/Wima/WimaController.cc
@@ -469,22 +469,22 @@ bool WimaController::fetchContainerData()
     _visualItems.clear();
     _missionItems.clearAndDeleteContents();
     _currentMissionItems.clearAndDeleteContents();
-    _waypointPath.clear();
     _currentWaypointPath.clear();
 
-    emit visualItemsChanged();
-    emit missionItemsChanged();
-    emit currentMissionItemsChanged();
-    emit currentWaypointPathChanged();
-
-    _localPlanDataValid = false;
+    _localPlanDataValid = false;    
 
-    if (_container == nullptr) {
+    QSharedPointer<const WimaPlanData> planData;
+    if (_container != nullptr) {
+        planData = _container->pull();
+    } else {
         qWarning("WimaController::fetchContainerData(): No container assigned!");
         return false;
     }
 
-    QSharedPointer<const WimaPlanData> planData = _container->pull();
+    // extract mission items
+    QList<QSharedPointer<const MissionItem>> tempMissionItems = planData->missionItems();
+    if (tempMissionItems.size() < 1)
+        return false;
 
     // extract list with WimaAreas
     QList<const WimaAreaData*> areaList = planData->areaList();
@@ -528,12 +528,12 @@ bool WimaController::fetchContainerData()
 
         if (areaCounter >= numAreas)
             break;
-    }
+    }    
 
-    // extract mission items
-    QList<QSharedPointer<const MissionItem>> tempMissionItems = planData->missionItems();
-    if (tempMissionItems.size() < 1)
+    if (areaCounter != numAreas) {
+        qWarning("WimaController::fetchContainerData(): areaCounter != numAreas");
         return false;
+    }
 
     // create mission items
     _missionController->removeAll();
@@ -553,12 +553,8 @@ bool WimaController::fetchContainerData()
         SimpleMissionItem *visualItemCopy = new SimpleMissionItem(*visualItem, true, this);
         _missionItems.append(visualItemCopy);
     }
-    if (areaCounter != numAreas)
-        return false;
-
-    if (!setTakeoffLandPosition())
-        return false;
 
+    setTakeoffLandPosition();
     updateWaypointPath();
 
     // set _nextPhaseStartWaypointIndex to 1
@@ -567,15 +563,14 @@ bool WimaController::fetchContainerData()
     _nextPhaseStartWaypointIndex.setRawValue(reverse? _missionItems.count() : int(1));
     connect(&_nextPhaseStartWaypointIndex,   &Fact::rawValueChanged, this, &WimaController::calcNextPhase);
 
+    /*
     if(!calcNextPhase())
         return false;
-
-
+    */
 
     emit visualItemsChanged();
     emit missionItemsChanged();
 
-
     _localPlanDataValid = true;
     return true;
 }
diff --git a/src/Wima/WimaDataContainer.cc b/src/Wima/WimaDataContainer.cc
index ada191081..b3ab1a220 100644
--- a/src/Wima/WimaDataContainer.cc
+++ b/src/Wima/WimaDataContainer.cc
@@ -18,7 +18,12 @@ void WimaDataContainer::push(QSharedPointer<const WimaPlanData> planData)
 {
     _planData = planData;
 
+    auto start = std::chrono::high_resolution_clock::now();
     emit newDataAvailable();
+    qWarning() << "WimaDataContainer::push"
+               << std::chrono::duration_cast<std::chrono::milliseconds>(
+                      std::chrono::high_resolution_clock::now()-start).count()
+               << " ms";
 }
 
 /*!
-- 
2.22.0