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

Changed function names on various slots in the OPMap plug-in to stop warning messages.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@953 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-06-30 20:22:18 +00:00 committed by pip
parent 143ea6c3bb
commit 1794ce50c0
7 changed files with 92 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ground/src/plugins/opmap/images/waypoint_marker1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
ground/src/plugins/opmap/images/waypoint_marker2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

2
ground/src/plugins/opmap/opmap.qrc
View File

@ -16,5 +16,7 @@
<file>images/hold.png</file> <file>images/hold.png</file>
<file>images/go.png</file> <file>images/go.png</file>
<file>images/combobox_down_arrow.png</file> <file>images/combobox_down_arrow.png</file>
<file>images/waypoint_marker2.png</file>
<file>images/waypoint_marker1.png</file>
</qresource> </qresource>
</RCC> </RCC>

33
ground/src/plugins/opmap/opmap_waypointeditor_dialog.cpp
View File

@ -48,26 +48,37 @@ WaypointItem::WaypointItem(QString name, double latitude, double longitude, doub
setFlag(QGraphicsItem::ItemIsMovable, true); setFlag(QGraphicsItem::ItemIsMovable, true);
setFlag(QGraphicsItem::ItemIsSelectable, true); setFlag(QGraphicsItem::ItemIsSelectable, true);
setFlag(QGraphicsItem::ItemSendsScenePositionChanges, true); setFlag(QGraphicsItem::ItemSendsScenePositionChanges, true);
pixmap.load(QString::fromUtf8(":/opmap/images/waypoint_marker1.png"));
} }
QRectF WaypointItem::boundingRect() const QRectF WaypointItem::boundingRect() const
{ {
return QRectF(-6, -10, 12, 20); // return QRectF(-6, -10, 12, 20);
return QRectF(-pixmap.width() / 2, -pixmap.height(), pixmap.width(), pixmap.height());
} }
/*
QPainterPath WaypointItem::shape() const QPainterPath WaypointItem::shape() const
{ {
QPainterPath path; QPainterPath path;
path.addEllipse(QPointF(0, 0), 6, 10); // path.addEllipse(QPointF(0, 0), 6, 10);
path.addRect(pixmap.rect());
return path; return path;
} }
*/
void WaypointItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) void WaypointItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
{ {
painter->setPen(Qt::black); // painter->setPen(Qt::black);
painter->setBrush(QColor(255, 0, 0, 128)); // painter->setBrush(QColor(255, 0, 0, 128));
painter->drawEllipse(QPointF(0, 0), 6, 10); // painter->drawEllipse(QPointF(0, 0), 6, 10);
}
painter->drawPixmap(-pixmap.width() / 2, -pixmap.height(), pixmap);
}
void WaypointItem::setPixmap(QPixmap pixmap)
{
this->pixmap = pixmap.copy(pixmap.rect());
}
// *************************************************************** // ***************************************************************
// Scene object // Scene object
@ -119,9 +130,12 @@ opmap_waypointeditor_dialog::opmap_waypointeditor_dialog(QWidget *parent) :
view = ui->graphicsViewWaypointHeightAndTimeline; view = ui->graphicsViewWaypointHeightAndTimeline;
scene = new OurScene(); scene = new OurScene();
scene->setSceneRect(QRect(0, 0, 1800, 500)); scene->setSceneRect(QRect(0, 0, 500, 500));
view->setScene(scene); view->setScene(scene);
waypoint_pixmap1.load(QString::fromUtf8(":/opmap/images/waypoint_marker1.png"));
waypoint_pixmap2.load(QString::fromUtf8(":/opmap/images/waypoint_marker2.png"));
undoStack = new QUndoStack(); undoStack = new QUndoStack();
connect(scene, SIGNAL(itemMoved(WaypointItem *, const QPointF &)), this, SLOT(itemMoved(WaypointItem *, const QPointF &))); connect(scene, SIGNAL(itemMoved(WaypointItem *, const QPointF &)), this, SLOT(itemMoved(WaypointItem *, const QPointF &)));
@ -138,6 +152,7 @@ opmap_waypointeditor_dialog::opmap_waypointeditor_dialog(QWidget *parent) :
scene->addItem(waypoint2); scene->addItem(waypoint2);
WaypointItem *waypoint3 = new WaypointItem(tr("Waypoint 3"), 0, 0, 100, 8, 5); WaypointItem *waypoint3 = new WaypointItem(tr("Waypoint 3"), 0, 0, 100, 8, 5);
waypoint3->setPixmap(waypoint_pixmap2);
waypoint3->setPos(scene->width() / 2 + 60, scene->height() / 2); waypoint3->setPos(scene->width() / 2 + 60, scene->height() / 2);
scene->addItem(waypoint3); scene->addItem(waypoint3);

