mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-29 20:55:42 +08:00
[AFV] Temporarily disable AFV Map in swiftguistd
This commit is contained in:
committed by
Mat Sutcliffe
parent
18821c2a30
commit
139690457d
@@ -13,8 +13,8 @@
|
||||
|
||||
#include "afvmapdialog.h"
|
||||
#include "ui_afvmapdialog.h"
|
||||
#include <QQmlContext>
|
||||
#include <QQmlEngine>
|
||||
//#include <QQmlContext>
|
||||
//#include <QQmlEngine>
|
||||
|
||||
using namespace BlackCore::Afv::Model;
|
||||
using namespace BlackCore::Afv::Clients;
|
||||
@@ -30,25 +30,25 @@ namespace BlackGui
|
||||
m_afvMapReader = new CAfvMapReader(this);
|
||||
m_afvMapReader->updateFromMap();
|
||||
|
||||
if (sGui && !sGui->isShuttingDown() && sGui->getIContextAudio())
|
||||
{
|
||||
if (sGui->getIContextAudio()->isUsingImplementingObject())
|
||||
{
|
||||
m_afvClient = &sGui->getCoreFacade()->getCContextAudio()->voiceClient();
|
||||
}
|
||||
}
|
||||
// if (sGui && !sGui->isShuttingDown() && sGui->getIContextAudio())
|
||||
// {
|
||||
// if (sGui->getIContextAudio()->isUsingImplementingObject())
|
||||
// {
|
||||
// m_afvClient = &sGui->getCoreFacade()->getCContextAudio()->voiceClient();
|
||||
// }
|
||||
// }
|
||||
|
||||
ui->setupUi(this);
|
||||
QQmlContext *ctxt = ui->qw_AfvMap->rootContext();
|
||||
ctxt->setContextProperty("afvMapReader", m_afvMapReader);
|
||||
// QQmlContext *ctxt = ui->qw_AfvMap->rootContext();
|
||||
// ctxt->setContextProperty("afvMapReader", m_afvMapReader);
|
||||
|
||||
if (m_afvClient)
|
||||
{
|
||||
ctxt->setContextProperty("voiceClient", m_afvClient);
|
||||
}
|
||||
// if (m_afvClient)
|
||||
// {
|
||||
// ctxt->setContextProperty("voiceClient", m_afvClient);
|
||||
// }
|
||||
|
||||
// ui->qw_AfvMap->engine()->setBaseUrl(":/blackgui/qml");
|
||||
ui->qw_AfvMap->setSource(QUrl("qrc:/blackgui/qml/AFVMap.qml"));
|
||||
// // ui->qw_AfvMap->engine()->setBaseUrl(":/blackgui/qml");
|
||||
// ui->qw_AfvMap->setSource(QUrl("qrc:/blackgui/qml/AFVMap.qml"));
|
||||
}
|
||||
|
||||
CAfvMapDialog::~CAfvMapDialog() { }
|
||||
|
||||
Reference in New Issue
Block a user