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
2b90f032
Commit
2b90f032
authored
Mar 14, 2017
by
Gus Grubba
Committed by
GitHub
Mar 14, 2017
Browse files
Merge pull request #4764 from dogmaphobic/attitudeTweak
Tweaking Attitude Indicator
parents
381c4bf8
a4ea5660
Changes
2
Hide whitespace changes
Inline
Side-by-side
build_ios.sh
View file @
2b90f032
...
...
@@ -5,7 +5,7 @@ if [ ! -d /Volumes/RAMDisk ] ; then
exit
1
fi
#-- Set to my local installation
QMAKE
=
/Applications/Qt/5.
5
/ios/bin/qmake
QMAKE
=
/
Users/gus/
Applications/Qt/5.
7
/ios/bin/qmake
#-- Using Travis variables as this will eventually live there
SHADOW_BUILD_DIR
=
/Volumes/RAMDisk/build-qgroundcontrol-iOS-Release
TRAVIS_BUILD_DIR
=
/Users/gus/github/work/qgroundcontrol
...
...
src/FlightMap/Widgets/QGCPitchIndicator.qml
View file @
2b90f032
...
...
@@ -21,15 +21,13 @@ import QGroundControl.Controls 1.0
Rectangle
{
property
real
pitchAngle
:
0
property
real
rollAngle
:
0
property
real
size
:
_defaultSize
property
real
size
:
ScreenTools
.
isAndroid
?
300
:
100
property
real
_reticleHeight
:
1
property
real
_reticleSpacing
:
size
*
0.15
property
real
_reticleSlot
:
_reticleSpacing
+
_reticleHeight
property
real
_longDash
:
size
*
0.
40
property
real
_longDash
:
size
*
0.
35
property
real
_shortDash
:
size
*
0.25
property
real
_fontSize
:
ScreenTools
.
defaultFontPointSize
*
(
size
/
_defaultSize
)
property
real
_defaultSize
:
ScreenTools
.
isAndroid
?
300
:
100
property
real
_fontSize
:
ScreenTools
.
defaultFontPointSize
*
0.75
height
:
size
width
:
size
...
...
@@ -55,22 +53,22 @@ Rectangle {
smooth
:
true
QGCLabel
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenterOffset
:
-
(
_longDash
*
0.8
)
anchors.horizontalCenterOffset
:
-
(
_longDash
)
anchors.verticalCenter
:
parent
.
verticalCenter
smooth
:
true
font.family
:
ScreenTools
.
demiboldFontFamily
font.pointSize
:
_fontSize
<
1
?
1
:
_fontSize
;
font.pointSize
:
_fontSize
text
:
_pitch
color
:
"
white
"
visible
:
(
_pitch
!=
0
)
&&
((
_pitch
%
10
)
===
0
)
}
QGCLabel
{
anchors.horizontalCenter
:
parent
.
horizontalCenter
anchors.horizontalCenterOffset
:
(
_longDash
*
0.8
)
anchors.horizontalCenterOffset
:
(
_longDash
)
anchors.verticalCenter
:
parent
.
verticalCenter
smooth
:
true
font.family
:
ScreenTools
.
demiboldFontFamily
font.pointSize
:
_fontSize
<
1
?
1
:
_fontSize
;
font.pointSize
:
_fontSize
text
:
_pitch
color
:
"
white
"
visible
:
(
_pitch
!=
0
)
&&
((
_pitch
%
10
)
===
0
)
...
...
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