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
874b14f5
Commit
874b14f5
authored
Sep 02, 2019
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
754a3ebb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
9 deletions
+25
-9
MissionItemEditor.qml
src/PlanView/MissionItemEditor.qml
+24
-8
MissionItemIndexLabel.qml
src/QmlControls/MissionItemIndexLabel.qml
+1
-1
No files found.
src/PlanView/MissionItemEditor.qml
View file @
874b14f5
...
@@ -70,6 +70,8 @@ Rectangle {
...
@@ -70,6 +70,8 @@ Rectangle {
}
}
}
}
/*
Trying no sequence numbers in ui
QGCLabel {
QGCLabel {
id: label
id: label
anchors.verticalCenter: commandPicker.verticalCenter
anchors.verticalCenter: commandPicker.verticalCenter
...
@@ -77,7 +79,7 @@ Rectangle {
...
@@ -77,7 +79,7 @@ Rectangle {
anchors.left: parent.left
anchors.left: parent.left
text: missionItem.homePosition ? "P" : missionItem.sequenceNumber
text: missionItem.homePosition ? "P" : missionItem.sequenceNumber
color: _outerTextColor
color: _outerTextColor
}
}
*/
QGCColoredImage
{
QGCColoredImage
{
id
:
hamburger
id
:
hamburger
...
@@ -172,15 +174,28 @@ Rectangle {
...
@@ -172,15 +174,28 @@ Rectangle {
checked
=
missionItem
.
rawEdit
checked
=
missionItem
.
rawEdit
}
}
}
}
QGCMenuItem
{
text
:
qsTr
(
"
Item #%1
"
).
arg
(
missionItem
.
sequenceNumber
)
enabled
:
false
}
}
}
}
}
QGCButton
{
QGCButton
{
id
:
commandPicker
id
:
commandPicker
anchors.topMargin
:
_margin
/
2
anchors.topMargin
:
_margin
/
2
anchors.leftMargin
:
ScreenTools
.
defaultFontPixelWidth
*
2
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.rightMargin
:
ScreenTools
.
defaultFontPixelWidth
anchors.leftMargin
:
_margin
anchors.left
:
parent
.
left
/*
Trying no sequence numbers in ui
anchors.leftMargin: ScreenTools.defaultFontPixelWidth * 2
anchors.left: label.right
anchors.left: label.right
*/
anchors.top
:
parent
.
top
anchors.top
:
parent
.
top
visible
:
!
commandLabel
.
visible
visible
:
!
commandLabel
.
visible
text
:
missionItem
.
commandName
text
:
missionItem
.
commandName
...
@@ -201,6 +216,7 @@ Rectangle {
...
@@ -201,6 +216,7 @@ Rectangle {
anchors.fill
:
commandPicker
anchors.fill
:
commandPicker
visible
:
!
missionItem
.
isCurrentItem
||
!
missionItem
.
isSimpleItem
||
_waypointsOnlyMode
visible
:
!
missionItem
.
isCurrentItem
||
!
missionItem
.
isSimpleItem
||
_waypointsOnlyMode
verticalAlignment
:
Text
.
AlignVCenter
verticalAlignment
:
Text
.
AlignVCenter
horizontalAlignment
:
Text
.
AlignHCenter
text
:
missionItem
.
commandName
text
:
missionItem
.
commandName
color
:
_outerTextColor
color
:
_outerTextColor
}
}
...
...
src/QmlControls/MissionItemIndexLabel.qml
View file @
874b14f5
...
@@ -35,7 +35,7 @@ Canvas {
...
@@ -35,7 +35,7 @@ Canvas {
property
real
_labelMargin
:
2
property
real
_labelMargin
:
2
property
real
_labelRadius
:
_indicatorRadius
+
_labelMargin
property
real
_labelRadius
:
_indicatorRadius
+
_labelMargin
property
string
_label
:
label
.
length
>
1
?
label
:
""
property
string
_label
:
label
.
length
>
1
?
label
:
""
property
string
_index
:
index
===
0
||
index
===
-
1
?
label
.
charAt
(
0
)
:
index
property
string
_index
:
index
===
0
||
index
===
-
1
?
label
.
charAt
(
0
)
:
""
/*index*/
onColorChanged
:
requestPaint
()
onColorChanged
:
requestPaint
()
onShowGimbalYawChanged
:
requestPaint
()
onShowGimbalYawChanged
:
requestPaint
()
...
...
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