Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
19b98503
Commit
19b98503
authored
Jan 09, 2020
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
befor QList -> QVector
parent
0cdd04cc
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4925 additions
and
224 deletions
+4925
-224
KlingenbachTest.wima
Paths/KlingenbachTest.wima
+4915
-214
ToDo.txt
ToDo.txt
+0
-5
qgroundcontrol.pro
qgroundcontrol.pro
+2
-1
TransectStyleComplexItem.cc
src/MissionManager/TransectStyleComplexItem.cc
+2
-3
CircularSurveyComplexItem.cc
src/Wima/CircularSurveyComplexItem.cc
+6
-1
No files found.
Paths/KlingenbachTest.wima
View file @
19b98503
This diff is collapsed.
Click to expand it.
ToDo.txt
deleted
100644 → 0
View file @
0cdd04cc
(improve) optimisation circular survey
profile survey
add dijkstra to flight view
add save and load to circular survey
qgroundcontrol.pro
View file @
19b98503
...
...
@@ -27,7 +27,8 @@ QGCROOT = $$PWD
DebugBuild
{
DESTDIR
=
$$
{
OUT_PWD
}
/
debug
}
else
{
}
else
{
DESTDIR
=
$$
{
OUT_PWD
}
/
release
}
...
...
src/MissionManager/TransectStyleComplexItem.cc
View file @
19b98503
...
...
@@ -357,10 +357,9 @@ void TransectStyleComplexItem::_rebuildTransects(void)
return
;
}
CALLGRIND_START_INSTRUMENTATION
;
CALLGRIND_TOGGLE_COLLECT
;
//CALLGRIND_TOGGLE_COLLECT;
_rebuildTransectsPhase1
();
CALLGRIND_TOGGLE_COLLECT
;
//
CALLGRIND_TOGGLE_COLLECT;
if
(
_followTerrain
)
{
// Query the terrain data. Once available terrain heights will be calculated
...
...
src/Wima/CircularSurveyComplexItem.cc
View file @
19b98503
#include "CircularSurveyComplexItem.h"
#include "JsonHelper.h"
#include "QGCApplication.h"
#include <chrono>
const
char
*
CircularSurveyComplexItem
::
settingsGroup
=
"CircularSurvey"
;
...
...
@@ -364,6 +365,7 @@ void CircularSurveyComplexItem::_rebuildTransectsPhase1()
using
namespace
GeoUtilities
;
using
namespace
PolygonCalculus
;
using
namespace
PlanimetryCalculus
;
auto
startTime
=
std
::
chrono
::
high_resolution_clock
::
now
();
// rebuild not necessary?
if
(
!
_isInitialized
||
_referencePointBeingChanged
)
...
...
@@ -628,7 +630,10 @@ void CircularSurveyComplexItem::_rebuildTransectsPhase1()
_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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment