Merge lp:~georg-zotti/stellarium/gz_Barnard into lp:stellarium

Proposed by gzotti
Status: Merged
Merged at revision: 7487
Proposed branch: lp:~georg-zotti/stellarium/gz_Barnard
Merge into: lp:stellarium
Diff against target: 1107 lines (+651/-39)
9 files modified
README (+2/-0)
data/default_config.ini.cmake (+1/-2)
nebulae/default/BarnardCat_tabbed.txt (+351/-0)
nebulae/default/CMakeLists.txt (+2/-2)
nebulae/default/ngc2000names.dat (+13/-1)
src/core/modules/Nebula.cpp (+122/-15)
src/core/modules/Nebula.hpp (+14/-9)
src/core/modules/NebulaMgr.cpp (+138/-10)
src/core/modules/NebulaMgr.hpp (+8/-0)
To merge this branch: bzr merge lp:~georg-zotti/stellarium/gz_Barnard
Reviewer Review Type Date Requested Status
Alexander Wolf Approve
Review via email: mp+253779@code.launchpad.net

Commit message

Add Barnard catalogue of dark nebulae, and (optionally) allow proportional DSO symbols.

Description of the change

This branch adds the Barnard catalogue of dark nebulae, and allows for proportional DSO symbols.

To post a comment you must log in.
Revision history for this message
Alexander Wolf (alexwolf) wrote :

Georg, why you don't use decimal values for coordinates?

review: Needs Information
Revision history for this message
gzotti (georg-zotti) wrote :

Did I overlook some guidelines again?

I just took the list from DVAA as-is, including all their data, and did the data processing during read-in of the file. In case they (DVAA) change something, the list can be updated most easily.

Revision history for this message
Alexander Wolf (alexwolf) wrote :

