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
2b75f468
Commit
2b75f468
authored
Aug 08, 2013
by
tstellanova
Browse files
Fix miswired slot/signals
parent
a0e6c55e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/ui/PrimaryFlightDisplay.cc
View file @
2b75f468
...
...
@@ -267,15 +267,24 @@ void PrimaryFlightDisplay::forgetUAS(UASInterface* uas)
{
if
(
this
->
uas
!=
NULL
&&
this
->
uas
==
uas
)
{
// Disconnect any previously connected active MAV
disconnect
(
this
->
uas
,
SIGNAL
(
attitudeChanged
(
UASInterface
*
,
double
,
double
,
double
,
quint64
)),
this
,
SLOT
(
updateAttitude
(
UASInterface
*
,
double
,
double
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
attitudeChanged
(
UASInterface
*
,
int
,
double
,
double
,
double
,
quint64
)),
this
,
SLOT
(
updateAttitude
(
UASInterface
*
,
int
,
double
,
double
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
waypointSelected
(
int
,
int
)),
this
,
SLOT
(
selectWaypoint
(
int
,
int
)));
disconnect
(
this
->
uas
,
SIGNAL
(
primarySpeedChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updatePrimarySpeed
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
gpsSpeedChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateGPSSpeed
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
climbRateChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateClimbRate
(
UASInterface
*
,
AltitudeMeasurementSource
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
primaryAltitudeChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updatePrimaryAltitude
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
gpsAltitudeChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateGPSAltitude
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
navigationControllerErrorsChanged
(
UASInterface
*
,
double
,
double
,
double
)),
this
,
SLOT
(
updateNavigationControllerErrors
(
UASInterface
*
,
double
,
double
,
double
)));
disconnect
(
this
->
uas
,
SIGNAL
(
attitudeChanged
(
UASInterface
*
,
double
,
double
,
double
,
quint64
)),
this
,
SLOT
(
updateAttitude
(
UASInterface
*
,
double
,
double
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
attitudeChanged
(
UASInterface
*
,
int
,
double
,
double
,
double
,
quint64
)),
this
,
SLOT
(
updateAttitude
(
UASInterface
*
,
int
,
double
,
double
,
double
,
quint64
)));
//disconnect(this->uas, SIGNAL(waypointSelected(int,int)),
// this, SLOT(selectWaypoint(int, int)));
disconnect
(
this
->
uas
,
SIGNAL
(
primarySpeedChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updatePrimarySpeed
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
gpsSpeedChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateGPSSpeed
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
climbRateChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateClimbRate
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
primaryAltitudeChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updatePrimaryAltitude
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
gpsAltitudeChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateGPSAltitude
(
UASInterface
*
,
double
,
quint64
)));
disconnect
(
this
->
uas
,
SIGNAL
(
navigationControllerErrorsChanged
(
UASInterface
*
,
double
,
double
,
double
)),
this
,
SLOT
(
updateNavigationControllerErrors
(
UASInterface
*
,
double
,
double
,
double
)));
//disconnect(this->uas, SIGNAL(batteryChanged(UASInterface*, double, double, double, int)), this, SLOT(updateBattery(UASInterface*, double, double, double, int)));
//disconnect(this->uas, SIGNAL(statusChanged(UASInterface*,QString,QString)), this, SLOT(updateState(UASInterface*,QString)));
...
...
@@ -314,10 +323,12 @@ void PrimaryFlightDisplay::setActiveUAS(UASInterface* uas)
//connect(uas, SIGNAL(localPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(updateLocalPosition(UASInterface*,double,double,double,quint64)));
//connect(uas, SIGNAL(globalPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(updateGlobalPosition(UASInterface*,double,double,double,quint64)));
connect
(
uas
,
SIGNAL
(
waypointSelected
(
int
,
int
)),
this
,
SLOT
(
selectWaypoint
(
int
,
int
)));
//connect(uas, SIGNAL(waypointSelected(int,int)), this,
// SLOT(selectWaypoint(int, int)));
connect
(
uas
,
SIGNAL
(
primarySpeedChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updatePrimarySpeed
(
UASInterface
*
,
double
,
quint64
)));
connect
(
uas
,
SIGNAL
(
gpsSpeedChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateGPSSpeed
(
UASInterface
*
,
double
,
quint64
)));
connect
(
uas
,
SIGNAL
(
climbRateChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateClimbRate
(
UASInterface
*
,
AltitudeMeasurementSource
,
double
,
quint64
)));
connect
(
uas
,
SIGNAL
(
climbRateChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateClimbRate
(
UASInterface
*
,
double
,
quint64
)));
connect
(
uas
,
SIGNAL
(
primaryAltitudeChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updatePrimaryAltitude
(
UASInterface
*
,
double
,
quint64
)));
connect
(
uas
,
SIGNAL
(
gpsAltitudeChanged
(
UASInterface
*
,
double
,
quint64
)),
this
,
SLOT
(
updateGPSAltitude
(
UASInterface
*
,
double
,
quint64
)));
connect
(
uas
,
SIGNAL
(
navigationControllerErrorsChanged
(
UASInterface
*
,
double
,
double
,
double
)),
this
,
SLOT
(
updateNavigationControllerErrors
(
UASInterface
*
,
double
,
double
,
double
)));
...
...
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