Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
0905b11b
Unverified
Commit
0905b11b
authored
Jan 17, 2018
by
Don Gagne
Committed by
GitHub
Jan 17, 2018
Browse files
Merge pull request #6035 from DonLakeFlyer/MoreFixes
More fixes
parents
3fbcc807
c5281249
Changes
3
Hide whitespace changes
Inline
Side-by-side
Vagrantfile
View file @
0905b11b
...
...
@@ -15,7 +15,7 @@ Vagrant.configure(2) do |config|
config
.
vm
.
provider
"virtualbox"
config
.
vm
.
provider
"vmware_fusion"
config
.
vm
.
box
=
"
boxcutter/ubuntu160
4"
config
.
vm
.
box
=
"
ubuntu/xenial6
4"
config
.
vm
.
provider
:docker
do
|
docker
,
override
|
override
.
vm
.
box
=
"tknerr/baseimage-ubuntu-16.04"
end
...
...
src/MissionManager/MissionSettingsItem.cc
View file @
0905b11b
...
...
@@ -297,6 +297,11 @@ void MissionSettingsItem::setMissionEndRTL(bool missionEndRTL)
void
MissionSettingsItem
::
_setHomeAltFromTerrain
(
double
terrainAltitude
)
{
if
(
!
_plannedHomePositionFromVehicle
)
{
// We need to stop this from signalling, Otherwise the dirty but get set on a delay
// which then marks the Plan view as incorrectly dirty
_plannedHomePositionAltitudeFact
.
setSendValueChangedSignals
(
false
);
_plannedHomePositionAltitudeFact
.
setRawValue
(
terrainAltitude
);
_plannedHomePositionAltitudeFact
.
clearDeferredValueChangeSignal
();
_plannedHomePositionAltitudeFact
.
setSendValueChangedSignals
(
false
);
}
}
src/MissionManager/QGCMapPolygonVisuals.qml
View file @
0905b11b
...
...
@@ -453,6 +453,7 @@ Item {
id
:
radiusField
text
:
_circleRadius
.
toFixed
(
2
)
onEditingFinished
:
setRadiusFromDialog
()
inputMethodHints
:
Qt
.
ImhFormattedNumbersOnly
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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