rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

Removing Ambiguity between current map plug-in and the newer upcoming map plug-in

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@780 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-06-16 07:40:53 +00:00 committed by pip
parent bf399821f6
commit b6492fc96f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/src/plugins/map/mapgadgetwidget.cpp
View File

@ -57,7 +57,7 @@ MapGadgetWidget::MapGadgetWidget(QWidget *parent) : QWidget(parent)
UAVObjectManager* objManager = pm->getObject<UAVObjectManager>();
m_positionActual = PositionActual::GetInstance(objManager);
m_mc = new MapControl(QSize(size, size));
m_mc = new qmapcontrol::MapControl(QSize(size, size));
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@ -102,15 +102,15 @@ MapGadgetWidget::MapGadgetWidget(QWidget *parent) : QWidget(parent)
heading = data.Heading;
addCompass(QPointF(100, 100), 200);
// addCompass(QPointF(100, 100), 200);
// create and add the GCS icon
gcsPoint = new ImagePoint(data.Longitude, data.Latitude, &gcs_pixmap, "GSC", Point::Middle);
gcsPoint = new ImagePoint(data.Longitude, data.Latitude, &gcs_pixmap, "GSC", qmapcontrol::Point::Middle);
m_positionLayer->addGeometry(gcsPoint);
connect(gcsPoint, SIGNAL(geometryClicked(Geometry*, QPoint)), this, SLOT(gcs_uav_ClickEvent(Geometry*, QPoint)));
// create and add the UAV icon
uavPoint = new ImagePoint(data.Longitude, data.Latitude, &uav_pixmap, "UAV", Point::Middle);
uavPoint = new ImagePoint(data.Longitude, data.Latitude, &uav_pixmap, "UAV", qmapcontrol::Point::Middle);
m_positionLayer->addGeometry(uavPoint);
connect(uavPoint, SIGNAL(geometryClicked(Geometry*, QPoint)), this, SLOT(gcs_uav_ClickEvent(Geometry*, QPoint)));

2
ground/src/plugins/map/mapgadgetwidget.h
View File

@ -70,7 +70,7 @@ private:
double heading; // compass/uav heading
MapControl *m_mc;
qmapcontrol::MapControl *m_mc;
MapAdapter *m_osmAdapter;
MapAdapter *m_googleAdapter;