LP-571 change generic instance tree node name to actual object name

filnet · filnet · commit 799667570816 · 2018-04-12T09:19:17.000+02:00
the other LP-571 issue is addressed by LP-567
diff --git a/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp b/ground/gcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
@@ -248,7 +248,7 @@ DataObjectTreeItem *UAVObjectTreeModel::createDataObject(UAVDataObject *obj)
 
 InstanceTreeItem *UAVObjectTreeModel::createDataObjectInstance(UAVDataObject *obj)
 {
-    QString name = tr("Instance") + " " + QString::number((int)obj->getInstID());
+    QString name = obj->getName() + " " + QString::number((int)obj->getInstID());
     InstanceTreeItem *item = new InstanceTreeItem(obj, name);
 
     item->setHighlightManager(m_highlightManager);

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ DataObjectTreeItem UAVObjectTreeModel::createDataObject(UAVDataObject obj)`
`248`	`248`
`249`	`249`	`InstanceTreeItem UAVObjectTreeModel::createDataObjectInstance(UAVDataObject obj)`
`250`	`250`	`{`
`251`		`- QString name = tr("Instance") + " " + QString::number((int)obj->getInstID());`
	`251`	`+ QString name = obj->getName() + " " + QString::number((int)obj->getInstID());`
`252`	`252`	`InstanceTreeItem *item = new InstanceTreeItem(obj, name);`
`253`	`253`
`254`	`254`	`item->setHighlightManager(m_highlightManager);`