Merge lp:~peppujols/stellarium/printsky into lp:stellarium

[Pep Pujols]

[Matthew Gates (matthew-porpoisehead)]

I found a couple of without looking into the code:

1. The preview window shows badly corrupted fonts. I think the font size is too big and/or the line spacing is not big enough. See http://i.imgur.com/ccR7I.png

2. The configuration dialog form design is not so good. Spacers and a tab level layout should be used to make the form re-sizable. I would also prefer the colouration to be the same as the other configuration dialogs (this is probably just a matter of copying the stylesheet from the Satellite or Occural plugin).

Matthew

review: Needs Fixing

[Bogdan Marinov (daggerstab)]

I agree that it needs some fixing.

Matthew, Pep, did you see the experimental build of Stellarium I've uploaded here?
https://launchpad.net/stellarium/+download
One of the two new plug-ins included in it is a _fixed_ version of Print Sky.

I can provide a patch with my changes. The main problem: it seems that the absolute coordinates used assume a resolution of 300 DPI (dots per inch). If the printer uses a higher resolution, the text appears too small and/or with wrong line spacing. My patch also includes some improvements to the interface.

review: Needs Fixing

[treaves (treaves)]

There are several of unused method arguments. For places where you can not change the signature, please use the Q_UNUSED macro.

I'll look over it more when I get home from work; all I had time for was a simple compile check, and that's what showed the above feedback.

[Bogdan Marinov (daggerstab)]

I've uploaded a branch with the changes I made to the plug-in when I added it to the experimental build and I've proposed it for merging into Pep Pujols' original branch.
https://code.launchpad.net/~daggerstab/stellarium/printsky

I have also uploaded to Scribd a sample of what the output from my version looks like:
http://www.scribd.com/doc/41205546/PrintSky-Output-Version-Exp02

[Bogdan Marinov (daggerstab)]

Just a comment - as the feature freeze is in effect, this should be merged only AFTER the release of 0.10.6 this weekend.

Skimming the code, I've noticed several unresolved merge conflicts, with Bazaar conflict markup in the source files.

Pep, if you set Bazaar to use the same e-mail address as the one you use in Launchpad, Launchpad will put a link to your profile page when it lists the revisions that you have committed. (See "Unmerged revisions" bellow: the author is listed as "Propietario", and there is no link.)

I'll build the plug-in and look deeper into the code later.

[Pep Pujols (peppujols)]

> Just a comment - as the feature freeze is in effect, this should be merged only AFTER the release of 0.10.6 this weekend.
>

Ok. No problem.

> Skimming the code, I've noticed several unresolved merge conflicts, with Bazaar conflict markup in the source files.
>

Yes, I should first pull and merge the trunk to my branch (resolving
conflicts) before push my branch to propose to merge?

> Pep, if you set Bazaar to use the same e-mail address as the one you use in Launchpad, Launchpad will put a link to your profile page when it lists the revisions that you have committed. (See "Unmerged revisions" bellow: the author is listed as "Propietario", and there is no link.)

Oh, yeah, I installed the bzr on a new PC and I forget to define my
credentials and EMail. I do it. In the future the new revisions will be
correct.

> I'll build the plug-in and look deeper into the code later.

Thanks.

Pep.

[lp:~peppujols/stellarium/printsky]

4714. By Pep Pujols on 2011-01-07

Merged in trunk, and corrected ISO C++ bug

4715. By Pep Pujols on 2011-05-05

Merge Trunk

4716. By Pep Pujols on 2011-05-23

Fixed some points: Invalid defines, removed pragma marks, reallocation owner metod from StarMgr to PrintSkyDialog

4717. By Pep Pujols on 2011-05-23

Merged from trunk

4718. By Pep Pujols on 2011-05-24

More simplified method getListMagnitudeRadius. Small patch to plugin info definition.

4719. By Pep Pujols on 2011-06-07

Fixed style dialog wrong

4720. By Pep Pujols on 2011-06-07

Merged from trunk

4721. By Pep Pujols on 2011-06-08

Merged from trunk (atmosphere refraction)

4722. By Pep Pujols on 2011-08-22

Added GNU GPL header to the main class.

4723. By Pep Pujols on 2012-02-17

Merge from code refactoring

Unmerged revisions

4723. By Pep Pujols on 2012-02-17

Merge from code refactoring

4722. By Pep Pujols on 2011-08-22

Added GNU GPL header to the main class.

4721. By Pep Pujols on 2011-06-08

Merged from trunk (atmosphere refraction)

4720. By Pep Pujols on 2011-06-07

Merged from trunk

4719. By Pep Pujols on 2011-06-07

Fixed style dialog wrong

4718. By Pep Pujols on 2011-05-24

More simplified method getListMagnitudeRadius. Small patch to plugin info definition.

4717. By Pep Pujols on 2011-05-23

Merged from trunk

4716. By Pep Pujols on 2011-05-23

Fixed some points: Invalid defines, removed pragma marks, reallocation owner metod from StarMgr to PrintSkyDialog

4715. By Pep Pujols on 2011-05-05

Merge Trunk

4714. By Pep Pujols on 2011-01-07

Merged in trunk, and corrected ISO C++ bug

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-12-06 14:07:59 +0000
+++ CMakeLists.txt	2011-01-07 22:29:26 +0000
@@ -9,7 +9,7 @@
 ENDIF()
 
 ########### Project name ###########
-PROJECT(Stellarium)
+PROJECT(Printsky)
 SET(STELLARIUM_MAJOR "0")
 SET(STELLARIUM_MINOR "10")
 SET(STELLARIUM_PATCH "6")
@@ -61,7 +61,7 @@
 # SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.5")
 # SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk/")
  # Universal binary
- #SET(CMAKE_OSX_ARCHITECTURES "x86_64")
+SET(CMAKE_OSX_ARCHITECTURES "x86_64")
 ENDIF()
 
 ########### Check functions ###########
@@ -137,6 +137,7 @@
 SET(USE_PLUGIN_TIMEZONECONFIGURATION 1 CACHE BOOL "Define whether the TimeZoneConfiguration plugin should be created.")
 SET(USE_PLUGIN_VIRGO 0 CACHE BOOL "Define whether the VirGO plugin should be created.")
 SET(USE_PLUGIN_SOLARSYSTEMEDITOR 1 CACHE BOOL "Define whether the Solar System Editor should be built.")
+SET(USE_PLUGIN_PRINTSKY 1 CACHE BOOL "Define wheter the PrintSky plugin should be created.")
 
 ########## Static plugins need to define includes and libraries
 ########## for the compilation of Stellarium itself

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2010-11-12 15:29:52 +0000
+++ plugins/CMakeLists.txt	2011-01-07 22:29:26 +0000
@@ -44,3 +44,6 @@
 IF (USE_PLUGIN_SOLARSYSTEMEDITOR)
   ADD_SUBDIRECTORY( SolarSystemEditor )
 ENDIF()
+IF (USE_PLUGIN_PRINTSKY)
+	ADD_SUBDIRECTORY( PrintSky )
+ENDIF()

=== added directory 'plugins/PrintSky'
=== added file 'plugins/PrintSky/CMakeLists.txt'
--- plugins/PrintSky/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/CMakeLists.txt	2011-01-07 22:29:26 +0000
@@ -0,0 +1,11 @@
+# This is the cmake config file for the PrintSky plugin
+SET(PRINTSKY_VERSION "0.1.0")
+
+ADD_SUBDIRECTORY( src )
+
+IF(APPLE)
+	 SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
+ElSE(APPLE)
+	 SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
+ENDIF(APPLE)
+INSTALL(FILES DESTINATION "modules/PrintSky")

