Skip to content

Commit 92d64b6

Browse files
1011011110110111
authored
Fix nebula names in search results (#4867)
This appears to be a mistake that had existed even before cc1935b. The search was matching partial names, e.g. "M3" search term matched M31. But it returned the search term itself as the result, which doesn't look like the intended output, since the search term is not what was found. But since the aforementioned commit the results returned include the actual object pointer, which now conflicts with the partial name, since "M3" is also an exact designation of a completely different object. This patch fixes the behavior by returning the actual name, rather than the search prefix, which now also lets the user finally get the partial-name search results like M31, M34, etc., which were not found even before the problematic commit. Fixes #4858.
1 parent 46326c7 commit 92d64b6

1 file changed

Lines changed: 29 additions & 29 deletions

File tree

‎src/core/modules/NebulaMgr.cpp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2206,7 +2206,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
22062206
QString constws = constw.mid(0, objUpper.size());
22072207
if (constws.toUpper()==objUpper)
22082208
{
2209-
result.append({constws, StelObjectP(n)});
2209+
result.append({constw, StelObjectP(n)});
22102210
continue; // Prevent adding both forms for name
22112211
}
22122212
constw = QString("M %1").arg(n->M_nb);
@@ -2227,7 +2227,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
22272227
QString constws2 = QString("Melotte%1").arg(n->Mel_nb).mid(0, objUpper.size());
22282228
if (constws.toUpper()==objUpper || constws2.toUpper()==objUpper)
22292229
{
2230-
result.append({constws, StelObjectP(n)});
2230+
result.append({constw, StelObjectP(n)});
22312231
continue; // Prevent adding both forms for name
22322232
}
22332233
constw = QString("Mel %1").arg(n->Mel_nb);
@@ -2248,7 +2248,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
22482248
QString constws = constw.mid(0, objUpper.size());
22492249
if (constws.toUpper()==objUpper)
22502250
{
2251-
result.append({constws, StelObjectP(n)});
2251+
result.append({constw, StelObjectP(n)});
22522252
continue; // Prevent adding both forms for name
22532253
}
22542254
constw = QString("IC %1").arg(n->IC_nb);
@@ -2266,7 +2266,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
22662266
QString constws = constw.mid(0, objUpper.size());
22672267
if (constws.toUpper()==objUpper)
22682268
{
2269-
result.append({constws, StelObjectP(n)});
2269+
result.append({constw, StelObjectP(n)});
22702270
continue;
22712271
}
22722272
constw = QString("NGC %1").arg(n->NGC_nb);
@@ -2285,7 +2285,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
22852285
QString constws = constw.mid(0, objUpper.size());
22862286
if (constws.toUpper()==objUpper)
22872287
{
2288-
result.append({constws, StelObjectP(n)}); // Prevent adding both forms for name
2288+
result.append({constw, StelObjectP(n)}); // Prevent adding both forms for name
22892289
continue;
22902290
}
22912291
constw = QString("PGC %1").arg(n->PGC_nb);
@@ -2305,7 +2305,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
23052305
QString constws = constw.mid(0, objUpper.size());
23062306
if (constws.toUpper()==objUpper)
23072307
{
2308-
result.append({constws, StelObjectP(n)});
2308+
result.append({constw, StelObjectP(n)});
23092309
continue; // Prevent adding both forms for name
23102310
}
23112311
constw = QString("UGC %1").arg(n->UGC_nb);
@@ -2325,7 +2325,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
23252325
QString constws = constw.mid(0, objUpper.size());
23262326
if (constws.toUpper()==objUpper)
23272327
{
2328-
result.append({constws, StelObjectP(n)});
2328+
result.append({constw, StelObjectP(n)});
23292329
continue; // Prevent adding both forms for name
23302330
}
23312331
constw = QString("C %1").arg(n->C_nb);
@@ -2346,7 +2346,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
23462346
QString constws2 = QString("Collinder%1").arg(n->Cr_nb).mid(0, objUpper.size());
23472347
if (constws.toUpper()==objUpper || constws2.toUpper()==objUpper)
23482348
{
2349-
result.append({constws, StelObjectP(n)});
2349+
result.append({constw, StelObjectP(n)});
23502350
continue; // Prevent adding both forms for name
23512351
}
23522352
constw = QString("Cr %1").arg(n->Cr_nb);
@@ -2367,7 +2367,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
23672367
QString constws = constw.mid(0, objUpper.size());
23682368
if (constws.toUpper()==objUpper)
23692369
{
2370-
result.append({constws, StelObjectP(n)});
2370+
result.append({constw, StelObjectP(n)});
23712371
continue; // Prevent adding both forms for name
23722372
}
23732373
constw = QString("Ced %1").arg(n->Ced_nb);
@@ -2387,7 +2387,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
23872387
QString constws = constw.mid(0, objUpper.size());
23882388
if (constws.toUpper()==objUpper)
23892389
{
2390-
result.append({constws, StelObjectP(n)});
2390+
result.append({constw, StelObjectP(n)});
23912391
continue; // Prevent adding both forms for name
23922392
}
23932393
constw = QString("B %1").arg(n->B_nb);
@@ -2407,7 +2407,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
24072407
QString constws = constw.mid(0, objUpper.size());
24082408
if (constws.toUpper()==objUpper)
24092409
{
2410-
result.append({constws, StelObjectP(n)});
2410+
result.append({constw, StelObjectP(n)});
24112411
continue; // Prevent adding both forms for name
24122412
}
24132413
constw = QString("SH 2-%1").arg(n->Sh2_nb);
@@ -2427,7 +2427,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
24272427
QString constws = constw.mid(0, objUpper.size());
24282428
if (constws.toUpper()==objUpper)
24292429
{
2430-
result.append({constws, StelObjectP(n)});
2430+
result.append({constw, StelObjectP(n)});
24312431
continue; // Prevent adding both forms for name
24322432
}
24332433
constw = QString("vdB %1").arg(n->VdB_nb);
@@ -2447,7 +2447,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
24472447
QString constws = constw.mid(0, objUpper.size());
24482448
if (constws.toUpper()==objUpper)
24492449
{
2450-
result.append({constws, StelObjectP(n)});
2450+
result.append({constw, StelObjectP(n)});
24512451
continue; // Prevent adding both forms for name
24522452
}
24532453
constw = QString("RCW %1").arg(n->RCW_nb);
@@ -2467,7 +2467,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
24672467
QString constws = constw.mid(0, objUpper.size());
24682468
if (constws.toUpper()==objUpper)
24692469
{
2470-
result.append({constws, StelObjectP(n)});
2470+
result.append({constw, StelObjectP(n)});
24712471
continue; // Prevent adding both forms for name
24722472
}
24732473
constw = QString("LDN %1").arg(n->LDN_nb);
@@ -2487,7 +2487,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
24872487
QString constws = constw.mid(0, objUpper.size());
24882488
if (constws.toUpper()==objUpper)
24892489
{
2490-
result.append({constws, StelObjectP(n)});
2490+
result.append({constw, StelObjectP(n)});
24912491
continue; // Prevent adding both forms for name
24922492
}
24932493
constw = QString("LBN %1").arg(n->LBN_nb);
@@ -2507,7 +2507,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
25072507
QString constws = constw.mid(0, objUpper.size());
25082508
if (constws.toUpper()==objUpper)
25092509
{
2510-
result.append({constws, StelObjectP(n)});
2510+
result.append({constw, StelObjectP(n)});
25112511
continue; // Prevent adding both forms for name
25122512
}
25132513
constw = QString("Arp %1").arg(n->Arp_nb);
@@ -2527,7 +2527,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
25272527
QString constws = constw.mid(0, objUpper.size());
25282528
if (constws.toUpper()==objUpper)
25292529
{
2530-
result.append({constws, StelObjectP(n)});
2530+
result.append({constw, StelObjectP(n)});
25312531
continue; // Prevent adding both forms for name
25322532
}
25332533
constw = QString("VV %1").arg(n->VV_nb);
@@ -2547,7 +2547,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
25472547
QString constws = constw.mid(0, objUpper.size());
25482548
if (constws.toUpper()==objUpper)
25492549
{
2550-
result.append({constws, StelObjectP(n)});
2550+
result.append({constw, StelObjectP(n)});
25512551
continue; // Prevent adding both forms for name
25522552
}
25532553
constw = QString("PK %1").arg(n->PK_nb);
@@ -2567,7 +2567,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
25672567
QString constws = constw.mid(0, objUpper.size());
25682568
if (constws.toUpper()==objUpper)
25692569
{
2570-
result.append({constws, StelObjectP(n)});
2570+
result.append({constw, StelObjectP(n)});
25712571
continue; // Prevent adding both forms for name
25722572
}
25732573
constw = QString("PN G%1").arg(n->PNG_nb);
@@ -2587,7 +2587,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
25872587
QString constws = constw.mid(0, objUpper.size());
25882588
if (constws.toUpper()==objUpper)
25892589
{
2590-
result.append({constws, StelObjectP(n)});
2590+
result.append({constw, StelObjectP(n)});
25912591
continue; // Prevent adding both forms for name
25922592
}
25932593
constw = QString("SNR G%1").arg(n->SNRG_nb);
@@ -2608,7 +2608,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
26082608
QString constws2 = QString("ACO%1").arg(n->ACO_nb).mid(0, objUpper.size());
26092609
if (constws.toUpper()==objUpper || constws2.toUpper()==objUpper)
26102610
{
2611-
result.append({constws, StelObjectP(n)});
2611+
result.append({constw, StelObjectP(n)});
26122612
continue; // Prevent adding both forms for name
26132613
}
26142614
constw = QString("Abell %1").arg(n->ACO_nb);
@@ -2629,7 +2629,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
26292629
QString constws = constw.mid(0, objUpper.size());
26302630
if (constws.toUpper()==objUpper)
26312631
{
2632-
result.append({constws, StelObjectP(n)});
2632+
result.append({constw, StelObjectP(n)});
26332633
continue; // Prevent adding both forms for name
26342634
}
26352635
constw = QString("HCG %1").arg(n->HCG_nb);
@@ -2649,7 +2649,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
26492649
QString constws = constw.mid(0, objUpper.size());
26502650
if (constws.toUpper()==objUpper)
26512651
{
2652-
result.append({constws, StelObjectP(n)});
2652+
result.append({constw, StelObjectP(n)});
26532653
continue; // Prevent adding both forms for name
26542654
}
26552655
constw = QString("ESO %1").arg(n->ESO_nb);
@@ -2669,7 +2669,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
26692669
QString constws = constw.mid(0, objUpper.size());
26702670
if (constws.toUpper()==objUpper)
26712671
{
2672-
result.append({constws, StelObjectP(n)});
2672+
result.append({constw, StelObjectP(n)});
26732673
continue; // Prevent adding both forms for name
26742674
}
26752675
constw = QString("vdBH %1").arg(n->VdBH_nb);
@@ -2689,7 +2689,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
26892689
QString constws = constw.mid(0, objUpper.size());
26902690
if (constws.toUpper()==objUpper)
26912691
{
2692-
result.append({constws, StelObjectP(n)});
2692+
result.append({constw, StelObjectP(n)});
26932693
continue; // Prevent adding both forms for name
26942694
}
26952695
constw = QString("DWB %1").arg(n->DWB_nb);
@@ -2710,7 +2710,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
27102710
QString constws2 = QString("Trumpler%1").arg(n->Tr_nb).mid(0, objUpper.size());
27112711
if (constws.toUpper()==objUpper || constws2.toUpper()==objUpper)
27122712
{
2713-
result.append({constws, StelObjectP(n)});
2713+
result.append({constw, StelObjectP(n)});
27142714
continue; // Prevent adding both forms for name
27152715
}
27162716
constw = QString("Tr %1").arg(n->Tr_nb);
@@ -2732,7 +2732,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
27322732
QString constws2 = QString("Stock%1").arg(n->St_nb).mid(0, objUpper.size());
27332733
if (constws.toUpper()==objUpper || constws2.toUpper()==objUpper)
27342734
{
2735-
result.append({constws, StelObjectP(n)});
2735+
result.append({constw, StelObjectP(n)});
27362736
continue; // Prevent adding both forms for name
27372737
}
27382738
constw = QString("St %1").arg(n->St_nb);
@@ -2754,7 +2754,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
27542754
QString constws2 = QString("Ruprecht%1").arg(n->Ru_nb).mid(0, objUpper.size());
27552755
if (constws.toUpper()==objUpper || constws2.toUpper()==objUpper)
27562756
{
2757-
result.append({constws, StelObjectP(n)});
2757+
result.append({constw, StelObjectP(n)});
27582758
continue; // Prevent adding both forms for name
27592759
}
27602760
constw = QString("Ru %1").arg(n->Ru_nb);
@@ -2775,7 +2775,7 @@ QVector<QPair<QString,StelObjectP>> NebulaMgr::listMatchingObjects(const QString
27752775
QString constws = constw.mid(0, objUpper.size());
27762776
if (constws.toUpper()==objUpper)
27772777
{
2778-
result.append({constws, StelObjectP(n)});
2778+
result.append({constw, StelObjectP(n)});
27792779
continue; // Prevent adding both forms for name
27802780
}
27812781
constw = QString("vdB-Ha %1").arg(n->VdBHa_nb);

0 commit comments

Comments
 (0)