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
76850a9e
Commit
76850a9e
authored
Dec 13, 2019
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
72fd8342
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
+17
-16
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+5
-4
PlanView.qml
src/PlanView/PlanView.qml
+12
-12
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
76850a9e
...
@@ -593,12 +593,12 @@ Item {
...
@@ -593,12 +593,12 @@ Item {
]
]
model
:
[
model
:
[
{
/*
{
name: "Plan",
name: "Plan",
iconSource: "/qmlimages/Plan.svg",
iconSource: "/qmlimages/Plan.svg",
buttonVisible: true,
buttonVisible: true,
buttonEnabled: true,
buttonEnabled: true,
},
},
*/
{
{
name
:
"
Checklist
"
,
name
:
"
Checklist
"
,
iconSource
:
"
/qmlimages/check.svg
"
,
iconSource
:
"
/qmlimages/check.svg
"
,
...
@@ -644,9 +644,10 @@ Item {
...
@@ -644,9 +644,10 @@ Item {
onClicked
:
{
onClicked
:
{
guidedActionsController
.
closeAll
()
guidedActionsController
.
closeAll
()
if
(
index
===
0
)
{
/*
if(index === 0) {
mainWindow.showPlanView()
mainWindow.showPlanView()
}
else
if
(
index
===
1
)
{
} else*/
if
(
index
===
0
)
{
checklistDropPanel
.
open
()
checklistDropPanel
.
open
()
}
else
{
}
else
{
var
action
=
model
[
index
].
action
var
action
=
model
[
index
].
action
...
...
src/PlanView/PlanView.qml
View file @
76850a9e
...
@@ -542,25 +542,25 @@ Item {
...
@@ -542,25 +542,25 @@ Item {
z
:
QGroundControl
.
zOrderWidgets
z
:
QGroundControl
.
zOrderWidgets
maxHeight
:
parent
.
height
-
toolStrip
.
y
maxHeight
:
parent
.
height
-
toolStrip
.
y
readonly
property
int
flyButtonIndex
:
0
//
readonly property int flyButtonIndex: 0
readonly
property
int
fileButtonIndex
:
1
readonly
property
int
fileButtonIndex
:
0
readonly
property
int
takeoffButtonIndex
:
2
readonly
property
int
takeoffButtonIndex
:
1
readonly
property
int
waypointButtonIndex
:
3
readonly
property
int
waypointButtonIndex
:
2
readonly
property
int
roiButtonIndex
:
4
readonly
property
int
roiButtonIndex
:
3
readonly
property
int
patternButtonIndex
:
5
readonly
property
int
patternButtonIndex
:
4
readonly
property
int
landButtonIndex
:
6
readonly
property
int
landButtonIndex
:
5
readonly
property
int
centerButtonIndex
:
7
readonly
property
int
centerButtonIndex
:
6
property
bool
_isRallyLayer
:
_editingLayer
==
_layerRallyPoints
property
bool
_isRallyLayer
:
_editingLayer
==
_layerRallyPoints
property
bool
_isMissionLayer
:
_editingLayer
==
_layerMission
property
bool
_isMissionLayer
:
_editingLayer
==
_layerMission
model
:
[
model
:
[
{
/*
{
name: qsTr("Fly"),
name: qsTr("Fly"),
iconSource: "/qmlimages/PaperPlane.svg",
iconSource: "/qmlimages/PaperPlane.svg",
buttonEnabled: true,
buttonEnabled: true,
buttonVisible: true,
buttonVisible: true,
},
},
*/
{
{
name
:
qsTr
(
"
File
"
),
name
:
qsTr
(
"
File
"
),
iconSource
:
"
/qmlimages/MapSync.svg
"
,
iconSource
:
"
/qmlimages/MapSync.svg
"
,
...
@@ -620,9 +620,9 @@ Item {
...
@@ -620,9 +620,9 @@ Item {
onClicked
:
{
onClicked
:
{
switch
(
index
)
{
switch
(
index
)
{
case
flyButtonIndex
:
/*
case flyButtonIndex:
mainWindow.showFlyView()
mainWindow.showFlyView()
break
break
*/
case
takeoffButtonIndex
:
case
takeoffButtonIndex
:
allAddClickBoolsOff
()
allAddClickBoolsOff
()
_missionController
.
insertTakeoffItem
(
mapCenter
(),
_missionController
.
currentMissionIndex
,
true
/* makeCurrentItem */
)
_missionController
.
insertTakeoffItem
(
mapCenter
(),
_missionController
.
currentMissionIndex
,
true
/* makeCurrentItem */
)
...
...
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