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
bad9ed57
Commit
bad9ed57
authored
Aug 17, 2017
by
Don Gagne
Committed by
GitHub
Aug 17, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5587 from DonLakeFlyer/SurvetFixes
Survey fixes
parents
a38d8e23
fc25bd3e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
4 deletions
+24
-4
SurveyMissionItem.cc
src/MissionManager/SurveyMissionItem.cc
+6
-2
SurveyItemEditor.qml
src/PlanView/SurveyItemEditor.qml
+18
-0
OfflineMap.qml
src/QtLocationPlugin/QMLControl/OfflineMap.qml
+0
-2
No files found.
src/MissionManager/SurveyMissionItem.cc
View file @
bad9ed57
...
...
@@ -747,7 +747,9 @@ void SurveyMissionItem::_generateGrid(void)
_setSurveyDistance
(
surveyDistance
);
if
(
cameraShots
==
0
&&
_triggerCamera
())
{
cameraShots
=
(
int
)
ceil
(
surveyDistance
/
_triggerDistance
());
cameraShots
=
(
int
)
floor
(
surveyDistance
/
_triggerDistance
());
// Take into account immediate camera trigger at waypoint entry
cameraShots
++
;
}
_setCameraShots
(
cameraShots
);
...
...
@@ -1065,7 +1067,9 @@ int SurveyMissionItem::_gridGenerator(const QList<QPointF>& polygonPoints, QLis
// Calc camera shots here if there are no images in turnaround
if
(
_triggerCamera
()
&&
!
_imagesEverywhere
())
{
for
(
int
i
=
0
;
i
<
resultLines
.
count
();
i
++
)
{
cameraShots
+=
(
int
)
ceil
(
resultLines
[
i
].
length
()
/
_triggerDistance
());
cameraShots
+=
(
int
)
floor
(
resultLines
[
i
].
length
()
/
_triggerDistance
());
// Take into account immediate camera trigger at waypoint entry
cameraShots
++
;
}
}
...
...
src/PlanView/SurveyItemEditor.qml
View file @
bad9ed57
...
...
@@ -584,6 +584,24 @@ Rectangle {
Layout.fillWidth
:
true
}
FactCheckBox
{
text
:
qsTr
(
"
Hover and capture image
"
)
fact
:
missionItem
.
hoverAndCapture
visible
:
missionItem
.
hoverAndCaptureAllowed
Layout.columnSpan
:
2
onClicked
:
{
if
(
checked
)
{
missionItem
.
cameraTriggerInTurnaround
.
rawValue
=
false
}
}
}
FactCheckBox
{
text
:
qsTr
(
"
Take images in turnarounds
"
)
fact
:
missionItem
.
cameraTriggerInTurnaround
enabled
:
!
missionItem
.
hoverAndCapture
.
rawValue
Layout.columnSpan
:
2
}
QGCCheckBox
{
text
:
qsTr
(
"
Refly at 90 degree offset
"
)
...
...
src/QtLocationPlugin/QMLControl/OfflineMap.qml
View file @
bad9ed57
...
...
@@ -342,8 +342,6 @@ QGCView {
property
bool
isSatelliteMap
:
activeMapType
.
name
.
indexOf
(
"
Satellite
"
)
>
-
1
||
activeMapType
.
name
.
indexOf
(
"
Hybrid
"
)
>
-
1
plugin
:
Plugin
{
name
:
"
QGroundControl
"
}
MapRectangle
{
id
:
mapBoundary
border.width
:
2
...
...
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