Commit 19b98503 authored by Valentin Platzgummer's avatar Valentin Platzgummer

befor QList -> QVector

parent 0cdd04cc
This diff is collapsed.
(improve) optimisation circular survey
profile survey
add dijkstra to flight view
add save and load to circular survey
...@@ -27,7 +27,8 @@ QGCROOT = $$PWD ...@@ -27,7 +27,8 @@ QGCROOT = $$PWD
DebugBuild { DebugBuild {
DESTDIR = $${OUT_PWD}/debug DESTDIR = $${OUT_PWD}/debug
} else { }
else {
DESTDIR = $${OUT_PWD}/release DESTDIR = $${OUT_PWD}/release
} }
......
...@@ -357,10 +357,9 @@ void TransectStyleComplexItem::_rebuildTransects(void) ...@@ -357,10 +357,9 @@ void TransectStyleComplexItem::_rebuildTransects(void)
return; return;
} }
CALLGRIND_START_INSTRUMENTATION; //CALLGRIND_TOGGLE_COLLECT;
CALLGRIND_TOGGLE_COLLECT;
_rebuildTransectsPhase1(); _rebuildTransectsPhase1();
CALLGRIND_TOGGLE_COLLECT; //CALLGRIND_TOGGLE_COLLECT;
if (_followTerrain) { if (_followTerrain) {
// Query the terrain data. Once available terrain heights will be calculated // Query the terrain data. Once available terrain heights will be calculated
......
#include "CircularSurveyComplexItem.h" #include "CircularSurveyComplexItem.h"
#include "JsonHelper.h" #include "JsonHelper.h"
#include "QGCApplication.h" #include "QGCApplication.h"
#include <chrono>
const char* CircularSurveyComplexItem::settingsGroup = "CircularSurvey"; const char* CircularSurveyComplexItem::settingsGroup = "CircularSurvey";
...@@ -364,6 +365,7 @@ void CircularSurveyComplexItem::_rebuildTransectsPhase1() ...@@ -364,6 +365,7 @@ void CircularSurveyComplexItem::_rebuildTransectsPhase1()
using namespace GeoUtilities; using namespace GeoUtilities;
using namespace PolygonCalculus; using namespace PolygonCalculus;
using namespace PlanimetryCalculus; using namespace PlanimetryCalculus;
auto startTime = std::chrono::high_resolution_clock::now();
// rebuild not necessary? // rebuild not necessary?
if (!_isInitialized || _referencePointBeingChanged) if (!_isInitialized || _referencePointBeingChanged)
...@@ -628,7 +630,10 @@ void CircularSurveyComplexItem::_rebuildTransectsPhase1() ...@@ -628,7 +630,10 @@ void CircularSurveyComplexItem::_rebuildTransectsPhase1()
_transects.append(transectList); _transects.append(transectList);
} }
qDebug() << "CircularSurveyComplexItem::_rebuildTransectsPhase1(): " << _updateCounter; qDebug() << "CircularSurveyComplexItem::_rebuildTransectsPhase1(): calls: " << _updateCounter;
auto delta = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - startTime).count();
qDebug() << "CircularSurveyComplexItem::_rebuildTransectsPhase1(): time: " << delta;
qDebug() << sizeof(QPointF);
} }
......
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