zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'experimental' of pixhawk.ethz.ch:qgroundcontrol into experimental

QGC4.4
pixhawk 15 years ago
parent
d5f5922c3e 1d560d9c44
commit
0198993ed7
4 changed files with 394 additions and 320 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 47
      images/earth.html
  2. 6
      qgroundcontrol.pri
  3. 640
      src/ui/map3D/QGCGoogleEarthView.cc
  4. 21
      src/ui/map3D/QGCGoogleEarthView.h

47
images/earth.html
Unescape View File

@ -13,12 +13,13 @@ google.load("earth", "1", { 'language': 'en'});
var ge = null; var ge = null;
var initialized = false; var initialized = false;
var aircraft = new Array();
var currAircraft = 220; var currAircraft = 220;
var followEnabled = false; var followAircraft = false;
var currLat = 47.3769; var currLat = 47.3769;
var currLon = 8.549444; var currLon = 8.549444;
var currAlt = 470; var currAlt = 470;
var currFollowHeading = 0.0;
var homeLat = 0; var homeLat = 0;
var homeLon = 0; var homeLon = 0;
@ -32,17 +33,11 @@ var currTilt = 40.0; ///<< The tilt angle (in degrees)
var currFollowTilt = 40.0; var currFollowTilt = 40.0;
var currView = null; var currView = null;
var M_PI = 3.14159265;
var planeOrient; var planeOrient;
var planeLoc; var planeLoc;
var aircraft = [];
var attitudes = [];
var locations = [];
var trails = [];
var trail; var trail;
var lineStringPlacemark; var lineStringPlacemark;
var lineStyle; var lineStyle;
@ -62,10 +57,7 @@ function init() {
function setCurrAircraft(id)
{
currAircraft = id;
}
function setGCSHome(lat, lon, alt) function setGCSHome(lat, lon, alt)
{ {
@ -98,6 +90,13 @@ function setGCSHome(lat, lon, alt)
{ {
homeGroundLevel = alt; homeGroundLevel = alt;
} }
goHome();
} }
function createAircraft(id, type, color) function createAircraft(id, type, color)
@ -205,19 +204,17 @@ function setAircraftPositionAttitude(id, lat, lon, alt, roll, pitch, yaw)
currLat = lat; currLat = lat;
currLon = lon; currLon = lon;
currAlt = alt; currAlt = alt;
currFollowHeading = ((yaw/M_PI)+1.0)*360.0;
} }
// FIXME Currently invalid conversion from right-handed z-down to z-up frame planeOrient.setRoll(roll);
planeOrient.setRoll(((roll/M_PI)+1.0)*360.0); planeOrient.setTilt(pitch);
planeOrient.setTilt(((pitch/M_PI)+1.0)*360.0); planeOrient.setHeading(yaw);
planeOrient.setHeading(((yaw/M_PI)+1.0)*360.0);
planeLoc.setLatitude(lat); planeLoc.setLatitude(lat);
planeLoc.setLongitude(lon); planeLoc.setLongitude(lon);
planeLoc.setAltitude(alt); planeLoc.setAltitude(alt);
} }
@ -249,16 +246,24 @@ function setCurrentAircraft(id)
currAircraft = id; currAircraft = id;
} }
function enableFollowing(follow)
{
followEnabled = follow;
}
function updateFollowAircraft() function updateFollowAircraft()
{ {
if (followEnabled)
{
currView = ge.getView().copyAsLookAt(ge.ALTITUDE_ABSOLUTE); currView = ge.getView().copyAsLookAt(ge.ALTITUDE_ABSOLUTE);
currView.setLatitude(currLat); currView.setLatitude(currLat);
currView.setLongitude(currLon); currView.setLongitude(currLon);
currView.setAltitude(currAlt); currView.setAltitude(currAlt);
currView.setRange(currViewRange); currView.setRange(currViewRange);
currView.setTilt(currFollowTilt); currView.setTilt(currFollowTilt);
currView.setHeading(currFollowHeading-90.0);
ge.getView().setAbstractView(currView); ge.getView().setAbstractView(currView);
}
} }
function failureCallback(object) function failureCallback(object)

