Merge lp:~stellarium/stellarium/toastImages into lp:stellarium

[Alexander Wolf]

[gzotti (georg-zotti)]

Works like a charm as long as network is good.

Maybe fix following: When disabling network (tset with aircraft mode on notebook), and reenabling, re-establish connection? Not sure what happens currently, network stays disabled. What about short network interruptions - would we have to completely restart Stellarium (and break connection to telescope etc.) to re-enable? It may be acceptable to toggle DSS off/on to reconnect. Maybe give screen notice "DSS: network unavailable" or such?

Things to possibly consider:

Fix TODOs (links) in ToastMgr::init(), and host data at stellarium.org?
Explain what TOAST actually means?
We should be prepared to answer questions about installing data locally (for use at off-line observing sites! Either private PCs or data on an in-house server.) (source, legal state, bandwidth, instructions?)
A chapter in the Guide should explain all this! (Can be added after merge, though.)

review: Needs Fixing

[Alexander Wolf (alexwolf)]

TOAST is "tessellated octahedral adaptive subdivision transform" (details: https://arxiv.org/pdf/1505.02291.pdf) + see section "2.3.2.8.1 The TOAST Projection" (skyview.gsfc.nasa.gov/current/docs/skyviewinajar.html)

TODOs - I hope Fabien can help with it (I can't add/change DNS names).

Network behaviour: it's more to the StelTexture class behaviour

[gzotti (georg-zotti)]

Thanks for the paper. This must be referenced in the Guide chapter to be written.

So this network behaviour problem must then become a "wishlist bug" for StelTexture, and should not impede branch merge.

Then it's OK from my side :-)

review: Approve

[Alexander Wolf (alexwolf)]

Offline mode: full collection of DSS has a size 112GiB and it can be problematic to the usage by many users.

=== added file 'data/gui/btToastSurvey-off.png'
Binary files data/gui/btToastSurvey-off.png	1970-01-01 00:00:00 +0000 and data/gui/btToastSurvey-off.png	2016-11-13 10:24:15 +0000 differ
=== added file 'data/gui/btToastSurvey-on.png'
Binary files data/gui/btToastSurvey-on.png	1970-01-01 00:00:00 +0000 and data/gui/btToastSurvey-on.png	2016-11-13 10:24:15 +0000 differ
=== modified file 'data/gui/guiRes.qrc'
--- data/gui/guiRes.qrc	2015-12-05 17:34:59 +0000
+++ data/gui/guiRes.qrc	2016-11-13 10:24:15 +0000
@@ -88,6 +88,8 @@
         <file>btConstellationLines-on.png</file>
         <file>btDSS-off.png</file>
         <file>btDSS-on.png</file>
+        <file>btToastSurvey-off.png</file>
+        <file>btToastSurvey-on.png</file>
         <file>btEquatorialGrid-off.png</file>
         <file>btEquatorialGrid-on.png</file>
         <file>btEquatorialMount-off.png</file>

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-11-05 13:35:49 +0000
+++ src/CMakeLists.txt	2016-11-13 10:24:15 +0000
@@ -153,6 +153,10 @@
      core/TrailGroup.cpp
      core/RefractionExtinction.hpp
      core/RefractionExtinction.cpp
+     core/StelToast.hpp
+     core/StelToast.cpp
+     core/StelToastGrid.hpp
+     core/StelToastGrid.cpp
      core/StelActionMgr.hpp
      core/StelActionMgr.cpp
      core/StelProgressController.hpp
@@ -249,6 +253,8 @@
      core/modules/StarMgr.hpp
      core/modules/StarWrapper.cpp
      core/modules/StarWrapper.hpp
+     core/modules/ToastMgr.hpp
+     core/modules/ToastMgr.cpp
      core/modules/ZoneArray.cpp
      core/modules/ZodiacalLight.hpp
      core/modules/ZodiacalLight.cpp
@@ -314,7 +320,6 @@
 SET(stellarium_RES ${CMAKE_SOURCE_DIR}/data/mainRes.qrc)
 QT5_ADD_RESOURCES(stellarium_RES_CXX ${stellarium_RES})
 
-
 #############################################################################################
 ############################# Standard GUI plugin compilation ###############################
 #############################################################################################

=== modified file 'src/core/MultiLevelJsonBase.cpp'
--- src/core/MultiLevelJsonBase.cpp	2014-06-12 15:47:22 +0000
+++ src/core/MultiLevelJsonBase.cpp	2016-11-13 10:24:15 +0000
@@ -169,7 +169,7 @@
 		}
 		Q_ASSERT(httpReply==NULL);
 		QNetworkRequest req(qurl);
-		req.setRawHeader("User-Agent", StelUtils::getApplicationName().toLatin1());
+		req.setRawHeader("User-Agent", StelUtils::getUserAgentString().toLatin1());
 		httpReply = getNetworkAccessManager().get(req);
 		//qDebug() << "Started downloading " << httpReply->request().url().path();
 		Q_ASSERT(httpReply->error()==QNetworkReply::NoError);

=== modified file 'src/core/StelApp.cpp'
--- src/core/StelApp.cpp	2016-10-23 17:09:45 +0000
+++ src/core/StelApp.cpp	2016-11-13 10:24:15 +0000
@@ -37,9 +37,9 @@
 #include "StelIniParser.hpp"
 #include "StelProjector.hpp"
 #include "StelLocationMgr.hpp"
+#include "ToastMgr.hpp"
 #include "StelActionMgr.hpp"
 #include "StelPropertyMgr.hpp"
-
 #include "StelProgressController.hpp"
 #include "StelModuleMgr.hpp"
 #include "StelLocaleMgr.hpp"
@@ -457,6 +457,11 @@
 	skyImageMgr->init();
 	getModuleMgr().registerModule(skyImageMgr);
 
+	// Toast surveys
+	ToastMgr* toasts = new ToastMgr();
+	toasts->init();
+	getModuleMgr().registerModule(toasts);
+
 	// Init audio manager
 	audioMgr = new StelAudioMgr();
 

=== modified file 'src/core/StelLocationMgr.cpp'
--- src/core/StelLocationMgr.cpp	2016-10-25 15:39:06 +0000
+++ src/core/StelLocationMgr.cpp	2016-11-13 10:24:15 +0000
@@ -356,7 +356,7 @@
 {
 	QNetworkRequest req( QUrl( QString("http://freegeoip.net/json/") ) );
 	req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-	req.setRawHeader("User-Agent", StelUtils::getApplicationName().toLatin1());
+	req.setRawHeader("User-Agent", StelUtils::getUserAgentString().toLatin1());
 	QNetworkReply* networkReply=StelApp::getInstance().getNetworkAccessManager()->get(req);
 	connect(networkReply, SIGNAL(finished()), this, SLOT(changeLocationFromNetworkLookup()));
 }

=== modified file 'src/core/StelSkyLayerMgr.cpp'
--- src/core/StelSkyLayerMgr.cpp	2016-06-14 14:56:19 +0000
+++ src/core/StelSkyLayerMgr.cpp	2016-11-13 10:24:15 +0000
@@ -69,6 +69,7 @@
 		qWarning() << "ERROR while loading nebula texture set default";
 	else
 		insertSkyImage(path);
+
 	QSettings* conf = StelApp::getInstance().getSettings();
 	conf->beginGroup("skylayers");
 	foreach (const QString& key, conf->childKeys())

=== modified file 'src/core/StelSphereGeometry.cpp'
--- src/core/StelSphereGeometry.cpp	2016-07-23 05:23:41 +0000
+++ src/core/StelSphereGeometry.cpp	2016-11-13 10:24:15 +0000
@@ -1314,6 +1314,11 @@
 	{
 		return SphericalRegionP(new SphericalPolygon(pathFromQVariantList(l)));
 	}
+	else if (code=="CONVEX_POLYGON")
+	{
+		return SphericalRegionP(new SphericalConvexPolygon(singleContourFromQVariantList(l.at(1).toList())));
+	}
+
 	Q_ASSERT(0);
 	return EmptySphericalRegion::staticInstance;
 }

=== modified file 'src/core/StelTexture.cpp'
--- src/core/StelTexture.cpp	2016-10-11 14:47:05 +0000
+++ src/core/StelTexture.cpp	2016-11-13 10:24:15 +0000
@@ -57,10 +57,12 @@
 		}
 		id = 0;
 	}
-	if (networkReply != NULL)
+	if (networkReply)
 	{
 		networkReply->abort();
-		networkReply->deleteLater();
+		//networkReply->deleteLater();
+		delete networkReply;
+		networkReply = NULL;
 	}
 	if (loader != NULL) {
 		delete loader;
@@ -124,9 +126,9 @@
 		QNetworkRequest req = QNetworkRequest(QUrl(fullPath));
 		// Define that preference should be given to cached files (no etag checks)
 		req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-		req.setRawHeader("User-Agent", StelUtils::getApplicationName().toLatin1());
+		req.setRawHeader("User-Agent", StelUtils::getUserAgentString().toLatin1());
 		networkReply = StelApp::getInstance().getNetworkAccessManager()->get(req);
-		connect(networkReply, SIGNAL(finished()), this, SLOT(onNetworkReply()));
+		connect(networkReply, SIGNAL(finished()), this, SLOT(onNetworkReply()));		
 		return false;
 	}
 	// The network connection is still running.

=== modified file 'src/core/StelTexture.hpp'
--- src/core/StelTexture.hpp	2015-02-06 19:40:02 +0000
+++ src/core/StelTexture.hpp	2016-11-13 10:24:15 +0000
@@ -147,7 +147,7 @@
 
 
 	//! The URL where to download the file
-	QString fullPath;
+	QString fullPath;	
 
 	//! True when something when wrong in the loading process
 	bool errorOccured;

=== modified file 'src/core/StelTextureMgr.cpp'
--- src/core/StelTextureMgr.cpp	2015-03-04 18:42:24 +0000
+++ src/core/StelTextureMgr.cpp	2016-11-13 10:24:15 +0000
@@ -67,7 +67,7 @@
 
 	StelTextureSP tex = StelTextureSP(new StelTexture());
 	tex->loadParams = params;
