Show object constellation info in InfoString

- based on convex hull info.
- not used when convex hulls have been disabled.

Author: gzotti

src/core/StelObject.cpp

@@ -19,6 +19,7 @@
 
 
 #include "StelObject.hpp"
+#include "Constellation.hpp"
 #include "ConstellationMgr.hpp"
 #include "StelObjectMgr.hpp"
 #include "StelApp.hpp"
@@ -35,6 +36,7 @@
 #include "SpecificTimeMgr.hpp"
 #include "planetsephems/sidereal_time.h"
 #include "planetsephems/precession.h"
+#include <qforeach.h>
 
 #include <QRegularExpression>
 #include <QDebug>
@@ -968,6 +970,26 @@ QString StelObject::getCommonInfoString(const StelCore *core, const InfoStringGr
 		res += QString("%1: %2<br/>").arg(q_("IAU Constellation"), constel);
 		res += getExtraInfoStrings(flags&IAUConstellation).join("");
 		res += omgr->getExtraInfoStrings(flags&IAUConstellation).join("");
+
+		// Add constellation from convex hull, if that is enabled in the first place.
+		static QSettings *conf=StelApp::getInstance().getSettings();
+		static const bool hullsEnabled = conf->value("gui/skyculture_enable_hulls", "false").toBool();
+		if (hullsEnabled)
+		{
+			QList<Constellation*> constels=cMgr->isObjectIn(this, true);
+			QString constelStr="---";
+			if (!constels.isEmpty())
+			{
+				QStringList cNames;
+				foreach(const auto &cst, constels)
+				{
+					cNames.append(cst->getInfoLabel());
+				}
+				constelStr = cNames.join(", ");
+			}
+		res += QString("%1: %2<br/>").arg(q_("Constellations"), constelStr);
+		}
+
 		if (cMgr->hasZodiac() && (currentPlanet=="Earth"))
 		{
 			QString zodiacSystemLabel = cMgr->getZodiacSystemName();

src/core/modules/Constellation.hpp

@@ -120,10 +120,12 @@ class Constellation : public StelObject
 	QString getNamePronounce() const override {return (culturalName.pronounceI18n.isEmpty() ? culturalName.native : culturalName.pronounceI18n);}
 	//! Get the short name for the Constellation (returns the translated version of abbreviation).
 	QString getShortName() const {return abbreviationI18n;}
+public:
 	//! Combine screen label from various components, depending on settings in SkyCultureMgr
 	QString getScreenLabel() const override;
 	//! Combine InfoString label from various components, depending on settings in SkyCultureMgr
 	QString getInfoLabel() const override;
+private:
 	//! Underlying worker
 	QString getCultureLabel(StelObject::CulturalDisplayStyle style) const;
 	//! Draw the lines for the Constellation.

src/core/modules/ConstellationMgr.hpp

@@ -515,10 +515,12 @@ private slots:
 
 	QList<Constellation*> selected; // More than one can be selected at a time
 
+public:
 	//! Return list of constellations the object is member of.
 	//! In case of IAU constellations, the list is guaranteed to be of length 1.
 	//! @param useHull Prefer to use constellation hull, not IAU borders
 	QList<Constellation*> isObjectIn(const StelObject *s, bool useHull) const;
+private:
 	Constellation* findFromAbbreviation(const QString& abbreviation) const;
 	QList<Constellation*> constellations; //!< Constellations in the current SkyCulture
 	QFont asterFont;