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

OP-984 More refactoring.

Browse Source
This commit is contained in:
Fredrik Arvidsson 2014-01-06 12:56:30 +01:00
parent c24753603a
commit 3ed61a37d0
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
View File

@ -105,6 +105,15 @@ void ConfigTaskWidget::addWidgetBinding(UAVObject *object, UAVObjectField *field
}
void ConfigTaskWidget::addWidgetBinding(QString objectName, QString fieldName, QWidget *widget, int index, double scale,
bool isLimited, QList<int> *reloadGroupIDs, quint32 instID) {
// If object name is comma separated list of objects, call one time per objectName
foreach(QString singleObjectName, objectName.split(",")) {
doAddWidgetBinding(singleObjectName, fieldName, widget, index, scale, isLimited, reloadGroupIDs, instID);
}
}
void ConfigTaskWidget::doAddWidgetBinding(QString objectName, QString fieldName, QWidget *widget, int index, double scale,
bool isLimited, QList<int> *reloadGroupIDs, quint32 instID)
{
if (addShadowWidgetBinding(objectName, fieldName, widget, index, scale, isLimited, reloadGroupIDs, instID)) {
@ -126,12 +135,14 @@ void ConfigTaskWidget::addWidgetBinding(QString objectName, QString fieldName, Q
}
WidgetBinding *binding = new WidgetBinding(widget, object, field, index, scale, isLimited);
// Only the first binding per widget can be enabled.
binding->setIsEnabled(m_widgetBindingsPerWidget.count(widget) == 0);
m_widgetBindingsPerWidget.insert(widget, binding);
if (object) {
m_widgetBindingsPerObject.insert(object, binding);
if(m_saveButton) {
if (m_saveButton) {
m_saveButton->addObject((UAVDataObject *)object);
}
}
@ -236,7 +247,7 @@ void ConfigTaskWidget::onAutopilotConnect()
invalidateObjects();
m_isConnected = true;
foreach(WidgetBinding * binding, m_widgetBindingsPerWidget) {
if(!binding->isEnabled()) {
if (!binding->isEnabled()) {
continue;
}
loadWidgetLimits(binding->widget(), binding->field(), binding->index(), binding->isLimited(), binding->scale());
@ -617,6 +628,7 @@ void ConfigTaskWidget::autoLoadWidgets()
}
refreshWidgetsValues();
forceShadowUpdates();
foreach(WidgetBinding * binding, m_widgetBindingsPerWidget) {
if (binding->widget()) {
qDebug() << "Binding :" << binding->widget()->objectName();

4
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.h
View File

@ -227,6 +227,10 @@ private:
virtual UAVObject *getObject(const QString name, quint32 instId = 0);
int fieldIndexFromElementName(QString objectName, QString fieldName, QString elementName);
void doAddWidgetBinding(QString objectName, QString fieldName, QWidget *widget, int index = 0, double scale = 1,
bool isLimited = false, QList<int> *reloadGroupIDs = 0, quint32 instID = 0);
protected slots:
virtual void disableObjectUpdates();
virtual void enableObjectUpdates();