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
31582d6f
Unverified
Commit
31582d6f
authored
Mar 26, 2018
by
Don Gagne
Committed by
GitHub
Mar 26, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6268 from DonLakeFlyer/CorridorScanCrash
Fix Corridor Scan crash
parents
a40a857c
d55ff903
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
QGCMapPolygonVisuals.qml
src/MissionManager/QGCMapPolygonVisuals.qml
+1
-2
SimpleMissionItemTest.cc
src/MissionManager/SimpleMissionItemTest.cc
+1
-4
No files found.
src/MissionManager/QGCMapPolygonVisuals.qml
View file @
31582d6f
...
@@ -32,7 +32,6 @@ Item {
...
@@ -32,7 +32,6 @@ Item {
property
int
borderWidth
:
0
property
int
borderWidth
:
0
property
color
borderColor
:
"
black
"
property
color
borderColor
:
"
black
"
property
var
_gqcView
:
ggcView
property
var
_polygonComponent
property
var
_polygonComponent
property
var
_dragHandlesComponent
property
var
_dragHandlesComponent
property
var
_splitHandlesComponent
property
var
_splitHandlesComponent
...
@@ -173,7 +172,7 @@ Item {
...
@@ -173,7 +172,7 @@ Item {
QGCFileDialog
{
QGCFileDialog
{
id
:
kmlLoadDialog
id
:
kmlLoadDialog
qgcView
:
_qgcView
qgcView
:
_
root
.
qgcView
folder
:
QGroundControl
.
settingsManager
.
appSettings
.
missionSavePath
folder
:
QGroundControl
.
settingsManager
.
appSettings
.
missionSavePath
title
:
qsTr
(
"
Select KML File
"
)
title
:
qsTr
(
"
Select KML File
"
)
selectExisting
:
true
selectExisting
:
true
...
...
src/MissionManager/SimpleMissionItemTest.cc
View file @
31582d6f
...
@@ -41,9 +41,6 @@ const SimpleMissionItemTest::FactValue_t SimpleMissionItemTest::_rgFactValuesLoi
...
@@ -41,9 +41,6 @@ const SimpleMissionItemTest::FactValue_t SimpleMissionItemTest::_rgFactValuesLoi
{
"Hold"
,
10.1234567
},
{
"Hold"
,
10.1234567
},
};
};
const
SimpleMissionItemTest
::
FactValue_t
SimpleMissionItemTest
::
_rgFactValuesLand
[]
=
{
};
const
SimpleMissionItemTest
::
FactValue_t
SimpleMissionItemTest
::
_rgFactValuesTakeoff
[]
=
{
const
SimpleMissionItemTest
::
FactValue_t
SimpleMissionItemTest
::
_rgFactValuesTakeoff
[]
=
{
{
"Pitch"
,
10.1234567
},
{
"Pitch"
,
10.1234567
},
};
};
...
@@ -59,7 +56,7 @@ const SimpleMissionItemTest::ItemExpected_t SimpleMissionItemTest::_rgItemExpect
...
@@ -59,7 +56,7 @@ const SimpleMissionItemTest::ItemExpected_t SimpleMissionItemTest::_rgItemExpect
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterUnlim
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterUnlim
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesLoiterUnlim
,
70.1234567
,
SimpleMissionItem
::
AltitudeAMSL
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterUnlim
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterUnlim
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesLoiterUnlim
,
70.1234567
,
SimpleMissionItem
::
AltitudeAMSL
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterTurns
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterTurns
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesLoiterTurns
,
70.1234567
,
SimpleMissionItem
::
AltitudeRelative
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterTurns
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterTurns
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesLoiterTurns
,
70.1234567
,
SimpleMissionItem
::
AltitudeRelative
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterTime
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterTime
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesLoiterTime
,
70.1234567
,
SimpleMissionItem
::
AltitudeAMSL
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterTime
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLoiterTime
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesLoiterTime
,
70.1234567
,
SimpleMissionItem
::
AltitudeAMSL
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLand
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesLand
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesLand
,
70.1234567
,
SimpleMissionItem
::
AltitudeRelative
},
{
0
,
NULL
,
70.1234567
,
SimpleMissionItem
::
AltitudeRelative
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesTakeoff
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesTakeoff
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesTakeoff
,
70.1234567
,
SimpleMissionItem
::
AltitudeAMSL
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesTakeoff
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesTakeoff
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesTakeoff
,
70.1234567
,
SimpleMissionItem
::
AltitudeAMSL
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesDoJump
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesDoJump
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesDoJump
,
qQNaN
(),
SimpleMissionItem
::
AltitudeRelative
},
{
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesDoJump
)
/
sizeof
(
SimpleMissionItemTest
::
_rgFactValuesDoJump
[
0
]),
SimpleMissionItemTest
::
_rgFactValuesDoJump
,
qQNaN
(),
SimpleMissionItem
::
AltitudeRelative
},
};
};
...
...
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