Merge lp:~sibi-antony/stellarium/tui-enhancements into lp:stellarium

[Sibi Antony]

[Alexander Wolf (alexwolf)]

Well, code's enhancement look good but me really don't like implementation of shutdown.

[Sibi Antony (sibi-antony)]

Alexwolf: Thanks for the review!

Shutdown - In my humble opinion, the shutdown has to be left to the user to choose, as it is a platform specific operation. Also the only people who will use the shutdown option will be planetarium folks, who doesn't have the luxury of a keyboard+console or GUI during presentations.

So with this implementation, we give an interface wherein user can supply a shutdown command/script. The privileges required for the operation is to be set by the user.
Besides, this is one reason we call it 'Admin->shutdown'. It requires the user to be admin! :)

I can document on the new option in stellarium wiki. If you think there are better ways of implementing this, please let me know.

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'data/default_config.ini'
--- data/default_config.ini	2012-08-25 15:21:39 +0000
+++ data/default_config.ini	2012-08-28 11:35:36 +0000
@@ -179,6 +179,7 @@
 flag_show_tui_datetime         = false
 flag_show_tui_short_obj_info   = false
 tui_font_size                  = 15
+admin_shutdown_cmd	       = ""
 
 [navigation]
 auto_zoom_out_resets_direction = false

=== modified file 'plugins/TextUserInterface/src/TextUserInterface.cpp'
--- plugins/TextUserInterface/src/TextUserInterface.cpp	2012-02-21 14:20:52 +0000
+++ plugins/TextUserInterface/src/TextUserInterface.cpp	2012-08-28 11:35:36 +0000
@@ -35,6 +35,7 @@
 #include "StelModuleMgr.hpp"
 #include "StarMgr.hpp"
 #include "StelMovementMgr.hpp"
+#include "StelObjectMgr.hpp"
 #include "StelSkyDrawer.hpp"
 #include "ConstellationMgr.hpp"
 #include "NebulaMgr.hpp"
@@ -57,6 +58,8 @@
 #include <QKeyEvent>
 #include <QDebug>
 #include <QLabel>
+#include <QTime>
+#include <QProcess>
 
 /*************************************************************************
  Utility functions
@@ -471,7 +474,8 @@
 	TuiNode* m8_2 = new TuiNodeActivate(N_("Save current configuration"),
 	                                    this, SLOT(saveDefaultSettings()),
 	                                    m8, m8_1);
-	TuiNode* m8_3 = new TuiNode(N_("Shut down"), m8, m8_2);
+	TuiNode* m8_3 = new TuiNodeActivate(N_("Shut down"), this, SLOT(shutDown()), 
+					    m8, m8_2);
 	m8_1->setNextNode(m8_2);
 	m8_2->setNextNode(m8_3);
 	m8_3->setNextNode(m8_1);
@@ -491,6 +495,9 @@
 	Q_ASSERT(conf);
 
 	font.setPixelSize(conf->value("tui/tui_font_size", 15).toInt());
+	tuiDateTime = conf->value("tui/flag_show_tui_datetime", false).toBool();
+	tuiObjInfo = conf->value("tui/flag_show_tui_short_obj_info", false).toBool();
+	tuiGravityUi = conf->value("tui/flag_show_gravity_ui", false).toBool();
 }
 
 /*************************************************************************
@@ -498,37 +505,103 @@
 *************************************************************************/
 void TextUserInterface::draw(StelCore* core)
 {
+	if (!tuiActive && !tuiDateTime && !tuiObjInfo)
+		return;
+
+	int x = 0, y = 0;
+	int xVc = 0, yVc = 0;
+	int pixOffset = 15;
+	int fovOffsetX = 0, fovOffsetY=0;
+	bool fovMaskDisk = false;
+
+	StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
+	if (gui->getVisible())
+	{
+		QGraphicsItem* bottomBar = dynamic_cast<QGraphicsItem*>(gui->getButtonBar());
+		LeftStelBar* sideBar = gui->getWindowsButtonBar();			
+		x = (sideBar) ? sideBar->boundingRectNoHelpLabel().right() : 50;
+		y = (bottomBar) ? bottomBar->boundingRect().height() : 50;
+	}
+
+	// Alternate x,y for Disk viewport
+	if (core->getProjection(StelCore::FrameJ2000)->getMaskType() == StelProjector::MaskDisk)
+	{
+		fovMaskDisk = true;
+		StelProjector::StelProjectorParams projParams = core->getCurrentStelProjectorParams();
+		xVc = projParams.viewportCenter[0];
+		yVc = projParams.viewportCenter[1];
+		fovOffsetX = projParams.viewportFovDiameter*std::sin(20)/2;
+		fovOffsetY = projParams.viewportFovDiameter*std::cos(20)/2;
+	}
+	else 
+	{
+		xVc = core->getProjection(StelCore::FrameJ2000)->getViewportWidth()/2;
+	}
+
 	if (tuiActive)
 	{
-		int x = 0, y = 0;
-		StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
-		if (gui->getVisible())
-		{
-			QGraphicsItem* bottomBar = dynamic_cast<QGraphicsItem*>(gui->getButtonBar());
-			LeftStelBar* sideBar = gui->getWindowsButtonBar();			
-			x = (sideBar) ? sideBar->boundingRectNoHelpLabel().right() : 50;
-			y = (bottomBar) ? bottomBar->boundingRect().height() : 50;
-		}
-
-		// Alternate x,y for Disk viewport
-		if (core->getProjection(StelCore::FrameJ2000)->getMaskType() == StelProjector::MaskDisk)
-		{
-			StelProjector::StelProjectorParams projParams = core->getCurrentStelProjectorParams();
-			x = projParams.viewportCenter[0] - projParams.viewportFovDiameter/2;
-			y = projParams.viewportCenter[1];
-		}
-		
-		x += 20;
-		y += 15;
-
+		int text_x = x + pixOffset, text_y = y + pixOffset;
+		if (fovMaskDisk) {
+			text_x = xVc - fovOffsetX + pixOffset;
+			text_y = yVc - fovOffsetY + pixOffset;
+		}
+			
 		QString tuiText = q_("[no TUI node]");
-		if (currentNode!=NULL)
+		if (currentNode!=NULL) {
 			tuiText = currentNode->getDisplayText();
+		}
+
+		StelPainter painter(core->getProjection(StelCore::FrameJ2000));
+		painter.setFont(font);
+		painter.setColor(0.3,1,0.3);
+		painter.drawText(text_x, text_y, tuiText, 0, 0, 0, !tuiGravityUi);
+	}
+
+	if (tuiDateTime) 
+	{
+		double jd = core->getJDay();
+		int text_x = x + xVc*2/3, text_y = y + pixOffset;
+
+		QString newDate = StelApp::getInstance().getLocaleMgr().getPrintableDateLocal(jd) + "   "
+                       +StelApp::getInstance().getLocaleMgr().getPrintableTimeLocal(jd);
+		 
+		if (fovMaskDisk) {
+			text_x = xVc + fovOffsetY - pixOffset;
+			text_y = yVc - fovOffsetX + pixOffset;
+		}
 
 		StelPainter painter(core->getProjection(StelCore::FrameAltAz));
 		painter.setFont(font);
 		painter.setColor(0.3,1,0.3);
-		painter.drawText(x, y, tuiText, 0, 0, 0, false);
+		painter.drawText(text_x, text_y, newDate, 0, 0, 0, !tuiGravityUi);
+	}
+
+	if (tuiObjInfo) 
+	{
+		QString objInfo = ""; 
+		StelObject::InfoStringGroup tuiInfo(StelObject::Name|StelObject::CatalogNumber
+				|StelObject::Distance|StelObject::PlainText);
+		int text_x = x + xVc*4/3, text_y = y + pixOffset; 
+
+		QList<StelObjectP> selectedObj = GETSTELMODULE(StelObjectMgr)->getSelectedObject();
+		if (selectedObj.isEmpty()) {
+			objInfo = "";	
+		} else {
+			objInfo = selectedObj[0]->getInfoString(core, tuiInfo);
+			objInfo.replace("\n"," ");
+			objInfo.replace("Distance:"," ");
+			objInfo.replace("Light Years","ly");
+		}
+
+		if (fovMaskDisk) {
+			text_x = xVc + fovOffsetX - pixOffset;
+			text_y = yVc + fovOffsetY - pixOffset;
+		}
+
+		StelPainter painter(core->getProjection(StelCore::FrameJ2000));
+		painter.setFont(font);
+		painter.setColor(0.3,1,0.3);
+		painter.drawText(text_x, text_y, objInfo, 0, 0, 0, !tuiGravityUi);
 	}
 }
 
