From e6ac01a1c776ba80db1dfc5d3f7f7cdc6e57501f Mon Sep 17 00:00:00 2001
From: Sebastian Piwell <sebastian.piwell@gmail.com>
Date: Fri, 6 May 2016 16:27:55 -0400
Subject: [PATCH] Set names on screenSpaceImage

---
 data/scene/default.scene                     | 3 +++
 modules/base/rendering/screenspaceimage.cpp  | 9 +++++++--
 modules/iswa/rendering/screenspacecygnet.cpp | 2 --
 modules/iswa/util/iswamanager.cpp            | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/data/scene/default.scene b/data/scene/default.scene
index ee0605f4a9..33738959ab 100644
--- a/data/scene/default.scene
+++ b/data/scene/default.scene
@@ -37,6 +37,7 @@ function postInitialization()
     
     openspace.registerScreenSpaceRenderable(
     {
+        Name = "iSWACygnet7", 
         Type = "ScreenSpaceCygnet",
         CygnetId = 7,
         Position = {0.0, 0.0},
@@ -46,6 +47,7 @@ function postInitialization()
 
     openspace.registerScreenSpaceRenderable(
     {
+        Name = "Crazy Cat",
         Type = "ScreenSpaceImage",
         TexturePath = "${OPENSPACE_DATA}/test2.jpg",
         Position = {0.8, -0.3},
@@ -55,6 +57,7 @@ function postInitialization()
 
     openspace.registerScreenSpaceRenderable(
     {
+        Name = "From Online", 
         Type = "ScreenSpaceImage",
         URL = "http://i.imgur.com/KUunHgr.jpg",
         Position = {-0.8, 0.3},
diff --git a/modules/base/rendering/screenspaceimage.cpp b/modules/base/rendering/screenspaceimage.cpp
index fd7fdcec49..44ffa283a0 100644
--- a/modules/base/rendering/screenspaceimage.cpp
+++ b/modules/base/rendering/screenspaceimage.cpp
@@ -36,8 +36,13 @@ ScreenSpaceImage::ScreenSpaceImage(const ghoul::Dictionary& dictionary)
     ,_downloadImage(false)
     ,_futureTexture(nullptr)
 {
-    _id = id();
-    setName("ScreenSpaceImage" + std::to_string(_id));
+    std::string name;
+    if(dictionary.getValue("Name", name)){
+        setName(name);
+    }else{
+        _id = id();
+        setName("ScreenSpaceImage" + std::to_string(_id));
+    }
 
     addProperty(_texturePath);
     registerProperties();
diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp
index b5962ea78a..fa203c6343 100644
--- a/modules/iswa/rendering/screenspacecygnet.cpp
+++ b/modules/iswa/rendering/screenspacecygnet.cpp
@@ -46,8 +46,6 @@ ScreenSpaceCygnet::ScreenSpaceCygnet(const ghoul::Dictionary& dictionary)
     // setName("iSWACygnet" + std::to_string(_cygnetId));
     addProperty(_updateInterval);
 
-    // registerProperties();
-
     _downloadImage = true;
 
     _url = ISWAManager::ref().iSWAurl(_cygnetId);
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 0ed60f59ec..cfeb0496a2 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -263,7 +263,7 @@ void ISWAManager::createScreenSpace(int id){
         LERROR("A cygnet with the name \"" + name +"\" already exist");
         return;
     }else{
-        std::string luaTable = "{ Type='ScreenSpaceCygnet', CygnetId = "+std::to_string(id)+"}";
+        std::string luaTable = "{ Name = '" + name + "', Type='ScreenSpaceCygnet', CygnetId = "+std::to_string(id)+"}";
         std::string script = "openspace.registerScreenSpaceRenderable(" + luaTable + ");";
         OsEng.scriptEngine().queueScript(script);
     }