rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

LP-183 pfd: expose UAVTalk objects to Qml with lower camel case names (systemSettings vs SystemSettings)

Browse Source 
it is more compliant to the Qt naming convention
will solve a conflict in the Qml namespace when SystemSetting is both a type and a context value.
use of non compliant name should be discouraged
This commit is contained in:
Philippe Renon 2015-11-26 01:36:20 +01:00
parent d2121d7e86
commit 0c2f89a33d
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,36 @@
#include <QQmlEngine>
#include <QQmlContext>
/*
* Convert a string to lower camel case.
* Handles following cases :
* - Property -> property
* - MyProperty -> myProperty
* - MYProperty -> myProperty
* - MY_Property -> my_Property
* - MY -> my
*/
// TODO move to some utility class
QString toLowerCamelCase(const QString & name)
{
QString str = name;
for (int i = 0; i < str.length(); ++i) {
if (str[i].isLower() || !str[i].isLetter()) {
break;
}
if (i > 0 && i < str.length() - 1) {
// after first, look ahead one
if (str[i + 1].isLower()) {
break;
}
}
str[i] = str[i].toLower();
}
return str;
}
PfdQmlGadgetWidget::PfdQmlGadgetWidget(QWindow *parent) :
QQuickView(parent),
m_openGLEnabled(false),
@ -91,6 +121,11 @@ PfdQmlGadgetWidget::PfdQmlGadgetWidget(QWindow *parent) :
UAVObject *object = objManager->getObject(objectName);
if (object) {
// expose object with lower camel case name
engine()->rootContext()->setContextProperty(toLowerCamelCase(objectName), object);
// expose object with its name for backward compatibility
// exposing with the name conflicts with the Qml namespace (prevents to expose the object class as a type)
// this should be removed once the qml files all use the lower camel case name
engine()->rootContext()->setContextProperty(objectName, object);
} else {
qWarning() << "Failed to load object" << objectName;
@ -100,6 +135,7 @@ PfdQmlGadgetWidget::PfdQmlGadgetWidget(QWindow *parent) :
// to expose settings values
engine()->rootContext()->setContextProperty("qmlWidget", this);
#ifdef USE_OSG
// should not be done here (PFD should not be directly dependent of osg)
qmlRegisterType<OsgEarthItem>("org.OpenPilot", 1, 0, "OsgEarth");
#endif
}