Also remove labels and skyImages when cleaning the scene in a script.

Author: gzotti

src/core/StelSkyLayerMgr.cpp

@@ -149,7 +149,25 @@ QString StelSkyLayerMgr::insertSkyImage(const QString& uri, const QString& keyHi
 // Remove a sky image tile from the list of background images
 void StelSkyLayerMgr::removeSkyLayer(const QString& key)
 {
-	//qDebug() << "StelSkyLayerMgr::removeSkyImage removing image:" << key;
+	//qDebug() << "StelSkyLayerMgr::removeSkyLayer removing image:" << key;
+
+	if (key=="*")
+	{
+		QStringList keys = getAllKeys();
+
+		for (auto &k : std::as_const(keys))
+		{
+			// TODO: This list should contain all possible names of layers that are
+			//       not inserted by scripts and therefore should not be accidentally deleted.
+			//       So far I know of Nebulae, and maybe the custom nebulae from the NebulaeTextures plugin.
+			QStringList permanentList= {"Nebulae"};
+			//qDebug() << "Removing SkyImage " << k;
+			if (! permanentList.contains(k))
+				removeSkyLayer(k);
+		}
+		return;
+	}
+
 	if (allSkyLayers.contains(key))
 	{
 		SkyLayerElem* bEl = allSkyLayers[key];

src/core/StelSkyLayerMgr.hpp

@@ -153,6 +153,7 @@ public slots:
 	//! from scripts - use the similarly named function in the core
 	//! scripting API object to delete SkyLayers.
 	//! @param key the reference key (id) generated by insertSkyImage.
+	//! @note Use "*" to remove all sky images that had been added by scripts.
 	void removeSkyLayer(const QString& key);
 
 	//! Return the list of all the layer currently loaded.

src/scripting/StelMainScriptAPI.cpp

@@ -70,6 +70,7 @@
 #include <QTemporaryFile>
 #include <QTimer>
 #include <QEventLoop>
+#include <LabelMgr.hpp>
 
 #include <cmath>
 
@@ -1206,6 +1207,11 @@ void StelMainScriptAPI::clear(const QString& state)
 		StelMovementMgr* movmgr = GETSTELMODULE(StelMovementMgr);
 		ZodiacalLight* zl = GETSTELMODULE(ZodiacalLight);
 		StelPropertyMgr* propMgr = StelApp::getInstance().getStelPropertyManager();
+		LabelMgr* lMgr = GETSTELMODULE(LabelMgr);
+		StelSkyLayerMgr* siMgr = GETSTELMODULE(StelSkyLayerMgr);
+
+		lMgr->deleteAllLabels();
+		siMgr->removeSkyLayer("*");
 
 		// Hide artificial satellites through StelProperties to avoid crash if plugin was not loaded
 		propMgr->setStelPropertyValue("Satellites.flagHintsVisible",   false, true);