Merge lp:~stellarium/stellarium/meridian-of-opposition into lp:stellarium

[Alexander Wolf]

This patch introduce the new line on celestial sphere - meridian of opposition. It's a line in the ecliptic coordinates system, who passes through both celestial pole and the Sun (and, of course, through opposition point). This line is useful for planning observation of minor planets and comets. Plus it can be use for get the time of opposition of the big planets and the Moon.

[gzotti (georg-zotti)]

Just downloading...

While I am waiting, a first comment:

It sounds interesting, but but I don't like the name, it's misleading I think. "Meridian" is IMHO always linked to earth's poles. A great circle through ecliptic poles opposite the sun ... I have no name for this, just "opposition longitude"? Or is there an IAU standard for this name?

[Alexander Wolf (alexwolf)]

I tried search an official term but no success. Official term for point crossing ecliptic and this meridian is opposition point.

[gzotti (georg-zotti)]

Yes, the intersecting point is the opposition point. If you mark a longitudinal arc in ecliptical coordinates, let's call this longitude, not meridian. So I propose "opposition longitude" or "oppositional longitude".

OK, building complete. I am afraid this should be split into two semi-circles:

opposition longitude
conjunction longitude (the sun is here!)

Else this is a nice, very welcome addition!

review: Needs Fixing

[Alexander Wolf (alexwolf)]

The term "opposition longitude" is acceptable here.

But I think splitting for usage of two names for one line is not possible here.

[gzotti (georg-zotti)]

Yes, technically you should use two half-circles. Else we will have a misleading "opposition longitude" circle with the sun in it.

[Alexander Wolf (alexwolf)]

Maybe just "ecliptic longitude"? I guess implementation two half-circles with names is not easy.

[gzotti (georg-zotti)]

No, ecl. longitude is the general term, like right ascension.

You may have to use StelPainter::greatCircleArc() with start/stop in the ecliptic poles. Or if ==180degrees is a problem, this must be split further into -90..0 and 0..90 degrees of ecl. latitude.

[Alexander Wolf (alexwolf)]

Problem not in the line, problem with placing of strings with naming of the line.

[gzotti (georg-zotti)]

Ah yes, this is somewhat complicated. Look into my ArchaeoLines plugin to see some more usage examples. (This was "borrowed" itself from the gridlines.)

[lp:~stellarium/stellarium/meridian-of-opposition]

7423. By Alexander Wolf on 2015-02-24

refactored code

[Alexander Wolf (alexwolf)]

I've refactored the code and I think he has compromise in the implementation now.

[gzotti (georg-zotti)]

Well, it's renamed. (Will translate to "OK-Länge" or "KO-Länge" in German :-) I still would prefer two separate half-circles, but it's likely OK for now. Other voices?

review: Approve

=== modified file 'data/default_config.ini.cmake'
--- data/default_config.ini.cmake	2015-02-11 22:54:07 +0000
+++ data/default_config.ini.cmake	2015-02-24 16:54:09 +0000
@@ -130,6 +130,7 @@
 ecliptic_color                      = 0.6,0.2,0.2
 ecliptic_J2000_color                = 0.3,0.3,0.1
 meridian_color                      = 0.2,0.6,0.2
+longitude_color                     = 0.2,0.4,0.4
 horizon_color                       = 0.2,0.6,0.2
 const_lines_color                   = 0.1,0.1,0.3
 const_names_color                   = 0.2,0.4,0.7
@@ -203,6 +204,7 @@
 flag_equator_line                   = false
 flag_ecliptic_line                  = false
 flag_meridian_line                  = false
+flag_longitude_line                 = false
 flag_horizon_line                   = false
 flag_cardinal_points                = true
 flag_gravity_labels                 = false
 
=== modified file 'plugins/Oculars/src/Oculars.cpp'
--- plugins/Oculars/src/Oculars.cpp	2015-02-18 22:10:28 +0000
+++ plugins/Oculars/src/Oculars.cpp	2015-02-24 16:54:09 +0000
@@ -110,6 +110,7 @@
 	flagEclipticLine(false),
 	flagEclipticJ2000Grid(false),
 	flagMeridianLine(false),
