rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-26 15:54:15 +01:00
Code Issues Releases Activity

LP-29 remove pfdqmlgadgetwidget hacks

Browse Source
This commit is contained in:
Philippe Renon 2015-12-09 08:27:25 +01:00
parent 26a3df4715
commit 531c2dc32b
2 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
View File

@ -50,20 +50,6 @@ PfdQmlGadgetWidget::~PfdQmlGadgetWidget()
}
}
void PfdQmlGadgetWidget::init()
{
m_quickWidgetProxy = new QuickWidgetProxy(this);
#if 0
qDebug() << "PfdQmlGadgetWidget::PfdQmlGadgetWidget - persistent OpenGL context" << isPersistentOpenGLContext();
qDebug() << "PfdQmlGadgetWidget::PfdQmlGadgetWidget - persistent scene graph" << isPersistentSceneGraph();
#endif
// to expose settings values
m_pfdQmlContext = new PfdQmlContext(this);
m_pfdQmlContext->apply(engine()->rootContext());
}
void PfdQmlGadgetWidget::setSource(const QUrl &url)
{
m_quickWidgetProxy->setSource(url);
@ -83,32 +69,28 @@ void PfdQmlGadgetWidget::loadConfiguration(PfdQmlGadgetConfiguration *config)
{
qDebug() << "PfdQmlGadgetWidget::loadConfiguration" << config->name();
QuickWidgetProxy *oldQuickWidgetProxy = NULL;
PfdQmlContext *oldPfdQmlContext = NULL;
if (m_quickWidgetProxy) {
oldQuickWidgetProxy = m_quickWidgetProxy;
oldPfdQmlContext = m_pfdQmlContext;
m_quickWidgetProxy = NULL;
m_pfdQmlContext = NULL;
if (!m_quickWidgetProxy) {
m_quickWidgetProxy = new QuickWidgetProxy(this);
#if 0
qDebug() << "PfdQmlGadgetWidget::PfdQmlGadgetWidget - persistent OpenGL context" << isPersistentOpenGLContext();
qDebug() << "PfdQmlGadgetWidget::PfdQmlGadgetWidget - persistent scene graph" << isPersistentSceneGraph();
#endif
// expose context
m_pfdQmlContext = new PfdQmlContext(this);
m_pfdQmlContext->apply(engine()->rootContext());
// add widget
layout()->addWidget(m_quickWidgetProxy->widget());
}
if (!m_quickWidgetProxy) {
init();
}
setQmlFile("");
m_pfdQmlContext->loadConfiguration(config);
// go!
setQmlFile(config->qmlFile());
// deleting and recreating the PfdQmlGadgetWidget is workaround to avoid crashes in osgearth when
// switching between configurations. Please remove this workaround once osgearth is stabilized
if (oldQuickWidgetProxy) {
layout()->removeWidget(oldQuickWidgetProxy->widget());
delete oldQuickWidgetProxy;
delete oldPfdQmlContext;
}
layout()->addWidget(m_quickWidgetProxy->widget());
}
void PfdQmlGadgetWidget::setQmlFile(QString fn)

2
ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h
View File

@ -47,8 +47,6 @@ public:
void loadConfiguration(PfdQmlGadgetConfiguration *config);
private:
void init();
void setQmlFile(QString);
void setSource(const QUrl &url);