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
db3e3dab
Commit
db3e3dab
authored
Jul 12, 2013
by
Bill Bonney
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed APM Tool Bar connect button not changing images when connected
parent
069dced8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
15 deletions
+33
-15
ApmToolBar.qml
qml/ApmToolBar.qml
+23
-12
apmtoolbar.cpp
src/ui/apmtoolbar.cpp
+10
-3
No files found.
qml/ApmToolBar.qml
View file @
db3e3dab
...
...
@@ -8,26 +8,37 @@ Rectangle {
property
alias
backgroundColor
:
toolbar
.
color
property
alias
linkNameLabel
:
linkDevice
.
label
property
alias
baudrateLabel
:
baudrate
.
label
property
bool
connected
:
false
width
:
1024
<
parent
.
width
?
1024
:
parent
.
width
height
:
72
color
:
"
black
"
border.color
:
"
black
"
Connections
{
target
:
globalObj
onMAVConnected
:
{
console
.
log
(
"
Change Connection
"
+
connected
)
if
(
connect
){
console
.
log
(
"
connected
"
)
// connectButton.image = "./resources/apmplanner/toolbar/disconnect.png"
}
else
{
console
.
log
(
"
disconnected
"
)
// connectButton.image = "./resources/apmplanner/toolbar/connect.png"
}
}
onConnectedChanged
:
{
if
(
connected
){
console
.
log
(
"
APM Tool BAR QML: connected
"
)
connectButton
.
image
=
"
./resources/apmplanner/toolbar/disconnect.png
"
}
else
{
console
.
log
(
"
APM Tool BAR QML: disconnected
"
)
connectButton
.
image
=
"
./resources/apmplanner/toolbar/connect.png
"
}
}
// Connections {
// target: globalObj
// onMAVConnected: {
// console.log("QML Change Connection " + connected)
// if (connected){
// console.log("connected")
// connectButton.image = "./resources/apmplanner/toolbar/disconnect.png"
// } else {
// console.log("disconnected")
// connectButton.image = "./resources/apmplanner/toolbar/connect.png"
// }
// }
// }
Row
{
anchors.left
:
parent
.
left
spacing
:
2
...
...
src/ui/apmtoolbar.cpp
View file @
db3e3dab
...
...
@@ -10,16 +10,18 @@ APMToolBar::APMToolBar(QWidget *parent):
QDeclarativeView
(
parent
)
{
// Configure our QML object
this
->
rootContext
()
->
setContextProperty
(
"globalObj"
,
this
);
setSource
(
QUrl
::
fromLocalFile
(
"qml/ApmToolBar.qml"
));
setResizeMode
(
QDeclarativeView
::
SizeRootObjectToView
);
this
->
rootContext
()
->
setContextProperty
(
"globalObj"
,
this
);
connect
(
LinkManager
::
instance
(),
SIGNAL
(
newLink
(
LinkInterface
*
)),
this
,
SLOT
(
updateLinkDisplay
(
LinkInterface
*
)));
if
(
LinkManager
::
instance
()
->
getLinks
().
count
()
>=
3
)
{
updateLinkDisplay
(
LinkManager
::
instance
()
->
getLinks
().
last
());
}
QObject
*
object
=
rootObject
();
object
->
setProperty
(
"connected"
,
false
);
}
void
APMToolBar
::
setFlightViewAction
(
QAction
*
action
)
...
...
@@ -111,6 +113,11 @@ void APMToolBar::connectMAV()
result
=
!
LinkManager
::
instance
()
->
getLinks
().
last
()
->
disconnect
();
}
qDebug
()
<<
"result = "
<<
result
;
// Change the image to represent the state
QObject
*
object
=
rootObject
();
object
->
setProperty
(
"connected"
,
result
);
emit
MAVConnected
(
result
);
}
...
...
@@ -147,7 +154,7 @@ void APMToolBar::updateLinkDisplay(LinkInterface* newLink)
qDebug
()
<<
"APMToolBar: updateLinkDisplay"
;
QObject
*
object
=
rootObject
();
if
(
newLink
){
if
(
newLink
&&
object
){
qint64
baudrate
=
newLink
->
getNominalDataRate
();
object
->
setProperty
(
"baudrateLabel"
,
QString
::
number
(
baudrate
));
...
...
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