From 62041f40ad6f746a38f5e913baf074c857133679 Mon Sep 17 00:00:00 2001 From: Laura Sebesta Date: Sun, 12 Aug 2012 23:36:27 +0200 Subject: [PATCH] Changed variable from static to class static. --- .../src/libs/opmapcontrol/src/mapwidget/uavitem.cpp | 6 +++--- .../src/libs/opmapcontrol/src/mapwidget/uavitem.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp index baaf8b24a..9ef52384b 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp @@ -28,10 +28,11 @@ #include "uavitem.h" #include -static double groundspeed_mps_filt; - namespace mapcontrol { + + double UAVItem::groundspeed_mps_filt = 0; + UAVItem::UAVItem(MapGraphicItem* map,OPMapWidget* parent,QString uavPic):map(map),mapwidget(parent),showtrail(true),showtrailline(true),trailtime(5),traildistance(50),autosetreached(true) ,autosetdistance(100),altitude(0),showUAVInfo(false) { @@ -60,7 +61,6 @@ namespace mapcontrol Q_UNUSED(option); Q_UNUSED(widget); - //Draw plane painter->drawPixmap(-pic.width()/2,-pic.height()/2,pic); diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h index 67ef23d65..8e59e268c 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.h @@ -248,7 +248,7 @@ namespace mapcontrol double Distance3D(internals::PointLatLng const& coord, int const& altitude); double autosetdistance; bool showUAVInfo; - // QRectF rect; + static double groundspeed_mps_filt; public slots: