Merge lp:~alexwolf/stellarium/GRS into lp:stellarium

[Alexander Wolf]

Added a tool for fill custom settings of position of Great Red Spot on Jupiter

[gzotti (georg-zotti)]

Maybe hide dialog when user unchecks the custom GRS option?
Else, looks good, go for it!

review: Approve

[Alexander Wolf (alexwolf)]

The dialog is not enabled when checkbox is not checked.

=== modified file 'po/stellarium/POTFILES.in'
--- po/stellarium/POTFILES.in	2015-08-22 22:20:20 +0000
+++ po/stellarium/POTFILES.in	2016-04-06 14:27:06 +0000
@@ -50,6 +50,7 @@
 src/ui_addRemoveLandscapesDialog.h
 src/ui_shortcutsDialog.h
 src/ui_atmosphereDialog.h
+src/ui_greatRedSpotDialog.h
 src/ui_scriptConsole.h
 src/ui_astroCalcDialog.h
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-01-30 18:35:25 +0000
+++ src/CMakeLists.txt	2016-04-06 14:27:06 +0000
@@ -330,6 +330,8 @@
           gui/AddRemoveLandscapesDialog.cpp
           gui/AtmosphereDialog.hpp
           gui/AtmosphereDialog.cpp
+          gui/GreatRedSpotDialog.hpp
+          gui/GreatRedSpotDialog.cpp
           gui/CustomDeltaTEquationDialog.hpp
           gui/CustomDeltaTEquationDialog.cpp
           gui/AstroCalcDialog.hpp
@@ -348,6 +350,7 @@
           gui/searchDialogGui.ui
           gui/configurationDialog.ui
           gui/atmosphereDialog.ui
+          gui/greatRedSpotDialog.ui
           gui/customDeltaTEquationDialog.ui
           gui/astroCalcDialog.ui
           gui/addRemoveLandscapesDialog.ui

=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2016-04-02 10:07:12 +0000
+++ src/core/modules/Planet.cpp	2016-04-06 14:27:06 +0000
@@ -54,6 +54,11 @@
 
 bool Planet::permanentDrawingOrbits = false;
 
+bool Planet::flagCustomGrsSettings = false;
+double Planet::customGrsJD = 2456908.;
+double Planet::customGrsDrift = 15.21875;
+int Planet::customGrsLongitude = 216;
+
 QOpenGLShaderProgram* Planet::planetShaderProgram=NULL;
 Planet::PlanetShaderVars Planet::planetShaderVars;
 QOpenGLShaderProgram* Planet::ringPlanetShaderProgram=NULL;
@@ -709,7 +714,7 @@
 	double wholeRotations = floor(rotations);
 	double remainder = rotations - wholeRotations;
 
