Merge lp:~alexwolf/stellarium/date-and-time into lp:stellarium

[Alexander Wolf]

Added calculations of length of solar days and sidereal periods for planets, comets and asteroids.

[gzotti (georg-zotti)]

Good idea, sure for me!

review: Approve

=== modified file 'src/core/StelCore.cpp'
--- src/core/StelCore.cpp	2012-08-12 12:50:34 +0000
+++ src/core/StelCore.cpp	2012-09-07 14:54:23 +0000
@@ -906,7 +906,12 @@
 
 void StelCore::addSiderealYear()
 {
-	addSolarDays(365.256363004);
+	double days = 365.256363004;
+	const PlanetP& home = position->getHomePlanet();
+	if ((home->getEnglishName() != "Solar System StelObserver") && (home->getSiderealPeriod()>0))
+		days = home->getSiderealPeriod();
+
+	addSolarDays(days);
 }
 
 
@@ -942,11 +947,31 @@
 
 void StelCore::subtractSiderealYear()
 {
-	addSolarDays(-365.256363004);
+	double days = 365.256363004;
+	const PlanetP& home = position->getHomePlanet();
+	if ((home->getEnglishName() != "Solar System StelObserver") && (home->getSiderealPeriod()>0))
+		days = home->getSiderealPeriod();
+
+	addSolarDays(-days);
 }
 
 void StelCore::addSolarDays(double d)
 {
+	double sp, coeff;
+	const PlanetP& home = position->getHomePlanet();
+	if (home->getEnglishName() != "Solar System StelObserver")
+	{
+		sp = home->getSiderealPeriod();
+		double dsol = home->getSiderealDay();
+
+		if ((home->getEnglishName() == "Venus") || (home->getEnglishName() == "Uranus"))
+			coeff = -1 * (sp - 1)/sp;
+		else
+			coeff = (sp + 1)/sp;
+
+		d *= dsol*coeff;
+	}
+
 	setJDay(getJDay() + d);
 }
 

=== modified file 'src/core/modules/Comet.cpp'
--- src/core/modules/Comet.cpp	2012-08-10 18:06:08 +0000
+++ src/core/modules/Comet.cpp	2012-09-07 14:54:23 +0000
@@ -155,11 +155,35 @@
 		oss << q_("Apparent diameter: %1").arg(StelUtils::radToDmsStr(2.*getAngularSize(core)*M_PI/180., true));
 	*/
 
+	// If semi-major axis not zero then calculate and display orbital period for comet in days
+	double siderealPeriod = getSiderealPeriod();
+	if ((flags&Extra1) && (siderealPeriod>0))
+	{
+		// TRANSLATORS: Sidereal (orbital) period for solar system bodies in days and in Julian years (symbol: a)
+		oss << q_("Sidereal period: %1 days (%2 a)").arg(QString::number(siderealPeriod, 'f', 2)).arg(QString::number(siderealPeriod/365.25, 'f', 3)) << "<br>";
+	}
+
 	postProcessInfoString(str, flags);
 
 	return str;
 }
 
