rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

Ground/Joystick/Magicwaypoint: Fix initialization condition that led to crash

Browse Source 
when closing gadget and also center icon on click in magic waypoint.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1821 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-10-01 12:33:36 +00:00 committed by peabody124
parent 9f4e3906e3
commit 93a85e24a0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/src/libs/sdlgamepad/sdlgamepad.cpp
View File

@ -29,6 +29,7 @@ SDLGamepad::SDLGamepad()
index = -1;
loop = false;
tick = MIN_RATE;
gamepad = 0;
}
/**********************************************************************/

8
ground/src/plugins/magicwaypoint/positionfield.cpp
View File

@ -85,14 +85,18 @@ void PositionField::updateDesiredIndicator(double north, double east)
{
QRectF sceneSize = scene()->sceneRect();
m_positiondesired->setPos((east+1)/2*sceneSize.width(),(-north+1)/2*sceneSize.height());
m_positiondesired->setPos(
(east+1)/2*sceneSize.width() - m_positiondesired->boundingRect().width() / 2,
(-north+1)/2*sceneSize.height() - m_positiondesired->boundingRect().height() / 2);
}
void PositionField::updateActualIndicator(double north, double east)
{
QRectF sceneSize = scene()->sceneRect();
m_positionactual->setPos((east+1)/2*sceneSize.width(),(-north+1)/2*sceneSize.height());
m_positionactual->setPos(
(east+1)/2*sceneSize.width() - m_positionactual->boundingRect().width() / 2,
(-north+1)/2*sceneSize.height() - m_positionactual->boundingRect().height() / 2);
}
/**