-	if (englishName=="Jupiter" && re.offset < 0.0)
+	if (englishName=="Jupiter")
 	{
 		// http://www.projectpluto.com/grs_form.htm
 		// CM( System II) =  181.62 + 870.1869147 * jd + correction [870d rotation every day]
@@ -724,7 +729,11 @@
 		// http://www.skyandtelescope.com/observing/transit-times-of-jupiters-great-red-spot/ writes:
 		// The predictions assume the Red Spot was at Jovian System II longitude 216° in September 2014 and continues to drift 1.25° per month, based on historical trends noted by JUPOS.
 		// GRS longitude was at 2014-09-08 216d with a drift of 1.25d every month
-		double longitudeGRS=216+1.25*( JDE - 2456908)/30;
+		double longitudeGRS = 0.;
+		if (flagCustomGrsSettings)
+			longitudeGRS = customGrsLongitude + customGrsDrift*(JDE - customGrsJD)/365.25;
+		else
+			longitudeGRS=216+1.25*( JDE - 2456908)/30;
 		// qDebug() << "Jupiter: CM2 = " << cm2 << " longitudeGRS = " << longitudeGRS << " --> rotation = " << (cm2 - longitudeGRS);
 		return cm2 - longitudeGRS + 25.; // + 25 = Jupiter Texture not 0d
 		// To verify:

=== modified file 'src/core/modules/Planet.hpp'
--- src/core/modules/Planet.hpp	2016-03-08 20:10:54 +0000
+++ src/core/modules/Planet.hpp	2016-04-06 14:27:06 +0000
@@ -362,6 +362,11 @@
 	static StelTextureSP hintCircleTex;	
 	static QMap<PlanetType, QString> pTypeMap; // Maps fast type to english name.
 	static QMap<ApparentMagnitudeAlgorithm, QString> vMagAlgorithmMap;
+
+	static bool flagCustomGrsSettings;	// Is enabled usage of custom settings for calculation of position of Great Red Spot?
+	static double customGrsJD;		// Initial JD for calculation of position of Great Red Spot
+	static int customGrsLongitude;		// Longitude of Great Red Spot (System II, degrees)
+	static double customGrsDrift;		// Annual drift of Great Red Spot position (degrees)
 	
 	// Shader-related variables
 	struct PlanetShaderVars {

=== modified file 'src/core/modules/SolarSystem.cpp'
--- src/core/modules/SolarSystem.cpp	2016-03-12 16:59:32 +0000
+++ src/core/modules/SolarSystem.cpp	2016-04-06 14:27:06 +0000
@@ -133,7 +133,7 @@
 // Init and load the solar system data
 void SolarSystem::init()
 {
-	QSettings* conf = StelApp::getInstance().getSettings();
+	conf = StelApp::getInstance().getSettings();
 	Q_ASSERT(conf);
 
 	Planet::init();
@@ -162,6 +162,12 @@
 	setFlagIsolatedOrbits(conf->value("viewing/flag_isolated_orbits", true).toBool());
 	setFlagPermanentOrbits(conf->value("astro/flag_permanent_orbits", false).toBool());
 
+	// Settings for calculation of position of Great Red Spot on Jupiter
+	setFlagCustomGrsSettings(conf->value("astro/flag_grs_custom", false).toBool());
+	setCustomGrsLongitude(conf->value("astro/grs_longitude", 216).toInt());
+	setCustomGrsDrift(conf->value("astro/grs_drift", 1.25).toDouble());
+	setCustomGrsJD(conf->value("astro/grs_jd", 2456908.).toDouble());
+
 	recreateTrails();
 
 	setFlagTrails(conf->value("astro/flag_object_trails", false).toBool());
@@ -1787,7 +1793,55 @@
 
 void SolarSystem::setFlagPermanentOrbits(bool b)
 {
-	Planet::permanentDrawingOrbits=b;
+	Planet::permanentDrawingOrbits=b;	
+}
+
+void SolarSystem::setFlagCustomGrsSettings(bool b)
+{
+	Planet::flagCustomGrsSettings=b;
+	// automatic saving of the setting
+	conf->setValue("astro/flag_grs_custom", b);
+}
+
+bool SolarSystem::getFlagCustomGrsSettings()
+{
+	return Planet::flagCustomGrsSettings;
+}
+
+void SolarSystem::setCustomGrsLongitude(int longitude)
+{
+	Planet::customGrsLongitude = longitude;
+	// automatic saving of the setting
+	conf->setValue("astro/grs_longitude", longitude);
+}
+
+int SolarSystem::getCustomGrsLongitude()
+{
+	return Planet::customGrsLongitude;
+}
+
+void SolarSystem::setCustomGrsDrift(double drift)
+{
+	Planet::customGrsDrift = drift;
+	// automatic saving of the setting
+	conf->setValue("astro/grs_drift", drift);
+}
+
+double SolarSystem::getCustomGrsDrift()
+{
+	return Planet::customGrsDrift;
+}
+
+void SolarSystem::setCustomGrsJD(double JD)
+{
+	Planet::customGrsJD = JD;
+	// automatic saving of the setting
+	conf->setValue("astro/grs_jd", JD);
+}
+
+double SolarSystem::getCustomGrsJD()
+{
+	return Planet::customGrsJD;
 }
 
 double SolarSystem::getEclipseFactor(const StelCore* core) const

=== modified file 'src/core/modules/SolarSystem.hpp'
--- src/core/modules/SolarSystem.hpp	2016-02-06 13:58:54 +0000
+++ src/core/modules/SolarSystem.hpp	2016-04-06 14:27:06 +0000
@@ -303,6 +303,30 @@
 	//! Get the current value of the flag which enables showing of isolated orbits for selected objects only or not.
 	bool getFlagIsolatedOrbits(void) const;
 
+	//! Set flag which determines if custom settings is using for Great Red Spot on Jupiter
+	void setFlagCustomGrsSettings(bool b);
+	//! Get the current value of the flag which determines if custom settings for Great Red Spot on Jupiter is used or not.
+	bool getFlagCustomGrsSettings();
+
+	//! Set longitude of Great Red Spot (System II is used)
+	//! @param longitude (degrees)
+	void setCustomGrsLongitude(int longitude);
+	//! Get longitude of Great Red Spot (System II is used)
+	//! @return a longitude (degrees)
+	int getCustomGrsLongitude();
+
+	//! Set speed of annual drift for Great Red Spot (System II is used)
+	//! @param annual drift (degrees)
+	void setCustomGrsDrift(double drift);
+	//! Get speed of annual drift for Great Red Spot (System II is used)
+	double getCustomGrsDrift();
+
+	//! Set initial JD for calculation of position of Great Red Spot
+	//! @param JD
+	void setCustomGrsJD(double JD);
+	//! Get initial JD for calculation of position of Great Red Spot
+	double getCustomGrsJD();
+
 public:
 	///////////////////////////////////////////////////////////////////////////
 	// Other public methods
@@ -440,6 +464,7 @@
 
 	class TrailGroup* allTrails;
 	StelGui* gui;
+	QSettings* conf;
 	LinearFader trailFader;
 	Vec3f trailColor;
 	Vec3f pointerColor;

=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2016-03-16 05:40:56 +0000
+++ src/gui/ConfigurationDialog.cpp	2016-04-06 14:27:06 +0000
@@ -582,6 +582,10 @@
 	conf->setValue("astro/meteor_rate", mmgr->getZHR());
 	conf->setValue("astro/milky_way_intensity", GETSTELMODULE(MilkyWay)->getIntensity());
 	conf->setValue("astro/zodiacal_light_intensity", GETSTELMODULE(ZodiacalLight)->getIntensity());
+	conf->setValue("astro/flag_grs_custom", ssmgr->getFlagCustomGrsSettings());
+	conf->setValue("astro/grs_longitude", ssmgr->getCustomGrsLongitude());
+	conf->setValue("astro/grs_drift", ssmgr->getCustomGrsDrift());
+	conf->setValue("astro/grs_jd", ssmgr->getCustomGrsJD());
 
 	// view dialog / markings tab settings
 	conf->setValue("viewing/flag_azimuthal_grid", glmgr->getFlagAzimuthalGrid());

=== added file 'src/gui/GreatRedSpotDialog.cpp'
--- src/gui/GreatRedSpotDialog.cpp	1970-01-01 00:00:00 +0000
+++ src/gui/GreatRedSpotDialog.cpp	2016-04-06 14:27:06 +0000
@@ -0,0 +1,68 @@
+/*
+ * Stellarium
+ * Copyright (C) 2016 Alexander Wolf
+ *
+ * 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., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+*/
+
+#include "StelApp.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelUtils.hpp"
+#include "GreatRedSpotDialog.hpp"
+#include "ui_greatRedSpotDialog.h"
+
+GreatRedSpotDialog::GreatRedSpotDialog()
+{
+	dialogName = "GreatRedSpot";
+	ui = new Ui_GreatRedSpotDialogForm;
+}
+
+GreatRedSpotDialog::~GreatRedSpotDialog()
+{
+	delete ui;
+}
+
+void GreatRedSpotDialog::retranslate()
+{
+	if (dialog)
+		ui->retranslateUi(dialog);
+}
+
+
+void GreatRedSpotDialog::createDialogContent()
+{
+	ui->setupUi(dialog);
+	
+	//Signals and slots
+	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
+	connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
+	connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMovedTo(QPoint)));
+
+	SolarSystem* ss = GETSTELMODULE(SolarSystem);
+	ui->longitudeSpinBox->setValue(ss->getCustomGrsLongitude());
+	connect(ui->longitudeSpinBox, SIGNAL(valueChanged(int)), ss, SLOT(setCustomGrsLongitude(int)));
+
+	ui->driftDoubleSpinBox->setValue(ss->getCustomGrsDrift());
+	connect(ui->driftDoubleSpinBox, SIGNAL(valueChanged(double)), ss, SLOT(setCustomGrsDrift(double)));
+
+	//TODO: sync format with the main date and time format
+	ui->jdDateTimeEdit->setDisplayFormat("yyyy.MM.dd hh:mm");
+	ui->jdDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(ss->getCustomGrsJD()));
+	connect(ui->jdDateTimeEdit, SIGNAL(dateTimeChanged(QDateTime)), this, SLOT(setGrsJD(QDateTime)));
+}
+
+void GreatRedSpotDialog::setGrsJD(QDateTime dt)
+{
+	GETSTELMODULE(SolarSystem)->setCustomGrsJD(StelUtils::qDateTimeToJd(dt));
+}