=== added file 'plugins/PrintSky/PrintSky.qrc'
--- plugins/PrintSky/PrintSky.qrc	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/PrintSky.qrc	2011-01-07 22:29:26 +0000
@@ -0,0 +1,6 @@
+<RCC>
+  <qresource prefix="printsky">
+    <file>nightStyle.css</file>
+    <file>normalStyle.css</file>
+  </qresource>
+</RCC>

=== added file 'plugins/PrintSky/nightStyle.css'
--- plugins/PrintSky/nightStyle.css	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/nightStyle.css	2011-01-07 22:29:26 +0000
@@ -0,0 +1,31 @@
+QTabBar {
+	border: none;
+	margin: 0px;
+	padding: 0px;
+	font-weight: bold;
+	color: rgb(120, 0, 0);
+	background-color: rgb(22, 0, 0);
+	font-size: 14px;
+}
+
+QTabBar::tab {
+	border: 0px;
+	margin: 0px;
+	padding: 4px  1ex;
+	min-height: 28px;
+	/*font-size: 14px; <-- Causes text being cut by the frame*/
+}
+
+QTabBar::tab:selected {
+	border: none;
+	margin: 0px;
+	border-top-left-radius: 10px;
+	border-top-right-radius: 10px;
+	color: rgb(220, 0, 0);
+	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 rgb(68, 0, 0), stop: 1 rgb(86, 0, 0));
+}
+
+QTabWidget::pane {
+	margin-top: 0px;
+	border-top: none;
+}

=== added file 'plugins/PrintSky/normalStyle.css'
--- plugins/PrintSky/normalStyle.css	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/normalStyle.css	2011-01-07 22:29:26 +0000
@@ -0,0 +1,31 @@
+QTabBar {
+	border: none;
+	margin: 0px;
+	padding: 0px;
+	font-weight: bold;
+	color: rgb(170, 173, 164);
+	background-color: rgb(31, 31, 31);
+	font-size: 14px;
+}
+
+QTabBar::tab {
+	border: 0px;
+	margin: 0px;
+	padding: 4px  1ex;
+	min-height: 28px;
+	/*font-size: 14px; <-- Causes text being cut by the frame*/
+}
+
+QTabBar::tab:selected {
+	border: none;
+	margin: 0px;
+	border-top-left-radius: 10px;
+	border-top-right-radius: 10px;
+	color: rgb(220, 223, 214);
+	background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 rgb(68, 69, 72), stop: 1 rgb(86, 87, 90));
+}
+
+QTabWidget::pane {
+	margin-top: 0px;
+	border-top: none;
+}

