rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-17 02:52:12 +01:00
Code Issues Releases Activity

Corrected map rotation direction when following the UAV on the new map plug-in (twas backwards).

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@870 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-06-23 09:24:36 +00:00 committed by pip
parent bd58fa063d
commit db2c95f820
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ground/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -241,7 +241,8 @@ void OPMapGadgetWidget::contextMenuEvent(QContextMenuEvent *event)
menu.addAction(goMouseClickAct);
menu.addAction(goHomeAct);
menu.addAction(goUAVAct);
menu.addAction(followUAVAct);
menu.addAction(followUAVpositionAct);
menu.addAction(followUAVheadingAct);
menu.addSeparator()->setText(tr("Waypoints"));
@ -310,9 +311,9 @@ void OPMapGadgetWidget::updatePosition()
{
PositionActual::DataFields data = m_positionActual->getData(); // get current UAV data
if (m_map && followUAVAct)
if (m_map && followUAVpositionAct && followUAVheadingAct)
{
if (followUAVAct->isChecked())
if (followUAVpositionAct->isChecked())
{
internals::PointLatLng uav_pos = internals::PointLatLng(data.Latitude, data.Longitude); // current UAV position
double uav_heading = data.Heading;
@ -323,7 +324,9 @@ void OPMapGadgetWidget::updatePosition()
if (map_pos != uav_pos || map_heading != uav_heading)
{
m_map->SetCurrentPosition(uav_pos); // keep the map centered on the UAV
m_map->SetRotate(uav_heading); // rotate the map to match the uav heading
if (followUAVheadingAct->isChecked())
m_map->SetRotate(-uav_heading); // rotate the map to match the uav heading
}
}
}
@ -386,10 +389,6 @@ void OPMapGadgetWidget::zoomChanged(double zoom)
void OPMapGadgetWidget::OnMapDrag()
{
if (followUAVAct)
{ // disable follow UAV mode when the user starts to manually drag the map
// if (followUAVAct->isChecked()) followUAVAct->setChecked(false);
}
}
void OPMapGadgetWidget::OnCurrentPositionChanged(internals::PointLatLng point)
@ -550,12 +549,12 @@ void OPMapGadgetWidget::on_toolButtonFlightControlsShowHide_clicked()
void OPMapGadgetWidget::on_toolButtonMapHome_clicked()
{
followUAVAct->setChecked(false);
followUAVpositionAct->setChecked(false);
}
void OPMapGadgetWidget::on_toolButtonMapUAV_clicked()
{
followUAVAct->toggle();
followUAVpositionAct->toggle();
}
void OPMapGadgetWidget::on_toolButtonHome_clicked()
@ -768,12 +767,19 @@ void OPMapGadgetWidget::createActions()
goUAVAct->setStatusTip(tr("Center the map onto the UAV location"));
connect(goUAVAct, SIGNAL(triggered()), this, SLOT(goUAV()));
followUAVAct = new QAction(tr("Follow UAV"), this);
followUAVAct->setShortcut(tr("Ctrl+F"));
followUAVAct->setStatusTip(tr("Keep the map centered onto the UAV"));
followUAVAct->setCheckable(true);
followUAVAct->setChecked(false);
connect(followUAVAct, SIGNAL(toggled(bool)), this, SLOT(on_followUAVAct_toggled(bool)));
followUAVpositionAct = new QAction(tr("Follow UAV position"), this);
followUAVpositionAct->setShortcut(tr("Ctrl+F"));
followUAVpositionAct->setStatusTip(tr("Keep the map centered onto the UAV"));
followUAVpositionAct->setCheckable(true);
followUAVpositionAct->setChecked(false);
connect(followUAVpositionAct, SIGNAL(toggled(bool)), this, SLOT(on_followUAVpositionAct_toggled(bool)));
followUAVheadingAct = new QAction(tr("Follow UAV heading"), this);
followUAVheadingAct->setShortcut(tr("Ctrl+F"));
followUAVheadingAct->setStatusTip(tr("Keep the map rotation to the UAV heading"));
followUAVheadingAct->setCheckable(true);
followUAVheadingAct->setChecked(true);
connect(followUAVheadingAct, SIGNAL(toggled(bool)), this, SLOT(on_followUAVheadingAct_toggled(bool)));
wayPointEditorAct = new QAction(tr("&Way point editor"), this);
wayPointEditorAct->setShortcut(tr("Ctrl+W"));
@ -928,7 +934,7 @@ void OPMapGadgetWidget::goMouseClick()
void OPMapGadgetWidget::goHome()
{
followUAVAct->setChecked(false);
followUAVpositionAct->setChecked(false);
}
void OPMapGadgetWidget::goUAV()
@ -943,11 +949,15 @@ void OPMapGadgetWidget::goUAV()
}
}
void OPMapGadgetWidget::on_followUAVAct_toggled(bool checked)
void OPMapGadgetWidget::on_followUAVpositionAct_toggled(bool checked)
{
if (m_widget)
if (m_widget->toolButtonMapUAV->isChecked() != followUAVAct->isChecked())
m_widget->toolButtonMapUAV->setChecked(followUAVAct->isChecked());
if (m_widget->toolButtonMapUAV->isChecked() != followUAVpositionAct->isChecked())
m_widget->toolButtonMapUAV->setChecked(followUAVpositionAct->isChecked());
}
void OPMapGadgetWidget::on_followUAVheadingAct_toggled(bool checked)
{
}
void OPMapGadgetWidget::openWayPointEditor()

6
ground/src/plugins/opmap/opmapgadgetwidget.h
View File

@ -106,7 +106,8 @@ private slots:
void goMouseClick();
void goHome();
void goUAV();
void on_followUAVAct_toggled(bool checked);
void on_followUAVpositionAct_toggled(bool checked);
void on_followUAVheadingAct_toggled(bool checked);
void openWayPointEditor();
void addWayPoint();
void deleteWayPoint();
@ -161,7 +162,8 @@ private:
QAction *goMouseClickAct;
QAction *goHomeAct;
QAction *goUAVAct;
QAction *followUAVAct;
QAction *followUAVpositionAct;
QAction *followUAVheadingAct;
QAction *wayPointEditorAct;
QAction *addWayPointAct;
QAction *deleteWayPointAct;