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

[OP-835] Qt 5.0.1 - migrated GCS libs/opmapcontrol

Browse Source
This commit is contained in:
Philippe Renon 2013-09-15 23:01:08 +02:00
parent b249e58861
commit c10ffd0519
6 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/gpsitem.cpp
View File

@ -26,6 +26,7 @@
*/
#include "../internals/pureprojection.h"
#include "gpsitem.h"
#include <QGraphicsSceneMouseEvent>
namespace mapcontrol {
GPSItem::GPSItem(MapGraphicItem *map, OPMapWidget *parent, QString uavPic) : map(map), mapwidget(parent), showtrail(true), showtrailline(true), trailtime(1), traildistance(2), autosetreached(true)
, autosetdistance(100)

1
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp
View File

@ -25,6 +25,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "homeitem.h"
#include <QGraphicsSceneMouseEvent>
namespace mapcontrol {
HomeItem::HomeItem(MapGraphicItem *map, OPMapWidget *parent) : safe(true), map(map), mapwidget(parent),
showsafearea(true), toggleRefresh(true), safearea(1000), altitude(0), isDragging(false)

1
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
View File

@ -28,6 +28,7 @@
#include "gpsitem.h"
#include "homeitem.h"
#include "mapgraphicitem.h"
#include <QGraphicsSceneMouseEvent>
namespace mapcontrol {
MapGraphicItem::MapGraphicItem(internals::Core *core, Configuration *configuration) : core(core), config(configuration), MapRenderTransform(1), maxZoom(17), minZoom(2), zoomReal(0), isSelected(false), rotation(0), zoomDigi(0)

2
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.cpp
View File

@ -224,7 +224,7 @@ internals::PointLatLng OPMapWidget::currentMousePosition()
void OPMapWidget::mouseMoveEvent(QMouseEvent *event)
{
QGraphicsView::mouseMoveEvent(event);
QPointF p = event->posF();
QPointF p = event->pos();
p = map->mapFromParent(p);
currentmouseposition = map->FromLocalToLatLng(p.x(), p.y());

3
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
View File

@ -37,6 +37,7 @@
#include <QtOpenGL/QGLWidget>
#include "waypointitem.h"
#include "QtSvg/QGraphicsSvgItem"
#include "QGraphicsView"
#include "uavitem.h"
#include "gpsitem.h"
#include "homeitem.h"
@ -219,7 +220,7 @@ class OPMapWidget : public QGraphicsView {
Q_PROPERTY(double Zoom READ ZoomTotal WRITE SetZoom)
Q_PROPERTY(qreal Rotate READ Rotate WRITE SetRotate)
Q_ENUMS(internals::MouseWheelZoomType::Types)
Q_ENUMS(internals::GeoCoderStatusCode::Types)
Q_ENUMS(core::GeoCoderStatusCode::Types)
public:
QSize sizeHint() const;

1
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
View File

@ -26,6 +26,7 @@
*/
#include "waypointitem.h"
#include "homeitem.h"
#include <QGraphicsSceneMouseEvent>
namespace mapcontrol {
WayPointItem::WayPointItem(const internals::PointLatLng &coord, int const & altitude, MapGraphicItem *map, wptype type) : coord(coord), reached(false), description(""), shownumber(true), isDragging(false), altitude(altitude), map(map), myType(type)