No, it's not in guide :) Just for note - default DSO catalog has decimal values of coordinates.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2015-03-10 06:49:23 +0000
3+++ README 2015-03-23 00:10:05 +0000
4@@ -271,6 +271,8 @@
5 Samus N.N., Durlevich O.V., Kazarovets E V., Kireeva N.N., Pastukhova E.N.,
6 Zharova A.V., et al., General Catalogue of Variable Stars (Samus+ 2007-2012)
7 http://cdsarc.u-strasbg.fr/viz-bin/Cat?cat=B%2Fgcvs&
8+ 3.9 Barnard catalog taken from http://www.dvaa.org/AData/Barnard.html,
9+ courtesy of Delaware Valley Amateur Astronomers.
10
11 4. Graphics
12 4.1 All graphics are copyrighted by the Stellarium's Team (GPL) except
13
14=== modified file 'data/default_config.ini.cmake'
15--- data/default_config.ini.cmake 2015-02-24 16:53:57 +0000
16+++ data/default_config.ini.cmake 2015-03-23 00:10:05 +0000
17@@ -228,15 +228,14 @@
18 flag_object_trails = false
19 flag_nebula = true
20 flag_nebula_name = false
21-flag_nebula_long_name = false
22 flag_nebula_display_no_texture = false
23 extinction_mode_below_horizon = mirror
24 max_mag_nebula_name = 8
25 nebula_scale = 1
26+flag_nebula_hints_proportional = false
27 flag_milky_way = true
28 milky_way_intensity = 1
29 flag_bright_nebulae = false
30-flag_nebula_ngc = false
31 meteor_rate = 10
32 labels_amount = 3.0
33 nebula_hints_amount = 3.0
34
35=== added file 'nebulae/default/BarnardCat_tabbed.txt'
36--- nebulae/default/BarnardCat_tabbed.txt 1970-01-01 00:00:00 +0000
37+++ nebulae/default/BarnardCat_tabbed.txt 2015-03-23 00:10:05 +0000
38@@ -0,0 +1,351 @@
39+# Barnard catalog from: http://www.dvaa.org/AData/Barnard.html
40+#B# 2000 Epoch R.A. Dec Dia.Opacity1 Barnard's Descriptions UM2_Pg2 Constellation
41+1 3 32 57 +31 9 30 4 Large, indefinite 60 Perseus
42+2 3 33 31 +32 19 20 4 Indefinite; elongated SE and NW 60 Perseus
43+3 3 40 1 +31 58 20 5 Irregular, dark space in nebula; curved, bright strip of nebulosity in SW side 60 Perseus
44+4 3 44 2 +31 47 5 Very large; indefinite 60 Perseus
45+5 3 47 53 +32 53 60 5 Indefinite; elongated NE and SW; Eta Persei (mag 5.8) near NE side 60 Perseus
46+6 3 56 23 +56 7 4 Round; indefinite 28 Camelopardalis
47+7 4 17 25 +28 33 5 Large, irregular, with brighter condensation (B 10) in SE part 78 Taurus
48+8 4 17 50 +55 14 ? Center of a dark, irregular lane about 2.6 degrees long and 22' + or - across; very much like the dark lanes E. of Rho Ophiuchi 28 3 Camelopardalis
49+9 4 18 +55 3 ? Dark, irregular vacancy. This is the middle of a great vacancy extending east and west, the continuous part of which is 2.5 degrees long and about .5 degree wide. It really extends in a more or less broken form for about 6 degrees. There is a wide region extending south of it for a couple of degrees, nearly to the star BD +53 750 (magnitude 5.0) whose position is 4h6m58s, N 53 18' (1875.0). To the east it breaks up into more or less separate spots, somewhat resembling those at the east end of the great lane from Rho Ophiuchi, but unlike that lane it does not originate in a larger vacant space or a nebula. Its borders are not so definite as the Rho Ophiuchi lane. It is approximately bounded by the coordinates 3h58m, N54.7 and 4h20m, N54.8. The individual positions of some of the spots are given in the catalogue. 28 Camelopardalis
50+10 4 18 41 +28 16 8 5 The brightest part of B 7 78 Taurus
51+11 4 26 37 +55 2 3 East end of irregular lane, B 8 28 Camelopardalis
52+12 4 29 47 +54 14 24 5 Isolated dark spot SE of B 11; irregularly round with extension E. from the NE side 28 Camelopardalis
53+13 4 31 18 +54 53 11 4 Irregular; irregularly darker inside with a rather sharp, short, narrow extension toward the S. 28 Camelopardalis
54+14 4 39 59 +25 44 3 ? Very small, bright nebula; a bright spot in the dark nebula B 22. (Position given in Astrophysical Journal, 49:14, (1919ApJ.49.1B) in error by 10m in right ascension.) 78 Taurus
55+15 4 31 56 +46 37 13 5 Elliptical; diameter 15' x 10' slightly NW and SE. One of the finest examples of a dark object seen against the ordinary sky and away from the Milky Way. The background on which the stars shine is uniform over the entire plate. The object is in a region somewhat larger than itself, where there are relatively few stars, and is black by contrast with the sky alone. It clearly shows the presence of a feeble uniform luminosity in space which, from the appearance of similar objects in widely different parts of the sky, leads to the belief that this feeble illumination of distant space is universal. If this object were seen against the star clouds of the Milky Way it would appear strikingly black. 42 Perseus
56+16 4 32 26 +46 36 5 Very small; elongated N and S; close to SE edge of B 15 42 Perseus
57+17 4 32 30 +46 31 5 Very small; elongated N and S; close to E edge of B 15 42 Perseus
58+18 4 31 13 +24 21 60 5 Group of dark spots 78 Taurus
59+19 4 33 +26 16 60 ? Large, indefinite 78 Taurus
60+20 4 37 4 +50 58 60 2 In S part of larger, relatively vacant area; this is the dark object mentioned by Espin in Monthly Notices, 58, 334, (1898MNRAS..58..334E). It is close north of a small group of faint stars and is 6' or 8' in diameter. In a somewhat larger vacant space (sic). It is not so definite as B 15. 42 Perseus
61+21 4 37 57 +55 21 10 4 Indefinite; irregularly round 28 Camelopardalis
62+22 4 38 +26 3 120 4 Irregular; unequally dark; extended SE and NW; this is a very large region of obscure nebulosity with several darker streaks in it trending northwest. It is partly separated from another starless region lying about 2 degrees to the west and north. Near the middle of the first of these regions is a small luminous nebula with a faint fan-shaped extension for 10' to the northeast (B 14). This is undoubtedly a brighter condensation of the great obscuring mass surrounding it. The position of this small nebula is 4h32m20s, N25 30' (1875.0). 78 Taurus
63+23 4 40 33 +29 52 5 5 Sharply pointed to the SE; BD +29 728 (magnitude 6.5) in N part 59 Taurus
64+24 4 42 53 +29 44 8 5 Sharply pointed to the S 59 Taurus
65+25 4 52 4 +46 0 8 3 Irregularly round; a good example of a dark or more or less starless region. 42 Auriga
66+26 4 54 38 +30 37 5 6 Irregular; B 26, 27, 28 are close NW of BD +30 741 (mag 6.8), which is involved in feeble nebulosity 59 Auriga
67+27 4 55 8 +30 33 5 6 Irregular 59 Auriga
68+28 4 55 52 +30 38 4 6 Irregular 59 Auriga
69+29 5 6 23 +31 35 10 6 Round; indefinite 59 Auriga
70+30 5 30 16 +12 46 67 4 Large dark area with few stars. There is a nebulous border, .5 degree wide, to the semi-vacant region extending 1 degree east and north from BD +12 803 (magnitude 7.0). Apparently this nebulous border extends many degrees east in a very diffused manner. There is a narrow dark lane extending south from the semi-vacant region, running close west of BD +12 803 to a point nearly 1 degree south of BD +12 801 (mag 6.9). There is a small fan-shaped nebula close north of small star in the position 5h24m30s, +12 3.9' (1875.0). A small strip of nebulosity extends 5' southwest from this star. These two nebulae are probably the brighter parts of a large obscure nebulosity. 96 Orion
71+31 5 32 1 +12 45 30 4 Extended NE and SW; the E. and darkest part of B 30 96 Orion
72+32 5 32 8 +12 25 3 Dark projection from S. end of B 31 to the E. 96 Orion
73+33 5 40 52 - 2 27 4 4 Dark mass, on nebulous strip extending S from Zeta Orionis (see Astrophysical Journal, 38, 500, (1913ApJ....38..496B), and Plate XX) 116 Orion
74+34 5 43 30 +32 38 20 4 Round; starless; indefinite 59 Auriga
75+35 5 45 30 + 9 3 15 2 Elongated E and W, 20'x10', with an extension SE; three small stars N of it. 96 Orion
76+36 5 49 + 7 25 120 4 Irregular, narrow dark lane, NE and SW. The NE end connects brokenly with B 35. Well shown on Plate 21, Lick Observatory Publications, 11, 1913. 96 Orion
77+37 6 32 +10 28 175 4 Irregular, semi-vacant region. This region is abruptly terminated on the S side by the nebulosity extending north from 15 Monocerotis. Its west side ends abruptly at 6h22m15s, +12 26' (1875.0). B 37, 38, and 39 are shown in Plates 28 and 29, Lick Observatory Publications, 11, 1913. 96 Monocerus
78+38 6 33 41 +11 4 60 4 Irregular vacancy. This seems to refer to a portion of B 37. 96 Monocerus
79+39 6 38 2 +10 19 5 Small, sharply defined, elongated spot in the nebulosity NW of 15 Monocerotis. 96 Monocerus
80+40 16 14 38 -18 58 15 3 Diffused dark spot; small star in it. This spot and B 41 are connected with the great nebula about Nu Scorpii and are doubtless denser opaque masses of the nebula. There is a larger dark region belonging to this same system in B 43, from which broken dark lanes somewhat like those from Rho Ophiuchi, though less marked, run eastward for some degrees. 147 Scorpius
81+41 16 22 17 -19 37 45 3 Diffused dark spot 147 Scorpius
82+42 16 25 -23 26 6 Great nebula of Mu Ophiuchi; this object is put in the list because, though not wholly dark, it is partly so, and the evident obscuration produced by it puts it in the class for which the catalogue is made. The semi-vacant region in which this, the great nebula of Rho Ophiuchi, lies is about 3.5 degrees in diameter. For references to the visual discovery and early observations of this strange region see Astronomische Nachrichten, 138, 211, 1895; Popular Astronomy 5, 227, 1897; 14, 581, 1906; Lick Observatory Publications, 11, 19, 1913 and Plate 36. 147 Ophiuchus
83+43 16 30 -19 46 4 Large dark region 147 Ophiuchus
84+44 16 40 -24 4 5 Dark lane E. from Rho Ophiuchi region. This is the middle of the main part of the great vacant lane that runs east from the region of Rho Ophiuchi. It is about 32' wide and has its beginning in a vacant area in which is the star 22 Scorpii (CD -24 12695, magnitude 5.5). It runs slightly northeast to about 16h40m, -23 40' (1875.0). From this point it extends in a broken chain of dark spots to a little south of B 63. Its total length is therefore about 10 degrees. 147 Ophiuchus
85+#44a 16 44 45 -40 20 5 5 Irregular; sharpest on SE side; CD -40 10662 (mag 9.0) close N. Apparently a real dark object. 164 Scorpius
86+45 16 46 -21 35 120 5 Rather definite; Extended NE and SW with an irregular projection SW that connects it with the Rho Ophiuchi region. This appears to be a real, dark object. 146 Ophiuchus
87+46 16 57 12 -22 43 6 Irregular; definite; a string of small stars in the middle. 146 Ophiuchus
88+47 16 59 42 -22 38 15 5 Irregular; definite; connected with B 51 by two sharp lanes. 146 Ophiuchus
89+48 17 1 -40 41 40 5 Fairly well defined; 15' W and N of CD -40 11088 (magnitude 8); seems to be a real object. 164 Scorpius
90+49 17 2 39 -33 16 3 Small; close SE of and involving CD -33 11668 (magnitude 9.3). 164 Scorpius
91+50 17 2 54 -34 23 15 6 Large, irregular dark space; this is an irregular square, sharply defined on the east side and diffused on the west, where there are broken extensions for 30'. The star CD -34 11418 (magnitude 9.8) is near the middle. The stars CD -34 11422 (magnitude 9.8) and -34 11427 (magnitude 9.9) are on the eastern border. 164 Scorpius
92+51 17 4 44 -22 15 20 6 Definite; one of a straggling group toward the eastern end of the dark lane from Rho Ophiuchi. Two irregular, dark lanes run west from it to B 47. 146 Ophiuchus
93+53 17 6 -33 35 60 4 Large; diffuse; extended N and S by 30'; curved toward the E at N end. 164 Scorpius
94+54 17 6 34 -34 15 5 5 Small; round; close S. of magnitude 11 star 164 Scorpius
95+55 17 7 33 -32 0 16 5 Irregular; best defined SE.; CD -31 13582 (magnitude 8.9) near the center. 164 Scorpius
96+56 17 8 48 -32 5 3 5 Small; close E of CD -31 13609 (magnitude 9.0). This seems to be a real object. 164 Scorpius
97+57 17 8 22 -22 49 5 6 Elongated NE and SW 146 Ophiuchus
98+58 17 11 12 -40 24 30 6 Slightly extended N and S; a darker core at NE side 164 Scorpius
99+59 17 11 23 -27 29 60 5 Sink hole; at the W end of a wide broken lane from B 78 146 Ophiuchus
100+60 17 11 51 -22 26 13 3 Curved; extended NE and SW; this and B 57 are the most distinct of a group of dark spots SW of the square end of B 63. 146 Ophiuchus
101+61 17 14 59 -20 28 6 Small; elongated E and W 146 Ophiuchus
102+62 17 16 12 -20 52 19 6 Very black in NW part; brightest of three stars in S part is BD -20 4690 (magnitude 9.4). Apparently a real object. 146 Ophiuchus
103+63 17 16 -21 28 60 3 Large, definite, curved figure, convex to N; the W end abrupt; 97' E and W, 19' wide 146 Ophiuchus
104+64 17 17 18 -18 29 6 Cometary; W of M 9; This object is somewhat cometary in form and has a very black core or head that sharply abuts against the thick stratum of stars; from this it spreads out into a large dark area with much dark detail, filling quite a space close southwest of M 9. It thus resembles a dark comet with a dense and well-defined head and diffused widening tail. The position of the head is 17h9m57s, -18 20.6 (1875.0). 146 Ophiuchus
105+65 17 19 36 -26 42 12 6 Definite; elongated; 12' E and W 146 Ophiuchus
106+66 17 19 57 -26 53 8 6 Definite; extended E and W; CD -26 12082 (magnitude 8.7) 5' from SE edge 146 Ophiuchus
107+67 17 22 30 -21 53 6 Definite; extended N and S; connects B 65 and 66 146 Ophiuchus
108+#67a 17 20 57 -26 51 13 6 Irregular; definite; BD -21 4591 (magnitude 9.5) in spot, near SE edge 146 Ophiuchus
109+68 17 22 36 -23 47 4 6 Small; irregular; sharply defined; about 20' SW of B 72 146 Ophiuchus
110+69 17 22 55 -23 55 6 Very small; irregular; sharply defined; extends N and S 4' 146 Ophiuchus
111+70 17 23 32 -24 2 4 4 Sharply defined on W side 146 Ophiuchus
112+71 17 23 2 -24 0 1 ? Very small; extends 1.25', plus or minus 146 Ophiuchus
113+72 17 23 35 -23 37 6 S-shaped; this is a striking object. It is a thin, curved black marking, the exact form of the letter S or the figure 5, as the imagination or point of view may dictate. The SE branch runs E for some distance passing close S of the star CD -23 13376 (magnitude 9.1). Its average thickness is about 2'-3'. The position in the catalogue is for the southern part of the figure, or the bottom of the S (see Astrophysical Journal, 49, (1919ApJ....49....1B), Plate III). 146 Ophiuchus
114+73 17 24 8 -24 17 1 ? Very small; extended N and S 4' 146 Ophiuchus
115+74 17 25 8 -24 12 5 Slightly curved, extending 5' N from CD -24 13325 (magnitude 7.1). Sharpest on W and S sides. 146 Ophiuchus
116+75 17 25 17 -22 1 5 Curved and scalloped marking; BD -21 4598 (magnitude 8.3) on N edge (see Astrophysical Journal, 49, Plate II, 1(1919ApJ....49....1B) 146 Ophiuchus
117+76 17 25 -24 24 4 Irregular, narrow black strip, 30' long E and W 146 Ophiuchus
118+77 17 28 -23 51 60 3 Indefinite; connected by a vacant strip with B 78 146 Ophiuchus
119+78 17 32 -25 35 180 5 Very large; CD -26 12152 (magnitude 6.2) S of the middle. This vacant region, with its extension to the west running south of Theta Ophiuchi, is visible to the naked eye (see Popular Astronomy, 14, 580, 1906.) 146 Ophiuchus
120+79 17 37 23 -19 36 30 6 30' long SE and NW; narrow; sharply defined 146 Ophiuchus
121+80 17 37 42 -21 16 2 3 Small, definite; 3' x 1', SW and NE; close SE of BD -21 4674 (magnitude 80 8.1). 146 Ophiuchus
122+81 17 38 32 -23 55 ? Very small; diffused; close SW of NGC 6401 146 Ophiuchus
123+82 17 38 37 -23 46 3 Small; angular; well defined; 8' N of NGC 6401 146 Ophiuchus
124+83 17 45 18 -20 0 7 6 Irregular; several small stars in it; narrow extension to the S 146 Ophiuchus
125+#83a 17 38 58 -24 10 4 6 Small; definite; diam. 4', N and S; about 5' SE of BD -19 4698 (magnitude 9.5) 146 Ophiuchus
126+84 17 46 25 -20 15 6 Irregular looped figure; sharply defined; 22' long E and W; extension from it 20' toward the NW. BD -20 4865 (magnitude 8.2) near W end and BD -20 4860 (magnitude 9.1) near east end. 146 Sagittarius
127+#84a 17 57 37 -17 40 16 5 Round; diam. 16', with extension 45' S; BD -17 4967 (magnitude 9.1) in center; perhaps some detail in it 146 Sagittarius
128+85 18 2 25 -23 1 ? Trifid nebula. This is the southern part of the Trifid nebula, NGC 6514. The dark markings in this nebula are too well known to insert in this catalogue. 146 Sagittarius
129+86 18 3 1 -27 52 5 5 Diam. 5'; edge of diffused nebulosity. For the visual discovery of this object see Astronomische Nachrichten 108, 370, 1884. 146 Sagittarius
130+87 18 4 10 -32 29 4 "Parrot's head"; CD -3 13679 (magnitude 9.3) central; several smaller stars in it CD -32 13666 (magnitude 9.6) on NW edge. CD -32 13687 (9.6) on SE edge. 163 Sagittarius
131+88 18 4 35 -24 6 2 ? Extended N and S; 2.7'x0.5'; in M8. There are other well-known markings in this nebula. This one and B 89 are given as illustrations of dark markings in the sky shown in relief against a nebulous or other luminous background. In this case there may be non-luminous opaque parts of the nebula itself. 145 Sagittarius
132+89 18 4 59 -24 21 0.5 ? Very small, diam. 0.5'; in M8 145 Sagittarius
133+90 18 10 14 -28 16 3 5 Irregular; elongated; 3' N and S 145 Sagittarius
134+91 18 10 7 -23 41 5 5 Diam. 5'; edge of diffused nebulosity 145 Sagittarius
135+92 18 15 35 -18 13 12 6 Black spot; 15' N and S, 9' E and W 145 Sagittarius
136+93 18 16 53 -18 3 2 4 Cometary; a sharply defined black head 2' in diam., with a diffused tail 15' long running S; 20' NE of B 92 145 Sagittarius
137+94 18 25 53 -10 39 15 4 Roundish; diam. 15'; indefinite 126 Scutum
138+95 18 25 35 -11 44 30 5 Large; indefinite; diam. 30'; elongated 126 Scutum
139+96 18 26 24 -10 17 4 Small; indefinite; elongated E and W 126 Scutum
140+97 18 29 5 - 9 55 60 4 Irregular; not very definite; diam. 1 degree 126 Scutum
141+98 18 33 16 -26 3 3 6 Very small; black; sharply defined; diam . 3' 145 Sagittarius
142+99 18 33 17 -21 28 7 3 Definite; 11' long E. and W., 3' wide; E end is the larger, with a faint star in it. 145 Sagittarius
143+100 18 32 41 - 9 8 16 5 Definite; irregular; curved; 16' long NW and SE 125 Scutum
144+101 18 32 40 - 8 48 8 5 Definite; irregular; 13' long NE and SW; 4' wide; separated from B100 by a scattering of small stars.H91 125 Scutum
145+102 18 37 41 -13 44 5 5 Rather definite; elongated NE and SW, 8' x 3' 125 Scutum
146+103 18 39 25 - 6 40 4 6 Irregular; diam. 4'; one small star in it 125 Scutum
147+104 18 47 19 - 4 32 16 5 Small, definite, caret-shaped object 105 Scutum
148+105 18 47 44 - 6 54 0.5 4 Very small; diam. .5'; close NE of BD -7 4710 (magnitude 8.9) 125 Scutum
149+106 18 48 49 - 5 4 2 6 Diam. 2'; extended N and S; free of stars 125 Scutum
150+107 18 49 30 - 5 0 5 6 Irregular; diam. 5'; free of stars 105 Scutum
151+108 18 49 34 - 6 18 3 3 Very small; diam. 3'; not black; two narrow diverging lanes extending to the N; some small stars in it 125 Scutum
152+109 18 49 36 - 7 33 0.7 2 Irregular; diam. .7'; close E of BD -07 4726 (magnitude 8.0) 125 Scutum
153+110 18 50 8 - 4 47 11 6 Irregular; diam. 11'; 105 Scutum
154+111 18 50 - 4 57 120 3 Region 2 degrees in diam., full of dark structures 105 Scutum
155+112 18 51 8 - 6 40 18 4 Diffused dark region; diam. 18' plus or minus; perhaps due to want of stars. 125 Scutum
156+113 18 51 24 - 4 19 16 5 Irregular; diam. 16'; small star in W part 105 Scutum
157+114 18 53 11 - 6 56 6 5 Diam. 6'; BD -7 4754 (magnitude 9.2) near middle; BD -7 4755 (magnitude 9.1) on S edge 125 Scutum
158+115 18 53 19 - 6 39 6 5 Very small and black. Very narrow, running N and S for 7'; width 1.4'. It is in a small vacant region. 125 Scutum
159+116 18 53 32 - 7 10 3 Narrow, semi-vacant region extending 20' S from BD -7 4755 (magnitude 9.1) 125 Scutum
160+117 18 53 42 - 4 50 1 6 Round; very black; diam. 1'; sharply defined 125 Scutum
161+#117a 18 53 43 - 7 24 7 ? Black; irregular; diam. 7' 105 Scutum
162+118 18 53 55 - 7 26 2 6 Definite; diam. 2'; more definite and blacker than B 117 125 Scutum
163+119 18 54 36 - 4 32 2 Very small; close NW of BD -4 4623 (magnitude 9.2) 105 Scutum
164+#119a 18 54 39 - 5 10 30 3 Irregular dark region; diam. .5 degree; liberally sprinkled with stars in its NW half; several dark lanes in SE part 105 Scutum
165+120 18 54 53 - 4 35 2 Very small; close SE of BD -4 4623 (magnitude 9.2); E side bounded by a curve of very small stars 105 Scutum
166+121 18 55 25 - 4 36 2 Small dusky spot; magnitude 12 star in center 105 Scutum
167+122 18 56 48 - 4 45 4 5 Small; diam. 4'; narrow extension 4' N 105 Scutum
168+123 18 57 39 - 4 43 1.5 5 Roundish; diam. 1.5'; a narrow spur 4'-5' long from its NE edge; a narrow lane 18' long and 1.5' wide from its W side to the NW 105 Scutum
169+124 18 57 41 - 4 21 3 ? Small, dark spot; diam. 3' 105 Scutum
170+125 18 58 21 - 4 23 9 ? Dark; lune shaped; 9' E and W; fairly well-defined on N border; some faint stars in it 105 Scutum
171+126 18 59 2 - 4 31 8 4 Dusky; round; rather definite; diam. 8' 105 Aquila
172+127 19 1 31 - 5 26 4.5 5 Irregular; diam. 4.5' 105 Aquila
173+128 19 1 40 - 4 34 10 ? Irregular; dusky; fairly well defined; diam. 10' 105 Aquila
174+129 19 2 4 - 5 18 5 5 Very black; sharply defined; diam. 5'; a small star at the W end 105 Aquila
175+130 19 1 56 - 5 34 7 5 dusky; not well defined; length 7' 105 Aquila
176+131 19 2 15 - 4 22 3 5 Black spot, about 2'x4' 105 Aquila
177+132 19 4 27 - 4 25 16 6 Dark; fairly well-defined. Tadpole-shaped, 16' long E and W. Diameter of the larger (E) part 8', with BD -4 4680 (magnitude 9.0) in center. 105 Aquila
178+133 19 6 12 - 6 53 6 Cometary; close W of BD -7 4852 (magnitude 9.2) 125 Aquila
179+134 19 6 53 - 6 14 6 6 Round; diam. 6'; dark, but not sharply defined; a small star on S edge; a similar one on N edge 125 Aquila
180+135 19 7 32 - 3 55 13 6 Dusky spot; diam. 13'; BD -4 4698 (magnitude 9.2) on N border; BD -4 4702 (magnitude 9.2) on SE edge 105 Aquila
181+136 19 8 49 - 4 0 8 6 Dusky spot; diam. 8'; 10 mag. star near middle 105 Aquila
182+137 19 16 0 - 1 19 3 Projection near S end of B 138 105 Aquila
183+138 19 16 + 0 13 180 2 Great curved, semi-vacant lane over 3 degrees in length 105 Aquila
184+139 19 18 0 - 1 24 5 Narrow black spot; 10 mag star on SE edge 105 Aquila
185+140 19 19 49 + 5 13 60 3 Semi-vacant region; diam. 1 degree 105 Aquila
186+141 19 20 11 + 1 53 20 1 Semi-vacant region; N of the N end of B 138; diam. 20' 105 Aquila
187+142 19 39 41 +10 31 40 6 Large; irregular; about 40' E and W; BD +10 4016 in E part 85 Aquila
188+143 19 41 25 +11 0 30 6 Rather narrow, angular marking; the outline of a square 30' in diameter, with the W side missing. 85 Aquila
189+144 19 58 +35 20 270 1 Large, semi-vacant region, 6 x 3 degrees, NE and SW; rather definite at NE end; diffused to the SE 48 Cygnus
190+145 20 2 49 +37 40 45 4 Sharply defined; 3/4 degree long E and W 48 Cygnus
191+146 20 3 29 +36 1 6 Very small; like a dark border to the SW side of the star BD +35 3930 (mag. 7.0) 48 Cygnus
192+147 20 6 50 +35 22 11 5 Very narrow sinuous dark lane 11' long E and W; BD +34 3871 (mag. 8.3 at W end) 48 Cygnus
193+148 20 47 42 +59 37 3 5 Very small; round; indefinite; diam. 3' 20 Cepheus
194+149 20 49 1 +59 31 2 5 Very small; round; indefinite; diam. 2'. This spot and B 148 each in a larger dusky space. 20 Cepheus
195+150 20 50 39 +60 18 60 5 Curved dark marking; 1 degree long 20 Cepheus
196+151 21 8 13 +56 19 60 5 Very small; very dark; diam. 1 degree; about 14' N of BD +55 2529 (magnitude 7.5); apparently a real object in a slightly larger vacancy 19 Cepheus
197+152 21 14 29 +61 44 9 5 Small; 15'x3' SE and NW 19 Cepheus
198+153 21 21 3 +56 26 60 ? Black; irregular; diam. 1 degree; 5' S of BD +55 2565 (magnitude 7.4) 19 Cepheus
199+154 21 21 22 +56 36 8 5 Narrow; 8' long NE and SW; BD +55 2565 (magnitude 7.4) at the S end 19 Cepheus
200+155 21 32 8 +44 58 13 3 Round; diam. 13'; indefinite; four small stars in a line crossing it E and W 31 Cygnus
201+156 21 33 59 +45 35 8 3 Diam. 8'; sharp pointed to N; BD +44 3865 (magnitude 4.1) in center 31 Cygnus
202+157 21 33 41 +54 40 5 4 Round; diam. 5'; 8' plus or minus W of BD +54 2576 (magnitude 8.3); a semicircle of faint stars forms the western border 19 Cygnus
203+158 21 37 13 +43 24 3 ? Dark spot; diam. 3'; similar to those in the region of B 159. There are some others N and W of this 31 Cygnus
204+159 21 38 22 +43 13 25 5 Irregular partially vacant region; diam. 25' 31 Cygnus
205+160 21 37 58 +56 13 31 4 Large, dark; irregular; diam. 31' NE and SW 19 Cepheus
206+161 21 40 22 +57 49 3 6 Small, black spot. This is one of the comet-shaped objects. The head is very sharp and black, 3' across. This extends north for some 3', then widens out into a less dense tail about 13' long. 19 Cepheus
207+162 21 41 9 +56 19 13 4 Very thin, curved dark strip, 13' N and S; a curve of small stars on the SW end. 19 Cepheus
208+163 21 42 10 +56 42 4 Small; very black; pointed to the S; two dark streams running from this to the N 19 Cepheus
209+164 21 46 31 +51 5 20 5 V-shaped vacancy; 20' N and S 19 Cygnus
210+165 21 48 56 +60 12 18 5 Length E and W 18', width 1'; BD +59 2424 (magnitude 7.8) near the E end 19 Cepheus
211+166 21 51 5 +60 5 5 5 Round; diam 5'; small star on SW edge 19 Cepheus
212+167 21 51 58 +60 4 5 5 Small; irregularly round; diam 5'; about 7' N of BD +59 2427 (magnitude 7.7) 19 Cepheus
213+168 21 53 20 +47 16 10 4 Small nebula at E end of dark lane. This nebula is 10' in diameter with over a dozen stars of different magnitudes in it. There is no central condensation, nor does the nebula condense about any of the stars. There are some dark markings in it. The dark lane is 1.7 degrees long and 9' wide (see Lick Observatory Publ., 11, Plate 81). 31 Cygnus
214+169 21 58 52 +58 45 60 3 Elliptical black ring; diam. 1 degree. This encloses an "island" of small stars. The The dark ring is broadest on its east side where its thickness is 22'. The northern part is very black and straight. BD +58 2371 (magnitude 8.5) is in the northeast part of the "island" of stars. 19 Cepheus
215+170 21 58 2 +58 57 15 4 Irregular black strip 26' long NE and SW, 4' wide. This is the northwest border of the island of small stars. It is sharply defined and darker than the sky. 19 Cepheus
216+171 22 1 18 +58 52 91 5 Irregular, broken region; diam. 19'; at the E end of the "island" of small stars. 19 Cepheus
217+173 22 7 28 +59 40 4 6 Diam. 4'; rather definite; a small star on N edge and one on SW edge 19 Cepheus
218+174 22 7 19 +59 4 19 6 Narrow; irregular; 19' long NE and SW 19 Cepheus
219+175 22 14 +69 56 60 ? Large; diam. 1 degree; bright nebula in N part. This is a large dark spot, extended north and south, 62' in its largest diameter. In its upper part is the star BD +69 1231 (magnitude 8.8), which is nebulous. This is apparently a large dark nebula, the brighter part of which forms the star +69 1231. In Monthly Notices, 69 (1908MNRAS..69..117W), Dr. Max Wolf gives a photograph of the nebula, stating that the object was discovered by Dr. Kopff at Heidelberg on October 12, 1908. It is conspicuous on a photograph of mine made with the Willard lens at the Lick Observatory, September 24, 1895, with 5h0m exposure. It is also shown on a photograph of mine made with the Bruce telescope, July 20, 1904, with an exposure of 3h1m. By inadvertence reference to this object was omitted in Lick Observatory Publications, 11, where it is cut out by the matting in Plate 83. 9 3 Cepheus
220+201 2 13 0 +57 5 10 ? Small; diam. 10'; 45' W of NGC 869 29 Perseus
221+202 3 25 38 +30 16 22 4 Elongated NW and SE, 33'x12' 60 Aries
222+203 3 25 50 +30 46 4 Elongated E and W; BD +30 539 (magnitude 9.0) in N ed 60 Aries
223+204 3 28 29 +30 11 14 5 Irregular; diam. 14' plus or minus; 15' SW of BD +29 566 (magnitude 6.8) 60 Aries
224+205 3 28 32 +31 6 15 5 Two dark strips, 15' long N and S, with BD +30 547 (magnitude 9.3) between them; close SW of BD +30 548 (neb.) 60 Perseus
225+206 3 29 9 +30 11 5 5 Diffused; diam. 5' plus or minus 60 Aries
226+207 4 4 35 +26 20 ? Small black spot, elongated nearly N and S; 7' N of BD +25 670 (magnitude 8.3) 78 Taurus
227+208 4 11 32 +25 9 ? Darker spot in dark lane 78 Taurus
228+209 4 12 23 +28 19 ? Center of a broad extension from B 7, toward the W 78 Taurus
229+210 4 15 33 +25 3 5 Darker spot in dark lane 78 Taurus
230+211 4 17 12 +27 48 5 North end of dark lane running SE from B 7; extends from position given 4h20m0s, +25 50' (1875.0) (B 217) 78 Taurus
231+212 4 19 14 +25 18 5 Darker spot in dark lane 78 Taurus
232+213 4 21 10 +27 3 ? Dark spot in lane 78 Taurus
233+214 4 21 55 +28 32 5 ? Diam. 5'; close N of BD +28 645 (magnitude 9.1) 78 Taurus
234+215 4 23 34 +25 2 5 Darker spot in dark lane 78 Taurus
235+216 4 23 59 +26 37 ? Dark spot in lane 78 Taurus
236+217 4 27 38 +26 7 ? Southeast end of dark lane running from B 7 78 Taurus
237+218 4 28 9 +26 16 15 ? Triangular; diam. 15'; extension to the S 78 Taurus
238+219 4 34 +29 35 120 5 Partly vacant space; 55' x 3 degrees, NE and SW 78 Taurus
239+220 4 41 30 +25 59 7 ? Round, diam. 7'; feebler extension runs NW for 1 degree; BD +25 723 (magnitude 8.3) near W edge 78 Taurus
240+221 4 44 +31 44 45 ? Partly vacant region; diam. about 3/4 degree 59 Auriga
241+222 5 8 23 +32 10 10 ? Round; indefinite; diam. 10' 59 Auriga
242+223 5 21 28 + 8 19 8 ? Fan-shaped nebula; diam. 8' plus or minus. This nebula is close southwest of, and apparently attached to, BD +8 933 (magnitude 6.5). It is possibly the bright part of an obscuring nebula. 96 Orion
243+224 5 23 54 +10 37 20 ? Indefinite; diam. 20' 96 Orion
244+225 5 28 +11 36 ? South end of extension running S for 35' from B 30 96 Orion
245+226 5 36 34 +33 42 17 ? Dark spot; diam. 17'; S of M 36 59 Auriga
246+227 6 7 23 +19 39 12 ? Round, diam. 12'; one or two faint stars in it 76 Orion
247+228 15 44 -34 30 240 6 Large vacant region about 4 degrees long NW and SE. This vacant region is about 4 degrees long, extending from RA=15h31m, dec=-32 45' to RA=15h43m, dec=-35 30' (1875.0). Its average width is about 1/2 degree. It is strongest mark at the north end. There are fragments of other dark markings several degrees west of this. 165 Lupus
248+229 16 17 -27 18 45 ? Indefinite, partially vacant region; diam. 3/4 deg 147 Scorpius
249+230 16 27 -16 47 60 ? Round; diam. about 1 degree 127 Ophiuchus
250+231 16 38 24 -35 25 30 6 Dusky; diam. 30'; sharpest on W side, diffuses to the E 164 Scorpius
251+232 16 43 44 -39 49 10 ? Dusky; 10' N and S; 2 small stars in it 164 Scorpius
252+233 16 44 45 -35 24 37 5 Diffused; 55' N and S; 20' wide 164 Scorpius
253+234 16 46 26 -30 28 18 1 Narrow; nearly 1/2 degree long, 6' wide 164 Scorpius
254+235 16 47 6 -44 28 7 6 Diam. 7'; elongated NE and SW; darkest part at SW end 181 Scorpius
255+236 16 48 -29 48 ? Center of system of indistinct dark lanes 146 Scorpius
256+237 16 48 55 -29 58 37 1 Dark lane N of CD -30 13487 (magnitude 8.0). Beginning about 10' NW of CD -30 13487 (magnitude 8.0) this dark lane runs NE for 37' and then turns abruptly to the E for 18'. 146 Scorpius
257+238 16 52 21 -23 7 13 6 Irregular; diam. 13'; BD -22 4323 (magnitude 8.0) on NW edge 146 Ophiuchus
258+239 16 55 -31 7 15 1 Curved; 15' long; very black and narrow; rimmed with stars on S and E sides. 164 Scorpius
259+240 16 59 17 -35 21 20 ? Black; diam. 20' 164 Scorpius
260+241 16 59 27 -30 11 12 2 Dusky; diffused; 18' long E and W, 6' wide; about 20' W of M 62 164 Ophiuchus
261+242 17 5 6 -32 25 19 ? Dusky; elongated E and W, 30'x8' 164 Scorpius
262+243 17 9 46 -29 34 25 3 Very irregular; diam. 25' 164 Ophiuchus
263+244 17 10 51 -28 24 25 5 Irregular; sharpest on W side; about 30' long N and S, 20' wide; from S end a narrow projection runs W for about 10'. 146 Ophiuchus
264+245 17 11 55 -29 24 8 3 Round; diffused; diam. 8'; several bright stars in it 146 Ophiuchus
265+246 17 12 1 -22 39 15 3 Irregular; diam. about 15' 146 Ophiuchus
266+247 17 13 6 -30 15 4 3 Black; diam. 4' 164 Scorpius
267+248 17 13 4 -28 59 10 5 Irregular; 10' E and W 146 Ophiuchus
268+249 17 13 4 -29 9 13 5 Very thin, short, black line, 5' long, 20' plus or minus wide 25' NW of NGC 6304; small star at NE end 146 Ophiuchus
269+250 17 13 2 -28 24 15 4 Diffused; diam. 15' 146 Ophiuchus
270+251 17 13 48 -20 9 13 3 Dusky; elongated NE and SW, 20'x5' 146 Ophiuchus
271+252 17 15 18 -32 8 20 5 Triangular; 20' N and S; eastern side diffused. Abrupt dark marking in a bright, apparently nebulous, region. CD -31 13763 (magnitude 7.7) near northeast end. 164 Scorpius
272+253 17 15 -22 33 60 ? Irregular dark region; diam. nearly 1 degree; BD -22 4307 (magnitude 8.8) in W part. 146 Ophiuchus
273+254 17 20 29 -30 7 40 5 Irregular; diffused; elongated E and W, 1 degree x 20' 164 Scorpius
274+255 17 20 35 -23 27 5 5 Dusky; diam. 5' 146 Ophiuchus
275+256 17 22 12 -28 49 50 5 Very irregular and diffused; 50' E and W; BD -28 13101 (magnitude 7.7) near E end. 146 Ophiuchus
276+257 17 22 46 -35 37 15 5 Dusky spot; diam. 15'; about 10' NW of CD -35 11505 (magnitude 6.7) 164 Scorpius
277+258 17 22 57 -34 43 40 ? Irregular area of dark markings; diam. 40' plus or minus 164 Scorpius
278+259 17 22 1 -19 17 30 4 Irregular dark area; diam. 1/2 degree; BD -19 4605 (magnitude 6.5) on W border; BD -19 4617 (magnitude 7.8) in E part 146 Ophiuchus
279+260 17 24 48 -25 37 10 ? Diffused; elongated N and S, 12'x7' 146 Ophiuchus
280+261 17 25 4 -23 2 10 4 Elongated E and W, 14'x5'; diffused on S side, reaching almost to CD -23 13378 (magnitude 7.6), about 18' SE of the center 146 Ophiuchus
281+262 17 25 -22 36 30 4 Large dark region; diam 1/2 degree; diffused except on N border. A hooklike projection from the west side, with the star BD -22 4338 (magnitude 9.6) on west end of this hook 146 Ophiuchus
282+263 17 26 56 -42 46 30 5 Diam. 30' NE and SW 181 Scorpius
283+264 17 27 12 -25 31 10 4 Narrow; black; 10' E and W; bends N at E end; 15' W of CD -25 12179 (magnitude 7.3) 146 Ophiuchus
284+265 17 27 36 -25 11 12 4 Irregular; 18' N and S; 7' wide; diffused on E side; about 5' W of CD -25 12171 (magnitude 9.2) 146 Ophiuchus
285+266 17 28 7 -20 56 30 3 Curved; 30' long NE and SW; BD -20 4775 (magnitude 7.8) just S of S edge 146 Ophiuchus
286+267 17 28 31 -25 13 4 5 Small; very black; elongated NW and SE, 5'x3'; CD -25 12177 (magnitude 9.3) at NW end 146 Ophiuchus
287+268 17 31 -20 30 75 4 Irregular dark area, 1 3/4 degree N and S; 50' wide 146 Ophiuchus
288+269 17 32 13 -22 45 60 ? Dusky region, 1 degree long NW and SE; BD -22 4369 (magnitude 7.5) near SE end 146 Ophiuchus
289+270 17 32 43 -19 35 11 5 Round; diam. 11'; in NE part of B 268 146 Ophiuchus
290+271 17 34 -34 15 120 ? Dusky; curved; 2 degrees N and S; 10' plus or minus wide; CD -33 12241 (magnitude 8.7) near N end 164 Scorpius
291+272 17 37 -23 24 45 3 Region of irregular dark markings; diam. 45'; CD -23 13469 (magnitude 8.0) near middle. 146 Ophiuchus
292+273 17 38 29 -33 20 15 ? Dark spot at N end of B 271; diam. 15' 164 Scorpius
293+274 17 38 3 -22 43 18 4 Triangular; definite; 18' N and S; BD -22 4383 (magnitude 7.5) in N end 146 Ophiuchus
294+275 17 38 59 -32 19 13 4 Round; diam. 13'; about 20' W of M6. 164 Scorpius
295+276 17 39 39 -19 49 45 6 Broken region of dark markings; diam. 3/4 degree; BD -19 4677 (magnitude 8.3) in NW part 146 Ophiuchus
296+277 17 40 44 -23 4 18 4 Narrow; 18' long E and W; BD -22 4387 (magnitude 8.3) at W end. A less distinct branch running 30' plus or minus to the SE forms a large V, open to the E 146 Ophiuchus
297+278 17 42 39 -32 18 15 4 Round; diam. 15'; about 30' E of M 6 164 Scorpius
298+279 17 44 -22 33 60 3 Irregular dark area; diam. 1 degree; BD -22 4405 (magnitude 7.3) near N edge; BD -22 4411 (magnitude 8.7) in E part 146 Sagittarius
299+280 17 44 57 -20 43 60 3 Irregular dusky area; diam. 1 degree plus or minus 146 Sagittarius
300+281 17 46 47 -23 43 2 Dark loop close E of CD -23 13548 (magnitude 8.1) 146 Sagittarius
301+282 17 48 36 -23 27 18 ? 18' long NE and SW; sharp on NW side; CD -23 13589 (magnitude 8.0) near SE end 146 Sagittarius
302+283 17 51 -33 52 75 5 Irregular, dusky area 1 1/2 degree plus or minus E and W, 1 degree N and S 164 Scorpius
303+284 17 50 6 -14 22 25 ? Curved; 35' NE and SW, 5' wide; outline sharp except at SW end; BD -14 4780 (magnitude 8.0) about 5' NW of the center 126 Serpens Cauda
304+285 17 51 32 -12 52 15 ? Diffused; diam. 15' 126 Serpens Cauda
305+286 17 53 3 -35 37 15 ? Diffused; diam. 15' plus or minus; CD -35 12013 (magnitude 7.1) in SW part 164 Scorpius
306+287 17 54 26 -35 11 30 5 Irregular, semi-vacancy; diam. 1/2 degree plus or minus; SE of M 7 164 Scorpius
307+288 17 57 6 -37 5 2 ? Black; diam. 2'; diffuses toward NE; 25' SW of CD -36 12060 (magnitude 6.3) 163 Scorpius
308+289 17 56 36 -29 1 25 4 Dark space between clouds, about 7'x35' 146 Sagittarius
309+290 17 59 20 -37 8 3 ? Very small; diam. 3' plus or minus; extends N faintly for 25' to and beyond CD -36 12060 (magnitude 6.3) 163 Corona Australis
310+291 17 59 43 -33 53 5 ? Small, round, black; diam. 5'. CD -33 12697 (magnitude 8.3) is on the east edge of this spot; a very faint star in the center. A dark lane 2' wide runs southerly from the spot for a distance of 25' and ends in a dark broken region. From the eastern side of the lane, 8' south of the star, a similar dark lane runs easterly, then north, for 35', ending in the broken region B 292. 163 Scorpius
311+292 18 0 34 -33 20 60 ? Irregular, broken, dark region; diam. 1 degree 163 Sagittarius
312+293 18 1 12 -35 20 18 ? Dusky; curved; like an inverted U, 18' across; CD -35 21259 (magnitude 8.5) near the center. 163 Sagittarius
313+294 18 1 30 -28 36 3 3 Definite; diam. 3'; star in SW part 145 Sagittarius
314+295 18 4 5 -31 9 50 4 Irregular, dark region, diam. 50'; full of rich, soft details of an apparently nebulous character 163 Sagittarius
315+296 18 4 4 -24 31 4 ? Narrow; black; 6'x1'; on S edge of M 8 145 Sagittarius
316+297 18 4 -18 44 75 3 Region of irregular, dark markings, 2 degrees E of M 23; 1 1/2 degree E and W and about 1 degree N and S 145 Sagittarius
317+298 18 5 11 -30 5 4 ? Small; diam. 4'; 5' SE of NGC 6528 163 Sagittarius
318+299 18 6 20 -27 17 3 Several small spots in star cloud, each about 3' in diameter 145 Sagittarius
319+300 18 7 1 -32 39 4 Broken dark region about 30' E of B 87 163 Sagittarius
320+301 18 8 50 -18 42 30 3 Dusky lane; 45' plus or minus long NE and SW; 2' wide 145 Sagittarius
321+302 18 9 13 -23 58 30 5 Dark spot; diam. about 1/2 degree; close N of CD -24 13962 (magnitude 7.8) 145 Sagittarius
322+303 18 9 28 -23 59 1 5 Very black; lune shaped, convex to E; diameter about 1'; 3' SE of CD -24 13962 (magnitude 7.8) 145 Sagittarius
323+304 18 13 -18 43 3 Dusky lanes in star cloud extending toward the SW from B 92 for 1 1/2 degrees 145 Sagittarius
324+305 18 14 37 -31 48 13 ? Dark; irregular; diam. 13'. Dark streamers radiate from this spot to the north for more than 3/4 degree and broken ones for 1/2 degree toward the southwest. 163 Sagittarius
325+306 18 15 44 -25 42 4 3 Small, narrow, black; 4' long NE and SW; CD -25 12920 (magnitude 8.2) 5' SW of W end; similar to B 249 145 Sagittarius
326+307 18 18 38 -17 57 6 3 SW of W end; similar to B 249 145 Sagittarius
327+308 18 19 8 -22 14 6 3 Curved; dusky; 7' E and W, 5' wide 145 Sagittarius
328+309 18 23 8 -24 1 5 ? Irregular; dusky; diam. 5' 145 Sagittarius
329+310 18 30 13 -18 35 2 3 Diam. 2'; small star near center; 20' SW of BD -18 4988 (magnitude 6.0 145 Sagittarius
330+311 18 30 27 -17 40 6 4 Black; elliptical; diam. 6' NE and SW; in a semi-vacant strip 35' long 145 Sagittarius
331+312 18 32 -15 34 75 4 Large, dark area; 1 3/4 degree NW and SE, about 30' wide. This dark area is almost elliptical in form. It is sharply defined on its north and northwest sides, but is diffused to the south, and elsewhere. There is a heavy sprinkling of small stars all over it. 125 Scutum
332+313 18 35 56 -15 41 15 ? Narrow; curved; 15' E and W 125 Scutum
333+314 18 37 4 - 9 42 35 5 Irregular, dusky marking; 35' long NE and SW 125 Scutum
334+315 18 42 18 -20 1 5 3 Round; dark; diam. 5' 145 Sagittarius
335+316 18 41 50 - 2 8 6 4 Dark; diam. 6'; sharp on its S end, gradually diffusing to the N into a wide open space 105 Aquila
336+317 18 45 46 -14 12 20 4 Dusky; 30' NE and SW, 5' wide 125 Scutum
337+318 18 49 42 - 6 23 60 2 Long, straight, dark line. This dusky line, just S of M 11, extends E and W for about 1 1/2 degrees. It is uniformly about 2' wide. 125 Scutum
338+319 18 51 58 - 1 16 7 ? Thin, curved, dark marking; length 7'; BD -1 3586 (magnitude 9.5) at the NE end. 105 Aquila
339+320 18 52 47 - 5 51 15 4 Irregular; diam. 15' plus or minus; BD -6 4941 (magnitude 7.5) near center; at S end of the large crescent-shaped marking, B 111 105 Scutum
340+321 18 54 2 -11 17 13 3 Dusky; 15' long E and W, 7' wide; BD -11 4795 (magnitude 7.8) near W end 125 Scutum
341+322 18 55 47 - 4 27 2 ? Very small; black; diam. 2'; at NE end of the "crescent", B 111 105 Scutum
342+323 18 57 34 - 3 25 17 ? A dark parallelogram, 17' N and S; BD -3 4423 (magnitude 9.2) in W part 105 Serpens Cauda
343+324 18 59 22 - 2 59 30 3 Definite, dusky loop. The crooked dusky lane forming this marking is 2'-4' wide. The length of the E side is 35'. The conspicuous star in the NE part of the loop is BD -3 4439 (magnitude 7.4). 105 Aquila
344+325 18 59 53 - 4 3 15 ? Irregular; dusky; 15' NW and SE 105 Aquila
345+326 19 3 - 0 23 20 2 Narrow; 25' long E and W; 3' wide 105 Aquila
346+327 19 4 26 - 5 7 25 3 Curved, dusky lane; 30' N and S; 3' wide 105 Aquila
347+328 19 4 49 - 4 14 4 6 Small, black; diam. 4'; 13' S of BD -4 4684 (magnitude 5.7) 105 Aquila
348+329 19 6 59 + 3 11 6 2 Dusky spot in star cloud; diam. 6' plus or minus; BD +2 3789 (magnitude 9.0) near E edge 105 Aquila
349+330 19 19 33 + 7 33 30 4 Dark; round; diam. 30'; BD +7 4028 (magnitude 7.8) on NE border 85 Aquila
350+331 19 26 + 7 34 40 1 Dusky, narrow lane 1 degree long NW and SE, 3' wide 85 Aquila
351+332 19 28 + 8 45 1 Area of dark lanes. A black spot, connected with these lanes, is located about 15' N of BD +8 4112 (magnitude 7.5) 85 Aquila
352+333 19 28 +10 40 60 3 Area of irregular dark lanes; diam. 1 degree plus or minus; the irregular lanes have a uniform width of about 2' or 3' 85 Aquila
353+334 19 35 6 +12 19 3 4 Small, dark marking; diam. 3' 85 Aquila
354+335 19 36 54 + 7 36 6 6 Small; very black; diam+H55. 6'; in a slightly larger dusky area; BD +7 4151 (magnitude 7.8) near its SW edge 85 Aquila
355+336 19 36 41 +12 20 2 5 Dark; diam. 1'-2'; in a slightly larger vacant space; BD +11 3912 (magnitude 8.6) in SW part 85 Aquila
356+337 19 37 0 +12 23 3 4 Dark; diam. 3', with narrow extension for 17' to NW. This small spot, with its narrow extension, is in a relatively darker space in the star cloud. 85 Aquila
357+338 19 43 2 + 7 27 8 3 Dusky; diam. 8'; just S of BD +7 4191 (magnitude 8.8); in S part of B 339 85 Aquila
358+339 19 44 + 8 17 60 2 Broken, dusky region covering more than 1 degree 85 Aquila
359+340 19 48 44 +11 24 7 5 Irregular, curved; diam. 7'; 25' S of BD +11 3994 (magnitude 5.8); a narrow extension for 15' to the N 85 Aquila
360+341 19 50 1 +34 16 30 3 Narrow, dark lane, about 30' E and W. This is one of several similar dark lines in this region. They are very clear cut and narrow, not more than 1.5' wide. 48 Cygnus
361+342 20 9 30 +41 12 4 4 Small, dark marking; 4' E and W 32 Cygnus
362+343 20 13 26 +40 16 13 5 Elongated; 13' long NW and SE; sharpest at SE end; several stars in S part; 10' plus or minus E of BD +39 4082 (magnitude 7.5) 32 Cygnus
363+344 20 16 12 +40 13 7 3 Dusky spot, 7' long; like an arrowhead, pointed SW; small star at NE end 32 Cygnus
364+345 20 21 0 +46 33 15 ? Curved; convex to the E; 15' long; bordered by two parallel curves of small stars. 32 Cygnus
365+346 20 26 46 +43 44 10 3 Curved, black spot; diam. 10'; embraces to the N a triangular mass of small stars 32 Cygnus
366+347 20 28 27 +39 54 1 4 Dark streak in nebulous cloud; less than 1' wide, extending 10' SW from BD +39 4206 (magnitude 8.8) 48 Cygnus
367+348 20 34 +42 5 60 3 Narrow, dusky; nearly 1 degree long NE and SW. The southwest end of this dusky lane curves west and then north, curving around the star BD +41 3799 (magnitude 6.7). 32 Cygnus
368+349 20 47 24 +43 57 6 ? Small, curved, dusky; diam. 6'. Elongated north and south, with dusky extension running 15' NW. A short line of small stars close west. 32 Cygnus
369+350 20 49 6 +45 52 3 6 Small, round, dusky; diam. 3'; 14' S of BD +45 3291 (magnitude 5.6) 32 Cygnus
370+351 20 52 27 +47 24 20 ? Crooked, dusky lane, 3' wide, 25' long NE and SW; 1/2 degree W of BD +46 3111 (magnitude 6.0) 32 Cygnus
371+352 20 57 10 +45 53 22 5 Large; black; diam. 22'; sharply defined on SE side; a row of five stars runs nearly N and S across its E end 32 Cygnus
372+353 20 57 22 +45 28 9 ? Definite; dusky; 12' N and S; 6' wide 32 Cygnus
373+354 20 58 +58 9 60 2 Dusky; irregular; 1 degree NE and SW 19 Cepheus
374+355 20 59 38 +43 11 5 ? Dark; definite; 5' E and W; like a letter V - the open end toward the E 32 Cygnus
375+356 20 59 58 +46 41 24 5 Irregular; dusky; diam. 24; BD +46 3141 (magnitude 7.6) on SE border; irregular extension for 1 1/2 degree toward the NE 32 Cygnus
376+357 20 59 52 +55 34 30 5 Irregular; dusky; diam. 30; BD +55 2495 (magnitude 7.9) in NW edge; BD +54 2455 (magnitude 9.0) near center 19 Cepheus
377+358 21 5 40 +43 16 20 ? Diam. 20'; diffuses to NE; a curve of stars along N edge; BD +42 3960 (magnitude 9.5) at W side 32 Cygnus
378+359 21 6 46 +57 10 20 5 Narrow; dusky; 20' long NE and SW; BD +56 2527 (magnitude 8.7) about 7' W of SW end. 19 Cepheus
379+360 21 7 52 +56 30 54 5 Irregular, dark marking. This, together with the dusky space in which B 151 is located, forms an irregular, zigzag marking 54' long. 19 Cepheus
380+361 21 12 45 +47 25 20 4 Round; diam. 20'; irreg. extension to W for 1/2 degree, plus or minus 32 Cygnus
381+362 21 23 57 +50 12 15 5 Elongated; 15' NE and SW; BD +49 3517 (magnitude 9.0) on NE edge 32 Cygnus
382+363 21 24 53 +48 56 40 3 Irregular; dusky; 40' long NE and SW; BD +48 3390 (magnitude 5.5) 7' plus or minus E of SE side 32 Cygnus
383+364 21 34 +54 33 75 5 Region of many small dark lanes; diam. 1 1/4 degree 19 Cygnus
384+365 21 34 53 +56 43 22 4 Dark S-shaped object; 22' long N and S; BD +55 2604 (magnitude 9.0) near SW end 19 Cepheus
385+366 21 40 21 +59 34 10 3 Roundish; dusky; diam. 10'; 12' S of BD +59 2409 (magnitude 6.9); two small stars on N border 19 Cepheus
386+367 21 44 24 +57 10 5 5 Small; dark; 5' NW and SE; about 5' NW of BD +56 2635 (magnitude 9.5) 19 Cepheus
387+368 21 50 55 +58 59 14 5 Dusky spot, 14' long NE and SW; a row of small stars in it; about 4' SW of BD +58 2340 (magnitude 9.0) 19 Cepheus
388+369 22 15 54 +56 1 5 3 Round; dusky; diam. 5'; about 13' NE of BD +55 2709 (magnitude 7.8) 19 Cepheus
389+370 22 34 +56 38 ? Region of narrow dark lanes 19 Lacerta
390
391=== modified file 'nebulae/default/CMakeLists.txt'
392--- nebulae/default/CMakeLists.txt 2013-04-24 06:43:39 +0000
393+++ nebulae/default/CMakeLists.txt 2015-03-23 00:10:05 +0000
394@@ -5,9 +5,9 @@
395 INSTALL(FILES textures.json nebula_textures.fab DESTINATION share/${PACKAGE}/nebulae/default )
396
397 # install DSO catalog
398-INSTALL(FILES ngc2000.dat ngc2000names.dat DESTINATION share/${PACKAGE}/nebulae/default )
399+INSTALL(FILES ngc2000.dat ngc2000names.dat BarnardCat_tabbed.txt DESTINATION share/${PACKAGE}/nebulae/default )
400
401 # install textures of DSO
402 INSTALL(DIRECTORY ./ DESTINATION share/${PACKAGE}/nebulae/default
403 FILES_MATCHING PATTERN "*.png"
404- PATTERN "CMakeFiles" EXCLUDE )
405\ No newline at end of file
406+ PATTERN "CMakeFiles" EXCLUDE )
407
408=== modified file 'nebulae/default/ngc2000names.dat'
409--- nebulae/default/ngc2000names.dat 2015-03-17 15:58:15 +0000
410+++ nebulae/default/ngc2000names.dat 2015-03-23 00:10:05 +0000
411@@ -425,5 +425,17 @@
412 _("Robert's Quartet") 88
413 _("Robert's Quartet") 89
414 _("Robert's Quartet") 92
415+_("Horsehead") B 33
416+_("Ink Spot Nebula") B 68
417+_("The Snake") B 72
418+_("Pipe (stem)") B 59
419+_("Pipe (stem)") B 65
420+_("Pipe (stem)") B 66
421+_("Pipe (stem)") B 67
422+_("Pipe (bowl)") B 78
423+_("Trifid Nebula") B 85
424+_("Parrot's Head") B 87
425+_("E Nebula") B 142
426+_("E Nebula") B 143
427 _("Deer Lick Group") 7331
428-_("Spider nebula") I 417
429\ No newline at end of file
430+_("Spider nebula") I 417
431
432=== modified file 'src/core/modules/Nebula.cpp'
433--- src/core/modules/Nebula.cpp 2015-01-18 06:12:13 +0000
434+++ src/core/modules/Nebula.cpp 2015-03-23 00:10:05 +0000
435@@ -2,6 +2,7 @@
436 * Stellarium
437 * Copyright (C) 2002 Fabien Chereau
438 * Copyright (C) 2011 Alexander Wolf
439+ * Copyright (C) 2015 Georg Zotti
440 *
441 * This program is free software; you can redistribute it and/or
442 * modify it under the terms of the GNU General Public License
443@@ -42,8 +43,10 @@
444 StelTextureSP Nebula::texGlobularCluster;
445 StelTextureSP Nebula::texPlanetaryNebula;
446 StelTextureSP Nebula::texDiffuseNebula;
447+StelTextureSP Nebula::texDarkNebula;
448 StelTextureSP Nebula::texOpenClusterWithNebulosity;
449 float Nebula::circleScale = 1.f;
450+bool Nebula::drawHintProportional = false;
451 float Nebula::hintsBrightness = 0;
452 Vec3f Nebula::labelColor = Vec3f(0.4,0.3,0.5);
453 Vec3f Nebula::circleColor = Vec3f(0.8,0.8,0.1);
454@@ -53,6 +56,7 @@
455 , NGC_nb(0)
456 , IC_nb(0)
457 , C_nb(0)
458+ , B_nb(0)
459 , mag(99.)
460 , nType()
461 {
462@@ -85,6 +89,8 @@
463 QStringList catIds;
464 if ((M_nb > 0) && (M_nb < 111))
465 catIds << QString("M %1").arg(M_nb);
466+ if ((B_nb > 0) && (B_nb <= 370))
467+ catIds << QString("B %1").arg(B_nb);
468 if (NGC_nb > 0)
469 catIds << QString("NGC %1").arg(NGC_nb);
470 if (IC_nb > 0)
471@@ -105,11 +111,18 @@
472
473 if (mag < 50 && flags&Magnitude)
474 {
475- if (core->getSkyDrawer()->getFlagHasAtmosphere())
476- oss << q_("Magnitude: <b>%1</b> (extincted to: <b>%2</b>)").arg(QString::number(getVMagnitude(core), 'f', 2),
477- QString::number(getVMagnitudeWithExtinction(core), 'f', 2)) << "<br>";
478+ if (nType == NebDn)
479+ {
480+ oss << q_("Opacity: <b>%1</b>").arg(getVMagnitude(core), 0, 'f', 2) << "<br>";
481+ }
482 else
483- oss << q_("Magnitude: <b>%1</b>").arg(getVMagnitude(core), 0, 'f', 2) << "<br>";
484+ {
485+ if (core->getSkyDrawer()->getFlagHasAtmosphere())
486+ oss << q_("Magnitude: <b>%1</b> (extincted to: <b>%2</b>)").arg(QString::number(getVMagnitude(core), 'f', 2),
487+ QString::number(getVMagnitudeWithExtinction(core), 'f', 2)) << "<br>";
488+ else
489+ oss << q_("Magnitude: <b>%1</b>").arg(getVMagnitude(core), 0, 'f', 2) << "<br>";
490+ }
491 }
492 if (mag < 50 && flags&Extra)
493 {
494@@ -150,7 +163,10 @@
495
496 const float maxMagHint = nebMgr->computeMaxMagHint(core->getSkyDrawer());
497 // make very easy to select if labeled
498- if (std::min(15.f, getVMagnitude(core))<maxMagHint)
499+ float lim=getVMagnitude(core);
500+ if (nType==NebDn)
501+ lim=15.0f - mag - 2.0f*angularSize;
502+ if (std::min(15.f, lim)<maxMagHint)
503 return -10.f;
504 else
505 return StelObject::getSelectPriority(core)-2.f;
506@@ -169,7 +185,7 @@
507
508 float Nebula::getSurfaceBrightness(const StelCore* core) const
509 {
510- if (getVMagnitude(core)<99 && angularSize>0)
511+ if (getVMagnitude(core)<99 && angularSize>0 && nType!=NebDn)
512 return getVMagnitude(core) + 2.5*log10(M_PI*pow((angularSize*M_PI/180.)*1800,2));
513 else
514 return 99;
515@@ -177,7 +193,7 @@
516
517 float Nebula::getSurfaceBrightnessWithExtinction(const StelCore* core) const
518 {
519- if (getVMagnitudeWithExtinction(core)<99 && angularSize>0)
520+ if (getVMagnitudeWithExtinction(core)<99 && angularSize>0 && nType!=NebDn)
521 return getVMagnitudeWithExtinction(core) + 2.5*log10(M_PI*pow((angularSize*M_PI/180.)*1800,2));
522 else
523 return 99;
524@@ -191,7 +207,16 @@
525 // temporary workaround of this bug: https://bugs.launchpad.net/stellarium/+bug/1115035 --AW
526 if (getEnglishName().contains("Pleiades"))
527 lim = 5.f;
528-
529+ // Dark nebulae. Not sure how to assess visibility from opacity? --GZ
530+ if (nType==NebDn)
531+ {
532+ // GZ: ad-hoc visibility formula: assuming good visibility if objects of mag9 are visible, "usual" opacity 5 and size 30', better visibility (discernability) comes with higher opacity and larger size,
533+ // 9-(opac-5)-2*(angularSize-0.5)
534+ if (angularSize>0 && mag<50)
535+ lim = 15.0f - mag - 2.0f*angularSize;
536+ else
537+ lim = 9.0f;
538+ }
539 if (lim>maxMagHints)
540 return;
541
542@@ -223,6 +248,9 @@
543 case NebPn:
544 Nebula::texPlanetaryNebula->bind();
545 break;
546+ case NebDn:
547+ Nebula::texDarkNebula->bind();
548+ break;
549 case NebCn:
550 Nebula::texOpenClusterWithNebulosity->bind();
551 break;
552@@ -230,7 +258,13 @@
553 Nebula::texCircle->bind();
554 }
555
556- sPainter.drawSprite2dMode(XY[0], XY[1], 6);
557+ if (drawHintProportional)
558+ {
559+ float size = getAngularSize(NULL)*M_PI/180.*sPainter.getProjector()->getPixelPerRadAtCenter();
560+ sPainter.drawSprite2dMode(XY[0], XY[1], qMax(6.0f,size));
561+ }
562+ else
563+ sPainter.drawSprite2dMode(XY[0], XY[1], 6.0f);
564 }
565
566 void Nebula::drawLabel(StelPainter& sPainter, float maxMagLabel)
567@@ -241,7 +275,16 @@
568 // temporary workaround of this bug: https://bugs.launchpad.net/stellarium/+bug/1115035 --AW
569 if (getEnglishName().contains("Pleiades"))
570 lim = 5.f;
571-
572+ // Dark nebulae. Not sure how to assess visibility from opacity? --GZ
573+ if (nType==NebDn)
574+ {
575+ // GZ: ad-hoc visibility formula: assuming good visibility if objects of mag9 are visible, "usual" opacity 5 and size 30', better visibility (discernability) comes with higher opacity and larger size,
576+ // 9-(opac-5)-2*(angularSize-0.5)
577+ if (angularSize>0 && mag<50)
578+ lim = 15.0f - mag - 2.0f*angularSize;
579+ else
580+ lim = 9.0f;
581+ }
582 if (lim>maxMagLabel)
583 return;
584
585@@ -254,7 +297,7 @@
586
587 sPainter.setColor(col[0], col[1], col[2], hintsBrightness);
588 float size = getAngularSize(NULL)*M_PI/180.*sPainter.getProjector()->getPixelPerRadAtCenter();
589- float shift = 4.f + size/1.8f;
590+ float shift = 4.f + (drawHintProportional ? size : size/1.8f);
591 QString str;
592 if (!nameI18.isEmpty())
593 str = getNameI18n();
594@@ -264,6 +307,8 @@
595 str = QString("M %1").arg(M_nb);
596 else if (C_nb > 0)
597 str = QString("C %1").arg(C_nb);
598+ else if (B_nb > 0)
599+ str = QString("B %1").arg(B_nb);
600 else if (NGC_nb > 0)
601 str = QString("NGC %1").arg(NGC_nb);
602 else if (IC_nb > 0)
603@@ -292,13 +337,11 @@
604 StelUtils::spheToRect(ra,dec,XYZ);
605 Q_ASSERT(fabs(XYZ.lengthSquared()-1.)<0.000000001);
606 nType = (Nebula::NebulaType)type;
607- // GZ: Trace the undefined entries...
608 //if (type >= 5) {
609 // qDebug()<< (isIc?"IC" : "NGC") << nb << " type " << type ;
610 //}
611- if (type == 5) {
612- qDebug()<< (isIc?"IC" : "NGC") << nb << " type " << type ;
613- }
614+ // This confirms there are currently no dark nebulae in the NGC list.
615+ Q_ASSERT(type!=5);
616 pointRegion = SphericalRegionP(new SphericalPoint(getJ2000EquatorialPos(NULL)));
617 }
618
619@@ -376,6 +419,70 @@
620 }
621 #endif
622
623+bool Nebula::readBarnard(QString record)
624+{
625+ // Line Format: "<B>\t<RAh>\t<RAm>\t<RAs>\t[+-]DD MM\t<size>\t<obs>\t<comment>... ..."
626+ int rahr;
627+ float ramin;
628+ int dedeg;
629+ int demin;
630+
631+ QStringList list=record.split("\t", QString::KeepEmptyParts);
632+
633+ //qDebug() << "Barnard: " << list.at(0) << "RA " << list.at(1) << list.at(2) << list.at(3) <<
634+ // "Dec" << list.at(4) << "opac" << list.at(6) << "size" << list.at(5);
635+
636+ B_nb=list.at(0).toInt();
637+ rahr=list.at(1).toInt();
638+ ramin=list.at(2).toInt() + list.at(3).toInt() / 60.0f;
639+ float RaRad = (double)rahr+ramin/60;
640+
641+ QString degString=list.at(4);
642+
643+ dedeg=degString.mid(1,2).toInt();
644+ demin=degString.mid(4,2).toInt();
645+
646+ float DecRad = (float)dedeg+(float)demin/60.0f;
647+
648+ if (degString.at(0) == '-') DecRad *= -1.f;
649+
650+ RaRad*=M_PI/12.f; // Convert from hours to rad
651+ DecRad*=M_PI/180.f; // Convert from deg to rad
652+
653+ // Calc the Cartesian coord with RA and DE
654+ StelUtils::spheToRect(RaRad,DecRad,XYZ);
655+ Q_ASSERT(fabs(XYZ.lengthSquared()-1.)<0.000000001);
656+
657+ // "mag" will receive opacity for dark nebulae.
658+ QString opacityStr=list.at(6);
659+
660+ if (opacityStr.contains('?')) mag=99;
661+ else mag=opacityStr.toFloat();
662+
663+ // Calc the angular size in degrees
664+ float size=list.at(5).toFloat();
665+
666+ angularSize = size/60.0f;
667+ if (angularSize<0)
668+ angularSize=0;
669+
670+ // Barnard are dark nebulae only, so at least type is easy:
671+ nType=NebDn;
672+ pointRegion = SphericalRegionP(new SphericalPoint(getJ2000EquatorialPos(NULL)));
673+
674+// // Dark nebulae. Not sure how to assess visibility from opacity and size? --GZ
675+// float lim;
676+// // GZ: ad-hoc visibility formula: assuming good visibility if objects of mag9 are visible, "usual" opacity 5 and size 30', better visibility (discernability) comes with higher opacity and larger size,
677+// // 9-(opac-5)-2*(angularSize-0.5)
678+// if (angularSize>0 && mag<50)
679+// lim = 15.0f - mag - 2.0f*angularSize;
680+// else
681+// lim = 9.0f;
682+// qDebug() << "LIMIT:" << angularSize << "*" << mag << "=" << lim;
683+
684+ return true;
685+}
686+
687 QString Nebula::getTypeString(void) const
688 {
689 QString wsType;
690
691=== modified file 'src/core/modules/Nebula.hpp'
692--- src/core/modules/Nebula.hpp 2014-10-12 20:42:44 +0000
693+++ src/core/modules/Nebula.hpp 2015-03-23 00:10:05 +0000
694@@ -2,6 +2,7 @@
695 * Stellarium
696 * Copyright (C) 2002 Fabien Chereau
697 * Copyright (C) 2011 Alexander Wolf
698+ * Copyright (C) 2015 Georg Zotti
699 *
700 * This program is free software; you can redistribute it and/or
701 * modify it under the terms of the GNU General Public License
702@@ -96,7 +97,8 @@
703
704 bool readNGC(char *record);
705 void readNGC(QDataStream& in);
706-
707+ bool readBarnard(QString record);
708+
709 void drawLabel(StelPainter& sPainter, float maxMagLabel);
710 void drawHints(StelPainter& sPainter, float maxMagHints);
711
712@@ -104,27 +106,30 @@
713 unsigned int NGC_nb; // New General Catalog number
714 unsigned int IC_nb; // Index Catalog number
715 unsigned int C_nb; // Caldwell Catalog number
716+ unsigned int B_nb; // Barnard Catalog number (Dark Nebulae)
717 QString englishName; // English name
718 QString nameI18; // Nebula name
719- float mag; // Apparent magnitude
720+ float mag; // Apparent magnitude. For Dark Nebulae, opacity is stored here.
721 float angularSize; // Angular size in degree
722- Vec3d XYZ; // Cartesian equatorial position
723+ Vec3d XYZ; // Cartesian equatorial position (J2000.0)
724 Vec3d XY; // Store temporary 2D position
725 NebulaType nType;
726
727 SphericalRegionP pointRegion;
728
729 static StelTextureSP texCircle; // The symbolic circle texture
730- static StelTextureSP texGalaxy;
731- static StelTextureSP texOpenCluster;
732- static StelTextureSP texGlobularCluster;
733- static StelTextureSP texPlanetaryNebula;
734- static StelTextureSP texDiffuseNebula;
735- static StelTextureSP texOpenClusterWithNebulosity;
736+ static StelTextureSP texGalaxy; // Type 0
737+ static StelTextureSP texOpenCluster; // Type 1
738+ static StelTextureSP texGlobularCluster; // Type 2
739+ static StelTextureSP texPlanetaryNebula; // Type 3
740+ static StelTextureSP texDiffuseNebula; // Type 4
741+ static StelTextureSP texDarkNebula; // Type 5
742+ static StelTextureSP texOpenClusterWithNebulosity; // Type 7
743 static float hintsBrightness;
744
745 static Vec3f labelColor, circleColor;
746 static float circleScale; // Define the scaling of the hints circle
747+ static bool drawHintProportional; // scale hint with nebula size?
748 };
749
750 #endif // _NEBULA_HPP_
751
752=== modified file 'src/core/modules/NebulaMgr.cpp'
753--- src/core/modules/NebulaMgr.cpp 2014-11-21 03:06:31 +0000
754+++ src/core/modules/NebulaMgr.cpp 2015-03-23 00:10:05 +0000
755@@ -2,6 +2,7 @@
756 * Stellarium
757 * Copyright (C) 2002 Fabien Chereau
758 * Copyright (C) 2011 Alexander Wolf
759+ * Copyright (C) 2015 Georg Zotti
760 *
761 * This program is free software; you can redistribute it and/or
762 * modify it under the terms of the GNU General Public License
763@@ -54,7 +55,8 @@
764 const Vec3f &NebulaMgr::getCirclesColor(void) const {return Nebula::circleColor;}
765 void NebulaMgr::setCircleScale(float scale) {Nebula::circleScale = scale;}
766 float NebulaMgr::getCircleScale(void) const {return Nebula::circleScale;}
767-
768+void NebulaMgr::setHintsProportional(const bool proportional) {Nebula::drawHintProportional=proportional;}
769+bool NebulaMgr::getHintsProportional(void) const {return Nebula::drawHintProportional;}
770
771 NebulaMgr::NebulaMgr(void)
772 : nebGrid(200),
773@@ -72,6 +74,7 @@
774 Nebula::texGlobularCluster = StelTextureSP();
775 Nebula::texPlanetaryNebula = StelTextureSP();
776 Nebula::texDiffuseNebula = StelTextureSP();
777+ Nebula::texDarkNebula = StelTextureSP();
778 Nebula::texOpenClusterWithNebulosity = StelTextureSP();
779 }
780
781@@ -101,12 +104,13 @@
782 Q_ASSERT(conf);
783
784 nebulaFont.setPixelSize(StelApp::getInstance().getBaseFontSize());
785- Nebula::texCircle = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb.png"); // Load circle texture
786+ Nebula::texCircle = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb.png"); // Load circle texture
787 Nebula::texGalaxy = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb_gal.png"); // Load ellipse texture
788 Nebula::texOpenCluster = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb_ocl.png"); // Load open cluster marker texture
789 Nebula::texGlobularCluster = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb_gcl.png"); // Load globular cluster marker texture
790 Nebula::texPlanetaryNebula = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb_pnb.png"); // Load planetary nebula marker texture
791 Nebula::texDiffuseNebula = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb_dif.png"); // Load diffuse nebula marker texture
792+ Nebula::texDarkNebula = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb_drk.png"); // Load dark nebula marker texture
793 Nebula::texOpenClusterWithNebulosity = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/neb_ocln.png"); // Load Ocl/Nebula marker texture
794 texPointer = StelApp::getInstance().getTextureManager().createTexture(StelFileMgr::getInstallationDir()+"/textures/pointeur5.png"); // Load pointer texture
795
796@@ -115,6 +119,7 @@
797 setHintsAmount(conf->value("astro/nebula_hints_amount", 3).toFloat());
798 setLabelsAmount(conf->value("astro/nebula_labels_amount", 3).toFloat());
799 setCircleScale(conf->value("astro/nebula_scale",1.0f).toFloat());
800+ setHintsProportional(conf->value("astro/flag_nebula_hints_proportional", false).toBool());
801
802 updateI18n();
803
804@@ -212,7 +217,9 @@
805 // Size on screen
806 float size = obj->getAngularSize(core)*M_PI/180.*prj->getPixelPerRadAtCenter();
807
808- size+=20.f + 10.f*std::sin(2.f * StelApp::getInstance().getTotalRunTime());
809+ if (Nebula::drawHintProportional)
810+ size*=1.2f;
811+ size+=20.f + 10.f*std::sin(3.f * StelApp::getInstance().getTotalRunTime());
812 sPainter.drawSprite2dMode(pos[0]-size/2, pos[1]-size/2, 10, 90);
813 sPainter.drawSprite2dMode(pos[0]-size/2, pos[1]+size/2, 10, 0);
814 sPainter.drawSprite2dMode(pos[0]+size/2, pos[1]+size/2, 10, -90);
815@@ -242,7 +249,7 @@
816 }
817
818 // If no match found, try search by catalog reference
819- static QRegExp catNumRx("^(M|NGC|IC|C)\\s*(\\d+)$");
820+ static QRegExp catNumRx("^(M|NGC|IC|C|B)\\s*(\\d+)$");
821 if (catNumRx.exactMatch(uname))
822 {
823 QString cat = catNumRx.capturedTexts().at(1);
824@@ -252,6 +259,7 @@
825 if (cat == "NGC") return searchNGC(num);
826 if (cat == "IC") return searchIC(num);
827 if (cat == "C") return searchC(num);
828+ if (cat == "B") return searchB(num);
829 }
830 return NebulaP();
831 }
832@@ -259,6 +267,7 @@
833 void NebulaMgr::loadNebulaSet(const QString& setName)
834 {
835 QString ngcPath = StelFileMgr::findFile("nebulae/" + setName + "/ngc2000.dat");
836+ QString barnardPath = StelFileMgr::findFile("nebulae/" + setName + "/BarnardCat_tabbed.txt");
837 QString ngcNamesPath = StelFileMgr::findFile("nebulae/" + setName + "/ngc2000names.dat");
838 if (ngcPath.isEmpty() || ngcNamesPath.isEmpty())
839 {
840@@ -266,6 +275,7 @@
841 return;
842 }
843 loadNGC(ngcPath);
844+ loadBarnard(barnardPath);
845 loadNGCNames(ngcNamesPath);
846 }
847
848@@ -275,7 +285,7 @@
849 Vec3d pos = apos;
850 pos.normalize();
851 NebulaP plusProche;
852- float anglePlusProche=0.;
853+ float anglePlusProche=0.0f;
854 foreach (const NebulaP& n, nebArray)
855 {
856 if (n->XYZ*pos>anglePlusProche)
857@@ -284,7 +294,7 @@
858 plusProche=n;
859 }
860 }
861- if (anglePlusProche>0.999)
862+ if (anglePlusProche>0.999f)
863 {
864 return plusProche;
865 }
866@@ -344,6 +354,13 @@
867 return NebulaP();
868 }
869
870+NebulaP NebulaMgr::searchB(unsigned int B)
871+{
872+ foreach (const NebulaP& n, nebArray)
873+ if (n->B_nb == B)
874+ return n;
875+ return NebulaP();
876+}
877
878 #if 0
879 // read from stream
880@@ -456,6 +473,10 @@
881 {
882 e = searchIC(nb);
883 }
884+ else if (record[37] == 'B')
885+ {
886+ e = searchB(nb);
887+ }
888 else
889 {
890 e = searchNGC(nb);
891@@ -480,7 +501,7 @@
892 }
893 else if (name.left(2).toUpper() != "M " && name.left(2).toUpper() == "C ")
894 {
895- // If it's a caldwellnumber, we will call it a caldwell if there is no better name
896+ // If it's a Caldwell number, we will call it a Caldwell if there is no better name
897 name = name.mid(2); // remove "C "
898
899 // read the Caldwell number
900@@ -498,7 +519,7 @@
901 }
902 else if (name.left(2).toUpper() == "M " && name.left(2).toUpper() != "C ")
903 {
904- // If it's a messiernumber, we will call it a messier if there is no better name
905+ // If it's a Messier number, we will call it a Messier if there is no better name
906 name = name.mid(2); // remove "M "
907
908 // read the Messier number
909@@ -527,6 +548,53 @@
910 return true;
911 }
912
913+bool NebulaMgr::loadBarnard(const QString& filename)
914+{
915+ QFile in(filename);
916+ if (!in.open(QIODevice::ReadOnly | QIODevice::Text))
917+ return false;
918+
919+ int totalRecords=0;
920+ QString record;
921+ while (!in.atEnd())
922+ {
923+ in.readLine();
924+ ++totalRecords;
925+ }
926+
927+ // rewind the file to the start
928+ in.seek(0);
929+
930+ int currentLineNumber = 0; // what input line we are on
931+ int currentRecordNumber = 0; // what record number we are on
932+ int readOk = 0; // how many records were read without problems
933+ while (!in.atEnd())
934+ {
935+ record = QString::fromUtf8(in.readLine());
936+ ++currentLineNumber;
937+
938+ // skip comments
939+ if (record.startsWith("//") || record.startsWith("#"))
940+ continue;
941+ ++currentRecordNumber;
942+
943+ // Create a new Nebula record
944+ NebulaP e = NebulaP(new Nebula);
945+ if (!e->readBarnard(record)) // reading error
946+ {
947+ e.clear();
948+ }
949+ else
950+ {
951+ nebArray.append(e);
952+ nebGrid.insert(qSharedPointerCast<StelRegionObject>(e));
953+ ++readOk;
954+ }
955+ }
956+ in.close();
957+ qDebug() << "Loaded" << readOk << "/" << totalRecords << "Barnard records";
958+ return true;
959+}
960
961 void NebulaMgr::updateI18n()
962 {
963@@ -590,6 +658,16 @@
964 }
965 }
966
967+ // Search by Barnard numbers (possible formats are "B31" or "B 31")
968+ if (objw.mid(0, 1) == "B")
969+ {
970+ foreach (const NebulaP& n, nebArray)
971+ {
972+ if (QString("B%1").arg(n->B_nb) == objw || QString("B %1").arg(n->B_nb) == objw)
973+ return qSharedPointerCast<StelObject>(n);
974+ }
975+ }
976+
977 return StelObjectP();
978 }
979
980@@ -648,6 +726,16 @@
981 }
982 }
983
984+ // Search by Barnard numbers (possible formats are "B31" or "B 31")
985+ if (objw.mid(0, 1) == "B")
986+ {
987+ foreach (const NebulaP& n, nebArray)
988+ {
989+ if (QString("B%1").arg(n->B_nb) == objw || QString("B %1").arg(n->B_nb) == objw)
990+ return qSharedPointerCast<StelObject>(n);
991+ }
992+ }
993+
994 return NULL;
995 }
996
997@@ -716,7 +804,7 @@
998 result << constw;
999 }
1000
1001- // Search by caldwell objects number (possible formats are "C31" or "C 31")
1002+ // Search by Caldwell objects number (possible formats are "C31" or "C 31")
1003 if (objw.size()>=1 && objw[0]=='C')
1004 {
1005 foreach (const NebulaP& n, nebArray)
1006@@ -736,6 +824,26 @@
1007 }
1008 }
1009
1010+ // Search by Barnard objects number (possible formats are "B31" or "B 31")
1011+ if (objw.size()>=1 && objw[0]=='B')
1012+ {
1013+ foreach (const NebulaP& n, nebArray)
1014+ {
1015+ if (n->B_nb==0) continue;
1016+ QString constw = QString("B%1").arg(n->B_nb);
1017+ QString constws = constw.mid(0, objw.size());
1018+ if (constws==objw)
1019+ {
1020+ result << constws;
1021+ continue; // Prevent adding both forms for name
1022+ }
1023+ constw = QString("B %1").arg(n->B_nb);
1024+ constws = constw.mid(0, objw.size());
1025+ if (constws==objw)
1026+ result << constw;
1027+ }
1028+ }
1029+
1030 QString dson;
1031 bool find;
1032 // Search by common names
1033@@ -830,7 +938,7 @@
1034 result << constw;
1035 }
1036
1037- // Search by caldwell objects number (possible formats are "C31" or "C 31")
1038+ // Search by Caldwell objects number (possible formats are "C31" or "C 31")
1039 if (objw.size()>=1 && objw[0]=='C')
1040 {
1041 foreach (const NebulaP& n, nebArray)
1042@@ -850,6 +958,26 @@
1043 }
1044 }
1045
1046+ // Search by Barnard objects number (possible formats are "B31" or "B 31")
1047+ if (objw.size()>=1 && objw[0]=='B')
1048+ {
1049+ foreach (const NebulaP& n, nebArray)
1050+ {
1051+ if (n->B_nb==0) continue;
1052+ QString constw = QString("B%1").arg(n->B_nb);
1053+ QString constws = constw.mid(0, objw.size());
1054+ if (constws==objw)
1055+ {
1056+ result << constws;
1057+ continue; // Prevent adding both forms for name
1058+ }
1059+ constw = QString("B %1").arg(n->B_nb);
1060+ constws = constw.mid(0, objw.size());
1061+ if (constws==objw)
1062+ result << constw;
1063+ }
1064+ }
1065+
1066 QString dson;
1067 bool find;
1068 // Search by common names
1069
1070=== modified file 'src/core/modules/NebulaMgr.hpp'
1071--- src/core/modules/NebulaMgr.hpp 2014-08-30 16:58:25 +0000
1072+++ src/core/modules/NebulaMgr.hpp 2015-03-23 00:10:05 +0000
1073@@ -2,6 +2,7 @@
1074 * Stellarium
1075 * Copyright (C) 2002 Fabien Chereau
1076 * Copyright (C) 2011 Alexander Wolf
1077+ * Copyright (C) 2015 Georg Zotti
1078 *
1079 * This program is free software; you can redistribute it and/or
1080 * modify it under the terms of the GNU General Public License
1081@@ -140,6 +141,11 @@
1082 //! Get flag for displaying Nebulae Hints.
1083 bool getFlagHints(void) const {return hintsFader;}
1084
1085+ //! Set whether hints (symbols) should be scaled according to nebula size.
1086+ void setHintsProportional(const bool proportional);
1087+ //! Get whether hints (symbols) are scaled according to nebula size.
1088+ bool getHintsProportional(void) const;
1089+
1090 //! Set flag used to turn on and off Nebula rendering.
1091 void setFlagShow(bool b) { flagShow = b; }
1092 //! Get value of flag used to turn on and off Nebula rendering.
1093@@ -205,9 +211,11 @@
1094 NebulaP searchNGC(unsigned int NGC);
1095 NebulaP searchIC(unsigned int IC);
1096 NebulaP searchC(unsigned int C);
1097+ NebulaP searchB(unsigned int B);
1098 bool loadNGC(const QString& fileName);
1099 bool loadNGCOld(const QString& catNGC);
1100 bool loadNGCNames(const QString& fileName);
1101+ bool loadBarnard(const QString& filename);
1102
1103 QVector<NebulaP> nebArray; // The nebulas list
1104 QHash<unsigned int, NebulaP> ngcIndex;
1105
1106=== added file 'textures/neb_drk.png'
1107Binary files textures/neb_drk.png 1970-01-01 00:00:00 +0000 and textures/neb_drk.png 2015-03-23 00:10:05 +0000 differ