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

OP-9 GCS/uavobjectbrowser: Minor change to highlight behavior.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@508 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
ephy 2010-04-16 05:47:29 +00:00 committed by ephy
parent c107ab34d4
commit 21afa3b9f0
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/src/plugins/uavobjectbrowser/treeitem.cpp
View File

@ -118,10 +118,11 @@ void TreeItem::setHighlight(bool highlight) {
m_timer.setSingleShot(true);
m_timer.start(m_highlightTimeMs);
}
emit updateHighlight(this);
}
void TreeItem::removeHighlight() {
m_highlight = false;
update();
emit removeHighlight(this);
emit updateHighlight(this);
}

2
ground/src/plugins/uavobjectbrowser/treeitem.h
View File

@ -71,7 +71,7 @@ public:
inline void setChanged(bool changed) { m_changed = changed; }
signals:
void removeHighlight(TreeItem*);
void updateHighlight(TreeItem*);
private slots:
void removeHighlight();

17
ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
View File

@ -71,8 +71,8 @@ void UAVObjectTreeModel::setupModelData(UAVObjectManager *objManager)
m_rootItem->appendChild(m_settingsTree);
m_nonSettingsTree = new TopTreeItem(tr("Data Objects"), m_rootItem);
m_rootItem->appendChild(m_nonSettingsTree);
connect(m_settingsTree, SIGNAL(removeHighlight(TreeItem*)), this, SLOT(removeHighlight(TreeItem*)));
connect(m_nonSettingsTree, SIGNAL(removeHighlight(TreeItem*)), this, SLOT(removeHighlight(TreeItem*)));
connect(m_settingsTree, SIGNAL(updateHighlight(TreeItem*)), this, SLOT(updateHighlight(TreeItem*)));
connect(m_nonSettingsTree, SIGNAL(updateHighlight(TreeItem*)), this, SLOT(updateHighlight(TreeItem*)));
QList< QList<UAVDataObject*> > objList = objManager->getDataObjects();
foreach (QList<UAVDataObject*> list, objList) {
@ -97,7 +97,7 @@ void UAVObjectTreeModel::addDataObject(UAVDataObject *obj)
addInstance(obj, root->child(index));
} else {
DataObjectTreeItem *data = new DataObjectTreeItem(obj->getName());
connect(data, SIGNAL(removeHighlight(TreeItem*)), this, SLOT(removeHighlight(TreeItem*)));
connect(data, SIGNAL(updateHighlight(TreeItem*)), this, SLOT(updateHighlight(TreeItem*)));
int index = root->nameIndex(obj->getName());
root->insert(index, data);
root->insertObjId(index, obj->getObjID());
@ -111,7 +111,7 @@ void UAVObjectTreeModel::addMetaObject(UAVMetaObject *obj, TreeItem *parent)
{
connect(obj, SIGNAL(objectUpdated(UAVObject*)), this, SLOT(highlightUpdatedObject(UAVObject*)));
MetaObjectTreeItem *meta = new MetaObjectTreeItem(obj, tr("Meta Data"));
connect(meta, SIGNAL(removeHighlight(TreeItem*)), this, SLOT(removeHighlight(TreeItem*)));
connect(meta, SIGNAL(updateHighlight(TreeItem*)), this, SLOT(updateHighlight(TreeItem*)));
foreach (UAVObjectField *field, obj->getFields()) {
if (field->getNumElements() > 1) {
addArrayField(field, meta);
@ -133,7 +133,7 @@ void UAVObjectTreeModel::addInstance(UAVObject *obj, TreeItem *parent)
} else {
QString name = tr("Instance") + " " + QString::number(obj->getInstID());
item = new InstanceTreeItem(obj, name);
connect(item, SIGNAL(removeHighlight(TreeItem*)), this, SLOT(removeHighlight(TreeItem*)));
connect(item, SIGNAL(updateHighlight(TreeItem*)), this, SLOT(updateHighlight(TreeItem*)));
parent->appendChild(item);
}
foreach (UAVObjectField *field, obj->getFields()) {
@ -149,7 +149,7 @@ void UAVObjectTreeModel::addInstance(UAVObject *obj, TreeItem *parent)
void UAVObjectTreeModel::addArrayField(UAVObjectField *field, TreeItem *parent)
{
TreeItem *item = new ArrayFieldTreeItem(field->getName());
connect(item, SIGNAL(removeHighlight(TreeItem*)), this, SLOT(removeHighlight(TreeItem*)));
connect(item, SIGNAL(updateHighlight(TreeItem*)), this, SLOT(updateHighlight(TreeItem*)));
for (uint i = 0; i < field->getNumElements(); ++i) {
addSingleField(i, field, item);
}
@ -208,7 +208,7 @@ void UAVObjectTreeModel::addSingleField(int index, UAVObjectField *field, TreeIt
} else {
Q_ASSERT(false);
}
connect(item, SIGNAL(removeHighlight(TreeItem*)), this, SLOT(removeHighlight(TreeItem*)));
connect(item, SIGNAL(updateHighlight(TreeItem*)), this, SLOT(updateHighlight(TreeItem*)));
parent->appendChild(item);
}
@ -367,7 +367,6 @@ void UAVObjectTreeModel::highlightUpdatedObject(UAVObject *obj)
QModelIndex itemIndex = index(item);
Q_ASSERT(itemIndex != QModelIndex());
emit dataChanged(itemIndex, itemIndex);
emit dataChanged(itemIndex.child(0, 0), itemIndex.child(rowCount(itemIndex)-1, TreeItem::dataColumn));
}
ObjectTreeItem *UAVObjectTreeModel::findObjectTreeItem(UAVObject *object)
@ -418,7 +417,7 @@ DataObjectTreeItem *UAVObjectTreeModel::findDataObjectTreeItem(UAVDataObject *ob
return 0;
}
void UAVObjectTreeModel::removeHighlight(TreeItem *item)
void UAVObjectTreeModel::updateHighlight(TreeItem *item)
{
QModelIndex itemIndex = index(item);
Q_ASSERT(itemIndex != QModelIndex());

2
ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.h
View File

@ -70,7 +70,7 @@ public slots:
private slots:
void highlightUpdatedObject(UAVObject *obj);
void removeHighlight(TreeItem*);
void updateHighlight(TreeItem*);
private:
QModelIndex index(TreeItem *item);