=== added directory 'plugins/PrintSky/src'
=== added file 'plugins/PrintSky/src/CMakeLists.txt'
--- plugins/PrintSky/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/src/CMakeLists.txt	2011-01-07 22:29:26 +0000
@@ -0,0 +1,69 @@
+INCLUDE_DIRECTORIES(
+	.
+	gui
+	${CMAKE_BINARY_DIR}/plugins/PrintSky/src
+)
+LINK_DIRECTORIES(${BUILD_DIR}/src)
+
+SET(PrintSky_SRCS
+  PrintSky.hpp
+  PrintSky.cpp
+  gui/PrintSkyDialog.hpp
+  gui/PrintSkyDialog.cpp
+  gui/StelDialogPrintSky.hpp
+  gui/StelDialogPrintSky.cpp
+  )
+
+################# compiles resources files ############
+SET(PrintSky_RES ../PrintSky.qrc)
+QT4_ADD_RESOURCES(PrintSky_RES_CXX ${PrintSky_RES})
+
+################# compiles .ui files ############
+SET(PrintSky_UIS
+  gui/printskyDialog.ui
+)
+QT4_WRAP_UI(PrintSky_UIS_H ${PrintSky_UIS})
+
+# Add here all the files which require moc compilation
+# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
+SET(PrintSky_MOC_HDRS
+ PrintSky.hpp
+ gui/PrintSkyDialog.hpp
+ gui/StelDialogPrintSky.hpp
+ )
+
+# After this call, PrintSky_MOC_SRCS = moc_PrintSky.cxx
+QT4_WRAP_CPP(PrintSky_MOC_SRCS ${PrintSky_MOC_HDRS})
+
+SET(extLinkerOption ${QT_LIBRARIES} ${FreeType2_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
+
+############### For building the dynamic library ######################
+IF(BUILD_DYNAMIC_PLUGINS)
+	ADD_LIBRARY(PrintSky MODULE ${PrintSky_SRCS} ${PrintSky_MOC_SRCS} ${PrintSky_RES_CXX} ${PrintSky_UIS_H})
+	IF(APPLE)
+		FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
+		MARK_AS_ADVANCED(OPENGL_LIBRARY)
+		SET_TARGET_PROPERTIES(PrintSky PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" SUFFIX ".dylib")
+	ENDIF(APPLE)
+
+	IF(WIN32)
+		SET_TARGET_PROPERTIES(PrintSky PROPERTIES LINK_FLAGS "-enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
+		SET(StelMain stelMain)
+	ELSE(WIN32)
+		SET(StelMain )
+	ENDIF(WIN32)
+
+	TARGET_LINK_LIBRARIES(PrintSky ${StelMain} ${extLinkerOption})
+	INSTALL(TARGETS PrintSky DESTINATION "modules/${PACKAGE}")
+ENDIF()
+
+############### For building the static library ######################
+IF(BUILD_STATIC_PLUGINS)
+	ADD_LIBRARY(PrintSky-static STATIC ${PrintSky_SRCS} ${PrintSky_MOC_SRCS} ${PrintSky_RES_CXX} ${PrintSky_UIS_H})
+	# The library target "PrintSky-static" has a default OUTPUT_NAME of "PrintSky-static", so change it.
+	SET_TARGET_PROPERTIES(PrintSky-static PROPERTIES OUTPUT_NAME "PrintSky")
+	TARGET_LINK_LIBRARIES(PrintSky-static ${extLinkerOption})
+	SET_TARGET_PROPERTIES(PrintSky-static PROPERTIES COMPILE_FLAGS "-fPIC -DQT_STATICPLUGIN")
+	ADD_DEPENDENCIES(AllStaticPlugins PrintSky-static)
+ENDIF()
+

=== added file 'plugins/PrintSky/src/PrintSky.cpp'
--- plugins/PrintSky/src/PrintSky.cpp	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/src/PrintSky.cpp	2011-01-07 22:29:26 +0000
@@ -0,0 +1,171 @@
+#include <QDebug>
+#include <QKeyEvent>
+#include "StelProjector.hpp"
+#include "StelPainter.hpp"
+#include "StelApp.hpp"
+#include "StelCore.hpp"
+#include "StelFileMgr.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelGui.hpp"
+#include "StelGuiItems.hpp"
+#include "StelIniParser.hpp"
+#include "StelVertexArray.hpp"
+#include "PrintSky.hpp"
+#include <QAction>
+#include "StelMainGraphicsView.hpp"
+#include <QGLWidget>
+
+//! This method is the one called automatically by the StelModuleMgr just
+//! after loading the dynamic library
+StelModule* PrintSkyStelPluginInterface::getStelModule() const
+{
+	return new PrintSky();
+}
+
+StelPluginInfo PrintSkyStelPluginInterface::getPluginInfo() const
+{
+	// Allow to load the resources when used as a static plugin
+	Q_INIT_RESOURCE(PrintSky);
+
+	StelPluginInfo info;
+	info.id = "PrintSky";
+	info.displayedName = "Print Sky";
+	info.authors = "Pep Pujols";
+	info.contact = "[e-mail]";
+	info.description = "Provides an system printing sky";
+	return info;
+}
+
+Q_EXPORT_PLUGIN2(PrintSky, PrintSkyStelPluginInterface)
+
+PrintSky::PrintSky()
+{
+	setObjectName("PrintSky");
+	useInvertColors=scaleToFit=false;
+	printData=true;
+}
+
+PrintSky::~PrintSky()
+{
+	delete printskyDialog;
+	printskyDialog = NULL;
+}
+
+void PrintSky::init()
+{
+	printskyDialog = new PrintSkyDialog();
+
+	// create action for enable/disable & hook up signals
+	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
+	Q_ASSERT(gui);
+
+	gui->addGuiActions("actionInit_Printing_Sky", N_("Printing Sky"), "Ctrl+P", "Plugin Key Bindings", true, false);
+	gui->getGuiActions("actionInit_Printing_Sky")->setChecked(true);
+	connect(gui->getGuiActions("actionInit_Printing_Sky"), SIGNAL(triggered()), this, SLOT(initPrintingSky()));
+
+	try
+	{
+		//Make sure that "/modules/PrintSky" exists
+		StelFileMgr::makeSureDirExistsAndIsWritable(StelFileMgr::getUserDir() + "/modules/PrintSky/");
+
+		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
+		QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini";
+
+		QSettings settings(printskyIniPath, QSettings::IniFormat);
+		useInvertColors = settings.value("use_invert_colors", 0.0).toBool();
+		scaleToFit=settings.value("use_scale_to_fit", true).toBool();
+		orientation=settings.value("orientation", "Portrait").toString();
+		printData=settings.value("print_data", true).toBool();
+		printSSEphemerides=settings.value("print_SS_ephemerides", true).toBool();
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to locate printsky.ini file or create a default one for PrintSky plugin: " << e.what();
+	}
+
+	//Load the module's custom style sheets
+	QFile styleSheetFile;
+	styleSheetFile.setFileName(":/printsky/normalStyle.css");
+	if(styleSheetFile.open(QFile::ReadOnly|QFile::Text))
+	{
+		normalStyleSheet = styleSheetFile.readAll();
+	}
+	styleSheetFile.close();
+	styleSheetFile.setFileName(":/printsky/nightStyle.css");
+	if(styleSheetFile.open(QFile::ReadOnly|QFile::Text))
+	{
+		nightStyleSheet = styleSheetFile.readAll();
+	}
+	styleSheetFile.close();
+
+}
+
+void PrintSky::update(double deltaTime)
+{
+}
+
+//! Draw any parts on the screen which are for our module
+void PrintSky::draw(StelCore* core)
+{
+}
+
+//! Determine which "layer" the plagin's drawing will happen on.
+double PrintSky::getCallOrder(StelModuleActionName actionName) const
+{
+	return 0;
+}
+
+void PrintSky::handleKeys(QKeyEvent* event)
+{
+		event->setAccepted(false);
+}
+
+void PrintSky::handleMouseClicks(class QMouseEvent* event)
+{
+		event->setAccepted(false);
+
+}
+
+bool PrintSky::handleMouseMoves(int x, int y, Qt::MouseButtons b)
+{
+		return false;
+}
+
+//! Show dialog printing enabling preview and print buttons
+void PrintSky::initPrintingSky()
+{
+	printskyDialog->setVisible(true);
+	printskyDialog->enableOutputOptions(true);
+}
+
+
+const StelStyle PrintSky::getModuleStyleSheet(const StelStyle& style)
+{
+	StelStyle pluginStyle(style);
+	if (style.confSectionName == "color")
+	{
+		pluginStyle.qtStyleSheet.append(normalStyleSheet);
+	}
+	else
+	{
+		pluginStyle.qtStyleSheet.append(nightStyleSheet);
+	}
+	return pluginStyle;
+}
+
+void PrintSky::setStelStyle(const QString& section)
+{
+	printskyDialog->updateStyle();
+}
+
+bool PrintSky::configureGui(bool show)
+{
+	if (show)
+	{
+		printskyDialog->setVisible(true);
+		printskyDialog->enableOutputOptions(false);
+	}
+
+	return true;
+}

=== added file 'plugins/PrintSky/src/PrintSky.hpp'
--- plugins/PrintSky/src/PrintSky.hpp	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/src/PrintSky.hpp	2011-01-07 22:29:26 +0000
@@ -0,0 +1,70 @@
+#ifndef PrintSky_H
+#define PrintSky_H
+
+#include "StelModule.hpp"
+#include <QPrinter>
+#include <QPrintPreviewWidget>
+#include <QPrintPreviewDialog>
+#include "StelStyle.hpp"
+#include "PrintSkyDialog.hpp"
+
+//class PrintSky
+class PrintSky : public StelModule
+{
+	Q_OBJECT
+public:
+	 PrintSky();
+	virtual ~PrintSky();
+
+
+	///////////////////////////////////////////////////////////////////////////
+	// Methods defined in the StelModule class
+	virtual void init();
+	virtual bool configureGui(bool show=true);
+	virtual void update(double deltaTime);
+	virtual void draw(StelCore* core);
+	virtual double getCallOrder(StelModuleActionName actionName) const;
+	virtual void handleKeys(class QKeyEvent* event);
+	virtual void handleMouseClicks(class QMouseEvent* event);
+	virtual bool handleMouseMoves(int x, int y, Qt::MouseButtons b);
+	virtual void setStelStyle(const QString& style);
+
+	//! Returns the module-specific style sheet.
+	//! The main StelStyle instance should be passed.
+	const StelStyle getModuleStyleSheet(const StelStyle& style);
+
+public slots:
+
+	//! Show dialog printing enabling preview and print buttons
+	void initPrintingSky();
+
+private slots:
+
+private:
+
+	//Styles
+	QByteArray normalStyleSheet;
+	QByteArray nightStyleSheet;
+
+	//Printing options
+	bool useInvertColors, scaleToFit, printData, printSSEphemerides;
+	QString orientation;
+
+	PrintSkyDialog *printskyDialog;
+};
+
+#include "fixx11h.h"
+#include <QObject>
+#include "StelPluginInterface.hpp"
+
+//! This class is used by Qt to manage a plug-in interface
+class PrintSkyStelPluginInterface : public QObject, public StelPluginInterface
+{
+	Q_OBJECT
+	Q_INTERFACES(StelPluginInterface)
+public:
+	virtual StelModule* getStelModule() const;
+	virtual StelPluginInfo getPluginInfo() const;
+ };
+
+#endif // PrintSky_H

=== added directory 'plugins/PrintSky/src/gui'
=== added file 'plugins/PrintSky/src/gui/PrintSkyDialog.cpp'
--- plugins/PrintSky/src/gui/PrintSkyDialog.cpp	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/src/gui/PrintSkyDialog.cpp	2011-01-07 22:29:26 +0000
@@ -0,0 +1,625 @@
+/*
+ * Copyright (C) 2010 Pep Pujols
+ *
+ * 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 "PrintSkyDialog.hpp"
+#include "ui_printskyDialog.h"
+#include "PrintSky.hpp"
+#include <QAction>
+#include <QGLWidget>
+#include <QPrintDialog>
+#include <QTimer>
+#include <QGraphicsWidget>
+
+#include "StelApp.hpp"
+#include "StelGui.hpp"
+#include "StelFileMgr.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelMainGraphicsView.hpp"
+#include "StelTranslator.hpp"
+#include "StelNavigator.hpp"
+#include "StelCore.hpp"
+#include "StelLocaleMgr.hpp"
+#include "StelMovementMgr.hpp"
+#include "StelSkyDrawer.hpp"
+#include "StarMgr.hpp"
+#include "SolarSystem.hpp"
+#include "Planet.hpp"
+
+#include <QDataWidgetMapper>
+#include <QDebug>
+#include <QFrame>
+#include <QSettings>
+
+
+PrintSkyDialog::PrintSkyDialog()
+{
+	ui = new Ui_printskyDialogForm;
+}
+
+PrintSkyDialog::~PrintSkyDialog()
+{
+	//These exist only if the window has been shown once:
+	if (dialog)
+	{
+	}
+
+	delete ui;
+	ui = NULL;
+
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark StelModule Methods
+#endif
+/* ********************************************************************* */
+void PrintSkyDialog::languageChanged()
+{
+	if (dialog) {
+		ui->retranslateUi(dialog);
+	}
+}
+
+void PrintSkyDialog::updateStyle()
+{
+	if(dialog) {
+		gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
+		Q_ASSERT(gui);
+		const StelStyle pluginStyle = GETSTELMODULE(PrintSky)->getModuleStyleSheet(gui->getStelStyle());
+		dialog->setStyleSheet(pluginStyle.qtStyleSheet);
+		//ui->textBrowser->document()->setDefaultStyleSheet(QString(pluginStyle.htmlStyleSheet));
+	}
+}
+
+void PrintSkyDialog::styleChanged()
+{
+	// Nothing for now
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Slot Methods
+#endif
+/* ********************************************************************* */
+void PrintSkyDialog::closeWindow()
+{
+	setVisible(false);
+	StelMainGraphicsView::getInstance().scene()->setActiveWindow(0);
+}
+
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Private Slot Methods
+#endif
+/* ********************************************************************* */
+void PrintSkyDialog::invertColorsStateChanged(int state)
+{
+	bool shouldInvert = (state == Qt::Checked);
+
+	try
+	{
+		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
+		QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini";
+		QSettings settings(printskyIniPath, QSettings::IniFormat);
+		bool useInvertColors = settings.value("use_invert_colors", 0.0).toBool();
+		if (state != useInvertColors)
+		{
+			settings.setValue("use_invert_colors", shouldInvert);
+			emit(invertColorsChanged(shouldInvert));
+		}
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to locate printsky.ini file or create a default one for PrintSky plugin: " << e.what();
+	}
+
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Private Slot Methods
+#endif
+/* ********************************************************************* */
+void PrintSkyDialog::scaleToFitStateChanged(int state)
+{
+	bool shouldScale = (state == Qt::Checked);
+
+	try
+	{
+		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
+		QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini";
+		QSettings settings(printskyIniPath, QSettings::IniFormat);
+		bool useScaleToFit = settings.value("use_scale_to_fit", 0.0).toBool();
+		if (state != useScaleToFit)
+		{
+			settings.setValue("use_scale_to_fit", shouldScale);
+			emit(scaleToFitChanged(shouldScale));
+		}
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to locate printsky.ini file or create a default one for PrintSky plugin: " << e.what();
+	}
+
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Private Slot Methods
+#endif
+/* ********************************************************************* */
+void PrintSkyDialog::orientationStateChanged(bool state)
+{
+	QString newOrientation=(ui->orientationPortraitRadioButton->isChecked()? "Portrait": "Landscape");
+
+	try
+	{
+		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
+		QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini";
+		QSettings settings(printskyIniPath, QSettings::IniFormat);
+		QString currentOrientation = settings.value("orientation", "Portrait").toString();
+		if (newOrientation != currentOrientation)
+		{
+			settings.setValue("orientation", newOrientation);
+			emit(orientationChanged(true));
+		}
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to locate printsky.ini file or create a default one for PrintSky plugin: " << e.what();
+	}
+
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Private Slot Methods
+#endif
+/* ********************************************************************* */
+void PrintSkyDialog::printDataStateChanged(int state)
+{
+	bool shouldPrint = (state == Qt::Checked);
+
+	try
+	{
+		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
+		QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini";
+		QSettings settings(printskyIniPath, QSettings::IniFormat);
+		bool printData = settings.value("print_data", 0.0).toBool();
+		if (state != printData)
+		{
+			settings.setValue("print_data", shouldPrint);
+			emit(printDataChanged(shouldPrint));
+		}
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to locate printsky.ini file or create a default one for PrintSky plugin: " << e.what();
+	}
+
+}
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Private Slot Methods
+#endif
+/* ********************************************************************* */
+void PrintSkyDialog::printSSEphemeridesStateChanged(int state)
+{
+	bool shouldPrint = (state == Qt::Checked);
+
+	try
+	{
+		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
+		QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini";
+		QSettings settings(printskyIniPath, QSettings::IniFormat);
+		bool printSSEphemerides = settings.value("print_SS_ephemerides", 0.0).toBool();
+		if (state != printSSEphemerides)
+		{
+			settings.setValue("print_SS_ephemerides", shouldPrint);
+			emit(printSSEphemeridesChanged(shouldPrint));
+		}
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to locate printsky.ini file or create a default one for PrintSky plugin: " << e.what();
+	}
+
+}
+
+
+/* ********************************************************************* */
+#if 0
+#pragma mark -
+#pragma mark Protected Methods
+#endif
+/* ********************************************************************* */
+void PrintSkyDialog::createDialogContent()
+{
+
+	ui->setupUi(dialog);
+
+	//Now the rest of the actions.
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+	connect(ui->invertColorsCheckBox, SIGNAL(stateChanged(int)), this, SLOT(invertColorsStateChanged(int)));
+	connect(ui->scaleToFitCheckBox, SIGNAL(stateChanged(int)), this, SLOT(scaleToFitStateChanged(int)));
+	connect(ui->previewSkyPushButton, SIGNAL(clicked()), this, SLOT(previewSky()));
+	connect(ui->printSkyPushButton, SIGNAL(clicked()), this, SLOT(printSky()));
+	connect(ui->orientationPortraitRadioButton, SIGNAL(toggled(bool)), this, SLOT(orientationStateChanged(bool)));
+	connect(ui->printDataCheckBox, SIGNAL(stateChanged(int)), this, SLOT(printDataStateChanged(int)));
+	connect(ui->printSSEphemeridesCheckBox, SIGNAL(stateChanged(int)), this, SLOT(printSSEphemeridesStateChanged(int)));
+
+	// set the initial state
+	try
+		{
+		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
+		QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini";
+		QSettings settings(printskyIniPath, QSettings::IniFormat);
+		bool useInvertColors = settings.value("use_invert_colors", false).toBool();
+		if (useInvertColors)
+		{
+			ui->invertColorsCheckBox->setCheckState(Qt::Checked);
+		}
+		bool useScaleToFit = settings.value("use_scale_to_fit", true).toBool();
+		if (useScaleToFit)
+		{
+			ui->scaleToFitCheckBox->setCheckState(Qt::Checked);
+		}
+		QString orientation=settings.value("orientation", "Portrait").toString();
+		if (orientation=="Portrait")
+			ui->orientationPortraitRadioButton->setChecked(true);
+		if (orientation=="Landscape")
+			ui->orientationLandscapeRadioButton->setChecked(true);
+		bool printData = settings.value("print_data", true).toBool();
+		if (printData)
+		{
+			ui->printDataCheckBox->setCheckState(Qt::Checked);
+		}
+		bool printSSEphemerides = settings.value("print_SS_ephemerides", true).toBool();
+		if (printSSEphemerides)
+		{
+			ui->printSSEphemeridesCheckBox->setCheckState(Qt::Checked);
+		}
+
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to locate printsky.ini file or create a default one for PrintSky plugin: " << e.what();
+	}
+
+
+	//Initialize the style
+	updateStyle();
+}
+
+//! Print report on a preview window
+void PrintSkyDialog::previewSky()
+{
+	currentVisibilityGui = gui->getVisible();
+	gui->setVisible(false);
+	dialog->setVisible(false);
+
+	outputOption = true;
+
+	QTimer::singleShot(50, this, SLOT(executePrinterOutputOption()));
+}
+
+//! Draw contents report
+void PrintSkyDialog::printDataSky(QPrinter * printer)
+{
+	QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+
+	QPainter painter(printer);
+
+	QGLWidget* glQGLWidget=(QGLWidget *) StelMainGraphicsView::getInstance().getStelQGLWidget();
+	Q_ASSERT(glQGLWidget);
+
+
+	QImage img=glQGLWidget->grabFrameBuffer();
+
+	int imageYPos=(printDataOption? 400: 0);
+
+	QSize sizeReal=printer->pageRect().size();
+	sizeReal.setHeight(sizeReal.height()-imageYPos);
+
+	if (scaleToFitOption)
+		img=img.scaled(sizeReal, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
+	if (invertColorsOption)
+		img.invertPixels();
+
+	int imageXPos=(printer->pageRect().width()-img.width())/2;
+
+	painter.drawImage(imageXPos, 0, img);
+
+	StelCore* core = StelApp::getInstance().getCore();
+	StelLocation locationData=core->getNavigator()->getCurrentLocation();
+	double jd = core->getNavigator()->getJDay();
+
+	QFont font("DejaVu Sans", 10, QFont::Normal);
+	font.setPixelSize(printer->pageRect().width()/60);
+	painter.setFont(font);
+	int lineSpacing=font.pixelSize()+5;
+
+	//qDebug() << "PrintSky: printer debugging information:";
+	//qDebug() << "Current printer resolution:" << printer->resolution();
+	//qDebug() << "Supported printer resolutions:" << printer->supportedResolutions();
+	//qDebug() << "Page size (size index, 0-30)" << printer->paperSize();
+	//For the paper size index, see http://doc.qt.nokia.com/qprinter.html#PaperSize-enum
+	//qDebug() << "Pixel Size:" << font.pixelSize();
+	//qDebug() << "Paper Rect: "<< printer->paperRect();
+	//qDebug() << "Page Rect: "<< printer->pageRect();
+
+	if (printDataOption)
+	{
+		int posY=img.height()+lineSpacing;
+
+		QRect surfaceData(printer->pageRect().left(), posY, printer->pageRect().width(), printer->pageRect().height()-posY);
+
+		painter.drawText(surfaceData.adjusted(0, 0, 0, -(surfaceData.height()-lineSpacing)), Qt::AlignCenter, "CHART INFORMATION");
+
+		QString printLatitude=StelUtils::radToDmsStr((std::fabs(locationData.latitude)/180.)*M_PI);
+		QString printLongitude=StelUtils::radToDmsStr((std::fabs(locationData.longitude)/180.)*M_PI);
+
+		QString location = QString("Location: %1\t%2\t%3\t%4\t%5\t%6m")
+							 .arg(locationData.name)
+							 .arg(locationData.country)
+							 .arg(locationData.planetName)
+							 .arg(locationData.latitude<0 ? QString("%1S").arg(printLatitude) : QString("%1N").arg(printLatitude))
+							 .arg(locationData.longitude<0 ? QString("%1W").arg(printLongitude) : QString("%1E").arg(printLongitude))
+							 .arg(locationData.altitude);
+		painter.drawText(surfaceData.adjusted(50, lineSpacing, 0, 0), Qt::AlignLeft, location);
+
+		QString time="Local time: ";
+		QString newDate = StelApp::getInstance().getLocaleMgr().getPrintableDateLocal(jd) +"   "
+							+StelApp::getInstance().getLocaleMgr().getPrintableTimeLocal(jd)+QString(" (GMT%1%2)").arg(StelApp::getInstance().getLocaleMgr().getGMTShift(jd)>=0? '+':'-').arg(StelApp::getInstance().getLocaleMgr().getGMTShift(jd));
+		time+=newDate;
+		painter.drawText(surfaceData.adjusted(50, (lineSpacing)*2, 0, 0), Qt::AlignLeft, time);
+
+		QString str;
+		QTextStream wos(&str);
+		wos << "FOV: " << qSetRealNumberPrecision(3) << core->getMovementMgr()->getCurrentFov() << QChar(0x00B0);
+		painter.drawText(surfaceData.adjusted(50, (lineSpacing)*3, 0, 0), Qt::AlignLeft, *wos.string());
+
+		painter.drawText(surfaceData.adjusted(surfaceData.width()-(15*font.pixelSize()), 0, 0, 0), Qt::AlignLeft, "Radius-magnitude relation");
+
+		StarMgr* smgr = GETSTELMODULE(StarMgr);
+		QList< QPair<float,float> > listPairsMagnitudesRadius=smgr->getListMagnitudeRadius(core);
+
+		int xPos=-(12*font.pixelSize()), yPos=lineSpacing+10;
+		for (int icount=1; icount<=listPairsMagnitudesRadius.count(); ++icount)
+		{
+			painter.drawText(surfaceData.adjusted(surfaceData.width()+xPos, yPos, 0, 0), Qt::AlignLeft, QString("%1").arg(listPairsMagnitudesRadius.at(icount-1).first));
+			painter.setBrush(Qt::SolidPattern);
+			painter.drawEllipse(QPoint(surfaceData.left() + surfaceData.width() + xPos - 40, surfaceData.top() + yPos + (font.pixelSize()/2)), 
+									  (int) std::ceil(listPairsMagnitudesRadius.at(icount - 1).second), 
+									  (int) std::ceil(listPairsMagnitudesRadius.at(icount - 1).second));
+			yPos+=lineSpacing;
+			if (yPos+lineSpacing>=surfaceData.height())
+			{
+				xPos+=200;
+				yPos=lineSpacing+10;
+			}
+		}
+	}
+
+		// Print solar system ephemerides
+	if (printSSEphemeridesOption)
+	{
+
+		SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
+
+		double geographicLongitude=-locationData.longitude*M_PI/180.;
+		double geographicLatitude=locationData.latitude*M_PI/180.;
+
+		PlanetP pHome=ssmgr->searchByEnglishName(locationData.planetName);
+		double standardSideralTime=pHome->getSiderealTime(((int) jd)+0.5)*M_PI/180.;
+
+		QStringList allBodiesNames=ssmgr->getAllPlanetEnglishNames();
+		allBodiesNames.sort();
+		bool doHeader=true;
+		int yPos;
+		bool oddLine=false;
+		for (int iBodyName=1; iBodyName<=allBodiesNames.count(); ++iBodyName)
+		{
+			QString englishName=allBodiesNames.at(iBodyName-1);
+			PlanetP p=ssmgr->searchByEnglishName(englishName);
+			double dec, ra;
+			StelUtils::rectToSphe(&ra,&dec, p->getEquinoxEquatorialPos(core->getNavigator()));
+			double standardAltitude=-0.5667;
+			if (englishName=="Sun")
+				standardAltitude=-0.8333;
+			if (englishName=="Moon")
+				standardAltitude=0.125;
+			standardAltitude*=M_PI/180.;
+
+			double cosH=(std::sin(standardAltitude)-(std::sin(geographicLatitude)*std::sin(dec)))/(std::cos(geographicLatitude)*std::cos(dec));
+
+			if (englishName!=locationData.planetName && cosH>=-1. && cosH<=1.)
+			{
+
+				if (doHeader)
+				{
+
+				    yPos=50;
+				    printer->newPage();
+				    painter.drawText(0, 0, printer->paperRect().width(), yPos, Qt::AlignCenter, "SOLAR SYSTEM EPHEMERIDES");
+
+				    int ratioWidth=300.*(double) font.pixelSize()/45.;
+				    int xPos=printer->pageRect().left()-ratioWidth;;
+				    yPos+=(lineSpacing)*2;
+
+				    painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, "Name");
+				    painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, "RA");
+				    painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, "Dec");
+				    painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, "Rising");
+				    painter.drawText(QRect(xPos, yPos-font.pixelSize()-10, ratioWidth, font.pixelSize()), Qt::AlignCenter, "Local Time");
+				    painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, "Transit");
+				    painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, "Setting");
+				    painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, "Dist.(AU)");
+				    painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, "Ap.Mag.");
+				    yPos+=lineSpacing;
+				    doHeader=false;
+				}
+
+
+				double angleH=std::acos(cosH);
+				double transit=((ra+geographicLongitude-standardSideralTime)/(2*M_PI));
+				if (transit>1.)
+					transit-=1.;
+				if (transit<0)
+					transit+=1.;
+
+				double rising=transit-angleH/(2*M_PI);
+				if (rising>1.)
+					rising-=1.;
+				if (rising<0.)
+					rising+=1.;
+
+				double setting=transit+angleH/(2*M_PI);
+				if (setting>1.)
+					setting-=1.;
+				if (setting<0.)
+					setting+=1.;
+
+				int shift=StelApp::getInstance().getLocaleMgr().getGMTShift(jd);
+
+				int ratioWidth=300.*(double) font.pixelSize()/45.;
+				int xPos=printer->pageRect().left()-ratioWidth;
+
+				oddLine=!oddLine;
+
+
+				painter.setPen(Qt::NoPen);
+				painter.setBrush((oddLine? Qt::white: Qt::gray));
+				painter.drawRect(QRect(xPos+ratioWidth, yPos, ratioWidth*8, font.pixelSize()));
+				painter.setPen(Qt::SolidLine);
+
+				painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignLeft, englishName);
+				painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignRight, QString("%1").arg(StelUtils::radToHmsStr(ra)));
+				painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignRight, QString("%1").arg(StelUtils::radToDmsStr(dec)));
+				painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, QString("%1").arg(printableTime(rising, shift)));
+				painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, QString("%1").arg(printableTime(transit, shift)));
+				painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignCenter, QString("%1").arg(printableTime(setting, shift)));
+				painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignRight, QString("%1").arg(p->getDistance(), 0, 'g', 5));
+				painter.drawText(QRect(xPos+=ratioWidth, yPos, ratioWidth, font.pixelSize()), Qt::AlignRight, QString("%1").arg(p->getVMagnitude(core->getNavigator()), 0, 'g', 3));
+
+				yPos+=lineSpacing;
+				if (yPos+((lineSpacing)*3)>=printer->pageRect().top()+printer->pageRect().height())
+				    doHeader=true;
+			    }
+		}
+	}
+	QApplication::restoreOverrideCursor();
+}
+
+//! Print report direct to printer
+void PrintSkyDialog::printSky()
+{
+	currentVisibilityGui=gui->getVisible();
+	gui->setVisible(false);
+	dialog->setVisible(false);
+
+	outputOption=false;
+
+	QTimer::singleShot(50, this, SLOT(executePrinterOutputOption()));
+
+}
+
+//! Read the printer parameters and run the output option selected (Print/Preview)
+void PrintSkyDialog::executePrinterOutputOption()
+{
+	//Options for printing image.
+	invertColorsOption=false;
+	scaleToFitOption=true;
+	orientationOption="Portrait";
+	printDataOption=true;
+	printSSEphemeridesOption=true;
+
+	try
+	{
+		StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable);
+		QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini";
+		QSettings settings(printskyIniPath, QSettings::IniFormat);
+		invertColorsOption=settings.value("use_invert_colors", false).toBool();
+		scaleToFitOption=settings.value("use_scale_to_fit", true).toBool();
+		orientationOption=settings.value("orientation", "Portrait").toString();
+		printDataOption=settings.value("print_data", true).toBool();
+		printSSEphemeridesOption=settings.value("print_SS_ephemerides", true).toBool();
+	}
+	catch (std::runtime_error& e)
+	{
+		qWarning() << "WARNING: unable to locate printsky.ini file or create a default one for PrintSky plugin: " << e.what();
+	}
+
+
+	//QPrinter printer(QPrinter::HighResolution);
+	QPrinter printer(QPrinter::ScreenResolution);
+	printer.setResolution(300);
+	printer.setDocName("STELLARIUM REPORT");
+	printer.setOrientation((orientationOption=="Portrait"? QPrinter::Portrait: QPrinter::Landscape));
+
+	if (outputOption)
+	{
+		//QPrintPreviewDialog oPrintPreviewDialog(&printer, &StelMainGraphicsView::getInstance());
+		QPrintPreviewDialog oPrintPreviewDialog(&printer);
+		connect(&oPrintPreviewDialog, SIGNAL(paintRequested(QPrinter *)), this, SLOT(printDataSky(QPrinter *)));
+		oPrintPreviewDialog.exec();
+	}
+	else
+	{
+		//QPrintDialog dialogPrinter(&printer, &StelMainGraphicsView::getInstance());
+		QPrintDialog dialogPrinter(&printer);
+		if (dialogPrinter.exec() == QDialog::Accepted)
+			printDataSky(&printer);
+	}
+
+	gui->setVisible(currentVisibilityGui);
+	((QGraphicsWidget*)StelMainGraphicsView::getInstance().getStelAppGraphicsWidget())->setFocus(Qt::OtherFocusReason);
+}
+
+
+
+void PrintSkyDialog::enableOutputOptions(bool enable)
+{
+	ui->buttonsFrame->setVisible(enable);
+}
+
+
+QString PrintSkyDialog::printableTime(double time, int shift)
+{
+	time*=24.;
+	time+=shift;
+	if (time>=24.)
+		time-=24.;
+	if (time<0)
+		time+=24.;
+	int hour=(int) time;
+	time-=hour;
+	time*=60;
+	int minute=(int) time;
+	return(QString("%1:%2").arg(hour, 2, 10, QChar('0')).arg(minute, 2, 10, QChar('0')));
+}

