From 69944cc76dcfa1485e6c8a613b188729023766f9 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 3 May 2017 21:32:49 -0700
Subject: [PATCH] add a way to get a SpatiallyNestable's name without knowing
 what its type is

---
 interface/src/ui/overlays/Base3DOverlay.cpp        |  7 +++++++
 interface/src/ui/overlays/Base3DOverlay.h          |  5 +++++
 libraries/avatars/src/AvatarData.h                 |  2 ++
 libraries/entities/src/EntityItem.h                |  2 +-
 .../entities/src/EntityScriptingInterface.cpp      | 14 +++++++++++++-
 libraries/shared/src/SpatiallyNestable.h           |  2 ++
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/interface/src/ui/overlays/Base3DOverlay.cpp b/interface/src/ui/overlays/Base3DOverlay.cpp
index d7057c6faa..6f1167cfc9 100644
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@@ -81,6 +81,10 @@ QVariantMap convertOverlayLocationFromScriptSemantics(const QVariantMap& propert
 void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
     QVariantMap properties = originalProperties;
 
+    if (properties["name"].isValid()) {
+        setName(properties["name"].toString());
+    }
+
     // carry over some legacy keys
     if (!properties["position"].isValid() && !properties["localPosition"].isValid()) {
         if (properties["p1"].isValid()) {
@@ -207,6 +211,9 @@ void Base3DOverlay::setProperties(const QVariantMap& originalProperties) {
 }
 
 QVariant Base3DOverlay::getProperty(const QString& property) {
+    if (property == "name") {
+        return _name;
+    }
     if (property == "position" || property == "start" || property == "p1" || property == "point") {
         return vec3toVariant(getPosition());
     }
diff --git a/interface/src/ui/overlays/Base3DOverlay.h b/interface/src/ui/overlays/Base3DOverlay.h
index a1c23e5cd8..29d4c093a9 100644
--- a/interface/src/ui/overlays/Base3DOverlay.h
+++ b/interface/src/ui/overlays/Base3DOverlay.h
@@ -26,6 +26,9 @@ public:
     virtual OverlayID getOverlayID() const override { return OverlayID(getID().toString()); }
     void setOverlayID(OverlayID overlayID) override { setID(overlayID); }
 
+    virtual QString getName() const override { return QString("Overlay:") + _name; }
+    void setName(QString name) { _name = name; }
+
     // getters
     virtual bool is3D() const override { return true; }
 
@@ -74,6 +77,8 @@ protected:
     bool _drawInFront;
     bool _isAA;
     bool _isGrabbable { false };
+
+    QString _name;
 };
 
 #endif // hifi_Base3DOverlay_h
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index b4c79470de..a93f37839f 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -357,6 +357,8 @@ class AvatarData : public QObject, public SpatiallyNestable {
 
 public:
 
+    virtual QString getName() const override { return QString("Avatar:") + _displayName; }
+
     static const QString FRAME_NAME;
 
     static void fromFrame(const QByteArray& frameData, AvatarData& avatar, bool useFrameSkeleton = true);
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index ff5f12b2f7..1896893b52 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -281,7 +281,7 @@ public:
     float getAngularDamping() const;
     void setAngularDamping(float value);
 
-    QString getName() const;
+    virtual QString getName() const override;
     void setName(const QString& value);
     QString getDebugName();
 
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 2189970cc7..c499ce4acc 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -469,7 +469,19 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties&
     if (entityFound) {
         queueEntityMessage(PacketType::EntityEdit, entityID, properties);
     } else {
-        qCWarning(entities) << "attempted edit on unknown entity: " << id;
+        QString name = "unknown";
+        QSharedPointer<SpatialParentFinder> parentFinder = DependencyManager::get<SpatialParentFinder>();
+        if (parentFinder) {
+            bool success;
+            auto nestableWP = parentFinder->find(id, success, static_cast<SpatialParentTree*>(_entityTree.get()));
+            if (success) {
+                auto nestable = nestableWP.lock();
+                if (nestable) {
+                    name = nestable->getName();
+                }
+            }
+        }
+        qCWarning(entities) << "attempted edit on unknown entity: " << id << name;
     }
     return id;
 }
diff --git a/libraries/shared/src/SpatiallyNestable.h b/libraries/shared/src/SpatiallyNestable.h
index 820c8685d7..0f89016f54 100644
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@@ -42,6 +42,8 @@ public:
     virtual const QUuid getID() const;
     virtual void setID(const QUuid& id);
 
+    virtual QString getName() const { return "SpatiallyNestable"; }
+
     virtual const QUuid getParentID() const;
     virtual void setParentID(const QUuid& parentID);