+	flagLongitudeLine(false),
 	flagHorizonLine(false),
 	flagGalacticEquatorLine(false),
 	flagAdaptation(false),
@@ -1782,6 +1783,7 @@
 	gridManager->setFlagEclipticLine(flagEclipticLine);
 	gridManager->setFlagEclipticJ2000Grid(flagEclipticJ2000Grid);
 	gridManager->setFlagMeridianLine(flagMeridianLine);
+	gridManager->setFlagLongitudeLine(flagLongitudeLine);
 	gridManager->setFlagHorizonLine(flagHorizonLine);
 	gridManager->setFlagGalacticEquatorLine(flagGalacticEquatorLine);
 	skyManager->setFlagLuminanceAdaptation(flagAdaptation);
@@ -1825,6 +1827,7 @@
 			flagEclipticLine = gridManager->getFlagEclipticLine();
 			flagEclipticJ2000Grid = gridManager->getFlagEclipticJ2000Grid();
 			flagMeridianLine = gridManager->getFlagMeridianLine();
+			flagLongitudeLine = gridManager->getFlagLongitudeLine();
 			flagHorizonLine = gridManager->getFlagHorizonLine();
 			flagGalacticEquatorLine = gridManager->getFlagGalacticEquatorLine();
 
@@ -1865,6 +1868,7 @@
 	gridManager->setFlagEclipticLine(false);
 	gridManager->setFlagEclipticJ2000Grid(false);
 	gridManager->setFlagMeridianLine(false);
+	gridManager->setFlagLongitudeLine(false);
 	gridManager->setFlagHorizonLine(false);
 	gridManager->setFlagGalacticEquatorLine(false);
 	skyManager->setFlagLuminanceAdaptation(false);
 
=== modified file 'plugins/Oculars/src/Oculars.hpp'
--- plugins/Oculars/src/Oculars.hpp	2015-02-18 22:21:55 +0000
+++ plugins/Oculars/src/Oculars.hpp	2015-02-24 16:54:09 +0000
@@ -219,6 +219,7 @@
 	bool flagEclipticLine;		//!< Flag to track if EclipticLine was displayed at activation.
 	bool flagEclipticJ2000Grid;	//!< Flag to track if EclipticJ2000Grid was displayed at activation.
 	bool flagMeridianLine;		//!< Flag to track if MeridianLine was displayed at activation.
+	bool flagLongitudeLine;		//!< Flag to track if LongitudeLine was displayed at activation.
 	bool flagHorizonLine;		//!< Flag to track if HorizonLine was displayed at activation.
 	bool flagGalacticEquatorLine;	//!< Flag to track if GalacticEquatorLine was displayed at activation.
 	bool flagAdaptation;		//!< Flag to track if adaptationCheckbox was enabled at activation.
 
=== modified file 'plugins/TextUserInterface/src/TextUserInterface.cpp'
--- plugins/TextUserInterface/src/TextUserInterface.cpp	2015-02-15 12:40:12 +0000
+++ plugins/TextUserInterface/src/TextUserInterface.cpp	2015-02-24 16:54:09 +0000
@@ -373,6 +373,11 @@
 					 SLOT(setColorGalacticEquatorLine(Vec3f)),
 					 gridLinesMgr->getColorGalacticEquatorLine(),
 					 m5, m5_19);
+	TuiNode* m5_21 = new TuiNodeColor(N_("Opposition/conjunction longitude line"),
+					 gridLinesMgr,
+					 SLOT(setColorLongitudeLine(Vec3f)),
+					 gridLinesMgr->getColorLongitudeLine(),
+					 m5, m5_20);
 
 	m5_1->setNextNode(m5_2);
 	m5_2->setNextNode(m5_3);
@@ -393,7 +398,8 @@
 	m5_17->setNextNode(m5_18);
 	m5_18->setNextNode(m5_19);
 	m5_19->setNextNode(m5_20);
-	m5_20->setNextNode(m5_1);
+	m5_20->setNextNode(m5_21);
+	m5_21->setNextNode(m5_1);
 	m5_1->loopToTheLast();
 	m5->setChildNode(m5_1);
 
