Merge lp:~stellarium/stellarium/0.12.1 into lp:stellarium

[Alexander Wolf]

Changes to version 0.12.1

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-01-31 11:23:10 +0000
+++ CMakeLists.txt	2013-01-31 13:16:30 +0000
@@ -12,7 +12,7 @@
 PROJECT(Stellarium)
 SET(STELLARIUM_MAJOR "0")
 SET(STELLARIUM_MINOR "12")
-SET(STELLARIUM_PATCH "0")
+SET(STELLARIUM_PATCH "1")
 SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
 SET(PACKAGE stellarium)
 

=== modified file 'src/core/StelCore.cpp'
--- src/core/StelCore.cpp	2013-01-04 17:32:22 +0000
+++ src/core/StelCore.cpp	2013-01-31 13:16:30 +0000
@@ -746,6 +746,16 @@
 	return JDay;
 }
 
+void StelCore::setMJDay(double MJD)
+{
+	JDay=MJD+2400000.5;
+}
+
+double StelCore::getMJDay() const
+{
+	return JDay-2400000.5;
+}
+
 double StelCore::getPresetSkyTime() const
 {
 	return presetSkyTime;

=== modified file 'src/core/StelCore.hpp'
--- src/core/StelCore.hpp	2013-01-04 17:17:17 +0000
+++ src/core/StelCore.hpp	2013-01-31 13:16:30 +0000
@@ -278,6 +278,11 @@
 	//! Get the current date in Julian Day
 	double getJDay() const;
 
+	//! Set the current date in Modified Julian Day
+	void setMJDay(double MJD);
+	//! Get the current date in Modified Julian Day
+	double getMJDay() const;
+
 	//! Return the preset sky time in JD
 	double getPresetSkyTime() const;
 	//! Set the preset sky time from a JD

=== modified file 'src/scripting/StelMainScriptAPI.cpp'
--- src/scripting/StelMainScriptAPI.cpp	2013-01-30 15:07:13 +0000
+++ src/scripting/StelMainScriptAPI.cpp	2013-01-31 13:16:30 +0000
@@ -117,6 +117,20 @@
 	return StelApp::getInstance().getCore()->getJDay();
 }
 
+//! Set the current date in Modified Julian Day
+//! @param MJD the Modified Julian Date
+void StelMainScriptAPI::setMJDay(double MJD)
+{
+	StelApp::getInstance().getCore()->setMJDay(MJD);
+}
+
+//! Get the current date in Modified Julian Day
+//! @return the Modified Julian Date
+double StelMainScriptAPI::getMJDay() const
+{
+	return StelApp::getInstance().getCore()->getMJDay();
+}
+
 void StelMainScriptAPI::setDate(const QString& dt, const QString& spec)
 {
 	StelApp::getInstance().getCore()->setJDay(jdFromDateString(dt, spec));

=== modified file 'src/scripting/StelMainScriptAPI.hpp'
--- src/scripting/StelMainScriptAPI.hpp	2013-01-30 15:07:13 +0000
+++ src/scripting/StelMainScriptAPI.hpp	2013-01-31 13:16:30 +0000
@@ -51,6 +51,13 @@
 	//! @return the Julian Date
 	double getJDay() const;
 
+	//! Set the current date in Modified Julian Day
+	//! @param MJD the Modified Julian Date
+	void setMJDay(double MJD);
+	//! Get the current date in Modified Julian Day
+	//! @return the Modified Julian Date
+	double getMJDay() const;
+
 	//! set the date in ISO format, e.g. "2008-03-24T13:21:01"
 	//! @param dt the date string to use.  Formats:
 	//! - ISO, e.g. "2008-03-24T13:21:01"