Merge lp:~i-martividal/stellarium/Observability-Preces into lp:stellarium

[Ivan Marti-Vidal]

Hi all,

A user of Stellarium sent me an e-mail describing a bug about wrong rise/set times in Observability for years far in the past. In the end, it is due to Observability not updating properly all the parameters when the year is changed: it still estimated well the time spent since/to the rise/set, but didn't convert them well well to local time.

Here I propose a simple fix to this.

   Cheers!

          Ivan

[Alexander Wolf (alexwolf)]

Why you use SET(Boost_USE_STATIC_LIBS OFF) in CMakeLists.txt?

review: Needs Information

[lp:~i-martividal/stellarium/Observability-Preces]

8191. By Ivan Marti-Vidal on 2016-02-22

Corrected CMakeLists

8192. By Ivan Marti-Vidal on 2016-02-22

Corrected CMakeLists

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-31 08:42:04 +0000
+++ CMakeLists.txt	2016-02-22 11:51:36 +0000
@@ -228,7 +228,6 @@
 FIND_PACKAGE(Qt5Network REQUIRED)
 FIND_PACKAGE(Qt5OpenGL REQUIRED)
 FIND_PACKAGE(Qt5Widgets REQUIRED)
-FIND_PACKAGE(Qt5PrintSupport REQUIRED)
 IF(USE_PLUGIN_TELESCOPECONTROL)
      FIND_PACKAGE(Qt5SerialPort REQUIRED)
 ENDIF()
@@ -374,7 +373,6 @@
     GET_TARGET_PROPERTY(QtWidgets_location Qt5::Widgets LOCATION)
     GET_TARGET_PROPERTY(QtSql_location Qt5::Sql LOCATION)    
     GET_TARGET_PROPERTY(QtXmlPatterns_location Qt5::XmlPatterns LOCATION)
-    GET_TARGET_PROPERTY(QtPrintSupport_location Qt5::PrintSupport LOCATION)
     IF(ENABLE_SCRIPTING)
         GET_TARGET_PROPERTY(QtScript_location Qt5::Script LOCATION)
         SET(ISS_QT_SCRIPT "Source: \"${QtScript_location}\"; DestDir: \"{app}\";")
@@ -515,7 +513,6 @@
      ${CMAKE_SOURCE_DIR}/src/core/planetsephems
      ${CMAKE_SOURCE_DIR}/src/core/external
      ${CMAKE_SOURCE_DIR}/src/core/external/qtcompress
-     ${CMAKE_SOURCE_DIR}/src/core/external/qcustomplot
      ${CMAKE_SOURCE_DIR}/src/core/external/glues_stel/source/
      ${CMAKE_SOURCE_DIR}/src/core/external/glues_stel/source/libtess
      ${CMAKE_SOURCE_DIR}/src/gui

=== modified file 'plugins/Observability/src/Observability.cpp'
--- plugins/Observability/src/Observability.cpp	2016-01-08 11:42:06 +0000
+++ plugins/Observability/src/Observability.cpp	2016-02-22 11:51:36 +0000
@@ -290,10 +290,8 @@
 //	GMTShift = StelUtils::getGMTShiftFromQT(currJD)/24.0;
 	GMTShift = StelApp::getInstance().getLocaleMgr().getGMTShift(currJD)/24.0;
 
-//	qDebug() << QString("%1%2 ").arg(GMTShift);
 
 	double currLocalT = 24.*modf(currJD + GMTShift,&currJDint);
-
 	int auxm, auxd, auxy;
 	StelUtils::getDateFromJulianDay(currJD, &auxy, &auxm, &auxd);
 	bool isSource = StelApp::getInstance().getStelObjectMgr().getWasSelected();
@@ -366,6 +364,7 @@
 	{
 		updateSunH();
 		lastJDMoon = 0.0;
+
 	};
 
 //////////////////////////////////////////////////////////////////
@@ -466,8 +465,9 @@
 // Compute source's altitude (in radians):
 	alti = std::asin(LocPos[2]);
 
+
 // Force re-computation of ephemeris if the location changes or the user changes the configuration:
-	if (locChanged || configChanged)
+	if (locChanged || configChanged || yearChanged)
 	{ 
 		souChanged=true;
 		configChanged=false;
@@ -1415,7 +1415,6 @@
 	if (qAbs(myJD.first-lastJDMoon)>StelCore::JD_SECOND || lastType!=bodyType || souChanged)
 	{
 
-//		qDebug() << q_("%1  %2   %3   %4").arg(Kind).arg(LastObject).arg(myJD,0,'f',5).arg(lastJDMoon,0,'f',5);
 
 		lastType = bodyType;
 
@@ -1588,7 +1587,6 @@
 			culmAlt = qAbs(mylat-dec); // 90 - altitude at transit.
 		};
 
-//		qDebug() << q_("%1").arg(MoonCulm,0,'f',5);
 
 
 	lastJDMoon = myJD.first;
@@ -1659,13 +1657,11 @@
 
 					};
 
-				//	qDebug() << QString("%1 %2 %3 %4 ").arg(Sec1).arg(Sec2).arg(Temp1).arg(Temp2);	
 
 
 					if (qAbs(Sec2.first-Sec1.first) < 10.*dT)  // 1 minute accuracy; convergence.
 					{
 						TempFullMoon = (Sec1.first+Sec2.first)/2.;
-				//		qDebug() << QString("%1%2 ").arg(TempFullMoon);	
 						break;
 					};