=== added file 'plugins/PrintSky/src/gui/PrintSkyDialog.hpp'
--- plugins/PrintSky/src/gui/PrintSkyDialog.hpp	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/src/gui/PrintSkyDialog.hpp	2011-01-07 22:29:26 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2010 Pep Pujols
+ *
+ * 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 _PRINTSKYDIALOG_HPP_
+#define _PRINTSKYDIALOG_HPP_
+
+#include <QObject>
+#include "StelDialogPrintSky.hpp"
+#include "StelStyle.hpp"
+#include <QPrinter>
+#include <QPrintPreviewWidget>
+#include <QPrintPreviewDialog>
+#include "StelGui.hpp"
+
+class Ui_printskyDialogForm;
+
+
+class PrintSkyDialog : public StelDialogPrintSky
+{
+	Q_OBJECT
+
+public:
+	PrintSkyDialog();
+	virtual ~PrintSkyDialog();
+	void languageChanged();
+	void updateStyle();
+
+	//! Notify that the application style changed
+	void styleChanged();
+	void enableOutputOptions(bool enable);
+
+public slots:
+	void closeWindow();
+
+	//! Print report on a preview window
+	void previewSky();
+	//! Read the printer parameters and run the output option selected (Print/Preview)
+	void executePrinterOutputOption();
+	//! Print report direct to printer
+	void printSky();
+
+signals:
+	void invertColorsChanged(bool state);
+	void scaleToFitChanged(bool state);
+	void orientationChanged(bool state);
+	void printDataChanged(bool state);
+	void printSSEphemeridesChanged(bool state);
+
+protected:
+	//! Initialize the dialog widgets and connect the signals/slots
+	virtual void createDialogContent();
+	Ui_printskyDialogForm* ui;
+
+private slots:
+	void invertColorsStateChanged(int state);
+	//! Draw contents report
+	//! @param printer the paint device to paint on a print
+	void printDataSky(QPrinter * printer);
+	void scaleToFitStateChanged(int state);
+	void orientationStateChanged(bool state);
+	void printDataStateChanged(int state);
+	void printSSEphemeridesStateChanged(int state);
+
+private:
+
+	//Gui
+	StelGui* gui;
+	bool currentVisibilityGui;
+
+	//! Printing options
+	bool outputOption;
+	bool invertColorsOption;
+	bool scaleToFitOption;
+	QString orientationOption;
+	bool printDataOption;
+	bool printSSEphemeridesOption;
+	QString printableTime(double time, int shift);
+
+};
+
+#endif // _OCULARDIALOG_HPP_

