rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

A bit of preliminary cleanup and removing unused code to map gadget

Browse Source
This commit is contained in:
James Cotton 2012-05-11 19:31:01 -05:00
parent fa20b0de63
commit 252f61bb8e
1 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -282,26 +282,19 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
// ************** // **************
// connect to the UAVObject updates we require to become a bit aware of our environment: // connect to the UAVObject updates we require to become a bit aware of our environment:
if (pm) Q_ASSERT(pm);
{ Q_ASSERT(obm);
// Register for Home Location state changes
if (obm)
{
UAVDataObject *obj = dynamic_cast<UAVDataObject *>(obm->getObject(QString("HomeLocation")));
if (obj)
{
connect(obj, SIGNAL(objectUpdated(UAVObject *)), this , SLOT(homePositionUpdated(UAVObject *)));
}
}
// Listen to telemetry connection events // Register for Home Location state changes
TelemetryManager *telMngr = pm->getObject<TelemetryManager>(); HomeLocation *obj = HomeLocation::GetInstance(obm);
if (telMngr) Q_ASSERT(obj != NULL);
{ connect(obj, SIGNAL(objectUpdated(UAVObject *)), this , SLOT(homePositionUpdated(UAVObject *)));
connect(telMngr, SIGNAL(connected()), this, SLOT(onTelemetryConnect()));
connect(telMngr, SIGNAL(disconnected()), this, SLOT(onTelemetryDisconnect())); // Listen to telemetry connection events
} TelemetryManager *telMngr = pm->getObject<TelemetryManager>();
} Q_ASSERT(telMngr);
connect(telMngr, SIGNAL(connected()), this, SLOT(onTelemetryConnect()));
connect(telMngr, SIGNAL(disconnected()), this, SLOT(onTelemetryDisconnect()));
// ************** // **************
// create the desired timers // create the desired timers
@ -332,29 +325,6 @@ OPMapGadgetWidget::~OPMapGadgetWidget()
m_map->SetShowUAV(false); // " " m_map->SetShowUAV(false); // " "
} }
// this destructor doesn't appear to be called at shutdown???
// #if defined(Q_OS_MAC)
// #elif defined(Q_OS_WIN)
// saveComboBoxLines(m_widget->comboBoxFindPlace, QCoreApplication::applicationDirPath() + "/opmap_find_place_history.txt");
// #else
// #endif
m_waypoint_list_mutex.lock();
foreach (t_waypoint *wp, m_waypoint_list)
{
if (!wp) continue;
// todo:
delete wp->map_wp_item;
}
m_waypoint_list_mutex.unlock();
m_waypoint_list.clear();
if (m_map) if (m_map)
{ {
delete m_map; delete m_map;
@ -472,11 +442,6 @@ void OPMapGadgetWidget::contextMenuEvent(QContextMenuEvent *event)
menu.addSeparator(); menu.addSeparator();
/*
menu.addAction(findPlaceAct);
menu.addSeparator();
*/
QMenu safeArea("Safety Area definitions"); QMenu safeArea("Safety Area definitions");
// menu.addAction(showSafeAreaAct); // menu.addAction(showSafeAreaAct);
QMenu safeAreaSubMenu(tr("Safe Area Radius") + " (" + QString::number(m_map->Home->SafeArea()) + "m)", this); QMenu safeAreaSubMenu(tr("Safe Area Radius") + " (" + QString::number(m_map->Home->SafeArea()) + "m)", this);