Prioritize M number then IC for object name
This commit is contained in:
+19
-4
@@ -271,15 +271,30 @@ QVector<SkyObject> Database::getObjects(double minRa, double maxRa, double minDe
|
||||
while(m_getNgc.next())
|
||||
{
|
||||
QString name;
|
||||
QString name2;
|
||||
QString m = m_getNgc.value("M").toString();
|
||||
QString ic = m_getNgc.value("IC").toString();
|
||||
if(!m.isEmpty())name = "M" + m + " ";
|
||||
if(!ic.isEmpty())name += "IC" + ic + " ";
|
||||
name += m_getNgc.value("Name").toString();
|
||||
if(!m.isEmpty())
|
||||
{
|
||||
name = "M" + m;
|
||||
m.clear();
|
||||
}
|
||||
else if(!ic.isEmpty())
|
||||
{
|
||||
name = "IC" + ic;
|
||||
ic.clear();
|
||||
}
|
||||
else
|
||||
{
|
||||
name = m_getNgc.value("Name").toString();
|
||||
}
|
||||
|
||||
if(!ic.isEmpty())name2 += "IC" + ic + " ";
|
||||
name2 += m_getNgc.value("Common names").toString();
|
||||
|
||||
objects.append({
|
||||
name,
|
||||
m_getNgc.value("Common names").toString(),
|
||||
name2,
|
||||
{m_getNgc.value("RA_deg").toDouble(), m_getNgc.value("DEC_deg").toDouble()},
|
||||
m_getNgc.value("MajAx").toDouble(),
|
||||
m_getNgc.value("MinAx").toDouble(),
|
||||
|
||||
Reference in New Issue
Block a user