From e4ea6b31dc2152646ea29b73b38132cdf1a732c9 Mon Sep 17 00:00:00 2001 From: pixhawk Date: Sun, 5 Dec 2010 15:27:21 +0100 Subject: [PATCH] Added Google Earth support for Mac platform --- images/earth.html | 202 +++++++++++++++++++++++--- lib/QMapControl/src/mapnetwork.cpp | 4 +- models/ascent-park-glider.skp | Bin 0 -> 373155 bytes models/multiplex-easyglider.skp | Bin 0 -> 384454 bytes models/multiplex-twinstar.skp | Bin 0 -> 1829719 bytes models/walkera-4g6.skp | Bin 0 -> 792071 bytes qgroundcontrol.pri | 4 + qgroundcontrol.pro | 9 +- src/uas/UAS.cc | 4 + src/uas/UAS.h | 6 + src/uas/UASInterface.h | 4 + src/ui/map3D/QGCGoogleEarthView.cc | 87 ++++++++++- src/ui/map3D/QGCGoogleEarthView.h | 39 +++++ src/ui/map3D/QGCGoogleEarthViewWin.ui | 21 +++ src/ui/map3D/QGCWebPage.cc | 12 ++ src/ui/map3D/QGCWebPage.h | 21 +++ 16 files changed, 386 insertions(+), 27 deletions(-) create mode 100644 models/ascent-park-glider.skp create mode 100644 models/multiplex-easyglider.skp create mode 100644 models/multiplex-twinstar.skp create mode 100644 models/walkera-4g6.skp create mode 100644 src/ui/map3D/QGCGoogleEarthViewWin.ui create mode 100644 src/ui/map3D/QGCWebPage.cc create mode 100644 src/ui/map3D/QGCWebPage.h diff --git a/images/earth.html b/images/earth.html index afdcec859..8f8aadf59 100644 --- a/images/earth.html +++ b/images/earth.html @@ -1,34 +1,101 @@ - + - + QGroundControl Google Earth View + +function setCurrentAircraft(id) +{ + currAircraft = id; +} + +function enableFollowing(follow) +{ + followEnabled = follow; +} + + +function updateFollowAircraft() +{ + if (followEnabled) + { + currView = ge.getView().copyAsLookAt(ge.ALTITUDE_ABSOLUTE); + currView.setLatitude(currLat); + currView.setLongitude(currLon); + currView.setAltitude(currAlt); + currView.setRange(currViewRange); + currView.setTilt(currFollowTilt); + ge.getView().setAbstractView(currView); + } +} + +function failureCallback(object) +{ +} + + +