-	tex->fullPath = url;
+	tex->fullPath = url;	
 	if (!lazyLoading)
 	{
 		tex->bind();

=== added file 'src/core/StelToast.cpp'
--- src/core/StelToast.cpp	1970-01-01 00:00:00 +0000
+++ src/core/StelToast.cpp	2016-11-13 10:24:15 +0000
@@ -0,0 +1,235 @@
+/*
+ * Stellarium
+ * Copyright (C) 2010 Guillaume Chereau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <QtOpenGL>
+#include "StelApp.hpp"
+#include "StelCore.hpp"
+#include "StelPainter.hpp"
+#include "StelTexture.hpp"
+#include "StelTextureMgr.hpp"
+#include "StelToast.hpp"
+
+ToastTile::ToastTile(QObject* parent, int level, int x, int y)
+	: QObject(parent), level(level), x(x), y(y), empty(false), ready(false), texture(NULL), texFader(NULL)
+{
+	Q_ASSERT(level <= getGrid()->getMaxLevel());
+	const ToastSurvey* survey = getSurvey();
+	// create the texture
+	imagePath = survey->getTilePath(level, x, y);
+
+	if (level==0)
+	{
+		boundingCap.n=Vec3d(1,0,0);
+		boundingCap.d=-1.;
+	}
+	const QVector<Vec3d>& pts = getGrid()->getPolygon(level, x, y);
+	Vec3d n = pts.at(0);
+	n+=pts.at(1);
+	n+=pts.at(2);
+	n+=pts.at(3);
+	n.normalize();
+	boundingCap.n=n;
+	if (level==1)
+		boundingCap.d=0;
+	else
+		boundingCap.d=qMin(qMin(n*pts.at(0), n*pts.at(1)), qMin(n*pts.at(2), n*pts.at(3)));
+}
+
+const ToastGrid* ToastTile::getGrid() const
+{
+	return getSurvey()->getGrid();
+}
+
+
+const ToastSurvey* ToastTile::getSurvey() const
+{
+	// the parent can either be a ToastSurvey either be a ToastTile
+	ToastSurvey* ret = qobject_cast<ToastSurvey*>(parent());
+	if (ret)
+		return ret;
+	ToastTile* tile = qobject_cast<ToastTile*>(parent());
+	Q_ASSERT(tile);
+	return tile->getSurvey();
+}
+
+
+bool ToastTile::isVisible(const SphericalCap& viewportShape, int maxVisibleLevel) const
+{
+	if (empty)
+		return false;
+	if (level == 0)
+		return true;
+	if (level > maxVisibleLevel)
+		return false;
+	return viewportShape.intersects(boundingCap);
+}
+
+bool ToastTile::isCovered(const SphericalCap& viewportShape) const
+{
+	// The tile is covered if we have at least one visible child and all the visible children are all ready to be drawn.
+	int nbVisibleChildren = 0;
+	foreach (const ToastTile* child, subTiles)
+	{
+		if (!viewportShape.intersects(child->boundingCap))
+			continue;
+		nbVisibleChildren++;
+		if (!child->ready || child->texFader->state()==QTimeLine::Running)
+			return false;
+	}
+	return nbVisibleChildren > 0;
+}
+
+
+void ToastTile::prepareDraw()
+{
+	Q_ASSERT(!empty);
+
+	if (texture.isNull())
+	{
+		//qDebug() << "load texture" << imagePath;
+		StelTextureMgr& texMgr=StelApp::getInstance().getTextureManager();
+		texture = texMgr.createTextureThread(imagePath, StelTexture::StelTextureParams(true));
+	}
+	if (texture.isNull() || (!texture->isLoading() && !texture->canBind() && !texture->getErrorMessage().isEmpty()))
+	{
+		if (!texture.isNull())
+			qDebug() << "can't get texture" << imagePath << texture->getErrorMessage();
+		empty = true;
+		return;
+	}
+	if (!texture->canBind())
+		return;
+	// Get the opengl arrays
+	if (vertexArray.empty())
+	{
+		int ml = qMin(qMax(3, level+1), getGrid()->getMaxLevel());
+		vertexArray = getGrid()->getVertexArray(level, x, y, ml);
+		textureArray = getGrid()->getTextureArray(level, x, y, ml);
+		indexArray = getGrid()->getTrianglesIndex(level, x, y, ml);
+	}
+
+	if (subTiles.isEmpty() && level < getSurvey()->getMaxLevel())
+	{
+		//qDebug() << "Create children";
+		// Create the children
+		for (int i = 0; i < 2; ++i)
+			for (int j = 0; j < 2; ++j)
+				subTiles.append(new ToastTile(this, level + 1, 2 * this->x + i, 2 * this->y + j));
+		Q_ASSERT(subTiles.size() == 4);
+	}
+	ready = true;
+}
+
+
+void ToastTile::drawTile(StelPainter* sPainter)
+{
+	if (!ready)
+		prepareDraw();
+
+	// Still not ready
+	if (texture.isNull() || !texture->bind())
+		return;
+
+	if (!texFader)
+	{
+		texFader = new QTimeLine(1000, this);
+		texFader->start();
+	}
+
+	if (texFader->state()==QTimeLine::Running)
+	{
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
+		glEnable(GL_BLEND);
+		sPainter->setColor(1,1,1, texFader->currentValue());
+	}
+	else
+	{
+		glDisable(GL_BLEND);
+		sPainter->setColor(1, 1, 1, 1);
+	}
+
+	sPainter->enableTexture2d(true);
+	Q_ASSERT(vertexArray.size() == textureArray.size());
+
+	glEnable(GL_CULL_FACE);
+	// sPainter.drawArrays(GL_TRIANGLES, vertexArray.size(), vertexArray.data(), textureArray.data(), NULL, NULL, indexArray.size(), indexArray.constData());
+	sPainter->setArrays(vertexArray.constData(), textureArray.constData());
+	sPainter->drawFromArray(StelPainter::Triangles, indexArray.size(), 0, true, indexArray.constData());
+	glDisable(GL_CULL_FACE);
+
+//	SphericalConvexPolygon poly(getGrid()->getPolygon(level, x, y));
+//	sPainter->enableTexture2d(false);
+//	sPainter->drawSphericalRegion(&poly, StelPainter::SphericalPolygonDrawModeBoundary);
+}
+
+
+void ToastTile::draw(StelPainter* sPainter, const SphericalCap& viewportShape, int maxVisibleLevel)
+{
+	if (!isVisible(viewportShape, maxVisibleLevel))
+	{
+		// Clean up to save memory.
+		foreach (ToastTile* child, subTiles)
+		{
+			child->deleteLater();
+		}
+		subTiles.clear();
+		ready = false;
+		return;
+	}
+	if (level==maxVisibleLevel || !isCovered(viewportShape))
+		drawTile(sPainter);
+
+	// Draw all the children
+	foreach (ToastTile* child, subTiles)
+	{
+		child->draw(sPainter, viewportShape, maxVisibleLevel);
+	}
+}
+
+/////// ToastSurvey methods ////////////
+ToastSurvey::ToastSurvey(const QString& path, int amaxLevel)
+	: grid(amaxLevel), path(path), maxLevel(amaxLevel)
+{
+	rootTile = new ToastTile(this, 0, 0, 0);
+}
+
+
+QString ToastSurvey::getTilePath(int level, int x, int y) const
+{
+	QString ret = path;
+	ret.replace("{level}", QString::number(level));
+	ret.replace("{x}", QString::number(x));
+	ret.replace("{y}", QString::number(y));
+	return ret;
+}
+
+
+void ToastSurvey::draw(StelPainter* sPainter)
+{
+	// Compute the maximum visible level for the tiles according to the view resolution.
+	// We know that each tile at level L represents an angle of 360 / 2**L
+	// The maximum angle we want to see is the size of a tile in pixels time the angle for one visible pixel.
+	const double anglePerPixel = 1./sPainter->getProjector()->getPixelPerRadAtCenter()*180./M_PI;
+	const double maxAngle = anglePerPixel * getTilesSize();
+	int maxVisibleLevel = (int)(log2(360. / maxAngle));
+
+	// We also get the viewport shape to discard invisibly tiles.
+	const SphericalCap& viewportRegion = sPainter->getProjector()->getBoundingCap();
+	rootTile->draw(sPainter, viewportRegion, maxVisibleLevel);
+}

=== added file 'src/core/StelToast.hpp'
--- src/core/StelToast.hpp	1970-01-01 00:00:00 +0000
+++ src/core/StelToast.hpp	2016-11-13 10:24:15 +0000
@@ -0,0 +1,114 @@
+/*
+ * Stellarium
+ * Copyright (C) 2010 Guillaume Chereau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _STELTOAST_HPP_
+#define _STELTOAST_HPP_
+
+#include <QObject>
+#include <QString>
+#include <QVector>
+
+#include "StelSphereGeometry.hpp"
+#include "StelTexture.hpp"
+#include "StelTextureTypes.hpp"
+#include "VecMath.hpp"
+#include "StelToastGrid.hpp"
+
+class StelPainter;
+class ToastSurvey;
+
+//! @class ToastTile
+//! Represents a tile in a Toast image.
+//! The tiles are stored in a tree structure, using the QObject
+//! children/parent relationships.
+class ToastTile : public QObject
+{
+	Q_OBJECT
+
+public:
+	ToastTile(QObject* parent, int level, int x, int y);	
+	void draw(StelPainter* painter, const SphericalCap& viewportShape, int maxVisibleLevel);
+	bool isTransparent();
+
+protected:
+	void drawTile(StelPainter* painter);
+	//! Return the survey the tile belongs to.
+	const ToastSurvey* getSurvey() const;
+	//! Return the toast grid used by the tile.
+	const ToastGrid* getGrid() const;
+	//! Return whether the tile should be drawn
+	bool isVisible(const SphericalCap& viewportShape, int maxVisibleLevel) const;
+	//! return whether the tile is covered by its children tiles
+	//! This is used to avoid drawing tiles that will be covered anyway
+	bool isCovered(const SphericalCap& viewportShape) const;
+	void prepareDraw();
+
+private:
+	//! The level of the tile
+	int level;
+	// x coordinate of the tile
+	int x;
+	// y coordinate of the tile
+	int y;
+	//! Path to the tile image
+	QString imagePath;
+	// Set to true if the tile has no texture
+	bool empty;
+	//! Set to true if the tile is ready to draw
+	bool ready;
+	//! The texture associated with the tile
+	StelTextureSP texture;
+	//! The bounding cap used to check if the tile is visible
+	SphericalCap boundingCap;
+
+	QList<ToastTile*> subTiles;
+
+	// QList<SphericalRegionP> skyConvexPolygons;
+	//! OpenGl arrays
+	QVector<Vec3d> vertexArray;
+	QVector<Vec2f> textureArray;
+	QVector<unsigned short> indexArray;
+
+	// Used for smooth fade in
+	class QTimeLine* texFader;
+};
+
+
+//! @class ToastSurvey
+//! Represents a full Toast survey.
+class ToastSurvey : public QObject
+{
+	Q_OBJECT
+
+public:
+	ToastSurvey(const QString& path, int maxLevel);
+	QString getTilePath(int level, int x, int y) const;
+	void draw(StelPainter* sPainter);
+	const ToastGrid* getGrid() const {return &grid;}
+	int getMaxLevel() const {return maxLevel;}
+	int getTilesSize() const {return 256;}
+
+private:
+	ToastGrid grid;
+	QString path;
+	ToastTile* rootTile;
+	int maxLevel;
+};
+
+#endif // _STELTOAST_HPP_

=== added file 'src/core/StelToastGrid.cpp'
--- src/core/StelToastGrid.cpp	1970-01-01 00:00:00 +0000
+++ src/core/StelToastGrid.cpp	2016-11-13 10:24:15 +0000
@@ -0,0 +1,177 @@
+/*
+ * Stellarium
+ * Copyright (C) 2010 Guillaume Chereau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <limits>
+#include "StelToastGrid.hpp"
+
+//! compute the middle of two points on the sphere
+static inline Vec3d middle(const Vec3d& a, const Vec3d b)
+{
+	Vec3d ret = a;
+	ret += b;
+	ret.normalize();
+	return ret;
+}
+
+
+ToastGrid::ToastGrid(int amaxLevel)
+	: maxLevel(amaxLevel), size(pow2(amaxLevel) + 1)
+{
+	// We assume that initialization of the grid is fast enough to be
+	// done in the constructor.
+	init_grid();
+}
+
+
+void ToastGrid::init_grid()
+{
+	// Allocate the grid memory.
+	grid.resize(size * size);
+	// Set up the level 0.
+	at(0, 0, 0) = at(0, 1, 0) = at(0, 1, 1) = at(0, 0, 1) = Vec3d(0, 0, -1);
+	// And the level 1
+	// Need mirror
+	at(1, 1, 1) = Vec3d(0, 0, 1);
+	at(1, 1, 0) = Vec3d(0, -1, 0);
+	at(1, 2, 1) = Vec3d(1, 0, 0);
+	at(1, 1, 2) = Vec3d(0, 1, 0);
+	at(1, 0, 1) = Vec3d(-1, 0, 0);
+
+	// Then we can compute the other levels by recursion
+	init_grid(1, 0, 0, false);
+	init_grid(1, 0, 1, true);
+	init_grid(1, 1, 1, false);
+	init_grid(1, 1, 0, true);
+}
+
+
+void ToastGrid::init_grid(int level, int x, int y, bool side)
+{
+	Q_ASSERT(level >= 1); // This method won't work for level 0 !
+	int clevel = level + 1;
+	int cx = 2*x;
+	int cy = 2*y;
+	// first we compute all the mid points
+	at(clevel, cx, cy+1) = middle(at(level, x, y), at(level, x, y+1));
+	at(clevel, cx+1, cy+2) = middle(at(level, x, y+1), at(level, x+1, y+1));
+	at(clevel, cx+2, cy+1) = middle(at(level, x+1, y+1), at(level, x+1, y));
+	at(clevel, cx+1, cy) = middle(at(level, x+1, y), at(level, x, y));
+	if (side)
+		at(clevel, cx+1, cy+1) = middle(at(level, x, y), at(level, x+1, y+1));
+	else
+		at(clevel, cx+1, cy+1) = middle(at(level, x, y+1), at(level, x+1, y));
+	// now we can compute the higher levels
+	if (clevel < maxLevel)
+	{
+		init_grid(clevel, cx, cy, side);
+		init_grid(clevel, cx+1, cy, side);
+		init_grid(clevel, cx+1, cy+1, side);
+		init_grid(clevel, cx, cy+1, side);
+	}
+}
+
+
+QVector<Vec3d> ToastGrid::getVertexArray(int level, int x, int y, int resolution) const
+{
+	Q_ASSERT(resolution >= level);
+	Q_ASSERT(resolution <= maxLevel);
+	// The size of the returned array
+	int size = pow2(resolution - level) + 1;
+	QVector<Vec3d> ret;
+	ret.reserve(size * size);
+	// Compute the real position in the grid
+	int scale = pow2(maxLevel - level);
+	x *= scale;
+	y *= scale;
+	// Fill the array
+	int step = pow2(maxLevel - resolution);
+	for (int i = 0; i < size; i++)
+	{
+		for (int j = 0; j < size; j++)
+		{
+			ret.append(at(x + j * step, y + i * step));
+		}
+	}
+	Q_ASSERT(ret.size() == size * size);
+	return ret;
+}
+
+
+QVector<Vec2f> ToastGrid::getTextureArray(int level, int x, int y, int resolution) const
+{
+	Q_UNUSED(x);
+	Q_UNUSED(y);
+	Q_ASSERT(resolution >= level);
+	Q_ASSERT(resolution <= maxLevel);
+	// The size of the returned array
+	int size = pow2(resolution - level) + 1;
+	QVector<Vec2f> ret;
+	ret.reserve(size * size);
+	for (int i = size-1; i >= 0; i--)
+	{
+		for (int j = 0; j < size; j++)
+		{
+			ret.append(Vec2f(j,i) / (size-1));
+		}
+	}
+	Q_ASSERT(ret.size() == size * size);
+	return ret;
+}
+
+
+QVector<unsigned short> ToastGrid::getTrianglesIndex(int level, int x, int y, int resolution) const
+{
+	Q_ASSERT(resolution >= level);
+	Q_ASSERT(resolution <= maxLevel);
+	int size = pow2(resolution - level) + 1;
+	int nbTiles = (size - 1) * (size - 1);
+	// If we are in the top right or the bottom left quadran we invert the diagonal of the triangles.
+	int middleIndex = pow2(level) / 2;
+	bool invert = (x >= middleIndex) == (y >= middleIndex);
+	QVector<unsigned short> ret;
+	ret.reserve(nbTiles * 6);
+	for (int i = 0; i < size - 1; ++i)
+	{
+		for (int j = 0; j < size - 1; ++j)
+		{
+			Q_ASSERT(i * size + j <= std::numeric_limits<short>::max());
+			unsigned int a = i * size + j;
+			unsigned int b = (i + 1) * size + j;
+			unsigned int c = (i + 1) * size + j + 1;
+			unsigned int d = i * size + j + 1;
+			if (!invert)
+				ret << b << c << a << c << d << a;
+			else
+				ret << b << d << a << d << b << c;
+		}
+	}
+
+	Q_ASSERT(ret.size() == nbTiles * 6);
+	return ret;
+}
+
+
+QVector<Vec3d> ToastGrid::getPolygon(int level, int x, int y) const
+{
+	QVector<Vec3d> array = getVertexArray(level, x, y, level);
+	QVector<Vec3d> ret;
+	ret.reserve(4);
+	ret << array[2] << array[3] << array[1] << array[0];
+	return ret;
+}

=== added file 'src/core/StelToastGrid.hpp'
--- src/core/StelToastGrid.hpp	1970-01-01 00:00:00 +0000
+++ src/core/StelToastGrid.hpp	2016-11-13 10:24:15 +0000
@@ -0,0 +1,90 @@
+/*
+ * Stellarium
+ * Copyright (C) 2010 Guillaume Chereau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef STELTOASTGRID_HPP
+#define STELTOASTGRID_HPP
+
+#include <QVector>
+#include "VecMath.hpp"
+
+//! Compute 2^x
+inline int pow2(int x) {return 1 << x;}
+
+//! @class ToastGrid
+//! Convenience class that can be used to compute the toast grid points.
+//! The ToastGrid class allow to compute the vertex arrays associated
+//! with Toast tiles. Each method refers to a tile by its level and x
+//! and y coordinates.
+class ToastGrid
+{
+public:
+	ToastGrid(int maxLevel);
+	//! Get the vertice array for a given tile.
+	//! The position are stored in a grid.
+	//! @param level the level of the tile.
+	//! @param x the x coordinate of the tile.
+	//! @param y the y coordinate of the tile.
+	//! @param resolution the resolution of the returned array.
+	QVector<Vec3d> getVertexArray(int level, int x, int y, int resolution) const;
+	//! Get the texture array for a given tile.
+	//! The position are stored in a grid
+	//! @param level the level of the tile.
+	//! @param x the x coordinate of the tile.
+	//! @param y the y coordinate of the tile.
+	//! @param resolution the resolution of the returned array.
+	QVector<Vec2f> getTextureArray(int level, int x, int y, int resolution) const;
+	//! Get the index of the vertex from getVertexArray sorted as a list of triangles.
+	//! @param level the level of the tile.
+	//! @param x the x coordinate of the tile.
+	//! @param y the y coordinate of the tile.
+	//! @param resolution the resolution of the returned array.
+	QVector<unsigned short> getTrianglesIndex(int level, int x, int y, int resolution) const;
+	//! Returns the polygon contouring a given tile.
+	//! @param level the level of the tile.
+	//! @param x the x coordinate of the tile.
+	//! @param y the y coordinate of the tile.
+	QVector<Vec3d> getPolygon(int level, int x, int y) const;
+	//! Return the max level of this grid.
+	int getMaxLevel() const {return maxLevel;}
+
+private:
+	//! Get the vector at a given point in the grid
+	const Vec3d& at(int x, int y) const {return grid[y * size + x];}
+	//! Get the vector at a given point in the grid
+	Vec3d& at(int x, int y) {return grid[y * size + x];}
+	//! Get the vector at a given point in the grid
+	const Vec3d& at(int level, int x, int y) const
+		{int scale = pow2(maxLevel - level); return at(scale * x, scale * y);}
+	//! Get the vector at a given point in the grid
+	Vec3d& at(int level, int x, int y)
+		{int scale = pow2(maxLevel - level); return at(scale * x, scale * y);}
+
+	//! initialize the grid
+	void init_grid();
+	void init_grid(int level, int x, int y, bool side);
+
+	//! The max level of the grid
+	int maxLevel;
+	//! the size of the grid
+	int size;
+	//! The actual grid data
+	QVector<Vec3d> grid;
+};
+
+#endif // STELTOASTGRID_HPP

=== modified file 'src/core/StelUtils.cpp'
--- src/core/StelUtils.cpp	2016-10-29 16:37:42 +0000
+++ src/core/StelUtils.cpp	2016-11-13 10:24:15 +0000
@@ -56,6 +56,23 @@
 #endif
 }
 
+QString getUserAgentString()
+{
+	// Get info about operating system
+	QString platform = StelUtils::getOperatingSystemInfo();
+	if (platform.contains("Linux"))
+		platform = "Linux";
+	if (platform.contains("FreeBSD"))
+		platform = "FreeBSD";
+	if (platform.contains("NetBSD"))
+		platform = "NetBSD";
+	if (platform.contains("OpenBSD"))
+		platform = "OpenBSD";
+
+	// Set user agent as "Stellarium/$version$ ($platform$)"
+	return QString("Stellarium/%1 (%2)").arg(StelUtils::getApplicationVersion()).arg(platform);
+}
+
 QString getOperatingSystemInfo()
 {
 	QString OS = "Unknown operating system";

=== modified file 'src/core/StelUtils.hpp'
--- src/core/StelUtils.hpp	2016-10-30 11:04:58 +0000
+++ src/core/StelUtils.hpp	2016-11-13 10:24:15 +0000
@@ -49,6 +49,9 @@
 	//! Return the name and the version of operating system, i.e. "Mac OS X 10.7"
 	QString getOperatingSystemInfo();
 
+	//! Return the user agent name, i.e. "Stellarium/0.15.0 (Linux)"
+	QString getUserAgentString();
+
 	//! Convert an angle in hms format to radian.
 	//! @param h hour component
 	//! @param m minute component

=== modified file 'src/core/modules/ConstellationMgr.cpp'
--- src/core/modules/ConstellationMgr.cpp	2016-09-17 18:27:21 +0000
+++ src/core/modules/ConstellationMgr.cpp	2016-11-13 10:24:15 +0000
@@ -134,7 +134,7 @@
 
 	StelObjectMgr *objectManager = GETSTELMODULE(StelObjectMgr);
 	objectManager->registerStelObjectMgr(this);
-	connect(objectManager, SIGNAL(selectedObjectChanged(StelModule::StelModuleSelectAction)), 
+	connect(objectManager, SIGNAL(selectedObjectChanged(StelModule::StelModuleSelectAction)),
 			this, SLOT(selectedObjectChange(StelModule::StelModuleSelectAction)));
 	StelApp *app = &StelApp::getInstance();
 	connect(app, SIGNAL(languageChanged()), this, SLOT(updateI18n()));

=== added file 'src/core/modules/ToastMgr.cpp'
--- src/core/modules/ToastMgr.cpp	1970-01-01 00:00:00 +0000
+++ src/core/modules/ToastMgr.cpp	2016-11-13 10:24:15 +0000
@@ -0,0 +1,97 @@
+/*
+ * Stellarium
+ * Copyright (C) 2006 Fabien Chereau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <QDebug>
+
+#include "ToastMgr.hpp"
+#include "StelToast.hpp"
+#include "StelFader.hpp"
+#include "StelPainter.hpp"
+#include "StelCore.hpp"
+#include "StelApp.hpp"
+#include "StelTranslator.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelSkyLayerMgr.hpp"
+
+#include <QSettings>
+
+ToastMgr::ToastMgr()
+{	
+	setObjectName("ToastMgr");
+	fader = new LinearFader();
+}
+
+ToastMgr::~ToastMgr()
+{
+	if (survey)
+	{
+		delete survey;
+		survey = NULL;
+	}
+
+	delete fader;
+	fader = NULL;
+}
+
+void ToastMgr::init()
+{
+	QSettings* conf = StelApp::getInstance().getSettings();
+	Q_ASSERT(conf);
+
+	// TODO: change settings before release (results->survey; dss.astro.altspu.ru->dss.stellarium.org)
+	QString toastHost = conf->value("astro/toast_survey_host", "http://dss.astro.altspu.ru").toString();	
+	QString toastDir = conf->value("astro/toast_survey_directory", "results").toString();
+	int toastLevel = conf->value("astro/toast_survey_levels", 11).toInt();	
+	survey = new ToastSurvey(toastHost+"/" + toastDir + "/{level}/{x}_{y}.jpg", toastLevel);
+	survey->setParent(this);
+
+	// Hide deep-sky survey by default
+	setFlagSurveyShow(conf->value("astro/flag_toast_survey", false).toBool());
+
+	addAction("actionShow_Toast_Survey", N_("Display Options"), N_("Digitized sky survey"), "surveyDisplayed", "Ctrl+Alt+D");
+}
+
+void ToastMgr::draw(StelCore* core)
+{
+	if (!getFlagSurveyShow())
+		return;
+
+	StelPainter sPainter(core->getProjection(StelCore::FrameJ2000));
+	survey->draw(&sPainter);
+}
+
+void ToastMgr::update(double deltaTime)
+{
+	fader->update((int)(deltaTime*1000));
+}
+
+void ToastMgr::setFlagSurveyShow(const bool displayed)
+{
+	if (*fader != displayed)
+	{
+		*fader = displayed;
+		GETSTELMODULE(StelSkyLayerMgr)->setFlagShow(!displayed);
+		emit surveyDisplayedChanged(displayed);
+	}
+}
+
+bool ToastMgr::getFlagSurveyShow() const
+{
+	return *fader;
+}

=== added file 'src/core/modules/ToastMgr.hpp'
--- src/core/modules/ToastMgr.hpp	1970-01-01 00:00:00 +0000
+++ src/core/modules/ToastMgr.hpp	2016-11-13 10:24:15 +0000
@@ -0,0 +1,53 @@
+/*
+ * Stellarium
+ * Copyright (C) 2006 Fabien Chereau
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _TOASTMGR_HPP_
+#define _TOASTMGR_HPP_
+
+#include "StelModule.hpp"
+
+class ToastMgr : public StelModule
+{
+	Q_OBJECT
+	Q_PROPERTY(bool surveyDisplayed
+			READ getFlagSurveyShow
+			WRITE setFlagSurveyShow
+			NOTIFY surveyDisplayedChanged)
+public:
+	ToastMgr();
+	virtual ~ToastMgr();
+	virtual void init();
+	virtual void update(double deltaTime);
+	virtual void draw(StelCore* core);
+	//! Used to determine the order in which the various modules are drawn. MilkyWay=1, we use 7.
+	virtual double getCallOrder(StelModuleActionName actionName) const {Q_UNUSED(actionName); return 7.;}
+
+public slots:
+	void setFlagSurveyShow(bool displayed);
+	bool getFlagSurveyShow(void) const;
+
+signals:
+	void surveyDisplayedChanged(const bool displayed) const;
+
+private:
+	class ToastSurvey* survey;
+	class LinearFader* fader;
+};
+
+#endif // _TOASTMGR_HPP_

=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2016-11-04 17:18:42 +0000
+++ src/gui/ConfigurationDialog.cpp	2016-11-13 10:24:15 +0000
@@ -54,6 +54,7 @@
 #include "StelJsonParser.hpp"
 #include "StelTranslator.hpp"
 #include "EphemWrapper.hpp"
+#include "ToastMgr.hpp"
 
 #include <QSettings>
 #include <QDebug>
@@ -77,15 +78,7 @@
 	customDeltaTEquationDialog = NULL;
 	hasDownloadedStarCatalog = false;
 	isDownloadingStarCatalog = false;
-	savedProjectionType = StelApp::getInstance().getCore()->getCurrentProjectionType();
-	// Get info about operating system
-	QString platform = StelUtils::getOperatingSystemInfo();
-	if (platform.contains("Linux"))
-		platform = "Linux";
-	if (platform.contains("FreeBSD"))
-		platform = "FreeBSD";
-	// Set user agent as "Stellarium/$version$ ($platform$)"
-	userAgent = QString("Stellarium/%1 (%2)").arg(StelUtils::getApplicationVersion()).arg(platform);
+	savedProjectionType = StelApp::getInstance().getCore()->getCurrentProjectionType();	
 }
 
 ConfigurationDialog::~ConfigurationDialog()
@@ -298,6 +291,9 @@
 	ui->showNebulaBgButtonCheckbox->setChecked(gui->getFlagShowNebulaBackgroundButton());
 	connect(ui->showNebulaBgButtonCheckbox, SIGNAL(toggled(bool)), gui, SLOT(setFlagShowNebulaBackgroundButton(bool)));
 
+	ui->showToastSurveyButtonCheckbox->setChecked(gui->getFlagShowToastSurveyButton());
+	connect(ui->showToastSurveyButtonCheckbox, SIGNAL(toggled(bool)), gui, SLOT(setFlagShowToastSurveyButton(bool)));
+
 	ui->showBookmarksButtonCheckBox->setChecked(gui->getFlagShowBookmarksButton());
 	connect(ui->showBookmarksButtonCheckBox, SIGNAL(toggled(bool)), gui, SLOT(setFlagShowBookmarksButton(bool)));
 
@@ -789,6 +785,7 @@
 	conf->setValue("gui/auto_hide_horizontal_toolbar", gui->getAutoHideHorizontalButtonBar());
 	conf->setValue("gui/auto_hide_vertical_toolbar", gui->getAutoHideVerticalButtonBar());
 	conf->setValue("gui/flag_show_nebulae_background_button", gui->getFlagShowNebulaBackgroundButton());
+	conf->setValue("gui/flag_show_toast_survey_button", gui->getFlagShowToastSurveyButton());
 	conf->setValue("gui/flag_show_decimal_degrees", StelApp::getInstance().getFlagShowDecimalDegrees());
 	conf->setValue("gui/flag_use_azimuth_from_south", StelApp::getInstance().getFlagSouthAzimuthUsage());
 	conf->setValue("gui/flag_time_jd", gui->getButtonBar()->getFlagTimeJd());
@@ -1176,7 +1173,7 @@
 	QNetworkRequest req(nextStarCatalogToDownload.value("url").toString());
 	req.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false);
 	req.setAttribute(QNetworkRequest::RedirectionTargetAttribute, false);
-	req.setRawHeader("User-Agent", userAgent.toLatin1());
+	req.setRawHeader("User-Agent", StelUtils::getUserAgentString().toLatin1());
 	starCatalogDownloadReply = StelApp::getInstance().getNetworkAccessManager()->get(req);
 	starCatalogDownloadReply->setReadBufferSize(1024*1024*2);	
 	connect(starCatalogDownloadReply, SIGNAL(finished()), this, SLOT(downloadFinished()));
@@ -1230,7 +1227,7 @@
 		QNetworkRequest req(redirect.toUrl());
 		req.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false);
 		req.setAttribute(QNetworkRequest::RedirectionTargetAttribute, false);
-		req.setRawHeader("User-Agent", userAgent.toLatin1());
+		req.setRawHeader("User-Agent", StelUtils::getUserAgentString().toLatin1());
 		starCatalogDownloadReply = StelApp::getInstance().getNetworkAccessManager()->get(req);
 		starCatalogDownloadReply->setReadBufferSize(1024*1024*2);
 		connect(starCatalogDownloadReply, SIGNAL(readyRead()), this, SLOT(newStarCatalogData()));

=== modified file 'src/gui/ConfigurationDialog.hpp'
--- src/gui/ConfigurationDialog.hpp	2016-10-29 11:47:49 +0000
+++ src/gui/ConfigurationDialog.hpp	2016-11-13 10:24:15 +0000
@@ -72,8 +72,6 @@
 	QFile* currentDownloadFile;
 	class StelProgressController* progressBar;
 
-	QString userAgent;
-
 private slots:
 	void setNoSelectedInfo();
 	void setAllSelectedInfo();

=== modified file 'src/gui/StelGui.cpp'
--- src/gui/StelGui.cpp	2016-10-29 12:45:33 +0000
+++ src/gui/StelGui.cpp	2016-11-13 10:24:15 +0000
@@ -42,6 +42,7 @@
 #include "StelObjectType.hpp"
 #include "StelObject.hpp"
 #include "SolarSystem.hpp"
+#include "ToastMgr.hpp"
 #include "StelSkyLayerMgr.hpp"
 #include "StelStyle.hpp"
 #include "StelSkyDrawer.hpp"
@@ -102,6 +103,8 @@
 	, flipHoriz(NULL)
 	, flagShowNebulaBackgroundButton(false)
 	, btShowNebulaeBackground(NULL)
+	, flagShowToastSurveyButton(false)
+	, btShowToastSurvey(NULL)
 	, flagShowBookmarksButton(false)
 	, btShowBookmarks(NULL)
 	, initDone(false)
@@ -382,6 +385,7 @@
 	// add the flip buttons if requested in the config
 	setFlagShowFlipButtons(conf->value("gui/flag_show_flip_buttons", false).toBool());
 	setFlagShowNebulaBackgroundButton(conf->value("gui/flag_show_nebulae_background_button", false).toBool());
+	setFlagShowToastSurveyButton(conf->value("gui/flag_show_toast_survey_button", false).toBool());
 	setFlagShowBookmarksButton(conf->value("gui/flag_show_bookmarks_button", false).toBool());
 
 	///////////////////////////////////////////////////////////////////////
@@ -537,6 +541,10 @@
 	if (getAction("actionShow_DSS")->isChecked() != flag)
 		getAction("actionShow_DSS")->setChecked(flag);
 
+	flag = GETSTELMODULE(ToastMgr)->getFlagSurveyShow();
+	if (getAction("actionShow_Toast_Survey")->isChecked() != flag)
+		getAction("actionShow_Toast_Survey")->setChecked(flag);
+
 	flag = StelApp::getInstance().getVisionModeNight();
 	if (getAction("actionShow_Night_Mode")->isChecked() != flag)
 		getAction("actionShow_Night_Mode")->setChecked(flag);
@@ -712,6 +720,24 @@
 	}
 }
 
+// Define whether the button toggling TOAST survey images should be visible
+void StelGui::setFlagShowToastSurveyButton(bool b)
+{
+	if (b==true) {
+		if (btShowToastSurvey==NULL) {
+			// Create the nebulae background button
+			QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png");
+			QPixmap pxmapOn(":/graphicGui/btToastSurvey-on.png");
+			QPixmap pxmapOff(":/graphicGui/btToastSurvey-off.png");
+			btShowToastSurvey = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionShow_Toast_Survey");
+		}
+		getButtonBar()->addButton(btShowToastSurvey, "040-nebulaeGroup");
+	} else {
+		getButtonBar()->hideButton("actionShow_Toast_Survey");
+	}
+	flagShowToastSurveyButton = b;
+}
+
 void StelGui::setFlagShowDecimalDegrees(bool b)
 {
 	StelApp::getInstance().setFlagShowDecimalDegrees(b);
@@ -809,6 +835,11 @@
 	return flagShowNebulaBackgroundButton;
 }
 
+bool StelGui::getFlagShowToastSurveyButton() const
+{
+	return flagShowToastSurveyButton;
+}
+
 bool StelGui::getFlagShowBookmarksButton() const
 {
 	return flagShowBookmarksButton;

=== modified file 'src/gui/StelGui.hpp'
--- src/gui/StelGui.hpp	2016-08-24 13:32:23 +0000
+++ src/gui/StelGui.hpp	2016-11-13 10:24:15 +0000
@@ -92,6 +92,9 @@
 	//! Get whether the button toggling nebulae background is visible
 	bool getFlagShowNebulaBackgroundButton() const;
 
+	//! Get whether the button toggling TOAST survey is visible
+	bool getFlagShowToastSurveyButton() const;
+
 	//! Get whether the button toggling bookmarks is visible
 	bool getFlagShowBookmarksButton() const;
 
@@ -123,6 +126,9 @@
 	//! Define whether the button toggling nebulae background should be visible
 	void setFlagShowNebulaBackgroundButton(bool b);
 
+	//! Define whether the button toggling TOAST survey should be visible
+	void setFlagShowToastSurveyButton(bool b);
+
 	//! Define whether the button toggling bookmarks should be visible
 	void setFlagShowBookmarksButton(bool b);
 
@@ -212,6 +218,9 @@
 	bool flagShowNebulaBackgroundButton;
 	StelButton* btShowNebulaeBackground;
 
+	bool flagShowToastSurveyButton;
+	StelButton* btShowToastSurvey;
+
 	bool flagShowBookmarksButton;
 	StelButton* btShowBookmarks;
 

=== modified file 'src/gui/configurationDialog.ui'
--- src/gui/configurationDialog.ui	2016-11-05 18:23:26 +0000
+++ src/gui/configurationDialog.ui	2016-11-13 10:24:15 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>512</width>
-    <height>563</height>
+    <height>579</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -1291,7 +1291,70 @@
              <property name="bottomMargin">
               <number>0</number>
              </property>
-             <item row="3" column="0">
+             <item row="8" column="0" colspan="2">
+              <widget class="QCheckBox" name="autoZoomResetsDirectionCheckbox">
+               <property name="toolTip">
+                <string>When enabled, the &quot;auto zoom out&quot; key will also set the initial viewing direction</string>
+               </property>
+               <property name="text">
+                <string>Auto zoom out returns to initial direction of view</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QCheckBox" name="diskViewportCheckbox">
+               <property name="toolTip">
+                <string>Mask out everything outside a central circle in the main view</string>
+               </property>
+               <property name="text">
+                <string>Disc viewport</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QCheckBox" name="gravityLabelCheckbox">
+               <property name="toolTip">
+                <string>Align labels with the horizon</string>
+               </property>
+               <property name="text">
+                <string>Gravity labels</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="1">
+              <widget class="QCheckBox" name="decimalDegreeCheckBox">
+               <property name="toolTip">
+                <string>Use decimal degrees for coordinates</string>
+               </property>
+               <property name="text">
+                <string>Use decimal degrees</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="sphericMirrorCheckbox">
+               <property name="toolTip">
+                <string>Spheric mirror distortion is used when projecting Stellarium onto a spheric mirror for low-cost planetarium systems.</string>
+               </property>
+               <property name="text">
+                <string>Spheric mirror distortion</string>
+               </property>
+               <property name="checkable">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="5" column="1">
+              <widget class="QCheckBox" name="topocentricCheckBox">
+               <property name="toolTip">
+                <string>Activate to view as seen from surface of the planet (recommended). If switched off, display planetocentric view.</string>
+               </property>
+               <property name="text">
+                <string>Topocentric coordinates</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="0">
               <widget class="QCheckBox" name="autoEnableAtmosphereCheckBox">
                <property name="toolTip">
                 <string>Auto-enabling of the atmosphere for bodies with atmosphere in location window</string>
@@ -1301,6 +1364,29 @@
                </property>
               </widget>
              </item>
+             <item row="2" column="1">
+              <widget class="QCheckBox" name="showFlipButtonsCheckbox">
+               <property name="toolTip">
+                <string>Toggle vertical and horizontal image flip buttons.</string>
+               </property>
+               <property name="text">
+                <string>Show flip buttons</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QCheckBox" name="selectSingleConstellationButton">
+               <property name="toolTip">
+                <string>Hide other constellations when you click one</string>
+               </property>
+               <property name="statusTip">
+                <string>Hide other constellations when you click one</string>
+               </property>
+               <property name="text">
+                <string>Select single constellation</string>
+               </property>
+              </widget>
+             </item>
              <item row="2" column="0">
               <widget class="QCheckBox" name="showNebulaBgButtonCheckbox">
                <property name="toolTip">
@@ -1311,7 +1397,7 @@
                </property>
               </widget>
              </item>
-             <item row="4" column="0">
+             <item row="5" column="0">
               <widget class="QCheckBox" name="nutationCheckBox">
                <property name="toolTip">
                 <string>Nutation is a small wobble of Earth's axis, amounting to a few arcseconds.</string>
@@ -1321,7 +1407,7 @@
                </property>
               </widget>
              </item>
-             <item row="5" column="0">
+             <item row="6" column="0">
               <widget class="QCheckBox" name="azimuthFromSouthcheckBox">
                <property name="toolTip">
                 <string>Activate this option to calculate azimuth from south towards west.</string>
@@ -1332,72 +1418,16 @@
               </widget>
              </item>
              <item row="3" column="1">
-              <widget class="QCheckBox" name="decimalDegreeCheckBox">
-               <property name="toolTip">
-                <string>Use decimal degrees for coordinates</string>
-               </property>
-               <property name="text">
-                <string>Use decimal degrees</string>
-               </property>
-              </widget>
-             </item>
-             <item row="4" column="1">
-              <widget class="QCheckBox" name="topocentricCheckBox">
-               <property name="toolTip">
-                <string>Activate to view as seen from surface of the planet (recommended). If switched off, display planetocentric view.</string>
-               </property>
-               <property name="text">
-                <string>Topocentric coordinates</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QCheckBox" name="showFlipButtonsCheckbox">
-               <property name="toolTip">
-                <string>Toggle vertical and horizontal image flip buttons.</string>
-               </property>
-               <property name="text">
-                <string>Show flip buttons</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QCheckBox" name="gravityLabelCheckbox">
-               <property name="toolTip">
-                <string>Align labels with the horizon</string>
-               </property>
-               <property name="text">
-                <string>Gravity labels</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QCheckBox" name="selectSingleConstellationButton">
-               <property name="toolTip">
-                <string>Hide other constellations when you click one</string>
-               </property>
-               <property name="statusTip">
-                <string>Hide other constellations when you click one</string>
-               </property>
-               <property name="text">
-                <string>Select single constellation</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="0">
-              <widget class="QCheckBox" name="sphericMirrorCheckbox">
-               <property name="toolTip">
-                <string>Spheric mirror distortion is used when projecting Stellarium onto a spheric mirror for low-cost planetarium systems.</string>
-               </property>
-               <property name="text">
-                <string>Spheric mirror distortion</string>
-               </property>
-               <property name="checkable">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item row="5" column="1">
+              <widget class="QCheckBox" name="showToastSurveyButtonCheckbox">
+               <property name="toolTip">
+                <string>Toggle display Digitized Sky Survey.</string>
+               </property>
+               <property name="text">
+                <string>Show DSS button</string>
+               </property>
+              </widget>
+             </item>
+             <item row="6" column="1">
               <widget class="QCheckBox" name="autoChangeLandscapesCheckBox">
                <property name="toolTip">
                 <string>Automatic change of landscape when planet is changed</string>
@@ -1407,27 +1437,7 @@
                </property>
               </widget>
              </item>
-             <item row="0" column="1">
-              <widget class="QCheckBox" name="diskViewportCheckbox">
-               <property name="toolTip">
-                <string>Mask out everything outside a central circle in the main view</string>
-               </property>
-               <property name="text">
-                <string>Disc viewport</string>
-               </property>
-              </widget>
-             </item>
-             <item row="7" column="0" colspan="2">
-              <widget class="QCheckBox" name="autoZoomResetsDirectionCheckbox">
-               <property name="toolTip">
-                <string>When enabled, the &quot;auto zoom out&quot; key will also set the initial viewing direction</string>
-               </property>
-               <property name="text">
-                <string>Auto zoom out returns to initial direction of view</string>
-               </property>
-              </widget>
-             </item>
-             <item row="6" column="0">
+             <item row="3" column="0">
               <widget class="QCheckBox" name="showBookmarksButtonCheckBox">
                <property name="text">
                 <string>Show bookmarks button</string>

=== added directory 'util/DSSToStellarium'
=== added file 'util/DSSToStellarium/DejaVuSans.ttf'
Binary files util/DSSToStellarium/DejaVuSans.ttf	1970-01-01 00:00:00 +0000 and util/DSSToStellarium/DejaVuSans.ttf	2016-11-13 10:24:15 +0000 differ
=== added file 'util/DSSToStellarium/UTdssUtils.py'
--- util/DSSToStellarium/UTdssUtils.py	1970-01-01 00:00:00 +0000
+++ util/DSSToStellarium/UTdssUtils.py	2016-11-13 10:24:15 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+# This file is part of Stellarium. Stellarium is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright Fabien Chereau <[e-mail]>
+
+import dssUtils
+import unittest
+
+class TestDssUtils(unittest.TestCase):
+
+    def setUp(self):
+      pass
+
+    def test_pointProjection(self):
+        wcs = dssUtils.DssWcs("S032")
+        pixPos = [500, 1253]
+        raDecPos = wcs.pixelToRaDec(pixPos)
+        self.assertAlmostEqual(pixPos[0], wcs.raDecToPixel(raDecPos)[0])
+        self.assertAlmostEqual(pixPos[1], wcs.raDecToPixel(raDecPos)[1])
+
+if __name__ == '__main__':
+    unittest.main()
+

=== added file 'util/DSSToStellarium/createUpperToastLevels.py'
--- util/DSSToStellarium/createUpperToastLevels.py	1970-01-01 00:00:00 +0000
+++ util/DSSToStellarium/createUpperToastLevels.py	2016-11-13 10:24:15 +0000
@@ -0,0 +1,81 @@
+#!/usr/bin/python
+
+# This file is part of Stellarium. Stellarium is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright Fabien Chereau <[e-mail]>
+
+import Image
+import os
+from subprocess import Popen, PIPE, STDOUT
+
+outDirectory = 'results'
+level=11
+imSize = 256
+
+print "Generate upper levels tile in " + outDirectory
+
+if not os.path.exists(outDirectory):
+    print "Output directory %s doesn't exist. It should be there and contain tiles for level %d" % (outDirectory, level)
+    exit(-1)
+
+level=level-1
+while level>=0:
+    print "Start level %s" % level
+    os.system("mkdir %s/%d" % (outDirectory, level))
+    allTiles = []
+    for filename in os.listdir("%s/%d" % (outDirectory, level+1)):
+        basename, extension = filename.split('.')
+        if basename.endswith("partial"):
+            tmp, partial = basename.split('-')
+            if not os.path.exists("%s/%d/%s" % (outDirectory, level+1, tmp+'.'+extension)):
+                cmd = "mv %s/%d/%s %s/%d/%s" % (outDirectory, level+1, filename, outDirectory, level+1, tmp+'.'+extension)
+                os.system(cmd)
+            basename = tmp
+        xystr = basename.split('_')
+        allTiles.append((int(xystr[0]), int(xystr[1])))
+
+    toGenerate = {}
+    for tile in allTiles:
+        key = (tile[0]/2, tile[1]/2)
+        if key not in toGenerate:
+            toGenerate[key]=[]
+        toGenerate[key].append(tile)
+
+    i = 0
+    for (x, y) in toGenerate:
+        i = i+1
+        if i % 1000 == 0:
+            print "%d/%d" % (i,len(toGenerate))
+        resImg=Image.new("RGB", (imSize, imSize))
+        tile = toGenerate[(x, y)]
+        if (x*2, y*2) in tile:
+            im = Image.open("%s/%d/%d_%d.jpg" % (outDirectory, level+1, x*2, y*2)).resize((imSize/2, imSize/2), Image.NEAREST)
+            resImg.paste(im, (0, 0))
+        if (x*2+1, y*2) in tile:
+            im = Image.open("%s/%d/%d_%d.jpg" % (outDirectory, level+1, x*2+1, y*2)).resize((imSize/2, imSize/2), Image.NEAREST)
+            resImg.paste(im, (imSize/2, 0))
+        if (x*2, y*2+1) in tile:
+            im = Image.open("%s/%d/%d_%d.jpg" % (outDirectory, level+1, x*2, y*2+1)).resize((imSize/2, imSize/2), Image.NEAREST)
+            resImg.paste(im, (0, imSize/2))
+        if ((x*2+1, y*2+1)) in tile:
+            im = Image.open("%s/%d/%d_%d.jpg" % (outDirectory, level+1, x*2+1, y*2+1)).resize((imSize/2, imSize/2), Image.NEAREST)
+            resImg.paste(im, (imSize/2, imSize/2))
+        resImg.save("%s/%d/%d_%d.jpg" % (outDirectory, level, x, y), quality=90)
+
+    level=level-1
+
+
+
+
+

=== added file 'util/DSSToStellarium/dssUtils.py'
--- util/DSSToStellarium/dssUtils.py	1970-01-01 00:00:00 +0000
+++ util/DSSToStellarium/dssUtils.py	2016-11-13 10:24:15 +0000
@@ -0,0 +1,169 @@
+#!/usr/bin/python
+
+# This file is part of Stellarium. Stellarium is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright Fabien Chereau <[e-mail]>
+
+
+import Image, ImageFilter, ImageStat, ImageChops
+import os
+import json
+import sys
+from astropy import wcs
+from astropy.io import fits
+import numpy
+import scipy.interpolate
+
+def getAllPlatesNames():
+  """Return the list of all DSS plates names"""
+  ret = []
+  for i in range(1, 895):
+    ret.append("S%03d" % i)
+  for i in range(2, 899):
+    ret.append("N%03d" % i)
+  return ret
+
+def getTestingPlatesNames():
+  """Return a list of some testing DSS plates names"""
+  ret = []
+  for i in range(100, 305):
+    ret.append("N%03d" % i)
+  return ret
+
+def getTestingPlatesNamesLMC():
+  """Return a list of some testing DSS plates names covering the Large Magellanic Cloud (one of the worst case)"""
+  return ["S086", "S085", "S057", "S056", "S033", "S032", "S055", "S054"]
+
+def getValidRegionForPlate(plateName):
+  """Return the polygon defining the valid pixels inside the full resolution plate image"""
+  if plateName[0]=='N':
+    return [[0,0], [17232, 0], [17232, 1200], [19200, 1200], [19200, 19200], [0, 19200]]
+  else:
+    assert plateName[0]=='S'
+    return [[480,0], [17232, 0], [17232, 17232], [0, 17232], [0, 624], [480, 624]]
+
+def enhancePlate(plateName, plate, referenceImage):
+  """Return a transformed version of the plate so that it matches the referenceImage
+  This is Fabien's version. It just attempts to scale brightness based on the average
+  brightness on a 8x8 map"""
+  
+  print "Enhance darker part of the image"
+  plate = plate.point(lambda t : 2.*t-256.*(t/256.)**1.8)
+  
+  """
+  plate.save("tmp/%s-full.jpg" % plateName, 'JPEG', quality=80)
+  referenceImage.save("tmp/%s-reference.jpg" % plateName, 'JPEG', quality=95)
+  return plate
+  
+  print "Enhance plate"
+  plateMap = plate.resize((8,8) , Image.ANTIALIAS)
+  plateMap.save("tmp/%s-full.jpg" % plateName, 'JPEG', quality=95)
+  
+  referenceImageMap = referenceImage.resize((8,8) , Image.ANTIALIAS)
+  referenceImageMap.save("tmp/%s-reference.jpg" % plateName, 'JPEG', quality=95)
+  
+  diffMap = plateMap-referenceImageMap
+  
+  step=8./plate.size[0]
+  
+  platePix = plate.load()
+  for i in range(plate.size[0]):
+      for j in range(plate.size[1]):
+          platePix[i, j] = platePix[i, j]+i*step
+  
+  print "Done enhancing plate"
+  """
+  return plate
+  
+def enhancePlate2(plateName, plate, referenceImage):
+  """Return a transformed version of the plate so that it matches the referenceImage"""
+  #print "Enhance darker part of the image"
+  plate = plate.point(lambda t : 2.*t-256.*(t/256.)**1.8)
+  
+  enhanceScaling = 32
+  
+  print "Enhance plate"
+  plate = plate.resize((256,256) , Image.BICUBIC)
+  plate.save("tmp/%s-full.jpg" % plateName, 'JPEG', quality=95)
+  #referenceImage = referenceImage.resize(plate.size, Image.BILINEAR)
+  referenceImage.save("tmp/%s-reference.jpg" % plateName, 'JPEG', quality=95)
+  
+  plate = None
+  #referenceImage = None
+  
+  #os.system("python src/main.py --hi_res tmp/%s-full.jpg --lo_res tmp/%s-reference.jpg --output tmp/%s-enhanced.jpg" % (plateName, plateName, plateName) )
+  referenceImage.save("tmp/%s-enhanced.jpg" % plateName, 'JPEG', quality=95)
+  
+  plate = Image.open("tmp/%s-enhanced.jpg" % plateName)
+  plate = plate.resize((plate.size[0]*enhanceScaling, plate.size[0]*enhanceScaling) , Image.BILINEAR)
+  print "Done enhancing plate"
+  
+  return plate
+
+class DssWcs:
+  """A pixel to sky conversion class. It wraps a WCS object read from the FITS header"""
+  def __init__(self, plateName):
+    # Load the FITS hdulist using astropy.io.fits
+    assert os.path.exists("preparedPlates/")
+    hdulist = fits.open("preparedPlates/%s/%s_00_00_x64-FITS-header.hhh" % (plateName, plateName))
+    self.w = wcs.WCS(hdulist[0].header)
+    
+    try:
+      f = open("preparedPlates/%s/%s.offsets" % (plateName, plateName), 'r')
+    except IOError:
+      self.gridPixelPos = None
+      self.gridOffset = None
+      self.inverseGridPixelPos = None
+    else:
+      offsets = json.loads(f.read())
+      f.close()
+      
+      self.gridPixelPos = []
+      self.gridOffset = []
+      self.inverseGridPixelPos = []
+      for el in offsets:
+        self.gridPixelPos.append(el['pixelPos'])
+        self.gridOffset.append(el['offset'])
+        self.inverseGridPixelPos.append([el['pixelPos'][0]+el['offset'][0], el['pixelPos'][1]+el['offset'][1]])
+      self.gridPixelPos = numpy.array(self.gridPixelPos)
+      self.gridOffset = numpy.array(self.gridOffset)
+      self.inverseGridPixelPos = numpy.array(self.inverseGridPixelPos)
+
+  def pixelToRaDec(self, pixelPos):
+    """Return the RA DEC pair for a given pixel position (even if outside the plate)
+    the passed wcs must be the one laying in the preparedPlates directory"""
+    arr = [pixelPos[0], pixelPos[1]]
+    if self.inverseGridPixelPos!=None:
+      nearestOffset = scipy.interpolate.griddata(self.inverseGridPixelPos, self.gridOffset, [arr], method='nearest')
+      arr = [arr[0]-nearestOffset[0][0], arr[1]-nearestOffset[0][1]]
+      
+    arr = [arr[0]/64.+1.5, arr[1]/64.+1.5]
+    arr = numpy.array([arr], numpy.float_)
+    ret = self.w.wcs_pix2world(arr, 1)
+    return [ret[0][0], ret[0][1]]
+    
+  def raDecToPixel(self, raDecPos):
+    """Return the pixel pos for a given RA DEC sky position (even if outside the plate)
+    the passed wcs must be the one laying in the preparedPlates directory"""
+    arr = numpy.array([[raDecPos[0], raDecPos[1]]], numpy.float_)
+    ret = self.w.wcs_world2pix(arr, 1)
+    ret = [(ret[0][0]-1.5)*64., (ret[0][1]-1.5)*64.]
+    
+    # Add offset to compensate for linear WCS model errors
+    if self.gridOffset!=None:
+      nearestOffset = scipy.interpolate.griddata(self.gridPixelPos, self.gridOffset, [ret], method='nearest')
+      ret = [ret[0]+nearestOffset[0][0], ret[1]+nearestOffset[0][1]]
+    
+    return ret
+

=== added file 'util/DSSToStellarium/generateFullPlate.py'
--- util/DSSToStellarium/generateFullPlate.py	1970-01-01 00:00:00 +0000
+++ util/DSSToStellarium/generateFullPlate.py	2016-11-13 10:24:15 +0000
@@ -0,0 +1,159 @@
+#!/usr/bin/python
+
+# This file is part of Stellarium. Stellarium is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright Fabien Chereau <[e-mail]>
+
+
+# -----------------------------------------------------------
+# Generate the survey, i.e.
+# Cut and re-project toast tiles from color DSS plates
+# -----------------------------------------------------------
+# python generateFullPlate.py
+#
+# input : the "preparedPlates" directory created in step 1 must be present
+# output: a "results" directory containing the survey ready for display in Stellarium
+
+
+import Image, ImageFilter, ImageStat, ImageChops, ImageOps, ImageDraw, ImageFont
+import os
+import json
+from subprocess import Popen, PIPE, STDOUT
+import sys
+import dssUtils
+
+# Test code where I tried to use a low res image from Axel mellinger as reference
+# for color harmonization (the image we use for the milky way in Stellarium)
+# It's not working well yet, so let commented for now
+#mellingerImage = Image.open("mellinger_rgb_rect-curved.jpg")
+#mellingerImagePix = mellingerImage.load()
+
+def generatePlate(plateName, maxLevel):
+    if not os.path.exists("results"):
+        os.system("mkdir results")
+    if not os.path.exists("results/%d" % maxLevel):
+        os.system("mkdir results/%d" % maxLevel)
+    if not os.path.exists("tmp"):
+        os.system("mkdir tmp")
+
+    print "-------- " + plateName + " --------"
+    if os.path.exists("results/%s.stamp" % (plateName)):
+        print "Plate %s already processed" % (plateName)
+        return
+
+    assert os.path.exists("preparedPlates")
+    assert os.path.exists("preparedPlates/%s/%s.jpg" % (plateName, plateName))
+    
+    print "Get list of TOAST tiles intersecting the plate"
+    
+    wcs = dssUtils.DssWcs(plateName)
+    
+    # And make sure to get rid of the plate edges in the corner..
+    #points = dssUtils.getValidRegionForPlate(plateName)
+    points = [[0,0], [19200, 0], [19200, 19200], [0, 19200]]
+    plateCornersRaDec = [wcs.pixelToRaDec(p) for p in points]
+    cmd = './toastForShape %d "' % (maxLevel) + json.dumps(plateCornersRaDec).replace('"', '\\"') + '"'
+    print cmd
+    p = Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
+    jsonTriangles = p.stdout.read()
+    triangles = json.loads(jsonTriangles)
+
+    print "Convert the pixel position of the toast tiles into the existing DSS image"
+    allTrianglesRadecPos = []
+    for tri in triangles:
+        allTrianglesRadecPos.extend(tri['tile'][1:])
+    allTrianglesPixelPos = [wcs.raDecToPixel(p) for p in allTrianglesRadecPos]
+
+    # Put all contained triangles (to be cut) in the tiles dict
+    tiles = {}
+    i=0
+    for tri in triangles:
+        tile = allTrianglesPixelPos[i*4:i*4+4]
+        t = {'XY': [tri['i'], tri['j']], 'tile': tile}
+        tiles[json.dumps(t['XY'])]=t
+        i=i+1
+
+    tiles = tiles.values()
+
+    print "Cut and save the toast tiles (%d tiles at level %s)." % (len(tiles), maxLevel)
+
+    # Create the sub directories
+
+    os.system("mkdir tmp/%s" % plateName)
+    os.system("mkdir tmp/%s/%d" % (plateName, maxLevel))
+
+
+    print "load full plate image"
+    resImg = Image.open("preparedPlates/%s/%s.jpg" % (plateName, plateName))
+    #draw = ImageDraw.Draw(resImg)
+    #font = ImageFont.truetype("DejaVuSans.ttf", 600)
+    #draw.text([9500, 9500], plateName, font=font, fill=(255,255,0))
+    
+    resImg = ImageOps.flip(resImg)
+        
+    def raDecToMellinger(raDec):
+        return [(-raDec[0]/360.+0.5)*mellingerImage.size[0], (-raDec[1]/180.+0.5)*mellingerImage.size[1]]
+    
+    # Generate a low res reference image from Mellinger data
+    delta = 19200./256.
+    referenceImage = Image.new("RGB", (256, 256))
+    #pix = referenceImage.load()
+    #for i in range(256):
+    #    for j in range(256):
+    #        raDec = wcs.pixelToRaDec((i*delta+delta/2, j*delta+delta/2))
+    #        if raDec[0]>180:
+    #             raDec[0]=raDec[0]-360
+    #        mellingerPos = raDecToMellinger(raDec)
+    #        pix[i, j] = mellingerImagePix[mellingerPos[0], mellingerPos[1]]
+    
+    # Enhance plate
+    resImg = dssUtils.enhancePlate(plateName, resImg, referenceImage)
+ 
+    def isPartial(imageW, imageH, region):
+        for i in range(len(region)/2):
+            p = [region[i*2], region[i*2+1]]
+            if p[0]<0 or p[0]>imageW or p[1]<0 or p[1]>imageH:
+                return True
+        return False
+      
+    print "Cut tiles"
+    for tile in tiles:
+        tt = []
+        partial = False
+        for p in tile['tile']:
+            x=p[0]
+            y=p[1]
+            tt.append(x)
+            tt.append(y)
+        tt = tt[6:]+tt[0:6]
+        
+        partial = isPartial(resImg.size[0], resImg.size[1], tt)
+        im = resImg.transform((256,256), Image.QUAD, tuple(tt), Image.BILINEAR)
+
+        xy = tile['XY']
+        im.save("tmp/%s/%d/%d_%d%s.jpg" % (plateName, maxLevel, xy[0], xy[1], "-partial" if partial else ""), quality=95)
+
+    print "package and store results"
+    os.system("mv tmp/%s/%d/* results/%d/" % (plateName, maxLevel, maxLevel))
+    os.system("rm -rf tmp/%s" % plateName)
+    os.system("touch results/%s.stamp" % plateName)
+
+
+if __name__ == '__main__':
+  maxLevel = 11
+
+  for plate in dssUtils.getAllPlatesNames():
+      generatePlate(plate, maxLevel)
+
+  os.system("python createUpperToastLevels.py")

=== added file 'util/DSSToStellarium/mellinger_rgb_rect-curved.jpg'
Binary files util/DSSToStellarium/mellinger_rgb_rect-curved.jpg	1970-01-01 00:00:00 +0000 and util/DSSToStellarium/mellinger_rgb_rect-curved.jpg	2016-11-13 10:24:15 +0000 differ
=== added file 'util/DSSToStellarium/prepareAllPlates.py'
--- util/DSSToStellarium/prepareAllPlates.py	1970-01-01 00:00:00 +0000
+++ util/DSSToStellarium/prepareAllPlates.py	2016-11-13 10:24:15 +0000
@@ -0,0 +1,117 @@
+#!/usr/bin/python
+
+# This file is part of Stellarium. Stellarium is free software: you can
+# redistribute it and/or modify it under the terms of the GNU General Public
+# License as published by the Free Software Foundation, version 2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright Fabien Chereau <[e-mail]>
+
+import Image, ImageFilter, ImageStat, ImageChops
+import os
+from astLib import astWCS
+import json
+from subprocess import Popen, PIPE, STDOUT
+import sys
+from multiprocessing import Pool
+import dssUtils
+from astropy import wcs
+from astropy.io import fits
+import numpy
+
+# -----------------------------------------------------------
+# Pre-process zipped plates to extract only necessary data
+# This has to be run once if you don't already have the
+# preprocessed plates
+# -----------------------------------------------------------
+# python prepareAllPlates.py
+#
+# input : a directory with all original plates .tgz files (change in code)
+# output: a directory "preparedPlates" containing for each plate a single full resolution jpg image + a FITS headers necessary for sky-to-pixel projection
+# usage : you must change the location of your input DSS plates path directly in the script
+
+# The directory containing the plates .tgz files
+originalPlatesDirectory = "/media/fabien/data/DSS-orig"
+
+# Pre-compute meta-infos about the plate as well as a re-combination of all tile into one large image
+def preparePlate(plateName):
+    if not os.path.exists("preparedPlates"):
+        os.system("mkdir preparedPlates")
+        
+    if os.path.exists("preparedPlates/%s-x64-FITS-header.hhh" % plateName):
+        print "%s already processed, skip." % plateName
+        return
+
+    print "-------- " + plateName + " --------"
+    if os.path.exists("preparedPlates/%s" % (plateName)):
+        print "Plate %s already pre-processed" % (plateName)
+        return
+    print "Copy and prepare plate data"
+    os.system("cp %s/%s.tgz ." % (originalPlatesDirectory, plateName))
+    os.system("tar -xzf %s.tgz" % plateName)
+    os.system("chmod -R a+w %s" % plateName)
+    assert os.path.exists("%s" % plateName)
+
+    print "create full plate image"
+    resImg=Image.new("RGB", (64*300, 64*300))
+    for j in range(0, 64):
+        for i in range(0,64):
+            if os.path.exists("%s/x1/%s_%.2d_%.2d_x1.jpg" % (plateName, plateName, i, j)):
+                im = Image.open("%s/x1/%s_%.2d_%.2d_x1.jpg" % (plateName, plateName, i, j))
+                resImg.paste(im, (i*300, 64*300-j*300-300))
+            else:
+                print "Missing jpeg tile: %s/x1/%s_%.2d_%.2d_x1.jpg" % (plateName, plateName, i, j)
+
+    print "package and store results"
+    os.system("mkdir preparedPlates/%s" % plateName)
+    resImg.save("preparedPlates/%s/%s.jpg" % (plateName, plateName))
+    os.system("cp %s/x64/%s_00_00_x64.hhh preparedPlates/%s/%s_00_00_x64-FITS-header.hhh" % (plateName, plateName, plateName, plateName))
+    
+    wcsWithoutCorrection = dssUtils.DssWcs(plateName)
+    
+    print "Compute the array of pixel offsets needed to adjust WCS conversions."
+    # Load the x1 FITS headers to get the corrective offset term
+    allOffsets = []
+    
+    for i in range(0,64, 4):
+      for j in range(0, 64, 4):
+        if not os.path.exists("%s/x1/%s_%.2d_%.2d_x1.hhh" % (plateName, plateName, i, j)):
+          print "Missing .hhh file"
+          continue
+        hdulist = fits.open("%s/x1/%s_%.2d_%.2d_x1.hhh" % (plateName, plateName, i, j))
+        w = wcs.WCS(hdulist[0].header)
+        arr = numpy.array([[0., 0.]], numpy.float_) # Bottom left corner
+        radecCorner = w.wcs_pix2world(arr, 1)
+        realPixelPos = [i*300, j*300]
+        currPixelPos = wcsWithoutCorrection.raDecToPixel([radecCorner[0][0], radecCorner[0][1]])
+        assert currPixelPos!=None
+        allOffsets.append({'pixelPos': currPixelPos, 'offset': [realPixelPos[0]-currPixelPos[0], realPixelPos[1]-currPixelPos[1]]})
+
+    f = open("preparedPlates/%s/%s.offsets" % (plateName, plateName), 'w')
+    f.write(json.dumps(allOffsets))
+    f.close()
+    
+    print "clean up"
+    os.system("rm %s.tgz" % plateName)
+    os.system("rm -rf %s" % plateName)
+
+jobsArgs = dssUtils.getAllPlatesNames()()
+
+pool = Pool(2)
+try:
+    pool.map_async(preparePlate, jobsArgs).get(9999999)
+except KeyboardInterrupt:
+    print "Caught KeyboardInterrupt, terminating workers"
+    pool.terminate()
+    pool.join()
+
+
+

=== added file 'util/DSSToStellarium/readme.txt'
--- util/DSSToStellarium/readme.txt	1970-01-01 00:00:00 +0000
+++ util/DSSToStellarium/readme.txt	2016-11-13 10:24:15 +0000
@@ -0,0 +1,33 @@
+A set of pyton scripts used to process DSS plates for Stellarium
+
+Dependencies:
+ - astropy: (sudo pip install astropy)
+ - PIL (sudo apt-get install python-imaging)
+ - numpy
+ 
+-----------------------------------------------------------
+1- Pre-process zipped plates to extract only necessary data
+-----------------------------------------------------------
+python prepareAllPlates.py
+
+input: a directory with all original plates .tgz files (change in code)
+output: a directory "preparedPlates" containing for each plate a single full resolution jpg image + a FITS headers necessary for sky-to-pixel projection
+usage: you must change the location of your input DSS plates path directly in the script
+
+
+-----------------------------------------------------------
+2- Generate the survey
+-----------------------------------------------------------
+python generateFullPlate.py
+
+input: the "preparedPlates" directory created in step 1 must be present
+output: a "results" directory containing the survey ready for display in Stellarium
+
+
+-----------------------------------------------------------
+3- Display the survey
+-----------------------------------------------------------
+Get the Stellarium branch bzr+ssh://bazaar.launchpad.net/~stellarium/stellarium/toastImages
+Change the base location of the survey to match the path where the results/ directory is stored. This can be done in ToastMgr.cpp line 29
+Compile and run the soft. Remove ground and atmosphere (press G and A), the survey should be visible in the south hemisphere.
+

=== added file 'util/DSSToStellarium/toastForShape'
Binary files util/DSSToStellarium/toastForShape	1970-01-01 00:00:00 +0000 and util/DSSToStellarium/toastForShape	2016-11-13 10:24:15 +0000 differ
=== added directory 'util/toastForShape'
=== added file 'util/toastForShape/main.cpp'
--- util/toastForShape/main.cpp	1970-01-01 00:00:00 +0000
+++ util/toastForShape/main.cpp	2016-11-13 10:24:15 +0000
@@ -0,0 +1,38 @@
+#include <QtCore/QCoreApplication>
+#include "StelToast.hpp"
+#include "StelJsonParser.hpp"
+
+int main(int argc, char *argv[])
+{
+	Q_ASSERT(argc==3);
+	QByteArray ar = argv[1];
+	bool ok;
+	int level = ar.toInt(&ok);
+	if (!ok)
+	{
+		qFatal("Argument 1 must be a valid level number");
+	}
+	int length = sqrt(pow(4, level));
+	SphericalRegionP reg = SphericalRegionP::loadFromQVariant(StelJsonParser::parse(argv[2]).toList());
+	//SphericalRegionP reg = SphericalRegionP::loadFromQVariant(StelJsonParser::parse("[[21.286982057125858, 82.117482778097937], [341.20801035028205, 82.141350178494122], [308.54824444399429, 86.661406614892087], [54.398199236987082, 86.613098160666411]]").toList());
+	ToastGrid grid(level);
+	QVariantList l;
+	for (int i=0;i<length;++i)
+	{
+		for (int j=0;j<length;++j)
+		{
+			SphericalConvexPolygon poly(grid.getPolygon(level,i,j));
+			if (reg->intersects(poly))
+			{
+				QVariantMap m;
+				m["i"]=i;
+				m["j"]=j;
+				m["tile"]= poly.toQVariant();
+				l << m;
+			}
+		}
+	}
+	printf("%s", StelJsonParser::write(l).constData());
+
+	return 0;
+}

=== added file 'util/toastForShape/toastForShape.pro'
--- util/toastForShape/toastForShape.pro	1970-01-01 00:00:00 +0000
+++ util/toastForShape/toastForShape.pro	2016-11-13 10:24:15 +0000
@@ -0,0 +1,73 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2010-11-28T20:43:35
+#
+#-------------------------------------------------
+
+QT       += core gui opengl network
+
+DEFINES += PACKAGE_VERSION=\\\"0.10.6\\\"
+DEFINES += DEFAULT_GRAPHICS_SYSTEM=\\\"raster\\\"
+DEFINES += INSTALL_DATADIR=\\\"/usr/share/stellarium\\\"
+DEFINES += INSTALL_LOCALEDIR=\\\"/usr/share/locale\\\"
+DEFINES += NDEBUG=1
+
+TARGET = toastForShape
+CONFIG   += console
+CONFIG   -= app_bundle
+
+TEMPLATE = app
+
+INCLUDEPATH += ../../src/core/ ../../src/core/external/glues_stel/source ../../src/core/external
+
+SOURCES += main.cpp \
+    ../../src/core/StelSphereGeometry.cpp \
+    ../../src/core/StelToastGrid.cpp \
+    ../../src/core/StelJsonParser.cpp \
+    ../../src/core/OctahedronPolygon.cpp \
+    ../../src/core/StelUtils.cpp \
+    ../../src/core/StelProjector.cpp \
+    ../../src/core/external/glues_stel/source/glues_error.c \
+    ../../src/core/external/glues_stel/source/libtess/tessmono.c \
+    ../../src/core/external/glues_stel/source/libtess/tess.c \
+    ../../src/core/external/glues_stel/source/libtess/sweep.c \
+    ../../src/core/external/glues_stel/source/libtess/render.c \
+    ../../src/core/external/glues_stel/source/libtess/priorityq.c \
+    ../../src/core/external/glues_stel/source/libtess/normal.c \
+    ../../src/core/external/glues_stel/source/libtess/mesh.c \
+    ../../src/core/external/glues_stel/source/libtess/memalloc.c \
+    ../../src/core/external/glues_stel/source/libtess/geom.c \
+    ../../src/core/external/glues_stel/source/libtess/dict.c \
+    ../../src/core/StelVertexArray.cpp \
+    ../../src/core/StelTranslator.cpp \
+    ../../src/core/StelFileMgr.cpp
+
+HEADERS += \
+    ../../src/core/VecMath.hpp \
+    ../../src/core/StelSphereGeometry.hpp \
+    ../../src/core/StelToastGrid.hpp \
+    ../../src/core/StelJsonParser.hpp \
+    ../../src/core/OctahedronPolygon.hpp \
+    ../../src/core/StelUtils.hpp \
+    ../../src/core/external/glues_stel/source/glues.h \
+    ../../src/core/external/glues_stel/source/glues_error.h \
+    ../../src/core/external/glues_stel/source/libtess/tessmono.h \
+    ../../src/core/external/glues_stel/source/libtess/tess.h \
+    ../../src/core/external/glues_stel/source/libtess/sweep.h \
+    ../../src/core/external/glues_stel/source/libtess/render.h \
+    ../../src/core/external/glues_stel/source/libtess/priorityq.h \
+    ../../src/core/external/glues_stel/source/libtess/priorityq-sort.h \
+    ../../src/core/external/glues_stel/source/libtess/priorityq-heap.h \
+    ../../src/core/external/glues_stel/source/libtess/normal.h \
+    ../../src/core/external/glues_stel/source/libtess/mesh.h \
+    ../../src/core/external/glues_stel/source/libtess/memalloc.h \
+    ../../src/core/external/glues_stel/source/libtess/geom.h \
+    ../../src/core/external/glues_stel/source/libtess/dict.h \
+    ../../src/core/external/glues_stel/source/libtess/dict-list.h \
+    ../../src/core/StelVertexArray.hpp \
+    ../../src/core/StelTranslator.hpp
+
+OTHER_FILES += \
+    ../../src/core/external/glues_stel/source/libtess/README \
+    ../../src/core/external/glues_stel/source/libtess/priorityq-heap.i \
+    ../../src/core/external/glues_stel/source/libtess/alg-outline