6
qgroundcontrol.pri
Unescape View File

@ -300,8 +300,9 @@ win32-msvc2008 {
DEFINES += QT_NO_DEBUG DEFINES += QT_NO_DEBUG
} }
# Special settings for debug debug {
#CONFIG += CONSOLE CONFIG += console
}
INCLUDEPATH += $$BASEDIR/lib/sdl/msvc/include \ INCLUDEPATH += $$BASEDIR/lib/sdl/msvc/include \
$$BASEDIR/lib/opal/include \ $$BASEDIR/lib/opal/include \
@ -379,6 +380,7 @@ win32-g++ {
debug { debug {
#DESTDIR = $$BUILDDIR/debug #DESTDIR = $$BUILDDIR/debug
CONFIG += console
} }
release { release {

640
src/ui/map3D/QGCGoogleEarthView.cc
Unescape View File

@ -1,310 +1,360 @@
#include <QApplication> #include <QApplication>
#include <QDir> #include <QDir>
#include <QShowEvent> #include <QShowEvent>
#include <QSettings> #include <QSettings>
#include <QAxObject>
#include <QDebug> #include <QUuid>
#include "UASManager.h"
#include <QDebug>
#ifdef Q_OS_MAC #include <QFile>
#include <QWebFrame> #include <QTextStream>
#include <QWebPage> #include "UASManager.h"
#include "QGCWebPage.h"
#endif #ifdef Q_OS_MAC
#include <QWebFrame>
#include <QWebPage>
#include "QGCWebPage.h"
#endif
#include "QGC.h" #include "QGC.h"
#include "ui_QGCGoogleEarthView.h" #include "ui_QGCGoogleEarthView.h"
#include "QGCGoogleEarthView.h" #include "QGCGoogleEarthView.h"
#define QGCGOOGLEEARTHVIEWSETTINGS QString("GoogleEarthViewSettings_") #define QGCGOOGLEEARTHVIEWSETTINGS QString("GoogleEarthViewSettings_")
QGCGoogleEarthView::QGCGoogleEarthView(QWidget *parent) : QGCGoogleEarthView::QGCGoogleEarthView(QWidget *parent) :
QWidget(parent), QWidget(parent),
updateTimer(new QTimer(this)), updateTimer(new QTimer(this)),
refreshRateMs(80), refreshRateMs(80),
mav(NULL), mav(NULL),
followCamera(true), followCamera(true),
trailEnabled(true), trailEnabled(true),
webViewInitialized(false), webViewInitialized(false),
gEarthInitialized(false), gEarthInitialized(false),
#if (defined Q_OS_MAC) #if (defined Q_OS_MAC)
webViewMac(new QWebView(this)), webViewMac(new QWebView(this)),
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
webViewWin(new QGCWebAxWidget(this)), webViewWin(new QGCWebAxWidget(this)),
#endif #endif
#if (defined _MSC_VER) #if (defined _MSC_VER)
ui(new Ui::QGCGoogleEarthView) ui(new Ui::QGCGoogleEarthView)
#else #else
ui(new Ui::QGCGoogleEarthView) ui(new Ui::QGCGoogleEarthView)
#endif #endif
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
// Create layout and attach webViewWin // Create layout and attach webViewWin
#else
#endif /*
QFile file("doc.html");
// Load settings if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
QSettings settings; qDebug() << __FILE__ << __LINE__ << "Could not open log file";
followCamera = settings.value(QGCGOOGLEEARTHVIEWSETTINGS + "follow", followCamera).toBool();
trailEnabled = settings.value(QGCGOOGLEEARTHVIEWSETTINGS + "trail", trailEnabled).toBool(); QTextStream out(&file);
out << webViewWin->generateDocumentation();
ui->setupUi(this); out.flush();
#if (defined Q_OS_MAC) file.flush();
ui->webViewLayout->addWidget(webViewMac); file.close();*/
connect(webViewMac, SIGNAL(loadFinished(bool)), this, SLOT(initializeGoogleEarth(bool)));
#endif
#else
#ifdef _MSC_VER #endif
ui->webViewLayout->addWidget(webViewWin);
#endif // Load settings
QSettings settings;
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*))); followCamera = settings.value(QGCGOOGLEEARTHVIEWSETTINGS + "follow", followCamera).toBool();
connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateState())); trailEnabled = settings.value(QGCGOOGLEEARTHVIEWSETTINGS + "trail", trailEnabled).toBool();
// Follow checkbox ui->setupUi(this);
ui->followAirplaneCheckbox->setChecked(followCamera); #if (defined Q_OS_MAC)
connect(ui->followAirplaneCheckbox, SIGNAL(toggled(bool)), this, SLOT(follow(bool))); ui->webViewLayout->addWidget(webViewMac);
connect(webViewMac, SIGNAL(loadFinished(bool)), this, SLOT(initializeGoogleEarth(bool)));
// Trail checkbox #endif
ui->trailCheckbox->setChecked(trailEnabled);
connect(ui->trailCheckbox, SIGNAL(toggled(bool)), this, SLOT(showTrail(bool))); #ifdef _MSC_VER
ui->webViewLayout->addWidget(webViewWin);
// Go home #endif
connect(ui->goHomeButton, SIGNAL(clicked()), this, SLOT(goHome()));
} connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateState()));
QGCGoogleEarthView::~QGCGoogleEarthView()
{ // Follow checkbox
QSettings settings; ui->followAirplaneCheckbox->setChecked(followCamera);
settings.setValue(QGCGOOGLEEARTHVIEWSETTINGS + "follow", followCamera); connect(ui->followAirplaneCheckbox, SIGNAL(toggled(bool)), this, SLOT(follow(bool)));
settings.setValue(QGCGOOGLEEARTHVIEWSETTINGS + "trail", trailEnabled);
settings.sync(); // Trail checkbox
delete ui; ui->trailCheckbox->setChecked(trailEnabled);
} connect(ui->trailCheckbox, SIGNAL(toggled(bool)), this, SLOT(showTrail(bool)));
void QGCGoogleEarthView::addUAS(UASInterface* uas) // Go home
{ connect(ui->goHomeButton, SIGNAL(clicked()), this, SLOT(goHome()));
#ifdef Q_OS_MAC }
QGCGoogleEarthView::~QGCGoogleEarthView()
{
QSettings settings;
settings.setValue(QGCGOOGLEEARTHVIEWSETTINGS + "follow", followCamera);
settings.setValue(QGCGOOGLEEARTHVIEWSETTINGS + "trail", trailEnabled);
settings.sync();
delete ui;
}
void QGCGoogleEarthView::addUAS(UASInterface* uas)
{
#ifdef Q_OS_MAC
// uasid, type, color (in aarrbbgg format) // uasid, type, color (in aarrbbgg format)
webViewMac->page()->currentFrame()->evaluateJavaScript(QString("createAircraft(%1, %2, %3);").arg(uas->getUASID()).arg(uas->getSystemType()).arg(uas->getColor().name().remove(0, 1).prepend("50"))); webViewMac->page()->currentFrame()->evaluateJavaScript(QString("createAircraft(%1, %2, %3);").arg(uas->getUASID()).arg(uas->getSystemType()).arg(uas->getColor().name().remove(0, 1).prepend("50")));
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
//if (webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool()) //if (webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool())
#endif #endif
// Automatically receive further position updates // Automatically receive further position updates
connect(uas, SIGNAL(globalPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(updateGlobalPosition(UASInterface*,double,double,double,quint64))); connect(uas, SIGNAL(globalPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(updateGlobalPosition(UASInterface*,double,double,double,quint64)));
} }
void QGCGoogleEarthView::setActiveUAS(UASInterface* uas) void QGCGoogleEarthView::setActiveUAS(UASInterface* uas)
{ {
if (uas) if (uas)
{ {
mav = uas; mav = uas;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
if (webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool()) if (webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool())
{ {
webViewMac->page()->currentFrame()->evaluateJavaScript(QString("setCurrAircraft(%1);").arg(uas->getUASID())); webViewMac->page()->currentFrame()->evaluateJavaScript(QString("setCurrAircraft(%1);").arg(uas->getUASID()));
} }
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
//if (webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool()) //if (webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool())
#endif #endif
} }
} }
void QGCGoogleEarthView::updateGlobalPosition(UASInterface* uas, double lat, double lon, double alt, quint64 usec) void QGCGoogleEarthView::updateGlobalPosition(UASInterface* uas, double lat, double lon, double alt, quint64 usec)
{ {
Q_UNUSED(usec); Q_UNUSED(usec);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
webViewMac->page()->currentFrame()->evaluateJavaScript(QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15)); webViewMac->page()->currentFrame()->evaluateJavaScript(QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15));
//qDebug() << QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15); //qDebug() << QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15);
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
//if (webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool()) //if (webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool())
#endif #endif
} }
void QGCGoogleEarthView::showTrail(bool state) void QGCGoogleEarthView::showTrail(bool state)
{ {
ui->trailCheckbox->setChecked(state); ui->trailCheckbox->setChecked(state);
} }
void QGCGoogleEarthView::showWaypoints(bool state) void QGCGoogleEarthView::showWaypoints(bool state)
{ {
} }
void QGCGoogleEarthView::follow(bool follow) void QGCGoogleEarthView::follow(bool follow)
{ {
ui->followAirplaneCheckbox->setChecked(follow); ui->followAirplaneCheckbox->setChecked(follow);
followCamera = follow; followCamera = follow;
} }
void QGCGoogleEarthView::goHome() void QGCGoogleEarthView::goHome()
{ {
// Disable follow and update // Disable follow and update
follow(false); follow(false);
updateState(); updateState();
// Go to home location // Go to home location
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
webViewMac->page()->currentFrame()->evaluateJavaScript("goHome();"); webViewMac->page()->currentFrame()->evaluateJavaScript("goHome();");
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
webViewWin.dynamicCall("InvokeScript(\"goHome\");"); webViewWin->dynamicCall("InvokeScript(\"goHome\");");
#endif #endif
} }
void QGCGoogleEarthView::setHome(double lat, double lon, double alt) void QGCGoogleEarthView::setHome(double lat, double lon, double alt)
{ {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
webViewMac->page()->currentFrame()->evaluateJavaScript(QString("setGCSHome(%1,%2,%3);").arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15)); webViewMac->page()->currentFrame()->evaluateJavaScript(QString("setGCSHome(%1,%2,%3);").arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15));
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
webViewWin.dynamicCall(QString("InvokeScript(\"setGCSHome\", %1, %2, %3);").arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15)); webViewWin->dynamicCall((QString("InvokeScript(\"setGCSHome\", %1, %2, %3)").arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15)).toStdString().c_str());
#endif #endif
} }
void QGCGoogleEarthView::hideEvent(QHideEvent* event) void QGCGoogleEarthView::hideEvent(QHideEvent* event)
{ {
Q_UNUSED(event) updateTimer->stop(); Q_UNUSED(event) updateTimer->stop();
} }
void QGCGoogleEarthView::showEvent(QShowEvent* event) void QGCGoogleEarthView::showEvent(QShowEvent* event)
{ {
// React only to internal (pre-display) // React only to internal (pre-display)
// events // events
Q_UNUSED(event) Q_UNUSED(event)
{ {
// Enable widget, initialize on first run // Enable widget, initialize on first run
if (!webViewInitialized) if (!webViewInitialized)
{ {
#if (defined Q_OS_MAC) #if (defined Q_OS_MAC)
webViewMac->setPage(new QGCWebPage(webViewMac)); webViewMac->setPage(new QGCWebPage(webViewMac));
webViewMac->settings()->setAttribute(QWebSettings::PluginsEnabled, true); webViewMac->settings()->setAttribute(QWebSettings::PluginsEnabled, true);
webViewMac->load(QUrl("earth.html")); webViewMac->load(QUrl("earth.html"));
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
//webViewWin->dynamicCall("GoHome()"); //webViewWin->dynamicCall("GoHome()");
webViewWin->dynamicCall("Navigate(const QString&)", QApplication::applicationDirPath() + "/earth.html"); webViewWin->dynamicCall("Navigate(const QString&)", QApplication::applicationDirPath() + "/earth.html");
#endif /*
webViewInitialized = true; Sleep(4000);
// Reloading the webpage, this resets Google Earth
gEarthInitialized = false;
QAxObject* doc = webViewWin->querySubObject("Document()");
QTimer::singleShot(1000, this, SLOT(initializeGoogleEarth())); IUnknown* winDoc = NULL;
updateTimer->start(refreshRateMs); doc->queryInterface(QUuid("{25336920-03F9-11CF-8FD0-00AA00686F13}"), (void**)(&winDoc));
} //if (winDoc)
} {
} doc = new QAxObject(winDoc, webViewWin);
}
void QGCGoogleEarthView::initializeGoogleEarth()
{ QFile file("ie-doc.html");
if (!gEarthInitialized) if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
{ qDebug() << __FILE__ << __LINE__ << "Could not open log file";
#ifdef Q_OS_MAC
if (!webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool()) QTextStream out(&file);
#endif out << doc->generateDocumentation();
#ifdef _MSC_VER out.flush();
//if (!webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool()) file.flush();
#endif file.close();
{ while(1);
QTimer::singleShot(200, this, SLOT(initializeGoogleEarth())); */
}
else #endif
{
// Set home location webViewInitialized = true;
setHome(47.3769, 8.549444, 500); // Reloading the webpage, this resets Google Earth
gEarthInitialized = false;
// Move to home location
goHome(); QTimer::singleShot(1000, this, SLOT(initializeGoogleEarth()));
updateTimer->start(refreshRateMs);
// Set current UAS }
setActiveUAS(mav); }
}
// Add all MAVs
QList<UASInterface*> mavs = UASManager::instance()->getUASList(); void QGCGoogleEarthView::initializeGoogleEarth()
foreach (UASInterface* mav, mavs) {
{ if (!gEarthInitialized)
addUAS(mav); {
} #ifdef Q_OS_MAC
if (!webViewMac->page()->currentFrame()->evaluateJavaScript("isInitialized();").toBool())
// Add any further MAV automatically #endif
connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(addUAS(UASInterface*))); #ifdef _MSC_VER
if (!webViewWin->dynamicCall("InvokeScript(const QString&)", QString("isInitialized")).toBool())
gEarthInitialized = true; #endif
} {
} QTimer::singleShot(200, this, SLOT(initializeGoogleEarth()));
} }
else
void QGCGoogleEarthView::updateState() {
{ // Set home location
setHome(47.3769, 8.549444, 500);
// Move to home location
goHome();
// Set current UAS
setActiveUAS(mav);
// Add all MAVs
QList<UASInterface*> mavs = UASManager::instance()->getUASList();
foreach (UASInterface* mav, mavs)
{
addUAS(mav);
}
// Add any further MAV automatically
connect(UASManager::instance(), SIGNAL(UASCreated(UASInterface*)), this, SLOT(addUAS(UASInterface*)));
gEarthInitialized = true;
}
}
}
void QGCGoogleEarthView::updateState()
{
#if (QGC_EVENTLOOP_DEBUG) #if (QGC_EVENTLOOP_DEBUG)
qDebug() << "EVENTLOOP:" << __FILE__ << __LINE__; qDebug() << "EVENTLOOP:" << __FILE__ << __LINE__;
#endif #endif
if (gEarthInitialized) if (gEarthInitialized)
{ {
int uasId = 0; int uasId = 0;
double lat = 47.3769; double lat = 47.3769;
double lon = 8.549444; double lon = 8.549444;
double alt = 470.0; double alt = 470.0;
float roll = 0.0f; float roll = 0.0f;
float pitch = 0.0f; float pitch = 0.0f;
float yaw = 0.0f; float yaw = 0.0f;
// Update all MAVs // Update all MAVs
QList<UASInterface*> mavs = UASManager::instance()->getUASList(); QList<UASInterface*> mavs = UASManager::instance()->getUASList();
foreach (UASInterface* mav, mavs) foreach (UASInterface* mav, mavs)
{ {
uasId = mav->getUASID(); uasId = mav->getUASID();
lat = mav->getLatitude(); lat = mav->getLatitude();
lon = mav->getLongitude(); lon = mav->getLongitude();
alt = mav->getAltitude(); alt = mav->getAltitude();
roll = mav->getRoll(); roll = mav->getRoll();
pitch = mav->getPitch(); pitch = mav->getPitch();
yaw = mav->getYaw(); yaw = mav->getYaw();
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
webViewMac->page()->currentFrame()->evaluateJavaScript(QString("setAircraftPositionAttitude(%1, %2, %3, %4, %6, %7, %8);") webViewMac->page()->currentFrame()->evaluateJavaScript(QString("setAircraftPositionAttitude(%1, %2, %3, %4, %6, %7, %8);")
.arg(uasId) .arg(uasId)
.arg(lat) .arg(lat)
.arg(lon) .arg(lon)
.arg(alt+500) .arg(alt+500)
.arg(roll) .arg(roll)
.arg(pitch) .arg(pitch)
.arg(yaw)); .arg(yaw));
#endif #endif
#ifdef _MSC_VER #ifdef _MSC_VER
webViewWin->dynamicCall((QString("InvokeScript(\"setAircraftPositionAttitude\", %1, %2, %3, %4, %6, %7, %8);")
#endif .arg(uasId)
} .arg(lat)
.arg(lon)
if (followCamera) .arg(alt+500)
{ .arg(roll)
#ifdef Q_OS_MAC .arg(pitch)
webViewMac->page()->currentFrame()->evaluateJavaScript(QString("updateFollowAircraft()")); .arg(yaw)).toStdString().c_str());
#endif #endif
#ifdef _MSC_VER }
#endif
} if (followCamera)
} {
} #ifdef Q_OS_MAC
webViewMac->page()->currentFrame()->evaluateJavaScript(QString("updateFollowAircraft()"));
#endif
void QGCGoogleEarthView::changeEvent(QEvent *e) #ifdef _MSC_VER
{ webViewWin->dynamicCall("InvokeScript(\"updateFollowAircraft\");");
QWidget::changeEvent(e); #endif
switch (e->type()) { }
case QEvent::LanguageChange: }
ui->retranslateUi(this); }
break;
default:
break; void QGCGoogleEarthView::changeEvent(QEvent *e)
} {
} QWidget::changeEvent(e);
switch (e->type()) {
case QEvent::LanguageChange:
ui->retranslateUi(this);
break;
default:
break;
}
}

21
src/ui/map3D/QGCGoogleEarthView.h
Unescape View File

@ -11,19 +11,36 @@
#ifdef _MSC_VER #ifdef _MSC_VER
#include <ActiveQt/QAxWidget> #include <ActiveQt/QAxWidget>
#include <ActiveQt/QAxObject>
#include "windows.h" #include "windows.h"
class QGCWebAxWidget : public QAxWidget class QGCWebAxWidget : public QAxWidget
{ {
public: public:
//Q_OBJECT
QGCWebAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0) QGCWebAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0)
: QAxWidget(parent, f) : QAxWidget(parent, f),
_document(NULL)
{ {
// Set web browser control // Set web browser control
setControl("{8856F961-340A-11D0-A96B-00C04FD705A2}"); setControl("{8856F961-340A-11D0-A96B-00C04FD705A2}");
//QObject::connect(this, SIGNAL(DocumentComplete(IDispatch*, QVariant&)), this, SLOT(setDocument(IDispatch*, QVariant&)));
} }
QAxObject* document()
{
return _document;
}
protected:
void setDocument(IDispatch* dispatch, QVariant& variant)
{
_document = this->querySubObject("Document()");
}
protected: protected:
QAxObject* _document;
virtual bool translateKeyEvent(int message, int keycode) const virtual bool translateKeyEvent(int message, int keycode) const
{ {
if (message >= WM_KEYFIRST && message <= WM_KEYLAST) if (message >= WM_KEYFIRST && message <= WM_KEYLAST)

Write Preview
Loading…
Cancel
Save