@@ -810,6 +816,7 @@
 	conf->setValue("color/planet_orbits_color", colToConf(ssmgr->getOrbitsColor()));
 	conf->setValue("color/object_trails_color", colToConf(ssmgr->getTrailsColor()));
 	conf->setValue("color/meridian_color", colToConf(glmgr->getColorMeridianLine()));
+	conf->setValue("color/longitude_color", colToConf(glmgr->getColorLongitudeLine()));
 	conf->setValue("color/azimuthal_color", colToConf(glmgr->getColorAzimuthalGrid()));
 	conf->setValue("color/equator_color", colToConf(glmgr->getColorEquatorGrid()));
 	conf->setValue("color/equatorial_J2000_color", colToConf(glmgr->getColorEquatorJ2000Grid()));
 
=== modified file 'src/core/modules/GridLinesMgr.cpp'
--- src/core/modules/GridLinesMgr.cpp	2015-02-18 22:10:28 +0000
+++ src/core/modules/GridLinesMgr.cpp	2015-02-24 16:54:09 +0000
@@ -70,7 +70,8 @@
 		ECLIPTIC,
 		MERIDIAN,
 		HORIZON,
-		GALACTICEQUATOR
+		GALACTICEQUATOR,
+		LONGITUDE
 	};
 	// Create and precompute positions of a SkyGrid
 	SkyLine(SKY_LINE_TYPE _line_type = EQUATOR);
@@ -601,6 +602,11 @@
 			frameType = StelCore::FrameGalactic;
 			label = q_("Galactic Equator");
 			break;
+		case LONGITUDE:
+			frameType = StelCore::FrameObservercentricEcliptic;
+			// TRANSLATORS: Full term is "opposition/conjunction longitude"
+			label = q_("O./C. longitude");
+			break;
 	}
 }
 
@@ -636,6 +642,16 @@
 		meridianSphericalCap.n.set(0,1,0);
 	}
 
+	if (line_type==LONGITUDE)
+	{
+		Vec3d coord;
+		double lambda, beta;
+		StelUtils::rectToSphe(&lambda, &beta, core->getCurrentPlanet()->getHeliocentricEclipticPos());
+		StelUtils::spheToRect(lambda + M_PI/2., 0., coord);
+		meridianSphericalCap.n.set(coord[0],coord[1],coord[2]);
+		fpt.set(0,0,1);
+	}
+
 	Vec3d p1, p2;
 	if (!SphericalCap::intersectionPoints(viewPortSphericalCap, meridianSphericalCap, p1, p2))
 	{
@@ -686,6 +702,7 @@
 	meridianLine = new SkyLine(SkyLine::MERIDIAN);
 	horizonLine = new SkyLine(SkyLine::HORIZON);
 	galacticEquatorLine = new SkyLine(SkyLine::GALACTICEQUATOR);
+	longitudeLine = new SkyLine(SkyLine::LONGITUDE);
 }
 
 GridLinesMgr::~GridLinesMgr()
@@ -700,6 +717,7 @@
 	delete meridianLine;
 	delete horizonLine;
 	delete galacticEquatorLine;