=== added file 'plugins/PrintSky/src/gui/StelDialogPrintSky.cpp'
--- plugins/PrintSky/src/gui/StelDialogPrintSky.cpp	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/src/gui/StelDialogPrintSky.cpp	2011-01-07 22:29:26 +0000
@@ -0,0 +1,134 @@
+/*
+ * Stellarium
+ * Copyright (C) 2008 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 "StelDialogPrintSky.hpp"
+#include "StelMainGraphicsView.hpp"
+#include "StelMainWindow.hpp"
+
+#include <QDebug>
+#include <QDialog>
+#include <QGraphicsProxyWidget>
+#include <QStyleOptionGraphicsItem>
+
+class CustomProxy : public QGraphicsProxyWidget
+{
+	public:
+		CustomProxy(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0) : QGraphicsProxyWidget(parent, wFlags)
+		{
+			setFocusPolicy(Qt::StrongFocus);
+		}
+		//! Reimplement this method to add windows decorations. Currently there are invisible 2 px decorations
+		void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+		{
+/*			QStyleOptionTitleBar bar;
+			initStyleOption(&bar);
+			bar.subControls = QStyle::SC_TitleBarCloseButton;
+			qWarning() << style()->subControlRect(QStyle::CC_TitleBar, &bar, QStyle::SC_TitleBarCloseButton);
+			QGraphicsProxyWidget::paintWindowFrame(painter, option, widget);*/
+		}
+	protected:
+
+		virtual bool event(QEvent* event)
+		{
+			if (event->type()==QEvent::WindowDeactivate)
+			{
+				widget()->setWindowOpacity(0.4);
+			}
+			if (event->type()==QEvent::WindowActivate)
+			{
+				widget()->setWindowOpacity(0.9);
+			}
+			return QGraphicsProxyWidget::event(event);
+		}
+};
+
+StelDialogPrintSky::StelDialogPrintSky() : dialog(NULL)
+{
+}
+
+StelDialogPrintSky::~StelDialogPrintSky()
+{
+}
+
+
+void StelDialogPrintSky::close()
+{
+	setVisible(false);
+	StelMainGraphicsView::getInstance().scene()->setActiveWindow(0);
+	((QGraphicsWidget*)StelMainGraphicsView::getInstance().getStelAppGraphicsWidget())->setFocus(Qt::OtherFocusReason);
+}
+
+void StelDialogPrintSky::setVisible(bool v)
+{
+	if (v)
+	{
+
+		QSize screenSize = StelMainWindow::getInstance().size();
+		if (dialog)
+		{
+			dialog->show();
+			StelMainGraphicsView::getInstance().scene()->setActiveWindow(proxy);
+			// If the main window has been resized, it is possible the dialog
+			// will be off screen.  Check for this and move it to a visible
+			// position if necessary
+			QPointF newPos = proxy->pos();
+			if (newPos.x()>=screenSize.width())
+				newPos.setX(screenSize.width() - dialog->size().width());
+			if (newPos.y()>=screenSize.height())
+				newPos.setY(screenSize.height() - dialog->size().height());
+			if (newPos != dialog->pos())
+				proxy->setPos(newPos);
+
+			proxy->setFocus();
+			return;
+		}
+		dialog = new QDialog(NULL);
+		connect(dialog, SIGNAL(rejected()), this, SLOT(close()));
+		createDialogContent();
+
+		proxy = new CustomProxy(NULL, Qt::Tool);
+		proxy->setWidget(dialog);
+		QRectF bound = proxy->boundingRect();
+
+		// centre with dialog according to current window size.
+		proxy->setPos((int)((screenSize.width()-bound.width())/2), (int)((screenSize.height()-bound.height())/2));
+		StelMainGraphicsView::getInstance().scene()->addItem(proxy);
+		proxy->setWindowFrameMargins(2,0,2,2);
+
+		// The caching is buggy on all plateforms with Qt 4.5.2
+
+#if QT_VERSION==0x040502
+		proxy->setCacheMode(QGraphicsItem::NoCache);
+#else
+		proxy->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
+#endif
+
+		proxy->setZValue(100);
+		StelMainGraphicsView::getInstance().scene()->setActiveWindow(proxy);
+		proxy->setFocus();
+	}
+	else
+	{
+		dialog->hide();
+		emit visibleChanged(false);
+		//proxy->clearFocus();
+		StelMainGraphicsView::getInstance().scene()->setActiveWindow(0);
+	}
+}