13
ground/src/plugins/opmap/opmap_waypointeditor_dialog.h
View File

@ -34,6 +34,7 @@
#include <QGraphicsView> #include <QGraphicsView>
#include <QGraphicsScene> #include <QGraphicsScene>
#include <QGraphicsItem> #include <QGraphicsItem>
#include <QPixmap>
#include <QUndoStack> #include <QUndoStack>
#include "uavobjects/uavobjectmanager.h" #include "uavobjects/uavobjectmanager.h"
@ -54,6 +55,8 @@ class WaypointItem : public QObject, public QGraphicsItem
public: public:
WaypointItem(QString name = "", double latitude = 0, double longitude = 0, double height_feet = 0, int time_seconds = 0, int hold_seconds = 0); WaypointItem(QString name = "", double latitude = 0, double longitude = 0, double height_feet = 0, int time_seconds = 0, int hold_seconds = 0);
void setPixmap(QPixmap pixmap);
QString waypoint_name; QString waypoint_name;
double latitude_degress; double latitude_degress;
double longitude_degress; double longitude_degress;
@ -61,11 +64,12 @@ class WaypointItem : public QObject, public QGraphicsItem
int time_seconds; int time_seconds;
int hold_seconds; int hold_seconds;
QRectF boundingRect() const; QPixmap pixmap;
QPainterPath shape() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
protected: protected:
QRectF boundingRect() const;
// QPainterPath shape() const;
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
// void timerEvent(QTimerEvent *event); // void timerEvent(QTimerEvent *event);
private: private:
@ -110,6 +114,9 @@ protected:
void changeEvent(QEvent *e); void changeEvent(QEvent *e);
private: private:
QPixmap waypoint_pixmap1;
QPixmap waypoint_pixmap2;
QGraphicsView *view; QGraphicsView *view;
QGraphicsScene *scene; QGraphicsScene *scene;

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

