Merge lp:~stellarium/stellarium/star-names-scheme-v2 into lp:stellarium
- star-names-scheme-v2
- Merge into trunk
Proposed by
Alexander Wolf
Status: | Merged |
---|---|
Merged at revision: | 8681 |
Proposed branch: | lp:~stellarium/stellarium/star-names-scheme-v2 |
Merge into: | lp:stellarium |
Diff against target: |
1511 lines (+943/-351) 9 files modified
skycultures/western/CMakeLists.txt (+3/-3) skycultures/western/reference.fab (+14/-0) skycultures/western/star_names.fab (+765/-333) src/core/StelSkyCultureMgr.cpp (+15/-4) src/core/StelSkyCultureMgr.hpp (+1/-1) src/core/modules/StarMgr.cpp (+122/-9) src/core/modules/StarMgr.hpp (+19/-0) src/core/modules/StarWrapper.cpp (+4/-0) stars/default/name.fab (+0/-1) |
To merge this branch: | bzr merge lp:~stellarium/stellarium/star-names-scheme-v2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
gzotti | Pending | ||
Stellarium | Pending | ||
Review via email: mp+305733@code.launchpad.net |
Commit message
Implementation for support of star names for second edition of skycultures:
- All stars names has been revised;
- Any star may contains synonyms for names;
- All stars names have the reference info (currently not visible in GUI, because it required change other parts of skycultures also);
- New scheme is compatible with previous edition.
Description of the change
Current branch has implementation support of star names for second edition of skycultures:
- All stars names has been revised;
- Any star may contains synonyms for names;
- All stars names have the reference info (currently not visible in GUI, because it required change other parts of skycultures also);
- New scheme is compatible with previous edition.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'skycultures/western/CMakeLists.txt' |
2 | --- skycultures/western/CMakeLists.txt 2013-04-24 06:43:39 +0000 |
3 | +++ skycultures/western/CMakeLists.txt 2016-09-14 16:38:20 +0000 |
4 | @@ -1,12 +1,12 @@ |
5 | |
6 | ########### install files ############### |
7 | |
8 | -# install info.ini and star_names.fab |
9 | -INSTALL(FILES info.ini star_names.fab DESTINATION share/${PACKAGE}/skycultures/western ) |
10 | +# install info.ini |
11 | +INSTALL(FILES info.ini DESTINATION share/${PACKAGE}/skycultures/western ) |
12 | |
13 | # install constellations data, artwork and descriptions |
14 | INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/skycultures/western |
15 | - FILES_MATCHING PATTERN "constellation*" |
16 | + FILES_MATCHING PATTERN "*.fab" |
17 | PATTERN "*.png" |
18 | PATTERN "description.*.utf8" |
19 | PATTERN "CMakeFiles" EXCLUDE ) |
20 | |
21 | === added file 'skycultures/western/reference.fab' |
22 | --- skycultures/western/reference.fab 1970-01-01 00:00:00 +0000 |
23 | +++ skycultures/western/reference.fab 2016-09-14 16:38:20 +0000 |
24 | @@ -0,0 +1,14 @@ |
25 | +# Reference file for Western skyculture |
26 | +# Format: |
27 | +# Link number | Description (Link name) | URL (if exists) |
28 | + 1|Kunitzsch, P.; Smart T. (2006). "A Dictionary of Modern star Names: A Short Guide to 254 Star Names and Their Derivations" (2nd rev. ed.). Cambridge, MA: Sky Pub. ISBN 978-1-931559-44-7.| |
29 | + 2|Allen, R. H. (1963). "Star Names: Their Lore and Meaning" (rep. ed.). New York, NY: Dover Publications Inc. ISBN 0-486-21079-0.| |
30 | + 3|2000, A&AS, 143, 9, "The SIMBAD astronomical database", Wenger et al.|http://adsabs.harvard.edu/abs/2000A%26AS..143....9W |
31 | + 4|Final Results of NameExoWorlds Public Vote Released|http://www.iau.org/news/pressreleases/detail/iau1514/ |
32 | + 5|STARS by Jim Kaler, Prof. Emeritus of Astronomy, University of Illinois|http://stars.astro.illinois.edu/sow/sowlist.html |
33 | + 6|IAU Catalog of Star Names (IAU-CSN)|http://www.pas.rochester.edu/~emamajek/WGSN/IAU-CSN.txt |
34 | + 7|Covington, Michael (2002). Celestial Objects for Modern Telescopes: Practical Amateur Astronomy. Cambridge University Press.|https://books.google.com/books?id=ql7wLq1fP5QC&pg=PA209 |
35 | + 8|"61 Cyg (Piazzi's Flying Star)". Science&Space News. Retrieved June 1, 2015.|http://news.sky-map.org/starview?object_type=1&object_id=2282&object_name=HD+201091&locale=EN |
36 | + 9|Kruger 60|https://en.wikipedia.org/wiki/Kruger_60 |
37 | + 10|List of Named Stars in Alphabetical Order|http://www.astro.wisc.edu/~dolan/constellations/starname_list.html |
38 | + 11|Jack W. Rhoads - Technical Memorandum 33-507-A Reduced Star Catalog Containing 537 Named Stars, Jet Propulsion Laboratory, California Institute of Technology; November 15, 1971|http://ntrs.nasa.gov/archive/nasa/casi.ntrs.nasa.gov/19720005197_1972005197.pdf |
39 | |
40 | === modified file 'skycultures/western/star_names.fab' |
41 | --- skycultures/western/star_names.fab 2016-02-27 05:39:35 +0000 |
42 | +++ skycultures/western/star_names.fab 2016-09-14 16:38:20 +0000 |
43 | @@ -1,339 +1,771 @@ |
44 | - 677|_("Alpheratz") |
45 | - 746|_("Caph") |
46 | - 1067|_("Algenib") |
47 | - 1562|_("Deneb Kaitos Shemali") |
48 | - 2081|_("Ankaa") |
49 | +# star names by constellation |
50 | +# Andromeda (And) |
51 | + 677|_("Alpheratz") 1,2,5,6,11 |
52 | + 677|_("Sirrah") |
53 | + 5447|_("Mirach") 1,2,5,6,11 |
54 | + 9640|_("Almach") 1,2,5,6,11 |
55 | + 9640|_("Almaak") |
56 | + 6411|_("Adhil") 1,2,6,11 |
57 | + 7607|_("Nembus") 2,11 |
58 | + 7513|_("Titawin") 4,6 |
59 | +116076|_("Veritate") 4,6 |
60 | + 6999|_("Thail") 11 |
61 | +# Aquarius (Aqr) |
62 | +109074|_("Sadalmelik") 1,2,6,11 |
63 | +106278|_("Sadalsuud") 1,2,6,11 |
64 | +110395|_("Sadachbia") 1,2,6,11 |
65 | +113136|_("Skat") 1,2,6,11 |
66 | +102618|_("Albali") 1,2,11 |
67 | +110003|_("Ancha") 1,2,11 |
68 | +111710|_("Situla") 1,2,11 |
69 | +110960|_("Sadaltager") 2,11 |
70 | +110960|_("Alsad") |
71 | +112961|_("Hydor") 5 |
72 | +104459|_("Albulan II") 2,11 |
73 | +104459|_("Albulaan") 2,11 |
74 | +103045|_("Albulan I") 2,11 |
75 | +103045|_("Albulaan") 2,11 |
76 | +106786|_("Bunda") 2 |
77 | +108874|_("Sadalmulk") 2,11 |
78 | +108874|_("Al Sa'd al Mulk") |
79 | +110672|_("Seat") 2,11 |
80 | +# Aquila (Aql) |
81 | + 97649|_("Altair") 1,2,6,11 |
82 | + 98036|_("Alshain") 1,2,6,11 |
83 | + 97278|_("Tarazed") 1,2,6,11 |
84 | + 97278|_("Reda") |
85 | + 97938|_("Libertas") 4,6 |
86 | + 93805|_("Al Thalimain Prior") 2,5,11 |
87 | + 93805|_("Al Thalimain I") |
88 | + 96468|_("Al Thalimain Posterior") 2,5,11 |
89 | + 96468|_("Al Thalimain II") |
90 | + 93747|_("Deneb al Okab Australis") 5,10 |
91 | + 93747|_("Deneb el Okab") |
92 | + 93244|_("Deneb al Okab Borealis") 5,10 |
93 | + 93244|_("Deneb el Okab") |
94 | + 95501|_("Almizan I") 11 |
95 | + 97804|_("Almizan II") 11 |
96 | + 99473|_("Almizan III") 11 |
97 | +# Ara (Ara) |
98 | + 86796|_("Cervantes") 4,6 |
99 | +# Aries (Ari) |
100 | + 9884|_("Hamal") 1,2,6,11 |
101 | + 8903|_("Sheratan") 1,2,6,11 |
102 | + 8832|_("Mesarthim") 1,2,6,11 |
103 | + 14838|_("Botein") 1,2,11 |
104 | + 12489|_("Barani I") 11 |
105 | + 12719|_("Barani II") 11 |
106 | + 13061|_("Barani III") 11 |
107 | + 13209|_("Nair al Butain") 11 |
108 | + 13914|_("Al Butain III") 11 |
109 | + 15110|_("Al Butain IV") 11 |
110 | + 12640|_("Koleon") 11 |
111 | + 13165|_("Al Butain I") 11 |
112 | + 13702|_("Al Butain II") 11 |
113 | +# Auriga (Aur) |
114 | + 24608|_("Capella") 1,2,6,11 |
115 | + 28360|_("Menkalinan") 1,2,6,11 |
116 | + 23015|_("Hassaleh") 1,11 |
117 | + 23015|_("Kabalinan") |
118 | + 23453|_("Haedus") 2,5,11 |
119 | + 23453|_("Haedus I") |
120 | + 23416|_("Almaaz") 2,3,5,11 |
121 | + 23416|_("Al Ma'az") |
122 | + 23416|_("Alanz") |
123 | + 23767|_("Haedus II") 5,11 |
124 | + 28380|_("Mahasim") 11 |
125 | + 24813|_("Alhiba II") 11 |
126 | + 24340|_("Alhiba I") 11 |
127 | + 25292|_("Alhiba III") 11 |
128 | + 30520|_("Dolones I") 11 |
129 | + 31832|_("Dolones III") 11 |
130 | + 31789|_("Dolones II") 11 |
131 | + 32173|_("Dolones IV") 11 |
132 | + 32480|_("Dolones V") 11 |
133 | + 32562|_("Dolones VI") 11 |
134 | + 32844|_("Dolones VII") 11 |
135 | + 33133|_("Dolones VIII") 11 |
136 | + 33377|_("Dolones IX") 11 |
137 | +# Bootes (Boo) |
138 | + 69673|_("Arcturus") 1,2,6,11 |
139 | + 73555|_("Nekkar") 1,2,6,11 |
140 | + 71075|_("Seginus") 1,2,5,6,10,11 |
141 | + 71075|_("Haris") |
142 | + 71075|_("Ceginus") |
143 | + 72105|_("Izar") 1,2,6,11 |
144 | + 72105|_("Pulcherrima") |
145 | + 67927|_("Muphrid") 1,2,11 |
146 | + 75411|_("Alkalurops") 1,2,6,11 |
147 | + 72487|_("Merga") 1,2,11 |
148 | + 70497|_("Asellus Primus") 2,5,11 |
149 | + 69713|_("Asellus Secundus") 2,5,11 |
150 | + 69483|_("Asellus Tertius") 2,5,11 |
151 | + 74666|_("Thiba") 11 |
152 | + 69732|_("Aulad Althiba") 11 |
153 | + 76534|_("Ceginus") 11 |
154 | + 73745|_("Aulad Alnathlat") 11 |
155 | +# Camelopardalis (Cam) |
156 | + 58952|_("Tonatiuh") 4,6 |
157 | +# Cancer (Cnc) |
158 | + 44066|_("Acubens") 1,2,6,11 |
159 | + 44066|_("Sertan") |
160 | + 42806|_("Asellus Borealis") 1,5,11 |
161 | + 42806|_("Ascellus Borealis") |
162 | + 42911|_("Asellus Australis") 1,5,11 |
163 | + 42911|_("Ascellus Australis") |
164 | + 40167|_("Tegmine") 1,2,11 |
165 | + 40526|_("Al Tarf") 2,3,5,10,11 |
166 | + 40526|_("Altarf") |
167 | + 43587|_("Copernicus") 4,6 |
168 | + 42556|_("Almalaf") 11 |
169 | + 43103|_("Zubanah") 11 |
170 | + 40881|_("Piautos") 11 |
171 | + 44946|_("Nahn") 11 |
172 | +# Canes Venatici (CVn) |
173 | + 63125|_("Cor Caroli") 1,2,6,11 |
174 | + 61317|_("Chara") 1,2,6,11 |
175 | + 62223|_("La Superba") 2,11 |
176 | +# Canis Major (CMa) |
177 | + 32349|_("Sirius") 1,2,6,11 |
178 | + 30324|_("Mirzam") 1,2,6,11 |
179 | + 34045|_("Muliphein") 1,2,5,6,11 |
180 | + 34045|_("Mirza") |
181 | + 34444|_("Wezen") 1,2,6,11 |
182 | + 33579|_("Adhara") 1,2,6,11 |
183 | + 30122|_("Furud") 1,2,6,11 |
184 | + 35904|_("Aludra") 1,2,6,11 |
185 | + 33345|_("Isis") 2,11 |
186 | + 33152|_("Udra") 11 |
187 | + 33977|_("Al Zara") 11 |
188 | +# Canis Minor (CMi) |
189 | + 37279|_("Procyon") 1,2,6,11 |
190 | + 36188|_("Gomeisa") 1,2,6,11 |
191 | + 36208|_("Luyten's Star") 3 |
192 | +# Capricornus (Cap) |
193 | +100027|_("Prima Giedi") 2,11 |
194 | +100064|_("Algedi") 1,2,6,10,11 |
195 | +100064|_("Secunda Giedi") |
196 | +100345|_("Dabih") 1,2,6,11 |
197 | +100345|_("Dabih Major") |
198 | +100325|_("Dabih Minor") 2,11 |
199 | +106985|_("Nashira") 1,2,6,11 |
200 | +107556|_("Deneb Algedi") 1,2,11 |
201 | +100310|_("Al Shat") 2,3,5,10,11 |
202 | +100310|_("Alshat") |
203 | +# Carina (Car) |
204 | + 30438|_("Canopus") 1,6,11 |
205 | + 30438|_("Suhel") |
206 | + 45238|_("Miaplacidus") 1,6,11 |
207 | + 41037|_("Avior") 1,6,11 |
208 | + 45556|_("Aspidiske") 1,6,11 |
209 | + 55042|_("Innes' Star") 3 |
210 | +# Cassiopeia (Cas) |
211 | + 3179|_("Shedar") 1,2,5,6,10,11 |
212 | 3179|_("Shedir") |
213 | - 3419|_("Diphda") |
214 | - 3821|_("Achird") |
215 | - 3829|_("van Maanen 2") |
216 | - 4427|_("Navi") |
217 | + 746|_("Caph") 1,2,6,11 |
218 | + 6686|_("Ruchbah") 1,2,6,11 |
219 | + 6686|_("Ksora") |
220 | + 3821|_("Achird") 1 |
221 | + 8886|_("Segin") 1,11 |
222 | + 5542|_("Marfak") 2,5,11 |
223 | + 5542|_("Marfak-East") |
224 | + 5336|_("Marfak") 2,5,11 |
225 | + 5336|_("Marfak-West") |
226 | + 5336|_("Al Marfak") |
227 | + 4427|_("Navi") 11 |
228 | +# Centaurus (Cen) |
229 | + 71683|_("Rigil Kentaurus") 1,2,11 |
230 | + 71683|_("Toliman") |
231 | + 71683|_("Bungula") |
232 | + 70890|_("Proxima") 1,6 |
233 | + 68702|_("Hadar") 1,2,6,11 |
234 | + 68702|_("Agena") |
235 | + 61932|_("Muhlifain") 1,11 |
236 | + 68002|_("Alnair") 1,11 |
237 | + 68002|_("Baten Kentaurus") |
238 | + 68933|_("Menkent") 1,6,11 |
239 | + 56709|_("Przybylski's Star") 3 |
240 | +# Cepheus (Cep) |
241 | +105199|_("Alderamin") 1,2,6,11 |
242 | +106032|_("Alfirk") 1,2,6,11 |
243 | +116727|_("Errai") 1,2,6,11 |
244 | +107259|_("The Garnet Star") 1,2,11 |
245 | +107259|_("Erakis") |
246 | +108917|_("Kurhah") 1,2,5,11 |
247 | +108917|_("Al Kurhah") |
248 | +111056|_("Al Kalb al Rai") 2,11 |
249 | +111056|_("Kalbalrai") |
250 | +107418|_("Castula") 2 |
251 | +110893|_("Kruger 60") 9 |
252 | +102422|_("Kabalfird") 11 |
253 | +101093|_("Al Kidr") 11 |
254 | + 99255|_("Al Aghnam I") 11 |
255 | +114222|_("Al Aghnam II") 11 |
256 | +# Cetus (Cet) |
257 | + 14135|_("Menkar") 1,2,6,11 |
258 | + 3419|_("Diphda") 1,2,5,6,11 |
259 | + 3419|_("Deneb Kaitos") |
260 | + 8645|_("Baten Kaitos") 1,2,11 |
261 | + 10826|_("Mira") 1,2,6,11 |
262 | + 12706|_("Al Kaff al Jidhmah") 2,5,11 |
263 | + 12706|_("Kaffaljidhma") |
264 | + 12706|_("Kafalgidma") |
265 | + 5364|_("Dheneb") 2,5,11 |
266 | 5364|_("Deneb Algenubi") |
267 | - 5447|_("Mirach") |
268 | - 5542|_("Marfark") |
269 | - 6411|_("Adhil") |
270 | - 6686|_("Ruchbah") |
271 | - 7097|_("Kullat Nunu") |
272 | - 7588|_("Achernar") |
273 | - 7607|_("Nembus") |
274 | - 8198|_("Torcularis Septentrionalis") |
275 | - 8645|_("Baten Kaitos") |
276 | - 8796|_("Mothallah") |
277 | - 8832|_("Mesarthim") |
278 | - 8903|_("Sheratan") |
279 | - 9487|_("Alrischa") |
280 | - 9640|_("Almaak") |
281 | - 9884|_("Hamal") |
282 | - 10826|_("Mira") |
283 | - 11767|_("Polaris") |
284 | - 12706|_("Kaffaljidhma") |
285 | - 13268|_("Miram") |
286 | - 13288|_("Angetenar") |
287 | - 13701|_("Azha") |
288 | - 13847|_("Acamar") |
289 | - 13879|_("Gorgonea Secunda") |
290 | - 14135|_("Menkar") |
291 | - 14354|_("Gorgonea Tertia") |
292 | - 14576|_("Algol") |
293 | - 14668|_("Misam") |
294 | - 14817|_("Gorgonea Quarta") |
295 | - 14838|_("Botein") |
296 | - 15197|_("Zibal") |
297 | - 15863|_("Mirphak") |
298 | - 17378|_("Rana") |
299 | - 17448|_("Atik") |
300 | - 17489|_("Celaeno") |
301 | - 17499|_("Electra") |
302 | - 17531|_("Taygeta") |
303 | - 17573|_("Maia") |
304 | - 17579|_("Asterope") |
305 | - 17608|_("Merope") |
306 | - 17702|_("Alcyone") |
307 | - 17847|_("Atlas") |
308 | - 17851|_("Pleione") |
309 | - 18543|_("Zaurak") |
310 | - 18614|_("Menkib") |
311 | - 19587|_("Beid") |
312 | - 19849|_("Keid") |
313 | - 20205|_("Hyadum I") |
314 | - 20455|_("Hyadum II") |
315 | - 20648|_("Cleeia") |
316 | - 20889|_("Ain") |
317 | - 21393|_("Theemim") |
318 | - 21421|_("Aldebaran") |
319 | - 21594|_("Sceptrum") |
320 | - 22449|_("Tabit") |
321 | - 23015|_("Hassaleh") |
322 | - 23203|_("Hind's Crimson Star") |
323 | - 23416|_("Almaaz") |
324 | - 23453|_("Haedus") |
325 | - 23767|_("Hoedus II") |
326 | - 23875|_("Cursa") |
327 | - 24186|_("Kapteyn's Star") |
328 | - 24436|_("Rigel") |
329 | - 24608|_("Capella") |
330 | - 25336|_("Bellatrix") |
331 | - 25428|_("Alnath") |
332 | - 25606|_("Nihal") |
333 | - 25923|_("Thabit") |
334 | - 25930|_("Mintaka") |
335 | - 25945|_("Ruby Star") |
336 | - 25985|_("Arneb") |
337 | - 26207|_("Meissa") |
338 | - 26241|_("Hatsya") |
339 | - 26311|_("Alnilam") |
340 | - 26634|_("Phact") |
341 | - 26727|_("Alnitak") |
342 | - 27366|_("Saiph") |
343 | - 27628|_("Wazn") |
344 | - 27989|_("Betelgeuse") |
345 | - 28360|_("Menkalinan") |
346 | - 29034|_("Al Kurud") |
347 | - 29655|_("Propus") |
348 | - 30089|_("Red Rectangle") |
349 | - 30122|_("Furud") |
350 | - 30324|_("Mirzam") |
351 | - 30343|_("Tejat") |
352 | - 30438|_("Canopus") |
353 | - 31646|_("Plaskett's star") |
354 | - 31681|_("Alhena") |
355 | - 32246|_("Mebsuta") |
356 | - 32349|_("Sirius") |
357 | + 1562|_("Deneb Kaitos Shemali") 2,10,11 |
358 | + 1562|_("Schemali") |
359 | + 1562|_("Deneb Kaitos") |
360 | + 13954|_("Menkar") 2,10,11 |
361 | + 13954|_("Menkab") |
362 | + 12387|_("Al Kaff al Jidhmah III") 11 |
363 | + 12390|_("Sadr al Kaitos III") 11 |
364 | + 6537|_("Al Naymat I") 11 |
365 | + 12828|_("Al Kaff al Jidhmah IV") 11 |
366 | + 10324|_("Al Kaff al Jidhmah I") 11 |
367 | + 11484|_("Al Kaff al Jidhmah II") 11 |
368 | + 12770|_("Sadr al Kaitos IV") 11 |
369 | + 11345|_("Sadr al Kaitos I") 11 |
370 | + 11783|_("Sadr al Kaitos II") 11 |
371 | + 8102|_("Al Naymat II") 11 |
372 | + 9347|_("Al Naymat III") 11 |
373 | + 3455|_("Alnitham I") 11 |
374 | + 3909|_("Alnitham II") 11 |
375 | + 4371|_("Alnitham III") 11 |
376 | + 4587|_("Alnitham IV") 11 |
377 | +# Columba (Col) |
378 | + 26634|_("Phact") 1,2,6,11 |
379 | + 27628|_("Wazn") 1,2,6,11 |
380 | + 29034|_("Kurud I") 11 |
381 | + 29807|_("Kurud II") 11 |
382 | +# Coma Berenices (Com) |
383 | + 62763|_("Polaris Galacticum Borealis") 5 |
384 | + 64241|_("Diadem") 3,5,10,11 |
385 | + 61071|_("Kissin") 11 |
386 | + 60742|_("Al Dafirah") 11 |
387 | +# Corona Australis (CrA) |
388 | + 94114|_("Alfecca Meridiana") 2,5,10,11 |
389 | +# Corona Borealis (CrB) |
390 | + 76267|_("Alphecca") 1,2,5,6,10,11 |
391 | + 76267|_("Gemma") |
392 | + 76267|_("Alphekka") |
393 | + 76267|_("Gnosia") |
394 | + 75695|_("Nusakan") 1,2,11 |
395 | + 77442|_("Variablis Coronae") 11 |
396 | + 78322|_("Blaze Star") 11 |
397 | +# Corvus (Crv) |
398 | + 59199|_("Alchiba") 1,2,11 |
399 | + 59199|_("Al Chiba") 1,2 |
400 | + 59803|_("Gienah Corvi") 1,2,5,10,11 |
401 | + 59803|_("Gienah") |
402 | + 59803|_("Gienah Ghurab") |
403 | + 60965|_("Algorab") 1,2,6,11 |
404 | + 61359|_("Kraz") 1,11 |
405 | + 59316|_("Minkar") 3,5,10,11 |
406 | +# Crater (Crt) |
407 | + 53740|_("Alkes") 1,2,11 |
408 | + 54682|_("Al Sharasif") 2,11 |
409 | + 54682|_("Al Sharasif II") |
410 | +# Crux (Cru) |
411 | + 60718|_("Acrux") 1,2,6,11 |
412 | + 62434|_("Mimosa") 1,6,11 |
413 | + 61084|_("Gacrux") 1,6,11 |
414 | +# Cygnus (Cyg) |
415 | +102098|_("Deneb") 1,2,6,11 |
416 | +102098|_("Arided") |
417 | +102098|_("Aridif") |
418 | + 95947|_("Albireo") 1,2,6,11 |
419 | +100453|_("Sadr") 1,2,6,11 |
420 | +102488|_("Gienah Cygni") 1,2,5,11 |
421 | +102488|_("Gienah") |
422 | +102488|_("Al Janah") |
423 | +107136|_("Azelfafage") 1,2,11 |
424 | +107136|_("Azelfage") |
425 | +101138|_("Ruchba") 2,11 |
426 | +101138|_("Rucba") |
427 | +104217|_("Bessel's Star") 7,8 |
428 | +104217|_("Piazzi's Flying Star") |
429 | + 96295|_("Campbell's Star") 3 |
430 | + 96295|_("Campbell’s Hydrogen Star") |
431 | +100044|_("Revenate of the Swan") 11 |
432 | + 97165|_("Fawaris II") 11 |
433 | +104732|_("Fawaris III") 11 |
434 | + 94779|_("Fawaris I") 11 |
435 | +# Delphinus (Del) |
436 | +101958|_("Sualocin") 1,2,11 |
437 | +101958|_("Svalocin") |
438 | +101769|_("Rotanev") 1,2,11 |
439 | +103527|_("Musica") 4,6 |
440 | +101421|_("Deneb Dulfim") 5,10,11 |
441 | +102532|_("Al Salib") 11 |
442 | +102281|_("Al Ukud") 11 |
443 | +# Draco (Dra) |
444 | + 68756|_("Thuban") 1,2,5,6,11 |
445 | + 68756|_("Adib") |
446 | + 68756|_("Al Tinnin") |
447 | + 85670|_("Rastaban") 1,2,6,11 |
448 | + 85670|_("Alwaid") |
449 | + 87833|_("Eltanin") 1,2,3,5,6,11 |
450 | + 87833|_("Etamin") |
451 | + 87833|_("Taurt") |
452 | + 94376|_("Altais") 1,2,6,11 |
453 | + 94376|_("Al Tais") |
454 | + 75458|_("Edasich") 1,2,6,11 |
455 | + 56211|_("Giausar") 1,2,11 |
456 | + 56211|_("Giansar") |
457 | + 56211|_("Nodus Secundus") |
458 | + 83608|_("Alrakis") 1,2,11 |
459 | + 83608|_("Arrakis") |
460 | + 83608|_("Errakis") |
461 | + 87585|_("Grumium") 1,2,11 |
462 | + 85819|_("Kuma") 1 |
463 | + 97433|_("Tyl") 1,11 |
464 | + 96100|_("Alsafi") 2,11 |
465 | + 86614|_("Dziban I") 2,10,11 |
466 | + 86614|_("Dsiban") |
467 | + 86614|_("Dziban") |
468 | + 86620|_("Dziban II") 2,11 |
469 | + 86620|_("Dsiban") |
470 | + 86201|_("Al Dhih") 2,11 |
471 | + 86201|_("Adfar Aldib II") |
472 | + 90344|_("Fafnir") 4,6 |
473 | + 83895|_("Al Dhibain Posterior") 3,5,10,11 |
474 | + 83895|_("Aldhibah") |
475 | + 83895|_("Dhibah") |
476 | + 80331|_("Al Dhibain Prior") 5,11 |
477 | + 80331|_("Dhibain") |
478 | + 85805|_("Adfar Aldib I") 11 |
479 | + 95081|_("Tais I") 11 |
480 | + 98702|_("Tais II") 11 |
481 | + 94648|_("Athafi II") 11 |
482 | + 92782|_("Athafi I") 11 |
483 | + 89908|_("Aldhiba") 11 |
484 | + 89937|_("Alahakan") 11 |
485 | +# Equuleus (Equ) |
486 | +104987|_("Kitalpha") 1,2,6,11 |
487 | +# Eridanus (Eri) |
488 | + 7588|_("Achernar") 1,2,6,11 |
489 | + 23875|_("Cursa") 1,2,6,11 |
490 | + 18543|_("Zaurak") 1,2,6,11 |
491 | + 15197|_("Zibal") 1,11 |
492 | + 13701|_("Azha") 1,2,11 |
493 | + 13847|_("Acamar") 1,2,6,11 |
494 | + 13847|_("Dalim") |
495 | + 19587|_("Beid") 1,2,11 |
496 | + 19849|_("Keid") 1,2,11 |
497 | + 20535|_("Theemin") 1,2,11 |
498 | + 20535|_("Theemim") |
499 | + 20535|_("Beemim II") |
500 | + 13288|_("Angetenar") 2,11 |
501 | + 21248|_("Beemim") 2,11 |
502 | + 21248|_("Beemim III") |
503 | + 16537|_("Ran") 4,6 |
504 | + 17378|_("Rana") 3,10,11 |
505 | + 21594|_("Sceptrum") 3,10,11 |
506 | + 23972|_("Kursi al Jauzah II") 11 |
507 | + 14060|_("Aludhi I") 11 |
508 | + 14168|_("Aludhi II") 11 |
509 | + 14293|_("Aludhi III") 11 |
510 | + 20042|_("Beemim I") 11 |
511 | + 23364|_("Kursi al Jauzah I") 11 |
512 | +# Gemini (Gem) |
513 | + 36850|_("Castor") 1,2,6,11 |
514 | + 37826|_("Pollux") 1,2,6,11 |
515 | + 31681|_("Alhena") 1,2,6,11 |
516 | + 31681|_("Almeisan") |
517 | + 35550|_("Wasat") 1,2,6,11 |
518 | + 32246|_("Mebsuta") 1,2,6,11 |
519 | + 34088|_("Mekbuda") 1,2,11 |
520 | + 29655|_("Propus") 1,2,6,10,11 |
521 | + 29655|_("Tejat Prior") |
522 | + 29655|_("Praepes") |
523 | + 30343|_("Tejat") 1,2,11 |
524 | + 30343|_("Tejat Posterior") |
525 | + 30343|_("Calx") |
526 | + 32362|_("Al Zirr") 2,5,10,11 |
527 | 32362|_("Alzirr") |
528 | - 33579|_("Adhara") |
529 | - 34045|_("Muliphein") |
530 | - 34088|_("Mekbuda") |
531 | - 34444|_("Wezen") |
532 | - 35264|_("Tureis") |
533 | - 35488|_("Bernes 135") |
534 | - 35550|_("Wasat") |
535 | - 35904|_("Aludra") |
536 | - 36188|_("Gomeisa") |
537 | - 36208|_("Luyten's Star") |
538 | - 36850|_("Castor") |
539 | - 37229|_("Markeb") |
540 | - 37279|_("Procyon") |
541 | - 37826|_("Pollux") |
542 | - 38170|_("Asmidiske") |
543 | - 39429|_("Naos") |
544 | - 39953|_("Regor") |
545 | - 40167|_("Tegmine") |
546 | - 40526|_("Tarf") |
547 | - 41037|_("Avior") |
548 | - 41075|_("Alsciaukat") |
549 | - 41704|_("Muscida") |
550 | - 42402|_("Minchir") |
551 | - 42806|_("Asellus Borealis") |
552 | - 42911|_("Asellus Australis") |
553 | - 43813|_("Hydrobius") |
554 | - 44066|_("Acubens") |
555 | - 44127|_("Talitha") |
556 | - 44816|_("Suhail") |
557 | - 45238|_("Miaplacidus") |
558 | - 45556|_("Aspidiske") |
559 | - 46390|_("Alphard") |
560 | - 46750|_("Alterf") |
561 | - 47508|_("Subra") |
562 | - 47908|_("Algenubi") |
563 | - 48455|_("Rasalas") |
564 | - 48774|_("Tseen Ke") |
565 | - 49669|_("Regulus") |
566 | - 49583|_("Al'dzhabkhakh") |
567 | - 50335|_("Adhafera") |
568 | - 50372|_("Tania Borealis") |
569 | - 50583|_("Algieba") |
570 | - 50801|_("Tania Australis") |
571 | - 53229|_("Praecipua") |
572 | - 53740|_("Alkes") |
573 | - 53910|_("Merak") |
574 | - 54061|_("Dubhe") |
575 | - 54872|_("Zosma") |
576 | - 54879|_("Chertan") |
577 | - 55042|_("Innes' Star") |
578 | - 55203|_("Alula Australis") |
579 | - 55219|_("Alula Borealis") |
580 | - 55282|_("Labr") |
581 | - 56211|_("Giausar") |
582 | - 56709|_("Przybylski's Star") |
583 | - 57399|_("Alkaphrah") |
584 | - 57632|_("Denebola") |
585 | - 57757|_("Zavijava") |
586 | - 58001|_("Phad") |
587 | - 59199|_("Alchiba") |
588 | - 59316|_("Minkar") |
589 | - 59774|_("Megrez") |
590 | - 59803|_("Gienah") |
591 | - 60129|_("Zaniah") |
592 | - 60718|_("Acrux") |
593 | - 60965|_("Algorab") |
594 | - 61084|_("Gacrux") |
595 | - 61317|_("Chara") |
596 | - 61359|_("Kraz") |
597 | - 61941|_("Porrima") |
598 | - 62223|_("La Superba") |
599 | - 62434|_("Mimosa") |
600 | - 62956|_("Alioth") |
601 | - 63090|_("Auva") |
602 | - 63125|_("Cor Caroli") |
603 | - 63608|_("Vindemiatrix") |
604 | - 64241|_("Diadem") |
605 | - 65378|_("Mizar") |
606 | - 65474|_("Spica") |
607 | - 65477|_("Alcor") |
608 | - 66249|_("Heze") |
609 | - 67301|_("Alkaid") |
610 | - 67927|_("Muphrid") |
611 | - 68702|_("Hadar") |
612 | - 68756|_("Thuban") |
613 | - 68933|_("Menkent") |
614 | - 69673|_("Arcturus") |
615 | - 69483|_("Asellus Tertius") |
616 | - 69701|_("Syrma") |
617 | - 69713|_("Asellus Secundus") |
618 | - 69974|_("Khambaliya") |
619 | - 70497|_("Asellus Primus") |
620 | - 70890|_("Proxima") |
621 | - 71075|_("Seginus") |
622 | - 71683|_("Rigil Kent") |
623 | - 71957|_("Rijl al Awwa") |
624 | - 72105|_("Izar") |
625 | - 72487|_("Merga") |
626 | + 30883|_("Nucatai") 11 |
627 | +# Grus (Gru) |
628 | +109268|_("Alnair") 1,2,6,11 |
629 | +109268|_("Al Na'ir") |
630 | +108085|_("Al Dhanab") 2,11 |
631 | +108085|_("Deneb Hut") |
632 | +112122|_("Deneb Alnahr") 11 |
633 | +# Hercules (Her) |
634 | + 84345|_("Rasalgethi") 1,2,6,11 |
635 | + 84345|_("Ras Algethi") |
636 | + 80816|_("Kornephoros") 1,2,6,11 |
637 | + 80816|_("Rutilicus") |
638 | + 79043|_("Marsic") 1,2,5,11 |
639 | + 79043|_("Marfik") |
640 | + 85693|_("Maasym") 1,2,11 |
641 | + 85693|_("Masym") |
642 | + 80463|_("Cujam") 1,2,11 |
643 | + 84379|_("Sarin") 1,11 |
644 | + 80838|_("Ogma") 4,6 |
645 | + 80170|_("Nasak Shamiya III") 11 |
646 | +# Hydra (Hya) |
647 | + 46390|_("Alphard") 1,2,6,11 |
648 | + 46982|_("Ukdah III") 11 |
649 | + 42313|_("Minazal I") 11 |
650 | + 43109|_("Minazal III") 11 |
651 | + 43813|_("Minazal V") 11 |
652 | + 42799|_("Minazal II") 11 |
653 | + 47431|_("Ukdah IV") 11 |
654 | + 47452|_("Al Sharasif I") 11 |
655 | + 43234|_("Minazal IV") 11 |
656 | + 42402|_("Minkalshuja") 11 |
657 | + 46509|_("Ukdah I") 11 |
658 | + 46776|_("Ukdah II") 11 |
659 | +# Indus (Ind) |
660 | +101772|_("Persian") 2,5 |
661 | +# Lacerta (Lac) |
662 | +112247|_("Babcock's Star") 3 |
663 | +# Leo (Leo) |
664 | + 49669|_("Regulus") 1,2,6,11 |
665 | + 57632|_("Denebola") 1,2,6,11 |
666 | + 50583|_("Algieba") 1,2,6,11 |
667 | + 54872|_("Zosma") 1,2,6,11 |
668 | + 54872|_("Duhr") |
669 | + 50335|_("Adhafera") 1,2,6,11 |
670 | + 54879|_("Chertan") 1,2,6,11 |
671 | + 54879|_("Al Haratan") |
672 | + 54879|_("Coxa") |
673 | + 46750|_("Alterf") 1,2,11 |
674 | + 48455|_("Rasalas") 1,2,11 |
675 | + 48455|_("Alshemali") |
676 | + 47508|_("Subra") 1,11 |
677 | + 47908|_("Algenubi") 2,11 |
678 | + 46146|_("Al Minlear al Asad") 5,11 |
679 | + 46146|_("Minkarasad") |
680 | + 54951|_("Zubrah") 11 |
681 | + 49583|_("Al Jabhah") 11 |
682 | +# Leo Minor (LMi) |
683 | + 53229|_("Praecipua") 5,10 |
684 | +# Lepus (Lep) |
685 | + 25985|_("Arneb") 1,2,6,11 |
686 | + 25606|_("Nihal") 1,2,6,11 |
687 | + 23203|_("Hind's Crimson Star") 2,5,11 |
688 | + 27072|_("Kursi al Jabbar") 11 |
689 | + 27654|_("Arsh al Jauzah") 11 |
690 | +# Libra (Lib) |
691 | + 72603|_("Zubenelgenubi I") 1,2,6,11 |
692 | 72603|_("Zubenelgenubi") |
693 | - 72607|_("Kochab") |
694 | + 72622|_("Zubenelgenubi II") 1,2,6,11 |
695 | 72622|_("Zubenelgenubi") |
696 | - 73473|_("Zuben Elakribi") |
697 | - 73555|_("Nekkar") |
698 | - 73714|_("Brachium") |
699 | - 73945|_("Zuben Hakrabi") |
700 | - 74666|_("Printseps") |
701 | - 74785|_("Zubeneschamali") |
702 | - 74793|_("Pherkad Minor") |
703 | - 75097|_("Pherkad") |
704 | - 75411|_("Alkalurops") |
705 | - 75415|_("Inkalunis") |
706 | - 75458|_("Edasich") |
707 | - 75695|_("Nusakan") |
708 | - 76267|_("Alphekka") |
709 | - 76333|_("Zuben Elakrab") |
710 | - 76534|_("Ceginus") |
711 | - 77070|_("Unukalhai") |
712 | - 78401|_("Dschubba") |
713 | - 78727|_("Graffias") |
714 | - 78820|_("Acrab") |
715 | - 79043|_("Marsik") |
716 | - 79374|_("Jabbah") |
717 | - 79593|_("Yed Prior") |
718 | - 79882|_("Yed Posterior") |
719 | + 74785|_("Zubeneschamali") 1,2,6,11 |
720 | + 73714|_("Brachium") 3,11 |
721 | + 73714|_("Zuben Acrabi") |
722 | + 73473|_("Zuben Elakribi") 10 |
723 | + 76333|_("Zuben Elakrab") 10 |
724 | + 76333|_("Zuben Hakraki") |
725 | + 73945|_("Zuben Hakrabi") 11 |
726 | +# Lynx (Lyn) |
727 | + 41075|_("Alsciaukat") 3,5,10,11 |
728 | + 41075|_("Mabsuthat") |
729 | + 41075|_("Shaukah") |
730 | + 33485|_("Dolones X") 11 |
731 | +# Lyra (Lyr) |
732 | + 91262|_("Vega") 1,2,6,11 |
733 | + 92420|_("Sheliak") 1,2,6,11 |
734 | + 93194|_("Sulafat") 1,2,6,11 |
735 | + 93194|_("Jugum") |
736 | + 94481|_("Aladfar") 2,5,11 |
737 | + 90191|_("Al Athfar") 2,3,5,10,11 |
738 | + 90191|_("Alathfar") |
739 | + 90191|_("Athfar") |
740 | + 91919|_("Double Double I") 10,11 |
741 | + 91926|_("Double Double II") 10,11 |
742 | + 91971|_("Nasr Alwaki I") 11 |
743 | + 91973|_("Nasr Alwaki II") 11 |
744 | +# Monoceros (Mon) |
745 | + 31646|_("Plaskett's Star") 3,5 |
746 | + 30089|_("Red Rectangle") 3 |
747 | +# Octanus (Oct) |
748 | +104382|_("Polaris Australis") 5 |
749 | +# Ophiuchus (Oph) |
750 | + 86032|_("Rasalhague") 1,2,6,11 |
751 | + 86742|_("Cebalrai") 1,2,6,11 |
752 | + 79593|_("Yed Prior") 1,2,11 |
753 | + 79882|_("Yed Posterior") 1,2,11 |
754 | + 84012|_("Sabik") 1,2,6,11 |
755 | + 80883|_("Marfik") 1,2,5,11 |
756 | + 87108|_("Muliphen") 2,5,11 |
757 | + 87937|_("Barnard's Star") 3 |
758 | + 81377|_("Saik") 11 |
759 | + 84970|_("Garafsa") 11 |
760 | + 84893|_("Aggia") 11 |
761 | +# Orion (Ori) |
762 | + 27989|_("Betelgeuse") 1,2,6,11 |
763 | + 24436|_("Rigel") 1,2,6,11 |
764 | + 25336|_("Bellatrix") 1,2,6,11 |
765 | + 25930|_("Mintaka") 1,2,6,11 |
766 | + 26311|_("Alnilam") 1,2,6,11 |
767 | + 26727|_("Alnitak") 1,2,6,11 |
768 | + 27366|_("Saiph") 1,2,6,11 |
769 | + 26207|_("Meissa") 1,2,6,11 |
770 | + 26207|_("Heka") |
771 | + 26241|_("Hatysa") 1,3,11 |
772 | + 25923|_("Thabit") 2,10,11 |
773 | + 22449|_("Tabit") 3,10,11 |
774 | + 26237|_("Mizan Batil I") 11 |
775 | + 26563|_("Mizan Batil III") 11 |
776 | + 22833|_("Manica") 11 |
777 | + 25281|_("Saif al Jabbar") 11 |
778 | + 26220|_("Trapezium") 11 |
779 | + 26235|_("Mizan Batil II") 11 |
780 | + 22667|_("Al Kumm I") 11 |
781 | + 22957|_("Al Kumm II") 11 |
782 | + 22845|_("Al Taj IV") 11 |
783 | + 22509|_("Al Taj I") 11 |
784 | + 22549|_("Al Taj II") 11 |
785 | + 22797|_("Al Taj III") 11 |
786 | + 23123|_("Al Taj V") 11 |
787 | + 26176|_("Heka") 11 |
788 | +# Pavo (Pav) |
789 | +100751|_("Peacock") 1,6,11 |
790 | +# Pegasus (Peg) |
791 | +113963|_("Markab") 1,2,6,11 |
792 | +113963|_("Yed Alpheras") |
793 | +113881|_("Scheat") 1,2,6,11 |
794 | + 1067|_("Algenib") 1,2,6,11 |
795 | +107315|_("Enif") 1,2,6,11 |
796 | +112029|_("Homam") 1,2,3,5,6,10,11 |
797 | +112158|_("Matar") 1,2,6,11 |
798 | +109427|_("Biham") 1,2,6,11 |
799 | +112748|_("Sadalbari") 1,2,6,11 |
800 | +112748|_("Sa'd al Bari'") |
801 | +115250|_("Al Karab") 2 |
802 | +115250|_("Salma") |
803 | +113357|_("Helvetios") 4,6 |
804 | +112440|_("Sadalnazi") 11 |
805 | +109068|_("Fum al Faras") 11 |
806 | +112447|_("Suudalnujum") 11 |
807 | +112051|_("Sadalmatar") 11 |
808 | +# Perseus (Per) |
809 | + 15863|_("Mirfak") 1,2,6,11 |
810 | + 15863|_("Algenib") |
811 | + 14576|_("Algol") 1,2,6,11 |
812 | + 14576|_("Gorgonea Prima") |
813 | + 18614|_("Menkib") 1,2,11 |
814 | + 17448|_("Ati") 1,2,11 |
815 | + 17448|_("Atik") |
816 | + 17448|_("Alatik") |
817 | + 18246|_("Atik") 1,2,11 |
818 | + 13879|_("Gorgonea Secunda") 2,5,11 |
819 | + 14354|_("Gorgonea Tertia") 2,5,11 |
820 | + 14817|_("Gorgonea Quarta") 2,11 |
821 | + 13268|_("Miram") 10,11 |
822 | + 14668|_("Misam") 3,11 |
823 | + 10729|_("Misam al Thurayya I") 11 |
824 | +# Phoenix (Phe) |
825 | + 2081|_("Ankaa") 1,6,11 |
826 | + 2081|_("Nair al Zaurak") |
827 | + 5165|_("Alrial III") 11 |
828 | + 6867|_("Alrial V") 11 |
829 | + 2071|_("Alrial I") 11 |
830 | + 3245|_("Alrial II") 11 |
831 | + 5862|_("Alrial IV") 11 |
832 | +# Pictor (Pic) |
833 | + 24186|_("Kapteyn's Star") 3,11 |
834 | +# Pisces (Psc) |
835 | + 9487|_("Alrescha") 1,2,5,6,10,11 |
836 | + 9487|_("Al Rescha") |
837 | + 9487|_("Alrischa") |
838 | + 3829|_("van Maanen's Star") 3 |
839 | + 3829|_("van Maanen 2") |
840 | + 8198|_("Torcularis Septentrionalis") 2,10,11 |
841 | + 8198|_("Torcular") |
842 | + 7097|_("Kullat Nunu") 2 |
843 | +113889|_("Fum al Samakah") 5,10,11 |
844 | + 3786|_("Kuton I") 11 |
845 | + 5737|_("Kuton II") 11 |
846 | + 5743|_("Kuton III") 11 |
847 | +# Piscis Austrinus (PsA) |
848 | +113368|_("Fomalhaut") 1,2,6,11 |
849 | +113368|_("Thalim") |
850 | +111188|_("Fum al Hui") 11 |
851 | +# Puppis (Pup) |
852 | + 39429|_("Naos") 1,6,11 |
853 | + 39757|_("Tureis") 1,5 |
854 | + 35488|_("Bernes 135") 3 |
855 | + 38170|_("Asmidiske") 3,5,11 |
856 | +# Sagitta (Sge) |
857 | + 96757|_("Sham") 1,5,11 |
858 | +# Sagittarius (Sgr) |
859 | + 95347|_("Rukbat") 1,2,6,11 |
860 | + 95347|_("Alrami") |
861 | + 95241|_("Arkab") 1,2,5,11 |
862 | + 95241|_("Arkab Prior") |
863 | + 95294|_("Arkab Posterior") 2,5,11 |
864 | + 88635|_("Alnasl") 1,2,5,6,10,11 |
865 | + 88635|_("Nushaba") |
866 | + 88635|_("Al Nasl") |
867 | + 88635|_("Nash") |
868 | + 89931|_("Kaus Media") 1,2,5,6,11 |
869 | + 89931|_("Kaus Meridionalis") |
870 | + 90185|_("Kaus Australis") 1,2,5,6,11 |
871 | + 93506|_("Ascella") 1,2,11 |
872 | + 90496|_("Kaus Borealis") 1,2,5,6,11 |
873 | + 90496|_("Al Thalimain") 2 |
874 | + 92855|_("Nunki") 1,2,6,11 |
875 | + 89341|_("Polis") 2,5,11 |
876 | + 89341|_("Al Thalimain") |
877 | + 89341|_("Alnam") |
878 | + 94141|_("Albaldah") 3,10,11 |
879 | + 94141|_("Al Baldah") |
880 | + 98066|_("Terebellum I") 10,11 |
881 | + 98162|_("Terebellum II") 10,11 |
882 | + 98353|_("Terebellum III") 10,11 |
883 | + 98688|_("Terebellum IV") 10,11 |
884 | + 89642|_("Hamalwarid") 11 |
885 | + 92761|_("Ain al Rami I") 11 |
886 | + 92845|_("Ain al Rami II") 11 |
887 | + 93864|_("Namalsadirah II") 11 |
888 | + 92041|_("Namalsadirah I") 11 |
889 | + 95477|_("Namalsadirah III") 11 |
890 | + 95503|_("Namalsadirah IV") 11 |
891 | + 94643|_("Al Kiladah") 11 |
892 | +# Scorpius (Sco) |
893 | + 80763|_("Antares") 1,2,6,11 |
894 | + 78820|_("Acrab") 1,2,5,6,10,11 |
895 | + 78820|_("Graffias") |
896 | + 78401|_("Dschubba") 1,2,6,11 |
897 | + 86228|_("Sargas") 1,6,11 |
898 | + 86228|_("Girtab") |
899 | + 85927|_("Shaula") 1,2,6,11 |
900 | + 80112|_("Alniyat I") 1,2,5,10,11 |
901 | 80112|_("Al Niyat") |
902 | - 80463|_("Cujam") |
903 | - 80763|_("Antares") |
904 | - 80816|_("Kornephoros") |
905 | - 80883|_("Marfik") |
906 | - 81266|_("Alniyat") |
907 | - 81377|_("Han") |
908 | - 82273|_("Atria") |
909 | - 82729|_("Grafias") |
910 | - 83608|_("Arrakis") |
911 | - 83895|_("Aldhibah") |
912 | - 84012|_("Sabik") |
913 | - 84345|_("Rasalgethi") |
914 | - 84379|_("Sarin") |
915 | - 85670|_("Rastaban") |
916 | - 85693|_("Maasym") |
917 | - 85696|_("Lesath") |
918 | - 85819|_("Kuma") |
919 | - 85822|_("Yildun") |
920 | - 85927|_("Shaula") |
921 | - 86032|_("Rasalhague") |
922 | - 86228|_("Sargas") |
923 | - 86614|_("Dziban") |
924 | - 86742|_("Cebalrai") |
925 | - 87585|_("Grumium") |
926 | - 87833|_("Etamin") |
927 | - 87937|_("Barnard's Star") |
928 | - 88048|_("Sinistra") |
929 | - 88567|_("Nash") |
930 | - 88635|_("Alnasl") |
931 | - 89341|_("Polis") |
932 | - 89931|_("Kaus Media") |
933 | - 90185|_("Kaus Australis") |
934 | - 90191|_("Alathfar") |
935 | - 90496|_("Kaus Borealis") |
936 | - 91262|_("Vega") |
937 | - 92420|_("Sheliak") |
938 | - 92855|_("Nunki") |
939 | - 92946|_("Alya") |
940 | - 93194|_("Sulafat") |
941 | - 93506|_("Ascella") |
942 | - 93683|_("Manubrij") |
943 | - 93747|_("Deneb el Okab") |
944 | - 93805|_("Al Thalimain Prior") |
945 | - 94114|_("Alphekka Meridiana") |
946 | - 94141|_("Albaldah") |
947 | - 94376|_("Altais") |
948 | - 95241|_("Arkab") |
949 | - 95347|_("Rukbat") |
950 | - 95501|_("Deneb Okab") |
951 | - 95771|_("Lukida") |
952 | - 95947|_("Albireo") |
953 | - 96100|_("Alsafi") |
954 | - 96295|_("Campbell's Star") |
955 | - 96468|_("Al Thalimain") |
956 | - 96757|_("Sham") |
957 | - 97165|_("Rukh") |
958 | - 97278|_("Tarazed") |
959 | - 97433|_("Tyl") |
960 | - 97649|_("Altair") |
961 | - 98036|_("Alshain") |
962 | - 98066|_("Terebellum I") |
963 | - 98162|_("Terebellum II") |
964 | - 98353|_("Terebellum III") |
965 | - 98688|_("Terebellum IV") |
966 | -100027|_("Algedi") |
967 | -100310|_("Alshat") |
968 | -100345|_("Dabih") |
969 | -100453|_("Sadr") |
970 | -100751|_("Peacock") |
971 | -100881|_("Okul") |
972 | -101421|_("Deneb Dulfim") |
973 | -101769|_("Rotanev") |
974 | -101958|_("Sualocin") |
975 | -102098|_("Deneb") |
976 | -102488|_("Gienah") |
977 | -102618|_("Albali") |
978 | -104019|_("Armus") |
979 | -104214|_("Bessel's Star") |
980 | -104382|_("Polaris Australis") |
981 | -104987|_("Kitalpha") |
982 | -105199|_("Alderamin") |
983 | -106032|_("Alfirk") |
984 | -106278|_("Sadalsuud") |
985 | -106723|_("Castra") |
986 | -106985|_("Nashira") |
987 | -107136|_("Azelfafage") |
988 | -107259|_("The Garnet Star") |
989 | -107315|_("Enif") |
990 | -107354|_("Jih") |
991 | -107533|_("Pennae Caudalis") |
992 | -107556|_("Deneb Algedi") |
993 | -108085|_("Al Dhanab") |
994 | -108917|_("Kurhah") |
995 | -109074|_("Sadalmelik") |
996 | -109268|_("Alnair") |
997 | -109427|_("Biham") |
998 | -110003|_("Ancha") |
999 | -110395|_("Sadachbia") |
1000 | -110893|_("Kruger 60") |
1001 | -110960|_("Sadaltager") |
1002 | -111056|_("Al Kalb al Rai") |
1003 | -111710|_("Situla") |
1004 | -112029|_("Homan") |
1005 | -112158|_("Matar") |
1006 | -112247|_("Babcock's Star") |
1007 | -112748|_("Sadalbari") |
1008 | -113136|_("Skat") |
1009 | -113368|_("Fomalhaut") |
1010 | -113881|_("Scheat") |
1011 | -113889|_("Fum al Samakah") |
1012 | -113963|_("Markab") |
1013 | -116727|_("Errai") |
1014 | + 81266|_("Alniyat II") 2,5,10,11 |
1015 | + 81266|_("Al Niyat") |
1016 | + 85696|_("Lesath") 1,2,6,11 |
1017 | + 79374|_("Jabbah") 2,11 |
1018 | + 78727|_("Grafias") 10,11 |
1019 | + 78727|_("Grassias") |
1020 | + 87073|_("Girtab") 11 |
1021 | + 87294|_("Vanant") 11 |
1022 | + 86670|_("Mula") 11 |
1023 | + 82514|_("Tali al Shaulah I") 11 |
1024 | + 82545|_("Tali al Shaulah II") 11 |
1025 | + 78265|_("Nur") 11 |
1026 | + 78104|_("Iolil") 11 |
1027 | + 78933|_("Jabhat Acrabi I") 11 |
1028 | + 78990|_("Jabhat Acrabi II") 11 |
1029 | +# Serpens (Ser) |
1030 | + 77070|_("Unukalhai") 1,2,6,11 |
1031 | + 92946|_("Alya") 1,2,6,11 |
1032 | + 77233|_("Nasak Shamiya I") 11 |
1033 | + 78072|_("Nasak Shamiya II") 11 |
1034 | + 76276|_("Nasak Yamani I") 11 |
1035 | + 77622|_("Nasak Yamani II") 11 |
1036 | +# Taurus (Tau) |
1037 | + 21421|_("Aldebaran") 1,2,6,11 |
1038 | + 25428|_("Elnath") 1,2,3,6,11 |
1039 | + 25428|_("El Nath") |
1040 | + 20889|_("Ain") 1,2,6,11 |
1041 | + 20889|_("Oculus Boreus") |
1042 | + 17702|_("Alcyone") 1,2,6,11 |
1043 | + 17489|_("Celaeno") 1,2,6,11 |
1044 | + 17499|_("Electra") 1,2,6,11 |
1045 | + 17531|_("Taygeta") 1,2,6,11 |
1046 | + 17573|_("Maia") 1,2,6,11 |
1047 | + 17579|_("Asterope") 1,2,6,11 |
1048 | + 17579|_("Sterope I") |
1049 | + 17608|_("Merope") 1,2,6,11 |
1050 | + 17847|_("Atlas") 1,2,6,11 |
1051 | + 17851|_("Pleione") 1,2,6,11 |
1052 | + 20205|_("Hyadum I") 2,11 |
1053 | + 20205|_("Prima Hyadum") |
1054 | + 20455|_("Hyadum II") 2,11 |
1055 | + 25945|_("The Ruby Star") |
1056 | + 17588|_("Sterope II") 11 |
1057 | + 20885|_("Hyadum III") 11 |
1058 | + 20894|_("Hyadum IV") 11 |
1059 | + 20635|_("Alkalbain III") 11 |
1060 | + 20641|_("Alkalbain IV") 11 |
1061 | + 20711|_("Alkalbain V") 11 |
1062 | + 20250|_("Alkalbain I") 11 |
1063 | + 20430|_("Alkalbain II") 11 |
1064 | +# Triangulum (Tri) |
1065 | + 8796|_("Mothallah") 1,6,11 |
1066 | + 8796|_("Caput Trianguli") |
1067 | + 10064|_("Mizan") 11 |
1068 | +# Triangulum Australe (TrA) |
1069 | + 82273|_("Atria") 1,6,11 |
1070 | +# Ursa Major (UMa) |
1071 | + 54061|_("Dubhe") 1,2,6,11 |
1072 | + 53910|_("Merak") 1,2,6,11 |
1073 | + 58001|_("Phecda") 1,2,6,11 |
1074 | + 58001|_("Phad") |
1075 | + 59774|_("Megrez") 1,2,6,11 |
1076 | + 59774|_("Kaffa") |
1077 | + 62956|_("Alioth") 1,2,6,11 |
1078 | + 65378|_("Mizar") 1,2,6,11 |
1079 | + 67301|_("Alkaid") 1,2,6,11 |
1080 | + 67301|_("Benetnasch") |
1081 | + 44127|_("Talitha") 1,2,6,11 |
1082 | + 50372|_("Tania Borealis") 1,2,6,11 |
1083 | + 50801|_("Tania Australis") 1,2,6,11 |
1084 | + 55219|_("Alula Borealis") 1,2,6,11 |
1085 | + 55203|_("Alula Australis") 1,2,6,11 |
1086 | + 41704|_("Muscida") 1,2,6,11 |
1087 | + 65477|_("Alcor") 1,2,6,11 |
1088 | + 57939|_("Groombridge 1830") 2,11 |
1089 | + 57939|_("Flying Star") |
1090 | + 57939|_("Runaway Star") |
1091 | + 46471|_("Intercrus") 4,6 |
1092 | + 53721|_("Chalawan") 4,6 |
1093 | + 57399|_("Al Kaphrah") 3,5,11 |
1094 | + 57399|_("Alkafzah") |
1095 | + 14590|_("Althiba I") 11 |
1096 | + 46977|_("Althiba VII") 11 |
1097 | + 45493|_("Alhaud III") 11 |
1098 | + 44901|_("Alhaud I") 11 |
1099 | + 46733|_("Alhaud IV") 11 |
1100 | + 46853|_("Alhaud V") 11 |
1101 | + 44471|_("Kafzatania") 11 |
1102 | + 42438|_("Althiba II") 11 |
1103 | + 42527|_("Althiba III") 11 |
1104 | + 44390|_("Althiba IV") 11 |
1105 | + 44857|_("Althiba V") 11 |
1106 | + 45038|_("Althiba VI") 11 |
1107 | + 45075|_("Alhaud II") 11 |
1108 | + 48319|_("Alhaud VI") 11 |
1109 | + 48402|_("Alhaud VII") 11 |
1110 | +# Ursa Minor (UMi) |
1111 | + 11767|_("Polaris") 1,2,6,11 |
1112 | + 11767|_("Alrucaba") |
1113 | + 11767|_("Cinosura") |
1114 | + 72607|_("Kochab") 1,2,6,11 |
1115 | + 75097|_("Pherkad") 1,2,6,11 |
1116 | + 75097|_("Pherkad Major") |
1117 | + 74793|_("Pherkad Minor") 2,10,11 |
1118 | + 85822|_("Yildun") 1,2,6,11 |
1119 | + 82080|_("Circitores") 11 |
1120 | + 77055|_("Akfa Farkadain") 11 |
1121 | + 79822|_("Anwa Farkadain") 11 |
1122 | +# Vela (Vel) |
1123 | + 39953|_("Regor") 1,11 |
1124 | + 45941|_("Markeb") 1,11 |
1125 | + 44816|_("Suhail") 1,6,11 |
1126 | +# Virgo (Vir) |
1127 | + 65474|_("Spica") 1,2,6,11 |
1128 | + 65474|_("Azimech") |
1129 | + 57757|_("Zavijava") 1,2,6,11 |
1130 | + 61941|_("Porrima") 1,2,6,11 |
1131 | + 61941|_("Antevorta") |
1132 | + 63608|_("Vindemiatrix") 1,2,6,11 |
1133 | + 63608|_("Almuredin") |
1134 | + 60129|_("Zaniah") 1,2,11 |
1135 | + 69701|_("Syrma") 1,2,11 |
1136 | + 61941|_("Arich") 1 |
1137 | + 66249|_("Heze") 1,11 |
1138 | + 63090|_("Minelauva") 3,10,11 |
1139 | + 63090|_("Auva") |
1140 | + 69974|_("Khambaliya") 3,11 |
1141 | + 69974|_("Kambalia") |
1142 | + 71957|_("Rijl al Awwa") 5,10,11 |
1143 | + 71957|_("Rigilawwa") |
1144 | + 69427|_("Algafar I") 11 |
1145 | + 70755|_("Algafar II") 11 |
1146 | +# Vulpecula (Vul) |
1147 | + 95771|_("Anser") 3,5,10,11 |
1148 | |
1149 | === modified file 'src/core/StelSkyCultureMgr.cpp' |
1150 | --- src/core/StelSkyCultureMgr.cpp 2016-06-03 17:40:43 +0000 |
1151 | +++ src/core/StelSkyCultureMgr.cpp 2016-09-14 16:38:20 +0000 |
1152 | @@ -49,7 +49,7 @@ |
1153 | } |
1154 | QSettings pd(pdFile, StelIniFormat); |
1155 | dirToNameEnglish[dir].englishName = pd.value("info/name").toString(); |
1156 | - dirToNameEnglish[dir].author = pd.value("info/author").toString(); |
1157 | + dirToNameEnglish[dir].author = pd.value("info/author").toString(); |
1158 | } |
1159 | } |
1160 | |
1161 | @@ -104,9 +104,20 @@ |
1162 | return true; |
1163 | } |
1164 | |
1165 | -QString StelSkyCultureMgr::getCurrentSkyCultureNameI18() const {return q_(currentSkyCulture.englishName);} |
1166 | - |
1167 | -QString StelSkyCultureMgr::getCurrentSkyCultureEnglishName() const {return currentSkyCulture.englishName;} |
1168 | +QString StelSkyCultureMgr::getCurrentSkyCultureNameI18() const |
1169 | +{ |
1170 | + return q_(currentSkyCulture.englishName); |
1171 | +} |
1172 | + |
1173 | +QString StelSkyCultureMgr::getCurrentSkyCultureEnglishName() const |
1174 | +{ |
1175 | + return currentSkyCulture.englishName; |
1176 | +} |
1177 | + |
1178 | +bool StelSkyCultureMgr::setCurrentSkyCultureNameI18(const QString& cultureName) |
1179 | +{ |
1180 | + return setCurrentSkyCultureID(skyCultureI18ToDirectory(cultureName)); |
1181 | +} |
1182 | |
1183 | //! returns newline delimited list of human readable culture names in english |
1184 | QString StelSkyCultureMgr::getSkyCultureListEnglish(void) |
1185 | |
1186 | === modified file 'src/core/StelSkyCultureMgr.hpp' |
1187 | --- src/core/StelSkyCultureMgr.hpp 2016-05-09 16:33:06 +0000 |
1188 | +++ src/core/StelSkyCultureMgr.hpp 2016-09-14 16:38:20 +0000 |
1189 | @@ -71,7 +71,7 @@ |
1190 | QString getCurrentSkyCultureNameI18() const; |
1191 | //! Set the sky culture from i18n name. |
1192 | //! @return true on success; false and doesn't change if skyculture is invalid. |
1193 | - bool setCurrentSkyCultureNameI18(const QString& cultureName) {return setCurrentSkyCultureID(skyCultureI18ToDirectory(cultureName));} |
1194 | + bool setCurrentSkyCultureNameI18(const QString& cultureName); |
1195 | |
1196 | //! Get the current sky culture ID. |
1197 | QString getCurrentSkyCultureID() const {return currentSkyCultureDir;} |
1198 | |
1199 | === modified file 'src/core/modules/StarMgr.cpp' |
1200 | --- src/core/modules/StarMgr.cpp 2016-07-11 07:39:54 +0000 |
1201 | +++ src/core/modules/StarMgr.cpp 2016-09-14 16:38:20 +0000 |
1202 | @@ -71,8 +71,12 @@ |
1203 | bool StarMgr::flagSciNames = true; |
1204 | QHash<int,QString> StarMgr::commonNamesMap; |
1205 | QHash<int,QString> StarMgr::commonNamesMapI18n; |
1206 | +QHash<int,QString> StarMgr::additionalNamesMap; |
1207 | +QHash<int,QString> StarMgr::additionalNamesMapI18n; |
1208 | QMap<QString,int> StarMgr::commonNamesIndexI18n; |
1209 | QMap<QString,int> StarMgr::commonNamesIndex; |
1210 | +QMap<QString,int> StarMgr::additionalNamesIndex; |
1211 | +QMap<QString,int> StarMgr::additionalNamesIndexI18n; |
1212 | QHash<int,QString> StarMgr::sciNamesMapI18n; |
1213 | QMap<QString,int> StarMgr::sciNamesIndexI18n; |
1214 | QHash<int,QString> StarMgr::sciAdditionalNamesMapI18n; |
1215 | @@ -85,6 +89,7 @@ |
1216 | QMap<int, int> StarMgr::saoStarsIndex; |
1217 | QHash<int, int> StarMgr::hdStarsMap; |
1218 | QMap<int, int> StarMgr::hdStarsIndex; |
1219 | +QHash<int, QString> StarMgr::referenceMap; |
1220 | |
1221 | QStringList initStringListFromFile(const QString& file_name) |
1222 | { |
1223 | @@ -180,6 +185,22 @@ |
1224 | return QString(); |
1225 | } |
1226 | |
1227 | +QString StarMgr::getAdditionalNames(int hip) |
1228 | +{ |
1229 | + QHash<int,QString>::const_iterator it(additionalNamesMapI18n.find(hip)); |
1230 | + if (it!=additionalNamesMapI18n.end()) |
1231 | + return it.value(); |
1232 | + return QString(); |
1233 | +} |
1234 | + |
1235 | +QString StarMgr::getAdditionalEnglishNames(int hip) |
1236 | +{ |
1237 | + QHash<int,QString>::const_iterator it(additionalNamesMap.find(hip)); |
1238 | + if (it!=additionalNamesMap.end()) |
1239 | + return it.value(); |
1240 | + return QString(); |
1241 | +} |
1242 | + |
1243 | QString StarMgr::getCommonEnglishName(int hip) |
1244 | { |
1245 | QHash<int,QString>::const_iterator it(commonNamesMap.find(hip)); |
1246 | @@ -609,8 +630,12 @@ |
1247 | { |
1248 | commonNamesMap.clear(); |
1249 | commonNamesMapI18n.clear(); |
1250 | + additionalNamesMap.clear(); |
1251 | + additionalNamesMapI18n.clear(); |
1252 | commonNamesIndexI18n.clear(); |
1253 | commonNamesIndex.clear(); |
1254 | + additionalNamesIndex.clear(); |
1255 | + additionalNamesIndexI18n.clear(); |
1256 | |
1257 | qDebug() << "Loading star names from" << QDir::toNativeSeparators(commonNameFile); |
1258 | QFile cnFile(commonNameFile); |
1259 | @@ -632,7 +657,7 @@ |
1260 | // " 677|_("Alpheratz")" |
1261 | // "113368|_("Fomalhaut")" |
1262 | // Note: Stellarium doesn't support sky cultures made prior version 0.10.6 now! |
1263 | - QRegExp recordRx("^\\s*(\\d+)\\s*\\|_[(]\"(.*)\"[)]\\s*\\n"); |
1264 | + QRegExp recordRx("^\\s*(\\d+)\\s*\\|_[(]\"(.*)\"[)]\\s*([\\,\\d\\s]*)\\n"); |
1265 | |
1266 | while(!cnFile.atEnd()) |
1267 | { |
1268 | @@ -667,13 +692,45 @@ |
1269 | continue; |
1270 | } |
1271 | |
1272 | - const QString commonNameI18n = englishCommonName; |
1273 | - QString commonNameI18n_cap = commonNameI18n.toUpper(); |
1274 | - |
1275 | - commonNamesMap[hip] = englishCommonName; |
1276 | - commonNamesMapI18n[hip] = commonNameI18n; |
1277 | - commonNamesIndexI18n[commonNameI18n_cap] = hip; |
1278 | - commonNamesIndex[englishCommonName.toUpper()] = hip; |
1279 | + const QString englishNameCap = englishCommonName.toUpper(); |
1280 | + if (commonNamesMap.find(hip)!=commonNamesMap.end()) |
1281 | + { |
1282 | + if (additionalNamesMap.find(hip)!=additionalNamesMap.end()) |
1283 | + { |
1284 | + QString sname = additionalNamesMap[hip].append(" - " + englishCommonName); |
1285 | + QString snamecap = sname.toUpper(); |
1286 | + additionalNamesMap[hip] = sname; |
1287 | + additionalNamesMapI18n[hip] = sname; |
1288 | + additionalNamesIndex.remove(englishNameCap); |
1289 | + additionalNamesIndexI18n.remove(englishNameCap); |
1290 | + additionalNamesIndex[snamecap] = hip; |
1291 | + additionalNamesIndexI18n[snamecap] = hip; |
1292 | + } |
1293 | + else |
1294 | + { |
1295 | + additionalNamesMap[hip] = englishCommonName; |
1296 | + additionalNamesMapI18n[hip] = englishCommonName; |
1297 | + additionalNamesIndex[englishNameCap] = hip; |
1298 | + additionalNamesIndexI18n[englishNameCap] = hip; |
1299 | + } |
1300 | + } |
1301 | + else |
1302 | + { |
1303 | + commonNamesMap[hip] = englishCommonName; |
1304 | + commonNamesMapI18n[hip] = englishCommonName; |
1305 | + commonNamesIndexI18n[englishNameCap] = hip; |
1306 | + commonNamesIndex[englishNameCap] = hip; |
1307 | + } |
1308 | + |
1309 | + QString reference = recordRx.capturedTexts().at(3).trimmed(); |
1310 | + if (!reference.isEmpty()) |
1311 | + { |
1312 | + if (referenceMap.find(hip)!=referenceMap.end()) |
1313 | + referenceMap[hip] = referenceMap[hip].append("," + reference); |
1314 | + else |
1315 | + referenceMap[hip] = reference; |
1316 | + } |
1317 | + |
1318 | readOk++; |
1319 | } |
1320 | } |
1321 | @@ -1143,6 +1200,8 @@ |
1322 | const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator(); |
1323 | commonNamesMapI18n.clear(); |
1324 | commonNamesIndexI18n.clear(); |
1325 | + additionalNamesMapI18n.clear(); |
1326 | + additionalNamesIndexI18n.clear(); |
1327 | for (QHash<int,QString>::ConstIterator it(commonNamesMap.constBegin());it!=commonNamesMap.constEnd();it++) |
1328 | { |
1329 | const int i = it.key(); |
1330 | @@ -1150,6 +1209,19 @@ |
1331 | commonNamesMapI18n[i] = t; |
1332 | commonNamesIndexI18n[t.toUpper()] = i; |
1333 | } |
1334 | + for (QHash<int,QString>::ConstIterator ita(additionalNamesMap.constBegin());ita!=additionalNamesMap.constEnd();ita++) |
1335 | + { |
1336 | + const int i = ita.key(); |
1337 | + QStringList a = ita.value().split(" - "); |
1338 | + QStringList tn; |
1339 | + foreach(const QString &str, a) |
1340 | + { |
1341 | + tn << trans.qtranslate(str); |
1342 | + } |
1343 | + const QString r = tn.join(" - "); |
1344 | + additionalNamesMapI18n[i] = r; |
1345 | + additionalNamesIndexI18n[r.toUpper()] = i; |
1346 | + } |
1347 | } |
1348 | |
1349 | // Search the star by HP number |
1350 | @@ -1208,6 +1280,13 @@ |
1351 | return searchHP(it.value()); |
1352 | } |
1353 | |
1354 | + // Search by I18n additional common names |
1355 | + QMap<QString,int>::const_iterator ita(additionalNamesIndexI18n.find(objw)); |
1356 | + if (ita!=additionalNamesIndexI18n.end()) |
1357 | + { |
1358 | + return searchHP(ita.value()); |
1359 | + } |
1360 | + |
1361 | // Search by sci name |
1362 | QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw); |
1363 | if (it2!=sciNamesIndexI18n.end()) |
1364 | @@ -1274,13 +1353,20 @@ |
1365 | } |
1366 | } |
1367 | |
1368 | - // Search by I18n common name |
1369 | + // Search by English common name |
1370 | QMap<QString,int>::const_iterator it(commonNamesIndex.find(objw)); |
1371 | if (it!=commonNamesIndex.end()) |
1372 | { |
1373 | return searchHP(it.value()); |
1374 | } |
1375 | |
1376 | + // Search by English additional common names |
1377 | + QMap<QString,int>::const_iterator ita(additionalNamesIndex.find(objw)); |
1378 | + if (ita!=additionalNamesIndex.end()) |
1379 | + { |
1380 | + return searchHP(ita.value()); |
1381 | + } |
1382 | + |
1383 | // Search by sci name |
1384 | QMap<QString,int>::const_iterator it2 = sciNamesIndexI18n.find(objw); |
1385 | if (it2!=sciNamesIndexI18n.end()) |
1386 | @@ -1310,6 +1396,7 @@ |
1387 | QString objw = objPrefix.toUpper(); |
1388 | |
1389 | QMap<QString, int> cNamesIdx = inEnglish ? commonNamesIndex : commonNamesIndexI18n; |
1390 | + QMap<QString, int> aNamesIdx = inEnglish ? additionalNamesIndex : additionalNamesIndexI18n; |
1391 | |
1392 | // Search for common names |
1393 | if (useStartOfWords) |
1394 | @@ -1326,6 +1413,19 @@ |
1395 | else |
1396 | break; |
1397 | } |
1398 | + for (QMap<QString,int>::const_iterator ita(aNamesIdx.lowerBound(objw)); ita!=aNamesIdx.end(); ++ita) |
1399 | + { |
1400 | + if (ita.key().startsWith(objw)) |
1401 | + { |
1402 | + if (maxNbItem<=0) |
1403 | + break; |
1404 | + result.append(inEnglish ? getAdditionalEnglishNames(ita.value()) : getAdditionalNames(ita.value())); |
1405 | + --maxNbItem; |
1406 | + } |
1407 | + else |
1408 | + break; |
1409 | + } |
1410 | + |
1411 | } |
1412 | else |
1413 | { |
1414 | @@ -1341,6 +1441,19 @@ |
1415 | --maxNbItem; |
1416 | } |
1417 | } |
1418 | + QMapIterator<QString, int> j(aNamesIdx); |
1419 | + while (j.hasNext()) |
1420 | + { |
1421 | + j.next(); |
1422 | + if (j.key().contains(objw)) |
1423 | + { |
1424 | + if (maxNbItem<=0) |
1425 | + break; |
1426 | + result.append(inEnglish ? getAdditionalEnglishNames(j.value()) : getAdditionalNames(j.value())); |
1427 | + --maxNbItem; |
1428 | + } |
1429 | + } |
1430 | + |
1431 | } |
1432 | |
1433 | // Search for sci names |
1434 | |
1435 | === modified file 'src/core/modules/StarMgr.hpp' |
1436 | --- src/core/modules/StarMgr.hpp 2016-07-11 07:39:54 +0000 |
1437 | +++ src/core/modules/StarMgr.hpp 2016-09-14 16:38:20 +0000 |
1438 | @@ -234,6 +234,18 @@ |
1439 | //! @return common name of star (from skyculture file star_names.fab) |
1440 | static QString getCommonEnglishName(int hip); |
1441 | |
1442 | + //! Get the (translated) additional names for a star with a specified |
1443 | + //! Hipparcos catalogue number. |
1444 | + //! @param hip The Hipparcos number of star |
1445 | + //! @return translated additional names of star |
1446 | + static QString getAdditionalNames(int hip); |
1447 | + |
1448 | + //! Get the English additional names for a star with a specified |
1449 | + //! Hipparcos catalogue number. |
1450 | + //! @param hip The Hipparcos number of star |
1451 | + //! @return additional names of star |
1452 | + static QString getAdditionalEnglishNames(int hip); |
1453 | + |
1454 | //! Get the cross-identification designations for a star with a specified |
1455 | //! Hipparcos catalogue number. |
1456 | //! @param hip The Hipparcos number of star |
1457 | @@ -403,6 +415,11 @@ |
1458 | static QMap<QString, int> commonNamesIndexI18n; |
1459 | static QMap<QString, int> commonNamesIndex; |
1460 | |
1461 | + static QHash<int, QString> additionalNamesMap; // additional names |
1462 | + static QHash<int, QString> additionalNamesMapI18n; |
1463 | + static QMap<QString, int> additionalNamesIndex; |
1464 | + static QMap<QString, int> additionalNamesIndexI18n; |
1465 | + |
1466 | static QHash<int, QString> sciNamesMapI18n; |
1467 | static QMap<QString, int> sciNamesIndexI18n; |
1468 | |
1469 | @@ -420,6 +437,8 @@ |
1470 | static QHash<int, int> hdStarsMap; |
1471 | static QMap<int, int> hdStarsIndex; |
1472 | |
1473 | + static QHash<int, QString> referenceMap; |
1474 | + |
1475 | QFont starFont; |
1476 | static bool flagSciNames; |
1477 | Vec3f labelColor; |
1478 | |
1479 | === modified file 'src/core/modules/StarWrapper.cpp' |
1480 | --- src/core/modules/StarWrapper.cpp 2016-07-11 07:39:54 +0000 |
1481 | +++ src/core/modules/StarWrapper.cpp 2016-09-14 16:38:20 +0000 |
1482 | @@ -106,6 +106,7 @@ |
1483 | oss << "<h2>"; |
1484 | |
1485 | const QString commonNameI18 = StarMgr::getCommonName(s->getHip()); |
1486 | + const QString additionalNameI18 = StarMgr::getAdditionalNames(s->getHip()); |
1487 | const QString sciName = StarMgr::getSciName(s->getHip()); |
1488 | const QString addSciName = StarMgr::getSciAdditionalName(s->getHip()); |
1489 | const QString varSciName = StarMgr::getGcvsName(s->getHip()); |
1490 | @@ -140,6 +141,9 @@ |
1491 | if (!commonNameI18.isEmpty()) |
1492 | oss << commonNameI18; |
1493 | |
1494 | + if (!additionalNameI18.isEmpty()) |
1495 | + oss << " (" << additionalNameI18 << ")"; |
1496 | + |
1497 | if (!commonNameI18.isEmpty() && !designationsList.isEmpty() && flags&CatalogNumber) |
1498 | oss << "<br>"; |
1499 | } |
1500 | |
1501 | === modified file 'stars/default/name.fab' |
1502 | --- stars/default/name.fab 2015-11-21 09:22:55 +0000 |
1503 | +++ stars/default/name.fab 2016-09-14 16:38:20 +0000 |
1504 | @@ -3692,7 +3692,6 @@ |
1505 | 80763|α_Sco |
1506 | 78820|β1_Sco |
1507 | 78821|β2_Sco |
1508 | - 73714|γ_Sco |
1509 | 78401|δ_Sco |
1510 | 82396|ε_Sco |
1511 | 82671|ζ1_Sco |