=== added file 'src/gui/GreatRedSpotDialog.hpp'
--- src/gui/GreatRedSpotDialog.hpp	1970-01-01 00:00:00 +0000
+++ src/gui/GreatRedSpotDialog.hpp	2016-04-06 14:27:06 +0000
@@ -0,0 +1,51 @@
+/*
+ * Stellarium
+ * 
+ * Copyright (C) 2016 Alexander Wolf
+ * 
+ * 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., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
+*/
+
+#ifndef _GREATREDSPOTDIALOG_HPP_
+#define _GREATREDSPOTDIALOG_HPP_
+
+#include <QObject>
+#include <QDateTime>
+#include "StelDialog.hpp"
+#include "SolarSystem.hpp"
+
+class Ui_GreatRedSpotDialogForm;
+
+class GreatRedSpotDialog : public StelDialog
+{
+	Q_OBJECT
+
+public:
+	GreatRedSpotDialog();
+	virtual ~GreatRedSpotDialog();
+
+public slots:
+        void retranslate();
+
+private slots:
+	void setGrsJD(QDateTime dt);
+
+protected:
+        //! Initialize the dialog widgets and connect the signals/slots.
+        virtual void createDialogContent();
+	Ui_GreatRedSpotDialogForm *ui;
+
+};
+
+#endif // _GREATREDSPOTDIALOG_HPP_

