From 0245a7005daa126c9569c3fc78b4ad361fc12aea Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 6 Dec 2017 22:44:58 -0800 Subject: [PATCH] Adding the query of a particular selection content --- .../scripting/SelectionScriptingInterface.cpp | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/interface/src/scripting/SelectionScriptingInterface.cpp b/interface/src/scripting/SelectionScriptingInterface.cpp index 195f1657e8..4e28fb4702 100644 --- a/interface/src/scripting/SelectionScriptingInterface.cpp +++ b/interface/src/scripting/SelectionScriptingInterface.cpp @@ -104,10 +104,6 @@ bool SelectionScriptingInterface::enableListHighlight(const QString& listName, c } if (!(*highlightStyle).isBoundToList()) { - /* auto currentList = _selectedItemsListMap.find(listName); - if (currentList == _selectedItemsListMap.end()) { - _selectedItemsListMap.insert(listName, GameplayObjects()); - }*/ setupHandler(listName); (*highlightStyle).setBoundToList(true); } @@ -248,31 +244,34 @@ QVariantMap SelectionScriptingInterface::getSelectedItemsList(const QString& lis if ((*currentList).getContainsData()) { if (!(*currentList).getAvatarIDs().empty()) { - QList avatarIDs = QList::fromVector(QVector::fromStdVector((*currentList).getAvatarIDs())); - list["avatars"].fromValue( avatarIDs); + QList avatarIDs; + for (auto j : (*currentList).getAvatarIDs()) { + avatarIDs.push_back((QUuid)j); + } + list["avatars"] = (avatarIDs); } if (!(*currentList).getEntityIDs().empty()) { - // QList entityIDs = QList::fromVector(QVector::fromStdVector((*currentList).getEntityIDs())); QList entityIDs; for (auto j : (*currentList).getEntityIDs()) { - entityIDs.push_back( j ); + entityIDs.push_back((QUuid)j ); } list["entities"] = (entityIDs); } if (!(*currentList).getOverlayIDs().empty()) { - QList overlayIDs = QList::fromVector(QVector::fromStdVector((*currentList).getOverlayIDs())); - list["overlays"].fromValue(overlayIDs); + QList overlayIDs; + for (auto j : (*currentList).getOverlayIDs()) { + overlayIDs.push_back((QUuid)j); + } + list["overlays"] = (overlayIDs); } return list; } else { - //qDebug() << "List named " << listName << " empty"; return list; } } else { - // qDebug() << "List named " << listName << " doesn't exist."; return list; } }