+void Comet::setSemiMajorAxis(double value)
+{
+	semiMajorAxis = value;
+}
+
+double Comet::getSiderealPeriod() const
+{
+	double period;
+	if (semiMajorAxis>0)
+		period = StelUtils::calculateOrbitalPeriod(semiMajorAxis);
+	else
+		period = 0;
+
+	return period;
+}
+
 float Comet::getVMagnitude(const StelCore* core, bool withExtinction) const
 {
 	//If the two parameter system is not used,

=== modified file 'src/core/modules/Comet.hpp'
--- src/core/modules/Comet.hpp	2012-01-11 10:50:37 +0000
+++ src/core/modules/Comet.hpp	2012-09-07 14:54:23 +0000
@@ -74,9 +74,16 @@
 	//! as the same parameters in MinorPlanet.
 	void setAbsoluteMagnitudeAndSlope(double magnitude, double slope);
 
+	//! set value for semi-major axis in AU
+	void setSemiMajorAxis(double value);
+
+	//! get sidereal period for minor planet
+	double getSiderealPeriod() const;
+
 private:
 	double absoluteMagnitude;
 	double slopeParameter;
+	double semiMajorAxis;
 
 	bool isCometFragment;
 	bool nameIsProvisionalDesignation;

=== modified file 'src/core/modules/MinorPlanet.cpp'
--- src/core/modules/MinorPlanet.cpp	2012-08-12 18:32:10 +0000
+++ src/core/modules/MinorPlanet.cpp	2012-09-07 14:54:23 +0000
@@ -240,8 +240,12 @@
 		oss << q_("Apparent diameter: %1").arg(StelUtils::radToDmsStr(2.*getAngularSize(core)*M_PI/180., true)) << "<br>";
 
 	// If semi-major axis not zero then calculate and display orbital period for asteroid in days
-	if ((flags&Extra1) && (semiMajorAxis>0))
-		oss << q_("Orbital period: %1 days").arg(QString::number(StelUtils::calculateOrbitalPeriod(semiMajorAxis), 'f', 0)) << "<br>";
+	double siderealPeriod = getSiderealPeriod();
+	if ((flags&Extra1) && (siderealPeriod>0))
+	{
+		// TRANSLATORS: Sidereal (orbital) period for solar system bodies in days and in Julian years (symbol: a)
+		oss << q_("Sidereal period: %1 days (%2 a)").arg(QString::number(siderealPeriod, 'f', 2)).arg(QString::number(siderealPeriod/365.25, 'f', 3)) << "<br>";
+	}
 
 	//This doesn't work, even if setOpenExternalLinks(true) is used in InfoPanel
 	/*
@@ -254,6 +258,17 @@
 	return str;
 }
 
+double MinorPlanet::getSiderealPeriod() const
+{
+	double period;
+	if (semiMajorAxis>0)
+		period = StelUtils::calculateOrbitalPeriod(semiMajorAxis);
+	else
+		period = 0;
+
+	return period;
+}
+
 float MinorPlanet::getVMagnitude(const StelCore* core, bool withExtinction) const
 {
 	float extinctionMag=0.0; // track magnitude loss

=== modified file 'src/core/modules/MinorPlanet.hpp'
--- src/core/modules/MinorPlanet.hpp	2012-08-10 13:55:20 +0000
+++ src/core/modules/MinorPlanet.hpp	2012-09-07 14:54:23 +0000
@@ -104,6 +104,9 @@
 	//! set value for semi-major axis in AU
 	void setSemiMajorAxis(double value);
 
+	//! get sidereal period for minor planet
+	double getSiderealPeriod() const;
+
 private:
 	int minorPlanetNumber;
 	double absoluteMagnitude;

=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2012-09-06 21:42:42 +0000
+++ src/core/modules/Planet.cpp	2012-09-07 14:54:23 +0000
@@ -475,6 +475,13 @@
 		oss << "<br>";
 	}
 
+	double siderealPeriod = getSiderealPeriod();
+	if ((flags&Extra1) && (siderealPeriod>0))
+	{
+		// TRANSLATORS: Sidereal (orbital) period for solar system bodies in days and in Julian years (symbol: a)
+		oss << q_("Sidereal period: %1 days (%2 a)").arg(QString::number(siderealPeriod, 'f', 2)).arg(QString::number(siderealPeriod/365.25, 'f', 3)) << "<br>";
+	}
+
 	if ((flags&Extra2) && (englishName.compare("Sun")!=0))
 	{
 		const Vec3d& observerHelioPos = core->getObserverHeliocentricEclipticPos();

=== modified file 'src/core/modules/Planet.hpp'
--- src/core/modules/Planet.hpp	2012-09-06 21:42:42 +0000
+++ src/core/modules/Planet.hpp	2012-09-07 14:54:23 +0000
@@ -211,6 +211,7 @@
 	//! @return the radius of the planet in astronomical units.
 	double getRadius(void) const {return radius;}
 	double getSiderealDay(void) const {return re.period;}
+	double getSiderealPeriod(void) const { return re.siderealPeriod; }
 
 	const QString& getTextMapName() const {return texMapName;}	
 

=== modified file 'src/core/modules/SolarSystem.cpp'
--- src/core/modules/SolarSystem.cpp	2012-08-30 16:26:04 +0000
+++ src/core/modules/SolarSystem.cpp	2012-09-07 14:54:23 +0000
@@ -789,6 +789,8 @@
 				}
 			}
 
+			mp->setSemiMajorAxis(pd.value(secname+"/orbit_SemiMajorAxis", 0).toDouble());
+
 		}
 		else
 		{