=== modified file 'src/gui/ViewDialog.cpp'
--- src/gui/ViewDialog.cpp	2016-03-16 07:21:37 +0000
+++ src/gui/ViewDialog.cpp	2016-04-06 14:27:06 +0000
@@ -23,6 +23,7 @@
 #include "ui_viewDialog.h"
 #include "AddRemoveLandscapesDialog.hpp"
 #include "AtmosphereDialog.hpp"
+#include "GreatRedSpotDialog.hpp"
 #include "StelApp.hpp"
 #include "StelCore.hpp"
 #include "StelSkyCultureMgr.hpp"
@@ -62,6 +63,7 @@
 	ui = new Ui_viewDialogForm;
 	addRemoveLandscapesDialog = NULL;
 	atmosphereDialog=NULL;
+	greatRedSpotDialog=NULL;
 }
 
 ViewDialog::~ViewDialog()
@@ -72,6 +74,8 @@
 	addRemoveLandscapesDialog = NULL;
 	delete atmosphereDialog;
 	atmosphereDialog = NULL;
+	delete greatRedSpotDialog;
+	greatRedSpotDialog = NULL;
 }
 
 void ViewDialog::retranslate()
@@ -220,6 +224,11 @@
 	connect(ui->planetLimitMagnitudeDoubleSpinBox, SIGNAL(valueChanged(double)), drawer, SLOT(setCustomPlanetMagnitudeLimit(double)));
 	ui->planetsLabelsHorizontalSlider->setValue((int)(ssmgr->getLabelsAmount()*10.f));
 	connect(ui->planetsLabelsHorizontalSlider, SIGNAL(valueChanged(int)), this, SLOT(planetsLabelsValueChanged(int)));
