From cbc779090f72010c80a5ded6145e7290e1d484bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Sun, 27 Jul 2025 15:36:19 +0200 Subject: [PATCH] Prioritize M number then IC for object name --- src/database.cpp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/database.cpp b/src/database.cpp index 55ea534..faa0f57 100644 --- a/src/database.cpp +++ b/src/database.cpp @@ -271,15 +271,30 @@ QVector 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(),