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
eae5dc8f
Commit
eae5dc8f
authored
Apr 25, 2015
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1502 from dogmaphobic/fixGPS
Fix GPS icon when no GPS is present.
parents
c3c6d326
ea38075b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
MainToolBar.h
src/ui/toolbar/MainToolBar.h
+2
-1
MainToolBar.qml
src/ui/toolbar/MainToolBar.qml
+3
-3
No files found.
src/ui/toolbar/MainToolBar.h
View file @
eae5dc8f
...
...
@@ -88,7 +88,7 @@ public:
Q_PROPERTY
(
int
newMessageCount
MEMBER
_currentMessageCount
NOTIFY
newMessageCountChanged
)
Q_PROPERTY
(
int
messageCount
MEMBER
_messageCount
NOTIFY
messageCountChanged
)
Q_PROPERTY
(
QString
systemPixmap
MEMBER
_systemPixmap
NOTIFY
systemPixmapChanged
)
Q_PROPERTY
(
int
satelliteCount
MEMBER
_satelliteCount
NOTIFY
satelliteCountChanged
)
Q_PROPERTY
(
int
satelliteCount
READ
satelliteCount
NOTIFY
satelliteCountChanged
)
Q_PROPERTY
(
QStringList
connectedList
MEMBER
_connectedList
NOTIFY
connectedListChanged
)
Q_PROPERTY
(
bool
mavPresent
READ
mavPresent
NOTIFY
mavPresentChanged
)
Q_PROPERTY
(
QString
currentState
MEMBER
_currentState
NOTIFY
currentStateChanged
)
...
...
@@ -104,6 +104,7 @@ public:
Q_PROPERTY
(
int
telemetryLRSSI
READ
telemetryLRSSI
NOTIFY
telemetryLRSSIChanged
)
bool
mavPresent
()
{
return
_mav
!=
NULL
;
}
int
satelliteCount
()
{
return
_satelliteCount
;
}
int
remoteRSSI
()
{
return
_remoteRSSI
;
}
int
telemetryRRSSI
()
{
return
_telemetryRRSSI
;
}
int
telemetryLRSSI
()
{
return
_telemetryLRSSI
;
}
...
...
src/ui/toolbar/MainToolBar.qml
View file @
eae5dc8f
...
...
@@ -315,7 +315,7 @@ Rectangle {
Rectangle
{
id
:
satelitte
width
:
getProportionalDimmension
(
5
0
)
width
:
getProportionalDimmension
(
5
5
)
height
:
cellHeight
visible
:
showMavStatus
()
&&
(
mainToolBar
.
showGPS
)
anchors.verticalCenter
:
parent
.
verticalCenter
...
...
@@ -336,8 +336,8 @@ Rectangle {
QGCLabel
{
id
:
satelitteText
text
:
mainToolBar
.
satelliteCount
font.pointSize
:
__screenTools
.
fontPointFactor
*
(
14
);
text
:
mainToolBar
.
satelliteCount
>=
0
?
mainToolBar
.
satelliteCount
:
'
NA
'
font.pointSize
:
mainToolBar
.
satelliteCount
>=
0
?
__screenTools
.
fontPointFactor
*
(
14
)
:
__screenTools
.
fontPointFactor
*
(
10
)
font.weight
:
Font
.
DemiBold
anchors.verticalCenter
:
parent
.
verticalCenter
anchors.right
:
parent
.
right
...
...
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