@@ -739,6 +812,12 @@
 	qDebug() << "TextUserInterface::saveDefaultSettings done";
 }
 
-
-
-
+void TextUserInterface::shutDown()
+{
+	QSettings* conf = StelApp::getInstance().getSettings();
+	QString shutdownCmd = conf->value("tui/admin_shutdown_cmd", "").toString();
+	int err; 
+	if (!(err = QProcess::execute(shutdownCmd))) {
+		qDebug() << "[TextUserInterface] shutdown error, QProcess::execute():" << err;
+	}
+}

=== modified file 'plugins/TextUserInterface/src/TextUserInterface.hpp'
--- plugins/TextUserInterface/src/TextUserInterface.hpp	2012-02-19 11:43:38 +0000
+++ plugins/TextUserInterface/src/TextUserInterface.hpp	2012-08-28 11:35:36 +0000
@@ -21,6 +21,7 @@
 
 #include "StelModule.hpp"
 #include "DummyDialog.hpp"
+
 #include <QObject>
 #include <QString>
 #include <QFont>
@@ -48,6 +49,16 @@
 	//! Loads the module's configuration from the config file.
 	void loadConfiguration(void);
 
+public slots:
+	//! Show/hide the TUI menu
+	void setTuiMenuActive(bool tActive) { tuiActive = tActive;}
+	//! Show/hide the TUI date time display
+	void setTuiDateTime(bool tDateTime) { tuiDateTime = tDateTime; }
+	//! Show/hide the selected object's short object information 
+	void setTuiObjInfo(bool tObjInfo) { tuiObjInfo = tObjInfo; }
+	//! Set Gravity text for the TUI text
+	void setTuiGravityUi(bool tGravityUi) { tuiGravityUi = tGravityUi; }
+
 private slots:
 	void setHomePlanet(QString planetName);
 	void setAltitude(int altitude);
@@ -59,11 +70,15 @@
 	void setSkyCulture(QString i18);
 	void setAppLanguage(QString lang);
 	void saveDefaultSettings(void);
+	void shutDown(void);
 
 private:
 	DummyDialog dummyDialog;
 	QFont font;
 	bool tuiActive;
+	bool tuiDateTime;
+	bool tuiObjInfo;
+	bool tuiGravityUi;
 	TuiNode* currentNode;
 
 	double getLatitude(void);