@ -146,7 +146,7 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
*/ */
m_widget->comboBoxFindPlace->setAutoCompletion(true); m_widget->comboBoxFindPlace->setAutoCompletion(true);
connect( m_widget->comboBoxFindPlace->lineEdit(), SIGNAL(returnPressed()), this, SLOT(on_comboBoxFindPlace_returnPressed())); connect( m_widget->comboBoxFindPlace->lineEdit(), SIGNAL(returnPressed()), this, SLOT(comboBoxFindPlace_returnPressed()));
// ************** // **************
// map stuff // map stuff
@ -269,7 +269,7 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
OPMapGadgetWidget::~OPMapGadgetWidget() OPMapGadgetWidget::~OPMapGadgetWidget()
{ {
on_clearWayPointsAct_triggered(); clearWayPointsAct_triggered();
if (wayPoint_treeView_model) delete wayPoint_treeView_model; if (wayPoint_treeView_model) delete wayPoint_treeView_model;
if (m_map_overlay_widget) delete m_map_overlay_widget; if (m_map_overlay_widget) delete m_map_overlay_widget;
@ -609,7 +609,7 @@ void OPMapGadgetWidget::WPDeleted(int const &number)
// ************************************************************************************* // *************************************************************************************
// user control signals // user control signals
void OPMapGadgetWidget::on_comboBoxFindPlace_returnPressed() void OPMapGadgetWidget::comboBoxFindPlace_returnPressed()
{ {
QString place = m_widget->comboBoxFindPlace->currentText().simplified(); QString place = m_widget->comboBoxFindPlace->currentText().simplified();
if (place.isNull() || place.isEmpty()) return; if (place.isNull() || place.isEmpty()) return;
@ -645,7 +645,7 @@ void OPMapGadgetWidget::on_comboBoxFindPlace_returnPressed()
void OPMapGadgetWidget::on_toolButtonFindPlace_clicked() void OPMapGadgetWidget::on_toolButtonFindPlace_clicked()
{ {
m_widget->comboBoxFindPlace->setFocus(); m_widget->comboBoxFindPlace->setFocus();
on_comboBoxFindPlace_returnPressed(); comboBoxFindPlace_returnPressed();
} }
void OPMapGadgetWidget::on_toolButtonZoomP_clicked() void OPMapGadgetWidget::on_toolButtonZoomP_clicked()
@ -862,91 +862,91 @@ void OPMapGadgetWidget::createActions()
reloadAct = new QAction(tr("&Reload map"), this); reloadAct = new QAction(tr("&Reload map"), this);
reloadAct->setShortcut(tr("F5")); reloadAct->setShortcut(tr("F5"));
reloadAct->setStatusTip(tr("Reload the map tiles")); reloadAct->setStatusTip(tr("Reload the map tiles"));
connect(reloadAct, SIGNAL(triggered()), this, SLOT(on_reloadAct_triggered())); connect(reloadAct, SIGNAL(triggered()), this, SLOT(reloadAct_triggered()));
findPlaceAct = new QAction(tr("&Find place"), this); findPlaceAct = new QAction(tr("&Find place"), this);
findPlaceAct->setShortcut(tr("Ctrl+F")); findPlaceAct->setShortcut(tr("Ctrl+F"));
findPlaceAct->setStatusTip(tr("Find a location")); findPlaceAct->setStatusTip(tr("Find a location"));
connect(findPlaceAct, SIGNAL(triggered()), this, SLOT(on_findPlaceAct_triggered())); connect(findPlaceAct, SIGNAL(triggered()), this, SLOT(findPlaceAct_triggered()));
showCompassAct = new QAction(tr("Show compass"), this); showCompassAct = new QAction(tr("Show compass"), this);
// showCompassAct->setShortcut(tr("Ctrl+M")); // showCompassAct->setShortcut(tr("Ctrl+M"));
showCompassAct->setStatusTip(tr("Show/Hide the map compass")); showCompassAct->setStatusTip(tr("Show/Hide the map compass"));
showCompassAct->setCheckable(true); showCompassAct->setCheckable(true);
showCompassAct->setChecked(true); showCompassAct->setChecked(true);
connect(showCompassAct, SIGNAL(toggled(bool)), this, SLOT(on_showCompassAct_toggled(bool))); connect(showCompassAct, SIGNAL(toggled(bool)), this, SLOT(showCompassAct_toggled(bool)));
zoomInAct = new QAction(tr("Zoom &In"), this); zoomInAct = new QAction(tr("Zoom &In"), this);
zoomInAct->setShortcut(Qt::Key_PageUp); zoomInAct->setShortcut(Qt::Key_PageUp);
zoomInAct->setStatusTip(tr("Zoom the map in")); zoomInAct->setStatusTip(tr("Zoom the map in"));
connect(zoomInAct, SIGNAL(triggered()), this, SLOT(on_goZoomInAct_triggered())); connect(zoomInAct, SIGNAL(triggered()), this, SLOT(goZoomInAct_triggered()));
zoomOutAct = new QAction(tr("Zoom &Out"), this); zoomOutAct = new QAction(tr("Zoom &Out"), this);
zoomOutAct->setShortcut(Qt::Key_PageDown); zoomOutAct->setShortcut(Qt::Key_PageDown);
zoomOutAct->setStatusTip(tr("Zoom the map out")); zoomOutAct->setStatusTip(tr("Zoom the map out"));
connect(zoomOutAct, SIGNAL(triggered()), this, SLOT(on_goZoomOutAct_triggered())); connect(zoomOutAct, SIGNAL(triggered()), this, SLOT(goZoomOutAct_triggered()));
goMouseClickAct = new QAction(tr("Go to where you right clicked the mouse"), this); goMouseClickAct = new QAction(tr("Go to where you right clicked the mouse"), this);
goMouseClickAct->setStatusTip(tr("Center the map onto where you right clicked the mouse")); goMouseClickAct->setStatusTip(tr("Center the map onto where you right clicked the mouse"));
connect(goMouseClickAct, SIGNAL(triggered()), this, SLOT(on_goMouseClickAct_triggered())); connect(goMouseClickAct, SIGNAL(triggered()), this, SLOT(goMouseClickAct_triggered()));
goHomeAct = new QAction(tr("Go to &Home location"), this); goHomeAct = new QAction(tr("Go to &Home location"), this);
goHomeAct->setShortcut(tr("Ctrl+H")); goHomeAct->setShortcut(tr("Ctrl+H"));
goHomeAct->setStatusTip(tr("Center the map onto the home location")); goHomeAct->setStatusTip(tr("Center the map onto the home location"));
connect(goHomeAct, SIGNAL(triggered()), this, SLOT(on_goHomeAct_triggered())); connect(goHomeAct, SIGNAL(triggered()), this, SLOT(goHomeAct_triggered()));
goUAVAct = new QAction(tr("Go to &UAV location"), this); goUAVAct = new QAction(tr("Go to &UAV location"), this);
goUAVAct->setShortcut(tr("Ctrl+U")); goUAVAct->setShortcut(tr("Ctrl+U"));
goUAVAct->setStatusTip(tr("Center the map onto the UAV location")); goUAVAct->setStatusTip(tr("Center the map onto the UAV location"));
connect(goUAVAct, SIGNAL(triggered()), this, SLOT(on_goUAVAct_triggered())); connect(goUAVAct, SIGNAL(triggered()), this, SLOT(goUAVAct_triggered()));
followUAVpositionAct = new QAction(tr("Follow UAV position"), this); followUAVpositionAct = new QAction(tr("Follow UAV position"), this);
followUAVpositionAct->setShortcut(tr("Ctrl+F")); followUAVpositionAct->setShortcut(tr("Ctrl+F"));
followUAVpositionAct->setStatusTip(tr("Keep the map centered onto the UAV")); followUAVpositionAct->setStatusTip(tr("Keep the map centered onto the UAV"));
followUAVpositionAct->setCheckable(true); followUAVpositionAct->setCheckable(true);
followUAVpositionAct->setChecked(false); followUAVpositionAct->setChecked(false);
connect(followUAVpositionAct, SIGNAL(toggled(bool)), this, SLOT(on_followUAVpositionAct_toggled(bool))); connect(followUAVpositionAct, SIGNAL(toggled(bool)), this, SLOT(followUAVpositionAct_toggled(bool)));
followUAVheadingAct = new QAction(tr("Follow UAV heading"), this); followUAVheadingAct = new QAction(tr("Follow UAV heading"), this);
followUAVheadingAct->setShortcut(tr("Ctrl+F")); followUAVheadingAct->setShortcut(tr("Ctrl+F"));
followUAVheadingAct->setStatusTip(tr("Keep the map rotation to the UAV heading")); followUAVheadingAct->setStatusTip(tr("Keep the map rotation to the UAV heading"));
followUAVheadingAct->setCheckable(true); followUAVheadingAct->setCheckable(true);
followUAVheadingAct->setChecked(true); followUAVheadingAct->setChecked(true);
connect(followUAVheadingAct, SIGNAL(toggled(bool)), this, SLOT(on_followUAVheadingAct_toggled(bool))); connect(followUAVheadingAct, SIGNAL(toggled(bool)), this, SLOT(followUAVheadingAct_toggled(bool)));
wayPointEditorAct = new QAction(tr("&Waypoint editor"), this); wayPointEditorAct = new QAction(tr("&Waypoint editor"), this);
wayPointEditorAct->setShortcut(tr("Ctrl+W")); wayPointEditorAct->setShortcut(tr("Ctrl+W"));
wayPointEditorAct->setStatusTip(tr("Open the waypoint editor")); wayPointEditorAct->setStatusTip(tr("Open the waypoint editor"));
connect(wayPointEditorAct, SIGNAL(triggered()), this, SLOT(on_openWayPointEditorAct_triggered())); connect(wayPointEditorAct, SIGNAL(triggered()), this, SLOT(openWayPointEditorAct_triggered()));
addWayPointAct = new QAction(tr("&Add waypoint"), this); addWayPointAct = new QAction(tr("&Add waypoint"), this);
addWayPointAct->setShortcut(tr("Ctrl+A")); addWayPointAct->setShortcut(tr("Ctrl+A"));
addWayPointAct->setStatusTip(tr("Add waypoint")); addWayPointAct->setStatusTip(tr("Add waypoint"));
connect(addWayPointAct, SIGNAL(triggered()), this, SLOT(on_addWayPointAct_triggered())); connect(addWayPointAct, SIGNAL(triggered()), this, SLOT(addWayPointAct_triggered()));
editWayPointAct = new QAction(tr("&Edit waypoint"), this); editWayPointAct = new QAction(tr("&Edit waypoint"), this);
editWayPointAct->setShortcut(tr("Ctrl+E")); editWayPointAct->setShortcut(tr("Ctrl+E"));
editWayPointAct->setStatusTip(tr("Edit waypoint")); editWayPointAct->setStatusTip(tr("Edit waypoint"));
connect(editWayPointAct, SIGNAL(triggered()), this, SLOT(on_editWayPointAct_triggered())); connect(editWayPointAct, SIGNAL(triggered()), this, SLOT(editWayPointAct_triggered()));
lockWayPointAct = new QAction(tr("&Lock waypoint"), this); lockWayPointAct = new QAction(tr("&Lock waypoint"), this);
lockWayPointAct->setStatusTip(tr("Lock/Unlock a waypoint")); lockWayPointAct->setStatusTip(tr("Lock/Unlock a waypoint"));
lockWayPointAct->setCheckable(true); lockWayPointAct->setCheckable(true);
lockWayPointAct->setChecked(false); lockWayPointAct->setChecked(false);
connect(lockWayPointAct, SIGNAL(triggered()), this, SLOT(on_lockWayPointAct_triggered())); connect(lockWayPointAct, SIGNAL(triggered()), this, SLOT(lockWayPointAct_triggered()));
deleteWayPointAct = new QAction(tr("&Delete waypoint"), this); deleteWayPointAct = new QAction(tr("&Delete waypoint"), this);
deleteWayPointAct->setShortcut(tr("Ctrl+D")); deleteWayPointAct->setShortcut(tr("Ctrl+D"));
deleteWayPointAct->setStatusTip(tr("Delete waypoint")); deleteWayPointAct->setStatusTip(tr("Delete waypoint"));
connect(deleteWayPointAct, SIGNAL(triggered()), this, SLOT(on_deleteWayPointAct_triggered())); connect(deleteWayPointAct, SIGNAL(triggered()), this, SLOT(deleteWayPointAct_triggered()));
clearWayPointsAct = new QAction(tr("&Clear waypoints"), this); clearWayPointsAct = new QAction(tr("&Clear waypoints"), this);
clearWayPointsAct->setShortcut(tr("Ctrl+C")); clearWayPointsAct->setShortcut(tr("Ctrl+C"));
clearWayPointsAct->setStatusTip(tr("Clear waypoints")); clearWayPointsAct->setStatusTip(tr("Clear waypoints"));
connect(clearWayPointsAct, SIGNAL(triggered()), this, SLOT(on_clearWayPointsAct_triggered())); connect(clearWayPointsAct, SIGNAL(triggered()), this, SLOT(clearWayPointsAct_triggered()));
zoomActGroup = new QActionGroup(this); zoomActGroup = new QActionGroup(this);
connect(zoomActGroup, SIGNAL(triggered(QAction *)), this, SLOT(on_zoomActGroup_triggered(QAction *))); connect(zoomActGroup, SIGNAL(triggered(QAction *)), this, SLOT(zoomActGroup_triggered(QAction *)));
zoomAct.clear(); zoomAct.clear();
for (int i = 2; i <= 19; i++) for (int i = 2; i <= 19; i++)
{ {
@ -959,13 +959,13 @@ void OPMapGadgetWidget::createActions()
// *********************** // ***********************
} }
void OPMapGadgetWidget::on_reloadAct_triggered() void OPMapGadgetWidget::reloadAct_triggered()
{ {
if (m_map) if (m_map)
m_map->ReloadMap(); m_map->ReloadMap();
} }
void OPMapGadgetWidget::on_findPlaceAct_triggered() void OPMapGadgetWidget::findPlaceAct_triggered()
{ {
m_widget->comboBoxFindPlace->setFocus(); // move focus to the 'find place' text box m_widget->comboBoxFindPlace->setFocus(); // move focus to the 'find place' text box
@ -989,25 +989,25 @@ void OPMapGadgetWidget::on_findPlaceAct_triggered()
*/ */
} }
void OPMapGadgetWidget::on_showCompassAct_toggled(bool show_compass) void OPMapGadgetWidget::showCompassAct_toggled(bool show_compass)
{ {
if (m_map) if (m_map)
m_map->SetShowCompass(show_compass); m_map->SetShowCompass(show_compass);
} }
void OPMapGadgetWidget::on_goZoomInAct_triggered() void OPMapGadgetWidget::goZoomInAct_triggered()
{ {
if (m_map) if (m_map)
setZoom(m_map->Zoom() + 1); setZoom(m_map->Zoom() + 1);
} }
void OPMapGadgetWidget::on_goZoomOutAct_triggered() void OPMapGadgetWidget::goZoomOutAct_triggered()
{ {
if (m_map) if (m_map)
setZoom(m_map->Zoom() - 1); setZoom(m_map->Zoom() - 1);
} }
void OPMapGadgetWidget::on_zoomActGroup_triggered(QAction *action) void OPMapGadgetWidget::zoomActGroup_triggered(QAction *action)
{ {
if (!action) return; if (!action) return;
@ -1017,18 +1017,18 @@ void OPMapGadgetWidget::on_zoomActGroup_triggered(QAction *action)
setZoom(zoom); setZoom(zoom);
} }
void OPMapGadgetWidget::on_goMouseClickAct_triggered() void OPMapGadgetWidget::goMouseClickAct_triggered()
{ {
if (m_map) if (m_map)
m_map->SetCurrentPosition(m_map->currentMousePosition()); // center the map onto the mouse position m_map->SetCurrentPosition(m_map->currentMousePosition()); // center the map onto the mouse position
} }
void OPMapGadgetWidget::on_goHomeAct_triggered() void OPMapGadgetWidget::goHomeAct_triggered()
{ {
followUAVpositionAct->setChecked(false); followUAVpositionAct->setChecked(false);
} }
void OPMapGadgetWidget::on_goUAVAct_triggered() void OPMapGadgetWidget::goUAVAct_triggered()
{ {
PositionActual::DataFields data = m_positionActual->getData(); // get current UAV data PositionActual::DataFields data = m_positionActual->getData(); // get current UAV data
@ -1040,7 +1040,7 @@ void OPMapGadgetWidget::on_goUAVAct_triggered()
} }
} }
void OPMapGadgetWidget::on_followUAVpositionAct_toggled(bool checked) void OPMapGadgetWidget::followUAVpositionAct_toggled(bool checked)
{ {
if (m_widget) if (m_widget)
{ {
@ -1052,18 +1052,18 @@ void OPMapGadgetWidget::on_followUAVpositionAct_toggled(bool checked)
} }
} }
void OPMapGadgetWidget::on_followUAVheadingAct_toggled(bool checked) void OPMapGadgetWidget::followUAVheadingAct_toggled(bool checked)
{ {
if (!checked && m_map) if (!checked && m_map)
m_map->SetRotate(0); // reset the rotation to '0' m_map->SetRotate(0); // reset the rotation to '0'
} }
void OPMapGadgetWidget::on_openWayPointEditorAct_triggered() void OPMapGadgetWidget::openWayPointEditorAct_triggered()
{ {
waypoint_editor_dialog.show(); waypoint_editor_dialog.show();
} }
void OPMapGadgetWidget::on_addWayPointAct_triggered() void OPMapGadgetWidget::addWayPointAct_triggered()
{ {
if (!m_map) return; if (!m_map) return;
@ -1081,7 +1081,7 @@ void OPMapGadgetWidget::on_addWayPointAct_triggered()
m_waypoint_list_mutex.unlock(); m_waypoint_list_mutex.unlock();
} }
void OPMapGadgetWidget::on_editWayPointAct_triggered() void OPMapGadgetWidget::editWayPointAct_triggered()
{ {
if (!m_mouse_waypoint) return; if (!m_mouse_waypoint) return;
@ -1092,7 +1092,7 @@ void OPMapGadgetWidget::on_editWayPointAct_triggered()
m_mouse_waypoint = NULL; m_mouse_waypoint = NULL;
} }
void OPMapGadgetWidget::on_lockWayPointAct_triggered() void OPMapGadgetWidget::lockWayPointAct_triggered()
{ {
if (!m_mouse_waypoint) return; if (!m_mouse_waypoint) return;
@ -1102,7 +1102,7 @@ void OPMapGadgetWidget::on_lockWayPointAct_triggered()
m_mouse_waypoint = NULL; m_mouse_waypoint = NULL;
} }
void OPMapGadgetWidget::on_deleteWayPointAct_triggered() void OPMapGadgetWidget::deleteWayPointAct_triggered()
{ {
if (!m_mouse_waypoint) return; if (!m_mouse_waypoint) return;
@ -1131,7 +1131,7 @@ void OPMapGadgetWidget::on_deleteWayPointAct_triggered()
m_mouse_waypoint = NULL; m_mouse_waypoint = NULL;
} }
void OPMapGadgetWidget::on_clearWayPointsAct_triggered() void OPMapGadgetWidget::clearWayPointsAct_triggered()
{ {
m_waypoint_list_mutex.lock(); m_waypoint_list_mutex.lock();
if (m_map) m_map->WPDeleteAll(); if (m_map) m_map->WPDeleteAll();

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

@ -109,7 +109,7 @@ private slots:
* *
* @param * @param
*/ */
void on_comboBoxFindPlace_returnPressed(); void comboBoxFindPlace_returnPressed();
void on_toolButtonFindPlace_clicked(); void on_toolButtonFindPlace_clicked();
void on_toolButtonZoomM_clicked(); void on_toolButtonZoomM_clicked();
void on_toolButtonZoomP_clicked(); void on_toolButtonZoomP_clicked();
@ -151,23 +151,23 @@ private slots:
* *
* @param * @param
*/ */
void on_reloadAct_triggered(); void reloadAct_triggered();
void on_findPlaceAct_triggered(); void findPlaceAct_triggered();
void on_showCompassAct_toggled(bool show_compass); void showCompassAct_toggled(bool show_compass);
void on_goZoomInAct_triggered(); void goZoomInAct_triggered();
void on_goZoomOutAct_triggered(); void goZoomOutAct_triggered();
void on_goMouseClickAct_triggered(); void goMouseClickAct_triggered();
void on_goHomeAct_triggered(); void goHomeAct_triggered();
void on_goUAVAct_triggered(); void goUAVAct_triggered();
void on_followUAVpositionAct_toggled(bool checked); void followUAVpositionAct_toggled(bool checked);
void on_followUAVheadingAct_toggled(bool checked); void followUAVheadingAct_toggled(bool checked);
void on_openWayPointEditorAct_triggered(); void openWayPointEditorAct_triggered();
void on_addWayPointAct_triggered(); void addWayPointAct_triggered();
void on_editWayPointAct_triggered(); void editWayPointAct_triggered();
void on_lockWayPointAct_triggered(); void lockWayPointAct_triggered();
void on_deleteWayPointAct_triggered(); void deleteWayPointAct_triggered();
void on_clearWayPointsAct_triggered(); void clearWayPointsAct_triggered();
void on_zoomActGroup_triggered(QAction *action); void zoomActGroup_triggered(QAction *action);
private: private:
double m_heading; // uav heading double m_heading; // uav heading