=== added file 'plugins/PrintSky/src/gui/StelDialogPrintSky.hpp'
--- plugins/PrintSky/src/gui/StelDialogPrintSky.hpp	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/src/gui/StelDialogPrintSky.hpp	2011-01-07 22:29:26 +0000
@@ -0,0 +1,52 @@
+/*
+ * Stellarium
+ * Copyright (C) 2008 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 _STELDIALOGPRINTSKY_HPP_
+#define _STELDIALOGPRINTSKY_HPP_
+
+#include <QObject>
+
+//! @class StelDialog
+//! A local copy of StelDialog, the base class for all the GUI windows in Stellarium, included to allow the plug-in to be
+//! loaded dynamically on Windows. (An "Invalid access to memory location" error is thrown otherwise.)
+class StelDialogPrintSky : public QObject
+{
+	Q_OBJECT
+public:
+	StelDialogPrintSky();
+	virtual ~StelDialogPrintSky();
+	//! Retranslate the content of the dialog
+	virtual void languageChanged()=0;
+
+public slots:
+	void setVisible(bool);
+	void close();
+signals:
+	void visibleChanged(bool);
+
+protected:
+	//! Initialize the dialog widgets and connect the signals/slots
+	virtual void createDialogContent()=0;
+
+	//! The main dialog
+	QWidget* dialog;
+	class CustomProxy* proxy;
+};
+
+#endif // _STELDIALOGPRINTSKY_HPP_

=== added file 'plugins/PrintSky/src/gui/printskyDialog.ui'
--- plugins/PrintSky/src/gui/printskyDialog.ui	1970-01-01 00:00:00 +0000
+++ plugins/PrintSky/src/gui/printskyDialog.ui	2011-01-07 22:29:26 +0000
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>printskyDialogForm</class>
+ <widget class="QWidget" name="printskyDialogForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>300</width>
+    <height>300</height>
+   </size>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="BarFrame" name="LocationBar">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_7">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>4</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <spacer name="spacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="stelWindowTitle">
+        <property name="text">
+         <string>Print sky</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="spacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="closeStelWindow">
+        <property name="minimumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16</width>
+          <height>16</height>
+         </size>
+        </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="Contents">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QTabWidget" name="Tabs">
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="General">
+         <attribute name="title">
+          <string>General</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QGroupBox" name="groupBox">
+            <property name="title">
+             <string>Options</string>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_2">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0" colspan="2">
+              <layout class="QVBoxLayout" name="verticalLayout">
+               <item>
+                <widget class="QCheckBox" name="invertColorsCheckBox">
+                 <property name="text">
+                  <string>Invert colors</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="scaleToFitCheckBox">
+                 <property name="text">
+                  <string>Scale to fit</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="printDataCheckBox">
+                 <property name="text">
+                  <string>Print scene information</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QCheckBox" name="printSSEphemeridesCheckBox">
+                 <property name="text">
+                  <string>Print Solar System ephemerides</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item row="0" column="2">
+              <widget class="QGroupBox" name="orientationGroupBox">
+               <property name="title">
+                <string>Orientation</string>
+               </property>
+               <layout class="QVBoxLayout" name="verticalLayout_5">
+                <property name="margin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <widget class="QRadioButton" name="orientationPortraitRadioButton">
+                  <property name="text">
+                   <string>Portrait</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QRadioButton" name="orientationLandscapeRadioButton">
+                  <property name="text">
+                   <string>Landscape</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item row="1" column="0" colspan="3">
+              <widget class="QFrame" name="buttonsFrame">
+               <layout class="QHBoxLayout" name="horizontalLayout">
+                <item>
+                 <widget class="QPushButton" name="previewSkyPushButton">
+                  <property name="text">
+                   <string>Preview</string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QPushButton" name="printSkyPushButton">
+                  <property name="text">
+                   <string>Print</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="About">
+         <attribute name="title">
+          <string>About</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelAbout">
+            <property name="text">
+             <string>This plugin allows the user to preview and print the current screen and some aditional data as the current location, the screen time adding the GMT difference, and also a relation radius magnitude as a field reference.
+
+In a optional second page you can get some Solar System ephemerides.
+
+Use Ctrl+P to open the print window.</string>
+            </property>
+            <property name="textFormat">
+             <enum>Qt::AutoText</enum>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Author: &lt;a href=&quot;mailto:[e-mail]&quot;&gt;Pep Pujols&lt;/a&gt; (with fixes by Bogdan Marinov)</string>
+            </property>
+            <property name="openExternalLinks">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BarFrame</class>
+   <extends>QFrame</extends>
+   <header>Dialog.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>Tabs</tabstop>
+  <tabstop>invertColorsCheckBox</tabstop>
+  <tabstop>scaleToFitCheckBox</tabstop>
+  <tabstop>printDataCheckBox</tabstop>
+  <tabstop>printSSEphemeridesCheckBox</tabstop>
+  <tabstop>orientationPortraitRadioButton</tabstop>
+  <tabstop>orientationLandscapeRadioButton</tabstop>
+  <tabstop>previewSkyPushButton</tabstop>
+  <tabstop>printSkyPushButton</tabstop>
+  <tabstop>labelAbout</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2011-01-05 14:26:19 +0000
+++ src/CMakeLists.txt	2011-01-07 22:29:26 +0000
@@ -580,6 +580,12 @@
 	SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${CMAKE_BINARY_DIR}/plugins/VirGO/src/${CMAKE_CFG_INTDIR}/libVirGO.a ${CFITSIO_LIBRARIES})
 	ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_VIRGO)
   ENDIF()
+
+  IF (USE_PLUGIN_PRINTSKY)
+	SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} "${CMAKE_BINARY_DIR}/plugins/PrintSky/src/${CMAKE_CFG_INTDIR}/libPrintSky.a")
+	ADD_DEFINITIONS(-DUSE_STATIC_PLUGIN_PRINTSKY)
+  ENDIF()
+
 ENDIF()
 
 

=== modified file 'src/StelMainGraphicsView.cpp'
--- src/StelMainGraphicsView.cpp	2010-11-12 15:29:52 +0000
+++ src/StelMainGraphicsView.cpp	2011-01-07 22:29:26 +0000
@@ -101,6 +101,10 @@
 Q_IMPORT_PLUGIN(TimeZoneConfiguration)
 #endif
 
+#ifdef USE_STATIC_PLUGIN_PRINTSKY
+Q_IMPORT_PLUGIN(PrintSky)
+#endif
+
 // Initialize static variables
 StelMainGraphicsView* StelMainGraphicsView::singleton = NULL;
 

=== modified file 'src/StelMainGraphicsView.hpp'
--- src/StelMainGraphicsView.hpp	2010-09-09 11:50:25 +0000
+++ src/StelMainGraphicsView.hpp	2011-01-07 22:29:26 +0000
@@ -65,6 +65,10 @@
 	StelScriptMgr& getScriptMgr() {return *scriptMgr;}
 #endif
 
+	//! Return the QGLWidget encapsulating the Stellarium main sky view.
+	//! Use its layout if you want to rendering OpenGL Graphics.
+	StelQGLWidget* getStelQGLWidget() {return glWidget;}
+
 public slots:
 
 	///////////////////////////////////////////////////////////////////////////

=== modified file 'src/core/modules/StarMgr.cpp'
--- src/core/modules/StarMgr.cpp	2010-10-19 15:28:27 +0000
+++ src/core/modules/StarMgr.cpp	2011-01-07 22:29:26 +0000
@@ -945,3 +945,70 @@
 	setFlagSciNames(skyCultureDir.startsWith("western"));
 	updateI18n();
 }
+
+//! Get relations between magnitude stars and draw radius
+QList< QPair<float, float> > StarMgr::getListMagnitudeRadius(StelCore *core)
+{
+	QList< QPair<float, float> > listPairsMagnitudesRadius;
+
+	StelNavigator* nav = core->getNavigator();
+	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
+	StelSkyDrawer* skyDrawer = core->getSkyDrawer();
+	// If stars are turned off don't waste time below
+	// projecting all stars just to draw disembodied labels
+	if (!starsFader.getInterstate())
+		return(listPairsMagnitudesRadius);
+
+	float rcmag_table[2*256];
+	float mag_table[256];
+
+	for (ZoneArrayMap::const_iterator it(zoneArrays.constBegin()); it!=zoneArrays.constEnd();++it)
+	{
+		const float mag_min = 0.001f*it.value()->mag_min;
+		const float k = (0.001f*it.value()->mag_range)/it.value()->mag_steps;
+		for (int i=it.value()->mag_steps-1;i>=0;--i)
+		{
+			const float mag = mag_min+k*i;
+
+			mag_table[i]=mag;
+			if (skyDrawer->computeRCMag(mag,rcmag_table + 2*i)==false)
+			{
+				if (i==0) goto exit_loop;
+			}
+			if (skyDrawer->getFlagPointStar())
+			{
+				rcmag_table[2*i+1] *= starsFader.getInterstate();
+			}
+			else
+			{
+				rcmag_table[2*i] *= starsFader.getInterstate();
+			}
+
+		}
+
+
+		for (int index=0;  index<=255; ++index)
+		{
+			double magnitude=mag_table[index];
+			double maginteger=magnitude-(int) magnitude;
+			if ((int) magnitude==0)
+				magnitude=0;
+			if (rcmag_table[2*index]>0. && rcmag_table[2*index]<13.&& (int) (maginteger*100000)==0)
+			{
+				QPair<float, float> pairMagnitudeRadius;
+				pairMagnitudeRadius.first=(int) magnitude;
+				pairMagnitudeRadius.second=rcmag_table[2*index];
+				bool found=false;
+				for (int icount=1; !found && icount<=listPairsMagnitudesRadius.count();++icount)
+					found=listPairsMagnitudesRadius.at(icount-1).first==pairMagnitudeRadius.first;
+				if (!found)
+				{
+					listPairsMagnitudesRadius << pairMagnitudeRadius;
+				}
+			}
+		}
+	};
+	exit_loop:
+
+	return(listPairsMagnitudesRadius);
+}

=== modified file 'src/core/modules/StarMgr.hpp'
--- src/core/modules/StarMgr.hpp	2010-05-19 13:33:21 +0000
+++ src/core/modules/StarMgr.hpp	2011-01-07 22:29:26 +0000
@@ -182,6 +182,11 @@
 	//! @return false in case of failure.
 	bool checkAndLoadCatalog(QVariantMap m);
 
+	//! Get relations between magnitude stars and draw radius
+	//! @param core the instance of stellarium's core
+	//! @return a list of pairs magnitude-radius
+	QList< QPair<float, float> > getListMagnitudeRadius(StelCore *core);
+
 private:
 
 	void setCheckFlag(const QString& catalogId, bool b);