+	bool grsFlag = ssmgr->getFlagCustomGrsSettings();
+	ui->customGrsSettingsCheckBox->setChecked(grsFlag);
+	connect(ui->customGrsSettingsCheckBox, SIGNAL(toggled(bool)), this, SLOT(setFlagCustomGrsSettings(bool)));
+	ui->pushButtonGrsDetails->setEnabled(grsFlag);
+	connect(ui->pushButtonGrsDetails, SIGNAL(clicked()), this, SLOT(showGreatRedSpotDialog()));
 
 	// Shooting stars section
 	connect(mmgr, SIGNAL(zhrChanged(int)), this, SLOT(setZHR(int)));
@@ -504,6 +513,12 @@
 	populateLandscapeMinimalBrightness();
 }
 
+void ViewDialog::setFlagCustomGrsSettings(bool b)
+{
+	GETSTELMODULE(SolarSystem)->setFlagCustomGrsSettings(b);
+	ui->pushButtonGrsDetails->setEnabled(b);
+}
+
 void ViewDialog::populateLandscapeMinimalBrightness()
 {
 	if (ui->landscapeBrightnessCheckBox->isChecked())
@@ -793,6 +808,13 @@
 	atmosphereDialog->setVisible(true);
 }
 
+void ViewDialog::showGreatRedSpotDialog()
+{
+	if(greatRedSpotDialog == NULL)
+		greatRedSpotDialog = new GreatRedSpotDialog();
+
+	greatRedSpotDialog->setVisible(true);
+}
 
 void ViewDialog::setZHR(int zhr)
 {

=== modified file 'src/gui/ViewDialog.hpp'
--- src/gui/ViewDialog.hpp	2015-10-22 03:01:15 +0000
+++ src/gui/ViewDialog.hpp	2016-04-06 14:27:06 +0000
@@ -29,6 +29,7 @@
 
 class AddRemoveLandscapesDialog;
 class AtmosphereDialog;
+class GreatRedSpotDialog;
 
 class ViewDialog : public StelDialog
 {
@@ -62,12 +63,14 @@
 	void setCurrentLandscapeAsDefault(void);
 	void setCurrentCultureAsDefault(void);
 	void setFlagLandscapeUseMinimalBrightness(bool b);
+	void setFlagCustomGrsSettings(bool b);
 	//! Update the widget to make sure it is synchrone if a value was changed programmatically
 	//! This function should be called repeatidly with e.g. a timer
 	void updateFromProgram();
 
 	void showAddRemoveLandscapesDialog();
         void showAtmosphereDialog();
+	void showGreatRedSpotDialog();
 
 	void populateLightPollution();
 	void populateLandscapeMinimalBrightness();
@@ -95,6 +98,7 @@
 
 	AddRemoveLandscapesDialog * addRemoveLandscapesDialog;
 	AtmosphereDialog * atmosphereDialog;
+	GreatRedSpotDialog * greatRedSpotDialog;
 };
 
 #endif // _VIEWDIALOG_HPP_

=== added file 'src/gui/greatRedSpotDialog.ui'
--- src/gui/greatRedSpotDialog.ui	1970-01-01 00:00:00 +0000
+++ src/gui/greatRedSpotDialog.ui	2016-04-06 14:27:06 +0000
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GreatRedSpotDialogForm</class>
+ <widget class="QWidget" name="GreatRedSpotDialogForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>378</width>
+    <height>190</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="BarFrame" name="TitleBar">
+     <property name="minimumSize">
+      <size>
+       <width>16</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <layout class="QHBoxLayout">
+      <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>
+        <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="palette">
+         <palette>
+          <active/>
+          <inactive/>
+          <disabled/>
+         </palette>
+        </property>
+        <property name="font">
+         <font/>
+        </property>
+        <property name="text">
+         <string>Great Red Spot Details</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <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="QGroupBox" name="greatRedSpotGroupBox">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="title">
+      <string>Custom settings for position of GRS on Jupiter</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="1" column="1">
+       <widget class="QDoubleSpinBox" name="driftDoubleSpinBox">
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="decimals">
+         <number>5</number>
+        </property>
+        <property name="minimum">
+         <double>-90.000000000000000</double>
+        </property>
+        <property name="maximum">
+         <double>90.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.000100000000000</double>
+        </property>
+        <property name="value">
+         <double>15.218750000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="jdLabel">
+        <property name="toolTip">
+         <string/>
+        </property>
+        <property name="whatsThis">
+         <string>Extinction is the loss of star brightness due to Earth's atmosphere. It is given in mag/airmass, where airmass is number of atmospheres light has to pass. (zenith: 1; horizon: about 40)</string>
+        </property>
+        <property name="text">
+         <string>Date and Time (UTC):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QDateTimeEdit" name="jdDateTimeEdit">
+        <property name="inputMethodHints">
+         <set>Qt::ImhDate|Qt::ImhPreferNumbers|Qt::ImhTime</set>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="displayFormat">
+         <string>yyyy.MM.dd hh:mm</string>
+        </property>
+        <property name="calendarPopup">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="driftLabel">
+        <property name="inputMethodHints">
+         <set>Qt::ImhNone</set>
+        </property>
+        <property name="text">
+         <string>Annual drift (degrees):</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="longitudeLabel">
+        <property name="text">
+         <string>Longitude of GRS (degrees):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="longitudeSpinBox">
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="maximum">
+         <number>359</number>
+        </property>
+        <property name="value">
+         <number>216</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BarFrame</class>
+   <extends>QFrame</extends>
+   <header>Dialog.hpp</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'src/gui/viewDialog.ui'
--- src/gui/viewDialog.ui	2016-03-17 14:58:14 +0000
+++ src/gui/viewDialog.ui	2016-04-06 14:27:06 +0000
@@ -792,6 +792,24 @@
               </widget>
              </item>
              <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_15">
+               <item>
+                <widget class="QCheckBox" name="customGrsSettingsCheckBox">
+                 <property name="text">
+                  <string>Use custom settings of GRS:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="pushButtonGrsDetails">
+                 <property name="text">
+                  <string>GRS details...</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item>
               <layout class="QHBoxLayout" name="planetLimMagHorizontalLayout">
                <item>
                 <widget class="QCheckBox" name="planetLimitMagnitudeCheckBox">
@@ -2624,15 +2642,15 @@
  <resources/>
  <connections/>
  <buttongroups>
+  <buttongroup name="buttonGroupDisplayedDSOTypes">
+   <property name="exclusive">
+    <bool>false</bool>
+   </property>
+  </buttongroup>
   <buttongroup name="buttonGroupDisplayedDSOCatalogs">
    <property name="exclusive">
     <bool>false</bool>
    </property>
   </buttongroup>
-  <buttongroup name="buttonGroupDisplayedDSOTypes">
-   <property name="exclusive">
-    <bool>false</bool>
-   </property>
-  </buttongroup>
  </buttongroups>
 </ui>