+	delete longitudeLine;
 }
 
 /*************************************************************************
@@ -727,6 +745,7 @@
 	setFlagMeridianLine(conf->value("viewing/flag_meridian_line").toBool());
 	setFlagHorizonLine(conf->value("viewing/flag_horizon_line").toBool());
 	setFlagGalacticEquatorLine(conf->value("viewing/flag_galactic_equator_line").toBool());
+	setFlagLongitudeLine(conf->value("viewing/flag_longitude_line").toBool());
 	
 	StelApp& app = StelApp::getInstance();
 	connect(&app, SIGNAL(colorSchemeChanged(const QString&)), this, SLOT(setStelStyle(const QString&)));
@@ -743,6 +762,7 @@
 	addAction("actionShow_Ecliptic_J2000_Grid", displayGroup, N_("Ecliptic J2000 grid"), "eclipticJ2000GridDisplayed");
 	addAction("actionShow_Galactic_Grid", displayGroup, N_("Galactic grid"), "galacticGridDisplayed");
 	addAction("actionShow_Galactic_Equator_Line", displayGroup, N_("Galactic equator"), "galacticEquatorLineDisplayed");
+	addAction("actionShow_Longitude_Line", displayGroup, N_("Opposition/conjunction longitude line"), "longitudeLineDisplayed");
 }
 
 void GridLinesMgr::update(double deltaTime)
@@ -758,6 +778,7 @@
 	meridianLine->update(deltaTime);
 	horizonLine->update(deltaTime);
 	galacticEquatorLine->update(deltaTime);
+	longitudeLine->update(deltaTime);
 }
 
 void GridLinesMgr::draw(StelCore* core)
@@ -772,6 +793,7 @@
 	meridianLine->draw(core);
 	horizonLine->draw(core);
 	galacticEquatorLine->draw(core);
+	longitudeLine->draw(core);
 }
 
 void GridLinesMgr::setStelStyle(const QString& section)
@@ -790,6 +812,7 @@
 	setColorMeridianLine(StelUtils::strToVec3f(conf->value(section+"/meridian_color", defaultColor).toString()));
 	setColorHorizonLine(StelUtils::strToVec3f(conf->value(section+"/horizon_color", defaultColor).toString()));
 	setColorGalacticEquatorLine(StelUtils::strToVec3f(conf->value(section+"/galactic_equator_color", defaultColor).toString()));
+	setColorLongitudeLine(StelUtils::strToVec3f(conf->value(section+"/longitude_color", defaultColor).toString()));
 }
 
 void GridLinesMgr::updateLineLabels()
@@ -799,6 +822,7 @@
 	meridianLine->updateLabel();
 	horizonLine->updateLabel();
 	galacticEquatorLine->updateLabel();
+	longitudeLine->updateLabel();
 }
 
 //! Set flag for displaying Azimuthal Grid
@@ -1002,6 +1026,31 @@
 	}
 }
 
+//! Set flag for displaying opposition/conjunction longitude line
+void GridLinesMgr::setFlagLongitudeLine(const bool displayed)
+{
+	if(displayed != longitudeLine->isDisplayed()) {
+		longitudeLine->setDisplayed(displayed);
+		emit longitudeLineDisplayedChanged(displayed);
+	}
+}
+//! Get flag for displaying opposition/conjunction longitude line
+bool GridLinesMgr::getFlagLongitudeLine(void) const
+{
+	return longitudeLine->isDisplayed();
+}
+Vec3f GridLinesMgr::getColorLongitudeLine(void) const
+{
+	return longitudeLine->getColor();
+}
+void GridLinesMgr::setColorLongitudeLine(const Vec3f& newColor)
+{
+	if(newColor != longitudeLine->getColor()) {
+		longitudeLine->setColor(newColor);
+		emit longitudeLineColorChanged(newColor);
+	}
+}
+
 //! Set flag for displaying Horizon Line
 void GridLinesMgr::setFlagHorizonLine(const bool displayed)
 {
 
=== modified file 'src/core/modules/GridLinesMgr.hpp'
--- src/core/modules/GridLinesMgr.hpp	2014-09-10 14:41:40 +0000
+++ src/core/modules/GridLinesMgr.hpp	2015-02-24 16:54:09 +0000
@@ -92,6 +92,14 @@
 			   READ getColorMeridianLine
 			   WRITE setColorMeridianLine
 			   NOTIFY meridianLineColorChanged)
+	Q_PROPERTY(bool longitudeLineDisplayed
+			   READ getFlagLongitudeLine
+			   WRITE setFlagLongitudeLine
+			   NOTIFY longitudeLineDisplayedChanged)
+	Q_PROPERTY(Vec3f longitudeLineColor
+			   READ getColorLongitudeLine
+			   WRITE setColorLongitudeLine
+			   NOTIFY longitudeLineColorChanged)
 	Q_PROPERTY(bool horizonLineDisplayed
 			   READ getFlagHorizonLine
 			   WRITE setFlagHorizonLine
@@ -252,6 +260,20 @@
 	//! @endcode
 	void setColorMeridianLine(const Vec3f& newColor);
 
+	//! Setter for displaying opposition/conjunction longitude line.
+	void setFlagLongitudeLine(const bool displayed);
+	//! Accessor for displaying opposition/conjunction longitude line.
+	bool getFlagLongitudeLine(void) const;
+	//! Get the current color of the opposition/conjunction longitude line.
+	Vec3f getColorLongitudeLine(void) const;
+	//! Set the color of the opposition/conjunction longitude line.
+	//! @param newColor The color of opposition/conjunction longitude line
+	//! @code
+	//! // example of usage in scripts
+	//! GridLinesMgr.setColorLongitudeLine(Vec3f(1.0,0.0,0.0));
+	//! @endcode
+	void setColorLongitudeLine(const Vec3f& newColor);
+
 	//! Setter for displaying Horizon Line.
 	void setFlagHorizonLine(const bool displayed);
 	//! Accessor for displaying Horizon Line.
@@ -302,6 +324,8 @@
 	void eclipticLineColorChanged(const Vec3f & newColor) const;
 	void meridianLineDisplayedChanged(const bool displayed) const;
 	void meridianLineColorChanged(const Vec3f & newColor) const;
+	void longitudeLineDisplayedChanged(const bool displayed) const;
+	void longitudeLineColorChanged(const Vec3f & newColor) const;
 	void horizonLineDisplayedChanged(const bool displayed) const;
 	void horizonLineColorChanged(const Vec3f & newColor) const;
 	void galacticEquatorLineDisplayedChanged(const bool displayed) const;
@@ -317,14 +341,15 @@
 	void updateLineLabels();
 
 private:
-	SkyGrid * equGrid;      	// Equatorial grid
-	SkyGrid * equJ2000Grid; 	// Equatorial J2000 grid
-	SkyGrid * galacticGrid; 	// Galactic grid
-	SkyGrid * eclJ2000Grid; 	// Ecliptic J2000 grid
-	SkyGrid * aziGrid;      	// Azimuthal grid
-	SkyLine * equatorLine;  	// Celestial Equator line
-	SkyLine * eclipticLine; 	// Ecliptic line
-	SkyLine * meridianLine; 	// Meridian line
+	SkyGrid * equGrid;		// Equatorial grid
+	SkyGrid * equJ2000Grid;		// Equatorial J2000 grid
+	SkyGrid * galacticGrid;		// Galactic grid
+	SkyGrid * eclJ2000Grid;		// Ecliptic J2000 grid
+	SkyGrid * aziGrid;		// Azimuthal grid
+	SkyLine * equatorLine;		// Celestial Equator line
+	SkyLine * eclipticLine;		// Ecliptic line
+	SkyLine * meridianLine;		// Meridian line
+	SkyLine * longitudeLine; 	// Opposition/conjunction longitude line
 	SkyLine * horizonLine;		// Horizon line
 	SkyLine * galacticEquatorLine;	// line depicting the Galactic equator as defined by the IAU definition of Galactic coordinates (System II, 1958)
 };
 
=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2015-02-23 09:12:19 +0000
+++ src/gui/ConfigurationDialog.cpp	2015-02-24 16:54:09 +0000
@@ -568,6 +568,7 @@
 	conf->setValue("viewing/flag_ecliptic_line", glmgr->getFlagEclipticLine());
 	conf->setValue("viewing/flag_ecliptic_J2000_grid", glmgr->getFlagEclipticJ2000Grid());
 	conf->setValue("viewing/flag_meridian_line", glmgr->getFlagMeridianLine());
+	conf->setValue("viewing/flag_longitude_line", glmgr->getFlagLongitudeLine());
 	conf->setValue("viewing/flag_horizon_line", glmgr->getFlagHorizonLine());
 	conf->setValue("viewing/flag_equatorial_J2000_grid", glmgr->getFlagEquatorJ2000Grid());
 	conf->setValue("viewing/flag_galactic_grid", glmgr->getFlagGalacticGrid());
 
=== modified file 'src/gui/ViewDialog.cpp'
--- src/gui/ViewDialog.cpp	2015-01-05 13:26:56 +0000
+++ src/gui/ViewDialog.cpp	2015-02-24 16:54:09 +0000
@@ -269,6 +269,7 @@
 	connectCheckBox(ui->showEquatorLineCheckBox, "actionShow_Equator_Line");
 	connectCheckBox(ui->showEclipticLineCheckBox, "actionShow_Ecliptic_Line");
 	connectCheckBox(ui->showMeridianLineCheckBox, "actionShow_Meridian_Line");
+	connectCheckBox(ui->showLongitudeLineCheckBox, "actionShow_Longitude_Line");
 	connectCheckBox(ui->showHorizonLineCheckBox, "actionShow_Horizon_Line");
 	connectCheckBox(ui->showEquatorialGridCheckBox, "actionShow_Equatorial_Grid");
 	connectCheckBox(ui->showGalacticGridCheckBox, "actionShow_Galactic_Grid");
 
=== modified file 'src/gui/viewDialog.ui'
--- src/gui/viewDialog.ui	2015-01-04 17:48:41 +0000
+++ src/gui/viewDialog.ui	2015-02-24 16:54:09 +0000
@@ -1466,6 +1466,13 @@
                    </property>
                   </widget>
                  </item>
+                 <item>
+                  <widget class="QCheckBox" name="showCardinalPointsCheckBox">
+                   <property name="text">
+                    <string>Cardinal points</string>
+                   </property>
+                  </widget>
+                 </item>
                 </layout>
                </item>
                <item>
@@ -1520,21 +1527,20 @@
                    </property>
                   </widget>
                  </item>
+                 <item>
+                  <widget class="QCheckBox" name="showLongitudeLineCheckBox">
+                   <property name="toolTip">
+                    <string>Opposition/conjunction longitude line - the line of ecliptic longitude which passes through the both ecliptic poles, the Sun and opposition point.</string>
+                   </property>
+                   <property name="text">
+                    <string>O./C. longitude</string>
+                   </property>
+                  </widget>
+                 </item>
                 </layout>
                </item>
               </layout>
              </item>
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout_16">
-               <item>
-                <widget class="QCheckBox" name="showCardinalPointsCheckBox">
-                 <property name="text">
-                  <string>Cardinal points</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
             </layout>
            </widget>
           </item>
@@ -2128,7 +2134,6 @@
   <tabstop>showEclipticGridJ2000CheckBox</tabstop>
   <tabstop>showAzimuthalGridCheckBox</tabstop>
   <tabstop>showGalacticGridCheckBox</tabstop>
-  <tabstop>showCardinalPointsCheckBox</tabstop>
   <tabstop>showEquatorLineCheckBox</tabstop>
   <tabstop>showMeridianLineCheckBox</tabstop>
   <tabstop>showEclipticLineCheckBox</tabstop>
 
=== modified file 'src/scripting/StelMainScriptAPI.cpp'
--- src/scripting/StelMainScriptAPI.cpp	2015-01-25 17:35:08 +0000
+++ src/scripting/StelMainScriptAPI.cpp	2015-02-24 16:54:09 +0000
@@ -967,6 +967,7 @@
 		glmgr->setFlagEquatorLine(false);
 		glmgr->setFlagEclipticLine(false);
 		glmgr->setFlagMeridianLine(false);
+		glmgr->setFlagLongitudeLine(false);
 		glmgr->setFlagHorizonLine(false);
 		glmgr->setFlagGalacticEquatorLine(false);
 		glmgr->setFlagEquatorJ2000Grid(false);
@@ -1000,6 +1001,7 @@
 		glmgr->setFlagEquatorLine(false);
 		glmgr->setFlagEclipticLine(false);
 		glmgr->setFlagMeridianLine(false);
+		glmgr->setFlagLongitudeLine(false);
 		glmgr->setFlagHorizonLine(false);
 		glmgr->setFlagGalacticEquatorLine(false);
 		glmgr->setFlagEquatorJ2000Grid(false);
@@ -1033,6 +1035,7 @@
 		glmgr->setFlagEquatorLine(false);
 		glmgr->setFlagEclipticLine(false);
 		glmgr->setFlagMeridianLine(false);
+		glmgr->setFlagLongitudeLine(false);
 		glmgr->setFlagHorizonLine(false);
 		glmgr->setFlagGalacticEquatorLine(false);
 		glmgr->setFlagEquatorJ2000Grid(false);