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
4de54a83
Commit
4de54a83
authored
Apr 01, 2015
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tweaking Altitude and Speed gadgets.
parent
b904d19c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
18 deletions
+24
-18
FlightDisplay.qml
src/ui/flightdisplay/FlightDisplay.qml
+2
-2
QGCAltitudeWidget.qml
src/ui/flightdisplay/components/QGCAltitudeWidget.qml
+11
-8
QGCSpeedWidget.qml
src/ui/flightdisplay/components/QGCSpeedWidget.qml
+11
-8
No files found.
src/ui/flightdisplay/FlightDisplay.qml
View file @
4de54a83
...
@@ -311,7 +311,7 @@ Rectangle {
...
@@ -311,7 +311,7 @@ Rectangle {
QGCAltitudeWidget
{
QGCAltitudeWidget
{
id
:
altitudeWidget
id
:
altitudeWidget
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
width
:
4
0
width
:
6
0
altitude
:
flightDisplay
.
altitudeWGS84
altitude
:
flightDisplay
.
altitudeWGS84
z
:
30
z
:
30
}
}
...
@@ -319,7 +319,7 @@ Rectangle {
...
@@ -319,7 +319,7 @@ Rectangle {
QGCSpeedWidget
{
QGCSpeedWidget
{
id
:
speedWidget
id
:
speedWidget
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
width
:
4
0
width
:
6
0
speed
:
flightDisplay
.
groundSpeed
speed
:
flightDisplay
.
groundSpeed
z
:
40
z
:
40
}
}
...
...
src/ui/flightdisplay/components/QGCAltitudeWidget.qml
View file @
4de54a83
...
@@ -67,26 +67,29 @@ Rectangle {
...
@@ -67,26 +67,29 @@ Rectangle {
height
:
parent
.
height
*
0.75
>
280
?
280
:
parent
.
height
*
0.75
height
:
parent
.
height
*
0.75
>
280
?
280
:
parent
.
height
*
0.75
clip
:
true
clip
:
true
smooth
:
true
smooth
:
true
radius
:
5
border
.
color
:
Qt
.
rgba
(
1
,
1
,
1
,
0.25
)
border
.
color
:
Qt
.
rgba
(
1
,
1
,
1
,
0.25
)
gradient
:
Gradient
{
gradient
:
Gradient
{
GradientStop
{
position
:
0.0
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
3
5
)
}
GradientStop
{
position
:
0.0
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
6
5
)
}
GradientStop
{
position
:
0.5
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
1
5
)
}
GradientStop
{
position
:
0.5
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
2
5
)
}
GradientStop
{
position
:
1.0
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
3
5
)
}
GradientStop
{
position
:
1.0
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
6
5
)
}
}
}
Column
{
Column
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
width
:
parent
.
width
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
spacing
:
_reticleSpacing
spacing
:
_reticleSpacing
Repeater
{
Repeater
{
model
:
_speedArray
model
:
_speedArray
Rectangle
{
Rectangle
{
width
:
root
.
width
property
int
_alt
:
modelData
width
:
(
_alt
%
10
===
0
)
?
15
:
30
anchors.left
:
parent
.
left
height
:
_reticleHeight
height
:
_reticleHeight
color
:
Qt
.
rgba
(
1
,
1
,
1
,
0.
1
)
color
:
Qt
.
rgba
(
1
,
1
,
1
,
0.
35
)
Text
{
Text
{
property
real
_alt
:
modelData
visible
:
(
_alt
%
10
===
0
)
visible
:
(
_alt
%
10
===
0
)
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenterOffset
:
25
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
antialiasing
:
true
antialiasing
:
true
font.weight
:
_alt
<
0
?
Font
.
Light
:
Font
.
DemiBold
font.weight
:
_alt
<
0
?
Font
.
Light
:
Font
.
DemiBold
...
...
src/ui/flightdisplay/components/QGCSpeedWidget.qml
View file @
4de54a83
...
@@ -41,26 +41,29 @@ Rectangle {
...
@@ -41,26 +41,29 @@ Rectangle {
height
:
parent
.
height
*
0.75
>
280
?
280
:
parent
.
height
*
0.75
height
:
parent
.
height
*
0.75
>
280
?
280
:
parent
.
height
*
0.75
clip
:
true
clip
:
true
smooth
:
true
smooth
:
true
radius
:
5
border.color
:
Qt
.
rgba
(
1
,
1
,
1
,
0.25
)
border.color
:
Qt
.
rgba
(
1
,
1
,
1
,
0.25
)
gradient
:
Gradient
{
gradient
:
Gradient
{
GradientStop
{
position
:
0.0
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
3
5
)
}
GradientStop
{
position
:
0.0
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
6
5
)
}
GradientStop
{
position
:
0.5
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
1
5
)
}
GradientStop
{
position
:
0.5
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
2
5
)
}
GradientStop
{
position
:
1.0
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
3
5
)
}
GradientStop
{
position
:
1.0
;
color
:
Qt
.
rgba
(
0
,
0
,
0
,
0.
6
5
)
}
}
}
Column
{
Column
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
width
:
parent
.
width
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
spacing
:
_reticleSpacing
spacing
:
_reticleSpacing
Repeater
{
Repeater
{
model
:
40
model
:
40
Rectangle
{
Rectangle
{
width
:
root
.
width
property
int
_speed
:
-
(
index
-
20
)
width
:
(
_speed
%
5
===
0
)
?
15
:
30
anchors.right
:
parent
.
right
height
:
_reticleHeight
height
:
_reticleHeight
color
:
Qt
.
rgba
(
1
,
1
,
1
,
0.
1
)
color
:
Qt
.
rgba
(
1
,
1
,
1
,
0.
35
)
Text
{
Text
{
property
real
_speed
:
-
(
index
-
20
)
visible
:
(
_speed
%
5
===
0
)
visible
:
(
_speed
%
5
===
0
)
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenterOffset
:
-
25
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.verticalCenter
:
parent
.
verticalCenter
antialiasing
:
true
antialiasing
:
true
font.weight
:
_speed
<
0
?
Font
.
Light
:
Font
.
DemiBold
font.weight
:
_speed
<
0
?
Font
.
Light
:
Font
.
DemiBold
...
...
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