Stellarium

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

  1. stellarium-limitmag
  2. Merge into trunk
Proposed by gzotti
Status: Merged
Merged at revision: 5867
Proposed branch: lp:~georg-zotti/stellarium/stellarium-limitmag
Merge into: lp:stellarium
Diff against target: 1302 lines (+580/-353)
15 files modified
data/default_config.ini (+4/-0)
skycultures/western/star_names.fab (+1/-1)
src/core/StelSkyDrawer.cpp (+8/-0)
src/core/StelSkyDrawer.hpp (+28/-1)
src/core/modules/Nebula.cpp (+51/-20)
src/core/modules/Nebula.hpp (+13/-7)
src/core/modules/NebulaMgr.cpp (+7/-2)
src/core/modules/NebulaMgr.hpp (+4/-1)
src/core/modules/Planet.cpp (+3/-3)
src/core/modules/ZoneArray.cpp (+15/-4)
src/core/modules/ZoneArray.hpp (+3/-3)
src/gui/ConfigurationDialog.cpp (+4/-0)
src/gui/ViewDialog.cpp (+13/-0)
src/gui/viewDialog.ui (+425/-310)
textures/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~georg-zotti/stellarium/stellarium-limitmag
Reviewer Review Type Date Requested Status
Alexander Wolf Approve
Review via email: mp+151367@code.launchpad.net

Description of the change

New user-defineable limits for stellar and Deep-Sky object brightness, so that no dim objects are displayed on zoom-in. Useful for naked-eye or binocular observers or historical questions.
Values settable on View options GUI.
Also includes some new symbols for deep-sky objects to better discern the object types.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/default_config.ini'
2--- data/default_config.ini 2013-01-31 13:54:25 +0000
3+++ data/default_config.ini 2013-03-02 19:13:21 +0000
4@@ -262,6 +262,10 @@
5 flag_telescope_name = false
6 labels_amount = 3.0
7 nebula_hints_amount = 3.0
8+flag_clamp_stellar_mag = false
9+clamp_stellar_mag = 6.5
10+flag_clamp_dso_mag = false
11+clamp_dso_mag = 8.5
12
13 [init_location]
14 location = Paris, France
15
16=== modified file 'skycultures/western/star_names.fab'
17--- skycultures/western/star_names.fab 2011-11-01 16:01:17 +0000
18+++ skycultures/western/star_names.fab 2013-03-02 19:13:21 +0000
19@@ -139,7 +139,7 @@
20 71683|_("Rigil Kent")
21 72105|_("Izar")
22 72487|_("Merga")
23- 72607|_("Kocab")
24+ 72607|_("Kochab")
25 72622|_("Zubenelgenubi")
26 73555|_("Nekkar")
27 74785|_("Zubeneschamali")
28
29=== modified file 'src/core/StelSkyDrawer.cpp'
30--- src/core/StelSkyDrawer.cpp 2012-09-06 01:28:07 +0000
31+++ src/core/StelSkyDrawer.cpp 2013-03-02 19:13:21 +0000
32@@ -79,6 +79,11 @@
33 setMaxAdaptFov(conf->value("stars/mag_converter_max_fov",70.0).toFloat());
34 setMinAdaptFov(conf->value("stars/mag_converter_min_fov",0.1).toFloat());
35 setFlagLuminanceAdaptation(conf->value("viewing/use_luminance_adaptation",true).toBool());
36+ setFlagClampStellarMagnitude((conf->value("astro/flag_clamp_stellar_mag", false).toBool()));
37+ setClampStellarMagnitude(conf->value("astro/clamp_stellar_mag", 6.5).toFloat());
38+ setFlagClampDSOMagnitude((conf->value("astro/flag_clamp_dso_mag", false).toBool()));
39+ setClampDSOMagnitude(conf->value("astro/clamp_dso_mag", 8.5).toFloat());
40+ // qDebug() << "drawer: clampStellarMag: " << clampStellarMagnitude << " , clampDSOmagnitude: " << clampDSOMagnitude;
41
42 bool ok=true;
43
44@@ -470,6 +475,9 @@
45 (StelProjectorP projector, const Vec3d& v, float illuminatedArea,
46 float mag, const Vec3f& color)
47 {
48+ // GZ: Only draw if we did not clamp this object away.
49+ if (flagClampStellarMagnitude && (mag > clampStellarMagnitude)) return;
50+
51 const float pixPerRad = projector->getPixelPerRadAtCenter();
52 // Assume a disk shape
53 float pixRadius = std::sqrt(illuminatedArea/(60.*60.)*M_PI/180.*M_PI/180.*(pixPerRad*pixPerRad))/M_PI;
54
55=== modified file 'src/core/StelSkyDrawer.hpp'
56--- src/core/StelSkyDrawer.hpp 2012-09-06 01:28:07 +0000
57+++ src/core/StelSkyDrawer.hpp 2013-03-02 19:13:21 +0000
58@@ -35,7 +35,7 @@
59
60 //! @class StelSkyDrawer
61 //! Provide a set of methods used to draw sky objects taking into account
62-//! eyes adaptation, zoom level and instrument model
63+//! eyes adaptation, zoom level, instrument model and artificially set magnitude limits
64 class StelSkyDrawer : public QObject
65 {
66 Q_OBJECT
67@@ -193,6 +193,24 @@
68 //! @return the limit V mag at which a point source will be displayed
69 float getLimitMagnitude() const {return limitMagnitude;}
70
71+ //! set true to draw stars only downto clampStellarMagnitude
72+ void setFlagClampStellarMagnitude(bool flagClamp) {flagClampStellarMagnitude = flagClamp;}
73+ //! set true to draw deep-sky objects only downto clampDSOMagnitude
74+ void setFlagClampDSOMagnitude(bool flagClamp) {flagClampDSOMagnitude = flagClamp;}
75+ //! @return true if user wants to draw only upto clampStellarMagnitude
76+ bool getFlagClampStellarMagnitude() const {return flagClampStellarMagnitude;}
77+ //! @return true if user wants to draw only upto clampDSOMagnitude
78+ bool getFlagClampDSOMagnitude() const {return flagClampDSOMagnitude;}
79+
80+ //! Get the artificially set limit for point sources, to limit drawing e.g. for naked-eye display
81+ float getClampStellarMagnitude() const {return clampStellarMagnitude;}
82+ //! Set the artificially set limit for point sources, to limit drawing e.g. for naked-eye display
83+ void setClampStellarMagnitude(double clampMag) {clampStellarMagnitude=clampMag;}
84+ //! Get the artificially set limit for deep-sky sources, to limit drawing e.g. for naked-eye display
85+ float getClampDSOMagnitude() const {return clampDSOMagnitude;}
86+ //! Set the artificially set limit for deep-sky sources, to limit drawing e.g. for naked-eye display
87+ void setClampDSOMagnitude(double clampMag) {clampDSOMagnitude=clampMag;}
88+
89 //! Get the luminance of the faintest visible object (e.g. RGB<0.05)
90 //! It depends on the zoom level, on the eye adapation and on the point source rendering parameters
91 //! @return the limit V luminance at which an object will be visible
92@@ -300,6 +318,10 @@
93 //! This is used to avoid twinkling/simulate extinction/refraction.
94 bool flagHasAtmosphere;
95
96+ //! if true, only draw stars downto clampStellarMagnitude
97+ bool flagClampStellarMagnitude;
98+ //! if true, only draw Deep-sky objects downto clampDSOMagnitude
99+ bool flagClampDSOMagnitude;
100
101 float starRelativeScale;
102 float starAbsoluteScaleF;
103@@ -312,6 +334,11 @@
104 //! Current magnitude luminance
105 float limitLuminance;
106
107+ //! Magnitude limit, e.g. to display naked-eye stars only
108+ float clampStellarMagnitude;
109+ //! Magnitude limit, e.g. to display naked-eye or binocular deep-sky objects only
110+ float clampDSOMagnitude;
111+
112 //! Little halo texture
113 class StelTextureNew* texHalo;
114
115
116=== modified file 'src/core/modules/Nebula.cpp'
117--- src/core/modules/Nebula.cpp 2012-08-12 14:34:36 +0000
118+++ src/core/modules/Nebula.cpp 2013-03-02 19:13:21 +0000
119@@ -44,9 +44,12 @@
120 if(!initialized){return;}
121
122 delete texCircle;
123+ delete texGalaxy;
124 delete texOpenCluster;
125 delete texGlobularCluster;
126 delete texPlanetaryNebula;
127+ delete texDiffuseNebula;
128+ delete texOpenClusterWithNebulosity;
129
130 initialized = false;
131 }
132@@ -55,10 +58,13 @@
133 {
134 if(initialized){return;}
135
136- texCircle = renderer->createTexture("textures/neb.png"); // Load circle texture
137- texOpenCluster = renderer->createTexture("textures/ocl.png"); // Load open cluster marker texture
138- texGlobularCluster = renderer->createTexture("textures/gcl.png"); // Load globular cluster marker texture
139- texPlanetaryNebula = renderer->createTexture("textures/pnb.png"); // Load planetary nebula marker texture
140+ texCircle = renderer->createTexture("textures/neb.png"); // Load circle texture
141+ texGalaxy = renderer->createTexture("textures/neb_gal.png"); // Load ellipse texture
142+ texOpenCluster = renderer->createTexture("textures/neb_ocl.png"); // Load open cluster marker texture
143+ texGlobularCluster = renderer->createTexture("textures/neb_gcl.png"); // Load globular cluster marker texture
144+ texPlanetaryNebula = renderer->createTexture("textures/neb_pnb.png"); // Load planetary nebula marker texture
145+ texDiffuseNebula = renderer->createTexture("textures/neb_dif.png"); // Load diffuse nebula marker texture
146+ texOpenClusterWithNebulosity = renderer->createTexture("textures/neb_ocln.png"); // Load Ocl/Nebula marker texture
147
148 initialized = true;
149 }
150@@ -184,22 +190,37 @@
151 col = StelUtils::getNightColor(col);
152
153 renderer->setGlobalColor(col[0], col[1], col[2], 1);
154- if (nType == 1)
155- {
156- hintTextures.texOpenCluster->bind();
157- }
158- else if (nType == 2)
159- {
160- hintTextures.texGlobularCluster->bind();
161- }
162- else if (nType == 4)
163- {
164- hintTextures.texPlanetaryNebula->bind();
165- }
166- else
167- {
168- hintTextures.texCircle->bind();
169- }
170+/*
171+ if (nType == NebGx) hintTextures.texGalaxy->bind();
172+ else if (nType == NebOc) hintTextures.texOpenCluster->bind();
173+ else if (nType == NebGc) hintTextures.texGlobularCluster->bind();
174+ else if (nType == NebN) hintTextures.texDiffuseNebula->bind();
175+ else if (nType == NebPn) hintTextures.texPlanetaryNebula->bind();
176+ else if (nType == NebCn) hintTextures.texOpenClusterWithNebulosity->bind();
177+ else hintTextures.texCircle->bind();
178+*/
179+ switch (nType) {
180+ case NebGx:
181+ hintTextures.texGalaxy->bind();
182+ break;
183+ case NebOc:
184+ hintTextures.texOpenCluster->bind();
185+ break;
186+ case NebGc:
187+ hintTextures.texGlobularCluster->bind();
188+ break;
189+ case NebN:
190+ hintTextures.texDiffuseNebula->bind();
191+ break;
192+ case NebPn:
193+ hintTextures.texPlanetaryNebula->bind();
194+ break;
195+ case NebCn:
196+ hintTextures.texOpenClusterWithNebulosity->bind();
197+ break;
198+ default:
199+ hintTextures.texCircle->bind();
200+}
201
202 renderer->drawTexturedRect(XY[0] - 6, XY[1] - 6, 12, 12);
203 }
204@@ -255,6 +276,13 @@
205 StelUtils::spheToRect(ra,dec,XYZ);
206 Q_ASSERT(fabs(XYZ.lengthSquared()-1.)<0.000000001);
207 nType = (Nebula::NebulaType)type;
208+ // GZ: Trace the undefined entries...
209+ //if (type >= 5) {
210+ // qDebug()<< (isIc?"IC" : "NGC") << nb << " type " << type ;
211+ //}
212+ if (type == 5) {
213+ qDebug()<< (isIc?"IC" : "NGC") << nb << " type " << type ;
214+ }
215 pointRegion = SphericalRegionP(new SphericalPoint(getJ2000EquatorialPos(NULL)));
216 }
217
218@@ -353,6 +381,9 @@
219 case NebPn:
220 wsType = q_("Planetary nebula");
221 break;
222+ case NebDn:
223+ wsType = q_("Dark Nebula (?)"); // Find out if this is true!
224+ break;
225 case NebCn:
226 wsType = q_("Cluster associated with nebulosity");
227 break;
228
229=== modified file 'src/core/modules/Nebula.hpp'
230--- src/core/modules/Nebula.hpp 2012-08-10 11:43:14 +0000
231+++ src/core/modules/Nebula.hpp 2013-03-02 19:13:21 +0000
232@@ -74,14 +74,20 @@
233 //! Textures used to draw nebula hints.
234 struct NebulaHintTextures
235 {
236- //! The symbolic circle texture.
237+ //! The symbolic circle texture. (default)
238 class StelTextureNew* texCircle;
239- //! The open cluster marker texture.
240+ //! The symbolic galaxy texture. (Type 0)
241+ class StelTextureNew* texGalaxy;
242+ //! The open cluster marker texture. (Type 1)
243 class StelTextureNew* texOpenCluster;
244- //! The globular cluster marker texture.
245+ //! The globular cluster marker texture. (Type 2)
246 class StelTextureNew* texGlobularCluster;
247- //! The planetary nebula marker texture.
248+ //! The diffuse nebula marker texture. (Type 3)
249+ class StelTextureNew* texDiffuseNebula;
250+ //! The planetary nebula marker texture. (type 4)
251 class StelTextureNew* texPlanetaryNebula;
252+ //! The "Open cluster with Nebulosity" nebula marker texture. (Type 7)
253+ class StelTextureNew* texOpenClusterWithNebulosity;
254 //! Are we initialized yet?
255 bool initialized;
256
257@@ -101,10 +107,10 @@
258 NebGc=2, //!< Globular star cluster, usually in the Milky Way Galaxy
259 NebN=3, //!< Bright emission or reflection nebula
260 NebPn=4, //!< Planetary nebula
261- NebDn=5, //!< ???
262- NebIg=6, //!< ???
263+ NebDn=5, //!< ??? Dark Nebula? Does not exist in current catalog
264+ NebIg=6, //!< ??? Irregular Galaxy? Does not exist in current catalog
265 NebCn=7, //!< Cluster associated with nebulosity
266- NebUnknown=8 //!< Unknown type
267+ NebUnknown=8 //!< Unknown type, catalog errors, "Unidentified Southern Objects" etc.
268 };
269
270 //! Translate nebula name using the passed translator
271
272=== modified file 'src/core/modules/NebulaMgr.cpp'
273--- src/core/modules/NebulaMgr.cpp 2013-02-22 11:43:47 +0000
274+++ src/core/modules/NebulaMgr.cpp 2013-03-02 19:13:21 +0000
275@@ -129,6 +129,10 @@
276 void operator()(StelRegionObject* obj)
277 {
278 Nebula* n = static_cast<Nebula*>(obj);
279+ StelSkyDrawer *drawer = core->getSkyDrawer();
280+ // filter out DSOs which are too dim to be seen (e.g. for bino observers)
281+ if ((drawer->getFlagClampDSOMagnitude()) && (n->mag > drawer->getClampDSOMagnitude())) return;
282+
283 if (n->angularSize>angularSizeLimit || (checkMaxMagHints && n->mag <= maxMagHints))
284 {
285 float refmag_add=0; // value to adjust hints visibility threshold.
286@@ -161,8 +165,8 @@
287 const SphericalRegionP& p = prj->getViewportConvexPolygon(margin, margin);
288
289 // Print all the nebulae of all the selected zones
290- float maxMagHints = skyDrawer->getLimitMagnitude()*1.2f-2.f+(hintsAmount*1.2f)-2.f;
291- float maxMagLabels = skyDrawer->getLimitMagnitude()-2.f+(labelsAmount*1.2f)-2.f;
292+ float maxMagHints = skyDrawer->getLimitMagnitude()*1.2f-2.f+(hintsAmount *1.2f)-2.f;
293+ float maxMagLabels = skyDrawer->getLimitMagnitude() -2.f+(labelsAmount*1.2f)-2.f;
294
295 renderer->setFont(nebulaFont);
296 nebulaHintTextures.lazyInit(renderer);
297@@ -176,6 +180,7 @@
298 }
299 }
300
301+// Draw the pointer around the object if selected
302 void NebulaMgr::drawPointer(const StelCore* core, StelRenderer* renderer)
303 {
304 const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
305
306=== modified file 'src/core/modules/NebulaMgr.hpp'
307--- src/core/modules/NebulaMgr.hpp 2013-02-22 11:43:47 +0000
308+++ src/core/modules/NebulaMgr.hpp 2013-03-02 19:13:21 +0000
309@@ -40,6 +40,8 @@
310 //! @class NebulaMgr
311 //! Manage a collection of nebulae. This class is used
312 //! to display the NGC catalog with information, and textures for some of them.
313+// GZ: This doc seems outdated/misleading - photo textures are not mamaged here but in StelSkyImageTile
314+
315 class NebulaMgr : public StelObjectModule
316 {
317 Q_OBJECT
318@@ -103,7 +105,7 @@
319 ///////////////////////////////////////////////////////////////////////////
320 // Properties setters and getters
321 public slots:
322- //! Set the color used to draw the nebula circles.
323+ //! Set the color used to draw the nebula symbols (circles, boxes. etc).
324 void setCirclesColor(const Vec3f& c);
325 //! Get current value of the nebula circle color.
326 const Vec3f& getCirclesColor(void) const;
327@@ -114,6 +116,7 @@
328 float getCircleScale(void) const;
329
330 //! Set how long it takes for nebula hints to fade in and out when turned on and off.
331+ //! @param duration given in seconds
332 void setHintsFadeDuration(float duration) {hintsFader.setDuration((int) (duration * 1000.f));}
333
334 //! Set flag for displaying Nebulae Hints.
335
336=== modified file 'src/core/modules/Planet.cpp'
337--- src/core/modules/Planet.cpp 2013-02-10 10:26:03 +0000
338+++ src/core/modules/Planet.cpp 2013-03-02 19:13:21 +0000
339@@ -1050,7 +1050,7 @@
340 */
341 // GZ: I prefer the values given by Meeus, Astronomical Algorithms (1992).
342 // There are two solutions:
343- // (1) G. Mller, based on visual observations 1877-91. [Expl.Suppl.1961]
344+ // (1) G. Mueller, based on visual observations 1877-91. [Expl.Suppl.1961]
345 // (2) Astronomical Almanac 1984 and later. These give V (instrumental) magnitudes.
346 // The structure is almost identical, just the numbers are different!
347 // I activate (1) for now, because we want to simulate the eye's impression. (Esp. Venus!)
348@@ -1068,7 +1068,7 @@
349 return -8.93 + d + extinctionMag;
350 if (englishName=="Saturn")
351 {
352- // TODO re-add rings computation
353+ // add rings computation
354 // GZ: implemented from Meeus, Astr.Alg.1992
355 const double jd=core->getJDay();
356 const double T=(jd-2451545.0)/36525.0;
357@@ -1100,7 +1100,7 @@
358 return -9.40 + d + 0.005*phaseDeg + extinctionMag;
359 if (englishName=="Saturn")
360 {
361- // TODO re-add rings computation
362+ // add rings computation
363 // GZ: implemented from Meeus, Astr.Alg.1992
364 const double jd=core->getJDay();
365 const double T=(jd-2451545.0)/36525.0;
366
367=== modified file 'src/core/modules/ZoneArray.cpp'
368--- src/core/modules/ZoneArray.cpp 2012-09-05 13:30:21 +0000
369+++ src/core/modules/ZoneArray.cpp 2013-03-02 19:13:21 +0000
370@@ -444,6 +444,8 @@
371 file->close();
372 }
373 }
374+ // GZ: Some diagnostics to understand the undocumented vars around mag.
375+ // qDebug() << "SpecialZoneArray: mag_min=" << mag_min << ", mag_steps=" << mag_steps << ", mag_range=" << mag_range ;
376 }
377 }
378
379@@ -485,22 +487,24 @@
380 static const double d2000 = 2451545.0;
381 const double movementFactor = (M_PI/180)*(0.0001/3600) * ((core->getJDay()-d2000)/365.25) / star_position_scale;
382 const float* tmpRcmag; // will point to precomputed rC in table
383- // GZ, added for extinction
384 Extinction extinction=core->getSkyDrawer()->getExtinction();
385 const bool withExtinction=(drawer->getFlagHasAtmosphere() && extinction.getExtinctionCoefficient()>=0.01f);
386 const float k = (0.001f*mag_range)/mag_steps; // from StarMgr.cpp line 654
387-
388+ // GZ: allow artificial cutoff:
389+ const int clampStellarMagnitude_mmag = (int) floor(drawer->getClampStellarMagnitude() * 1000.0f);
390+ // find s->mag, which is the step into the magnitudes which is just bright enough to be drawn.
391+ int cutoffMagStep=(drawer->getFlagClampStellarMagnitude() ? (clampStellarMagnitude_mmag - mag_min)*mag_steps/mag_range : mag_steps);
392
393 // go through all stars, which are sorted by magnitude (bright stars first)
394 for (const Star *s=z->getStars();s<end;++s)
395 {
396+ if (s->mag > cutoffMagStep) break; // e.g. naked-eye stars only.
397 tmpRcmag = rcmag_table+2*s->mag;
398 if (*tmpRcmag<=0.f) break; // no size for this and following (even dimmer, unextincted) stars? --> early exit
399 s->getJ2000Pos(z,movementFactor, vf);
400
401 const Vec3d vd(vf[0], vf[1], vf[2]);
402
403- // GZ new:
404 if (withExtinction)
405 {
406 //GZ: We must compute position first, then shift magnitude.
407@@ -509,7 +513,14 @@
408 extinction.forward(&altAz, &extMagShift);
409 const int extMagShiftStep =
410 qMin((int)floor(extMagShift / k), RCMAG_TABLE_SIZE-mag_steps);
411- tmpRcmag = rcmag_table + 2 * (s->mag+extMagShiftStep);
412+ if ((s->mag + extMagShiftStep) > cutoffMagStep) // i.e., if extincted it is dimmer than cutoff, so remove [draw with hopefully zero size].
413+ {
414+ tmpRcmag = rcmag_table + 2 * (RCMAG_TABLE_SIZE-1);
415+ }
416+ else
417+ {
418+ tmpRcmag = rcmag_table + 2 * (s->mag+extMagShiftStep);
419+ }
420 }
421
422 Vec3f win;
423
424=== modified file 'src/core/modules/ZoneArray.hpp'
425--- src/core/modules/ZoneArray.hpp 2012-08-19 16:37:16 +0000
426+++ src/core/modules/ZoneArray.hpp 2013-03-02 19:13:21 +0000
427@@ -122,13 +122,13 @@
428 //! Level in StelGeodesicGrid.
429 const int level;
430
431- //! Lower bound of magnitudes in this catalog.
432+ //! Lower bound of magnitudes in this catalog. Units: millimag. May be negative for brightest stars.
433 const int mag_min;
434
435- //! Range of magnitudes in this catalog.
436+ //! Range of magnitudes in this catalog. Units: millimags
437 const int mag_range;
438
439- //! Number of steps used to describe values in @em mag_range.
440+ //! Number of steps used to describe values in @em mag_range. Always positive. Individual stars have their mag entries from 0..mag_steps.
441 const int mag_steps;
442
443 float star_position_scale;
444
445=== modified file 'src/gui/ConfigurationDialog.cpp'
446--- src/gui/ConfigurationDialog.cpp 2013-02-25 00:27:09 +0000
447+++ src/gui/ConfigurationDialog.cpp 2013-03-02 19:13:21 +0000
448@@ -494,6 +494,10 @@
449 conf->setValue("stars/relative_scale", skyd->getRelativeStarScale());
450 conf->setValue("stars/flag_star_twinkle", skyd->getFlagTwinkle());
451 conf->setValue("stars/star_twinkle_amount", skyd->getTwinkleAmount());
452+ conf->setValue("astro/flag_clamp_stellar_mag", skyd->getFlagClampStellarMagnitude());
453+ conf->setValue("astro/clamp_stellar_mag", skyd->getClampStellarMagnitude());
454+ conf->setValue("astro/flag_clamp_dso_mag", skyd->getFlagClampDSOMagnitude());
455+ conf->setValue("astro/clamp_dso_mag", skyd->getClampDSOMagnitude());
456 conf->setValue("viewing/use_luminance_adaptation", skyd->getFlagLuminanceAdaptation());
457 conf->setValue("astro/flag_planets", ssmgr->getFlagPlanets());
458 conf->setValue("astro/flag_planets_hints", ssmgr->getFlagHints());
459
460=== modified file 'src/gui/ViewDialog.cpp'
461--- src/gui/ViewDialog.cpp 2013-02-11 12:29:27 +0000
462+++ src/gui/ViewDialog.cpp 2013-03-02 19:13:21 +0000
463@@ -155,6 +155,19 @@
464 ui->adaptationCheckbox->setChecked(StelApp::getInstance().getCore()->getSkyDrawer()->getFlagLuminanceAdaptation());
465 connect(ui->adaptationCheckbox, SIGNAL(toggled(bool)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setFlagLuminanceAdaptation(bool)));
466
467+ // Limit Magnitudes
468+ ui->starLimitMagnitudeCheckBox->setChecked(StelApp::getInstance().getCore()->getSkyDrawer()->getFlagClampStellarMagnitude());
469+ connect(ui->starLimitMagnitudeCheckBox, SIGNAL(toggled(bool)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setFlagClampStellarMagnitude(bool)));
470+
471+ ui->starLimitMagnitudeDoubleSpinBox->setValue(StelApp::getInstance().getCore()->getSkyDrawer()->getClampStellarMagnitude());
472+ connect(ui->starLimitMagnitudeDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setClampStellarMagnitude(double)));
473+
474+ ui->nebulaLimitMagnitudeCheckBox->setChecked(StelApp::getInstance().getCore()->getSkyDrawer()->getFlagClampDSOMagnitude());
475+ connect(ui->nebulaLimitMagnitudeCheckBox, SIGNAL(toggled(bool)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setFlagClampDSOMagnitude(bool)));
476+
477+ ui->nebulaLimitMagnitudeDoubleSpinBox->setValue(StelApp::getInstance().getCore()->getSkyDrawer()->getClampDSOMagnitude());
478+ connect(ui->nebulaLimitMagnitudeDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setClampDSOMagnitude(double)));
479+
480 // Planets section
481 SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
482 ui->showPlanetCheckBox->setChecked(ssmgr->getFlagPlanets());
483
484=== modified file 'src/gui/viewDialog.ui'
485--- src/gui/viewDialog.ui 2013-02-01 14:42:55 +0000
486+++ src/gui/viewDialog.ui 2013-03-02 19:13:21 +0000
487@@ -6,8 +6,8 @@
488 <rect>
489 <x>0</x>
490 <y>0</y>
491- <width>488</width>
492- <height>481</height>
493+ <width>594</width>
494+ <height>513</height>
495 </rect>
496 </property>
497 <property name="font">
498@@ -325,7 +325,7 @@
499 </item>
500 </widget>
501 </item>
502- <item>
503+ <item alignment="Qt::AlignTop">
504 <widget class="QStackedWidget" name="stackedWidget">
505 <property name="currentIndex">
506 <number>0</number>
507@@ -338,7 +338,273 @@
508 <property name="spacing">
509 <number>0</number>
510 </property>
511- <item row="0" column="0">
512+ <item row="1" column="1" alignment="Qt::AlignTop">
513+ <widget class="QGroupBox" name="labelsGroupBox">
514+ <property name="sizePolicy">
515+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
516+ <horstretch>0</horstretch>
517+ <verstretch>0</verstretch>
518+ </sizepolicy>
519+ </property>
520+ <property name="minimumSize">
521+ <size>
522+ <width>0</width>
523+ <height>150</height>
524+ </size>
525+ </property>
526+ <property name="font">
527+ <font>
528+ <pointsize>10</pointsize>
529+ <weight>50</weight>
530+ <bold>false</bold>
531+ </font>
532+ </property>
533+ <property name="title">
534+ <string>Labels and Markers</string>
535+ </property>
536+ <property name="checkable">
537+ <bool>false</bool>
538+ </property>
539+ <layout class="QGridLayout" name="gridLayoutx">
540+ <property name="margin">
541+ <number>0</number>
542+ </property>
543+ <item row="0" column="0">
544+ <widget class="QCheckBox" name="starLabelCheckBox">
545+ <property name="text">
546+ <string>Stars</string>
547+ </property>
548+ </widget>
549+ </item>
550+ <item row="0" column="1">
551+ <widget class="QSlider" name="starsLabelsHorizontalSlider">
552+ <property name="sizePolicy">
553+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
554+ <horstretch>0</horstretch>
555+ <verstretch>0</verstretch>
556+ </sizepolicy>
557+ </property>
558+ <property name="minimumSize">
559+ <size>
560+ <width>180</width>
561+ <height>0</height>
562+ </size>
563+ </property>
564+ <property name="value">
565+ <number>33</number>
566+ </property>
567+ <property name="orientation">
568+ <enum>Qt::Horizontal</enum>
569+ </property>
570+ </widget>
571+ </item>
572+ <item row="2" column="0">
573+ <widget class="QCheckBox" name="planetLabelCheckBox">
574+ <property name="text">
575+ <string>Planets</string>
576+ </property>
577+ </widget>
578+ </item>
579+ <item row="2" column="1">
580+ <widget class="QSlider" name="planetsLabelsHorizontalSlider">
581+ <property name="sizePolicy">
582+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
583+ <horstretch>0</horstretch>
584+ <verstretch>0</verstretch>
585+ </sizepolicy>
586+ </property>
587+ <property name="minimumSize">
588+ <size>
589+ <width>180</width>
590+ <height>0</height>
591+ </size>
592+ </property>
593+ <property name="value">
594+ <number>33</number>
595+ </property>
596+ <property name="orientation">
597+ <enum>Qt::Horizontal</enum>
598+ </property>
599+ </widget>
600+ </item>
601+ <item row="1" column="0">
602+ <widget class="QCheckBox" name="nebulaLabelCheckBox">
603+ <property name="text">
604+ <string>Nebulas</string>
605+ </property>
606+ </widget>
607+ </item>
608+ <item row="1" column="1">
609+ <widget class="QSlider" name="nebulasLabelsHorizontalSlider">
610+ <property name="sizePolicy">
611+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
612+ <horstretch>0</horstretch>
613+ <verstretch>0</verstretch>
614+ </sizepolicy>
615+ </property>
616+ <property name="minimumSize">
617+ <size>
618+ <width>180</width>
619+ <height>0</height>
620+ </size>
621+ </property>
622+ <property name="value">
623+ <number>33</number>
624+ </property>
625+ <property name="orientation">
626+ <enum>Qt::Horizontal</enum>
627+ </property>
628+ </widget>
629+ </item>
630+ </layout>
631+ </widget>
632+ </item>
633+ <item row="0" column="1">
634+ <widget class="QGroupBox" name="planetsGroupBox">
635+ <property name="font">
636+ <font>
637+ <pointsize>10</pointsize>
638+ <weight>50</weight>
639+ <bold>false</bold>
640+ </font>
641+ </property>
642+ <property name="title">
643+ <string>Planets and satellites</string>
644+ </property>
645+ <property name="checkable">
646+ <bool>false</bool>
647+ </property>
648+ <layout class="QVBoxLayout" name="verticalLayout_2">
649+ <property name="margin">
650+ <number>0</number>
651+ </property>
652+ <item>
653+ <widget class="QCheckBox" name="showPlanetCheckBox">
654+ <property name="text">
655+ <string>Show planets</string>
656+ </property>
657+ <property name="checked">
658+ <bool>true</bool>
659+ </property>
660+ </widget>
661+ </item>
662+ <item>
663+ <widget class="QCheckBox" name="planetMarkerCheckBox">
664+ <property name="text">
665+ <string>Show planet markers</string>
666+ </property>
667+ </widget>
668+ </item>
669+ <item>
670+ <widget class="QCheckBox" name="planetOrbitCheckBox">
671+ <property name="sizePolicy">
672+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
673+ <horstretch>0</horstretch>
674+ <verstretch>0</verstretch>
675+ </sizepolicy>
676+ </property>
677+ <property name="text">
678+ <string>Show planet orbits</string>
679+ </property>
680+ </widget>
681+ </item>
682+ <item>
683+ <widget class="QCheckBox" name="planetLightSpeedCheckBox">
684+ <property name="text">
685+ <string>Simulate light speed</string>
686+ </property>
687+ </widget>
688+ </item>
689+ <item>
690+ <widget class="QCheckBox" name="planetScaleMoonCheckBox">
691+ <property name="text">
692+ <string>Scale Moon</string>
693+ </property>
694+ </widget>
695+ </item>
696+ </layout>
697+ </widget>
698+ </item>
699+ <item row="1" column="0">
700+ <widget class="QGroupBox" name="atmosphereGroupBox">
701+ <property name="font">
702+ <font>
703+ <pointsize>10</pointsize>
704+ <weight>50</weight>
705+ <bold>false</bold>
706+ </font>
707+ </property>
708+ <property name="title">
709+ <string>Atmosphere</string>
710+ </property>
711+ <layout class="QVBoxLayout" name="verticalLayout_3">
712+ <property name="margin">
713+ <number>0</number>
714+ </property>
715+ <item>
716+ <widget class="QCheckBox" name="showAtmosphereCheckBox">
717+ <property name="text">
718+ <string>Show atmosphere</string>
719+ </property>
720+ </widget>
721+ </item>
722+ <item>
723+ <layout class="QHBoxLayout" name="_2">
724+ <item>
725+ <widget class="QLabel" name="label_4">
726+ <property name="text">
727+ <string>Light pollution:</string>
728+ </property>
729+ </widget>
730+ </item>
731+ <item>
732+ <widget class="QSpinBox" name="lightPollutionSpinBox">
733+ <property name="alignment">
734+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
735+ </property>
736+ <property name="minimum">
737+ <number>1</number>
738+ </property>
739+ <property name="maximum">
740+ <number>9</number>
741+ </property>
742+ <property name="value">
743+ <number>1</number>
744+ </property>
745+ </widget>
746+ </item>
747+ </layout>
748+ </item>
749+ <item>
750+ <widget class="QPushButton" name="pushButtonAtmosphereDetails">
751+ <property name="toolTip">
752+ <string>pressure, temperature, extinction coefficient</string>
753+ </property>
754+ <property name="text">
755+ <string>Refraction/Extinction settings...</string>
756+ </property>
757+ </widget>
758+ </item>
759+ <item>
760+ <spacer name="verticalSpacer_2">
761+ <property name="orientation">
762+ <enum>Qt::Vertical</enum>
763+ </property>
764+ <property name="sizeType">
765+ <enum>QSizePolicy::Expanding</enum>
766+ </property>
767+ <property name="sizeHint" stdset="0">
768+ <size>
769+ <width>20</width>
770+ <height>0</height>
771+ </size>
772+ </property>
773+ </spacer>
774+ </item>
775+ </layout>
776+ </widget>
777+ </item>
778+ <item row="0" column="0" alignment="Qt::AlignTop">
779 <widget class="QGroupBox" name="starGroupBox">
780 <property name="font">
781 <font>
782@@ -621,309 +887,7 @@
783 </layout>
784 </widget>
785 </item>
786- <item row="0" column="1">
787- <widget class="QGroupBox" name="planetsGroupBox">
788- <property name="font">
789- <font>
790- <pointsize>10</pointsize>
791- <weight>50</weight>
792- <bold>false</bold>
793- </font>
794- </property>
795- <property name="title">
796- <string>Planets and satellites</string>
797- </property>
798- <property name="checkable">
799- <bool>false</bool>
800- </property>
801- <layout class="QVBoxLayout" name="verticalLayout_2">
802- <property name="margin">
803- <number>0</number>
804- </property>
805- <item>
806- <widget class="QCheckBox" name="showPlanetCheckBox">
807- <property name="text">
808- <string>Show planets</string>
809- </property>
810- <property name="checked">
811- <bool>true</bool>
812- </property>
813- </widget>
814- </item>
815- <item>
816- <widget class="QCheckBox" name="planetMarkerCheckBox">
817- <property name="text">
818- <string>Show planet markers</string>
819- </property>
820- </widget>
821- </item>
822- <item>
823- <widget class="QCheckBox" name="planetOrbitCheckBox">
824- <property name="sizePolicy">
825- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
826- <horstretch>0</horstretch>
827- <verstretch>0</verstretch>
828- </sizepolicy>
829- </property>
830- <property name="text">
831- <string>Show planet orbits</string>
832- </property>
833- </widget>
834- </item>
835- <item>
836- <widget class="QCheckBox" name="planetLightSpeedCheckBox">
837- <property name="text">
838- <string>Simulate light speed</string>
839- </property>
840- </widget>
841- </item>
842- <item>
843- <widget class="QCheckBox" name="planetScaleMoonCheckBox">
844- <property name="text">
845- <string>Scale Moon</string>
846- </property>
847- </widget>
848- </item>
849- </layout>
850- </widget>
851- </item>
852- <item row="1" column="0">
853- <widget class="QGroupBox" name="atmosphereGroupBox">
854- <property name="font">
855- <font>
856- <pointsize>10</pointsize>
857- <weight>50</weight>
858- <bold>false</bold>
859- </font>
860- </property>
861- <property name="title">
862- <string>Atmosphere</string>
863- </property>
864- <layout class="QVBoxLayout" name="verticalLayout_3">
865- <property name="margin">
866- <number>0</number>
867- </property>
868- <item>
869- <widget class="QCheckBox" name="showAtmosphereCheckBox">
870- <property name="text">
871- <string>Show atmosphere</string>
872- </property>
873- </widget>
874- </item>
875- <item>
876- <layout class="QHBoxLayout" name="_2">
877- <item>
878- <widget class="QLabel" name="label_4">
879- <property name="text">
880- <string>Light pollution:</string>
881- </property>
882- </widget>
883- </item>
884- <item>
885- <widget class="QSpinBox" name="lightPollutionSpinBox">
886- <property name="alignment">
887- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
888- </property>
889- <property name="minimum">
890- <number>1</number>
891- </property>
892- <property name="maximum">
893- <number>9</number>
894- </property>
895- <property name="value">
896- <number>1</number>
897- </property>
898- </widget>
899- </item>
900- </layout>
901- </item>
902- <item>
903- <layout class="QHBoxLayout" name="horizontalLayout">
904- <item>
905- <widget class="QPushButton" name="pushButtonAtmosphereDetails">
906- <property name="toolTip">
907- <string>pressure, temperature, extinction coefficient</string>
908- </property>
909- <property name="text">
910- <string>Refraction/Extinction settings...</string>
911- </property>
912- </widget>
913- </item>
914- </layout>
915- </item>
916- <item>
917- <spacer name="verticalSpacer_2">
918- <property name="orientation">
919- <enum>Qt::Vertical</enum>
920- </property>
921- <property name="sizeType">
922- <enum>QSizePolicy::Expanding</enum>
923- </property>
924- <property name="sizeHint" stdset="0">
925- <size>
926- <width>20</width>
927- <height>0</height>
928- </size>
929- </property>
930- </spacer>
931- </item>
932- </layout>
933- </widget>
934- </item>
935- <item row="1" column="1">
936- <widget class="QGroupBox" name="labelsGroupBox">
937- <property name="sizePolicy">
938- <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
939- <horstretch>0</horstretch>
940- <verstretch>0</verstretch>
941- </sizepolicy>
942- </property>
943- <property name="minimumSize">
944- <size>
945- <width>0</width>
946- <height>150</height>
947- </size>
948- </property>
949- <property name="font">
950- <font>
951- <pointsize>10</pointsize>
952- <weight>50</weight>
953- <bold>false</bold>
954- </font>
955- </property>
956- <property name="title">
957- <string>Labels and Markers</string>
958- </property>
959- <property name="checkable">
960- <bool>false</bool>
961- </property>
962- <layout class="QGridLayout" name="gridLayoutx">
963- <property name="margin">
964- <number>0</number>
965- </property>
966- <item row="0" column="0">
967- <widget class="QCheckBox" name="starLabelCheckBox">
968- <property name="text">
969- <string>Stars</string>
970- </property>
971- </widget>
972- </item>
973- <item row="0" column="1">
974- <widget class="QSlider" name="starsLabelsHorizontalSlider">
975- <property name="sizePolicy">
976- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
977- <horstretch>0</horstretch>
978- <verstretch>0</verstretch>
979- </sizepolicy>
980- </property>
981- <property name="minimumSize">
982- <size>
983- <width>180</width>
984- <height>0</height>
985- </size>
986- </property>
987- <property name="value">
988- <number>33</number>
989- </property>
990- <property name="orientation">
991- <enum>Qt::Horizontal</enum>
992- </property>
993- </widget>
994- </item>
995- <item row="1" column="0">
996- <widget class="QCheckBox" name="nebulaLabelCheckBox">
997- <property name="text">
998- <string>Nebulas</string>
999- </property>
1000- </widget>
1001- </item>
1002- <item row="1" column="1">
1003- <widget class="QSlider" name="nebulasLabelsHorizontalSlider">
1004- <property name="sizePolicy">
1005- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
1006- <horstretch>0</horstretch>
1007- <verstretch>0</verstretch>
1008- </sizepolicy>
1009- </property>
1010- <property name="minimumSize">
1011- <size>
1012- <width>180</width>
1013- <height>0</height>
1014- </size>
1015- </property>
1016- <property name="value">
1017- <number>33</number>
1018- </property>
1019- <property name="orientation">
1020- <enum>Qt::Horizontal</enum>
1021- </property>
1022- </widget>
1023- </item>
1024- <item row="2" column="0">
1025- <widget class="QCheckBox" name="planetLabelCheckBox">
1026- <property name="text">
1027- <string>Planets</string>
1028- </property>
1029- </widget>
1030- </item>
1031- <item row="2" column="1">
1032- <widget class="QSlider" name="planetsLabelsHorizontalSlider">
1033- <property name="sizePolicy">
1034- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
1035- <horstretch>0</horstretch>
1036- <verstretch>0</verstretch>
1037- </sizepolicy>
1038- </property>
1039- <property name="minimumSize">
1040- <size>
1041- <width>180</width>
1042- <height>0</height>
1043- </size>
1044- </property>
1045- <property name="value">
1046- <number>33</number>
1047- </property>
1048- <property name="orientation">
1049- <enum>Qt::Horizontal</enum>
1050- </property>
1051- </widget>
1052- </item>
1053- <item row="3" column="1">
1054- <spacer name="horizontalSpacer_4">
1055- <property name="orientation">
1056- <enum>Qt::Horizontal</enum>
1057- </property>
1058- <property name="sizeType">
1059- <enum>QSizePolicy::Preferred</enum>
1060- </property>
1061- <property name="sizeHint" stdset="0">
1062- <size>
1063- <width>180</width>
1064- <height>0</height>
1065- </size>
1066- </property>
1067- </spacer>
1068- </item>
1069- <item row="3" column="0">
1070- <spacer name="horizontalSpacer_5">
1071- <property name="orientation">
1072- <enum>Qt::Horizontal</enum>
1073- </property>
1074- <property name="sizeType">
1075- <enum>QSizePolicy::Minimum</enum>
1076- </property>
1077- <property name="sizeHint" stdset="0">
1078- <size>
1079- <width>40</width>
1080- <height>0</height>
1081- </size>
1082- </property>
1083- </spacer>
1084- </item>
1085- </layout>
1086- </widget>
1087- </item>
1088- <item row="2" column="0" colspan="2">
1089+ <item row="3" column="0">
1090 <widget class="QGroupBox" name="shootingStarsGroupBox">
1091 <property name="sizePolicy">
1092 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
1093@@ -959,8 +923,11 @@
1094 </property>
1095 <item>
1096 <widget class="QLabel" name="label_14">
1097+ <property name="toolTip">
1098+ <string>Hourly zenith rate</string>
1099+ </property>
1100 <property name="text">
1101- <string>Hourly zenith rate:</string>
1102+ <string>ZHR:</string>
1103 </property>
1104 <property name="textFormat">
1105 <enum>Qt::PlainText</enum>
1106@@ -982,7 +949,7 @@
1107 <property name="margin">
1108 <number>0</number>
1109 </property>
1110- <item>
1111+ <item alignment="Qt::AlignTop">
1112 <widget class="QFrame" name="frame_8">
1113 <property name="frameShape">
1114 <enum>QFrame::StyledPanel</enum>
1115@@ -1064,6 +1031,155 @@
1116 </layout>
1117 </widget>
1118 </item>
1119+ <item row="3" column="1">
1120+ <widget class="QGroupBox" name="limitsGroupBox">
1121+ <property name="sizePolicy">
1122+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
1123+ <horstretch>0</horstretch>
1124+ <verstretch>0</verstretch>
1125+ </sizepolicy>
1126+ </property>
1127+ <property name="minimumSize">
1128+ <size>
1129+ <width>0</width>
1130+ <height>0</height>
1131+ </size>
1132+ </property>
1133+ <property name="font">
1134+ <font>
1135+ <pointsize>10</pointsize>
1136+ <weight>50</weight>
1137+ <bold>false</bold>
1138+ </font>
1139+ </property>
1140+ <property name="toolTip">
1141+ <string>Limit Magnitudes (for unaided/binocular observers)</string>
1142+ </property>
1143+ <property name="title">
1144+ <string>Limit Magnitudes</string>
1145+ </property>
1146+ <property name="checkable">
1147+ <bool>false</bool>
1148+ </property>
1149+ <layout class="QGridLayout" name="gridLayout_6">
1150+ <property name="margin">
1151+ <number>0</number>
1152+ </property>
1153+ <item row="1" column="0">
1154+ <widget class="QCheckBox" name="starLimitMagnitudeCheckBox">
1155+ <property name="toolTip">
1156+ <string>Stars to magnitude</string>
1157+ </property>
1158+ <property name="text">
1159+ <string>Stars</string>
1160+ </property>
1161+ </widget>
1162+ </item>
1163+ <item row="2" column="1">
1164+ <widget class="QDoubleSpinBox" name="nebulaLimitMagnitudeDoubleSpinBox">
1165+ <property name="sizePolicy">
1166+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
1167+ <horstretch>0</horstretch>
1168+ <verstretch>0</verstretch>
1169+ </sizepolicy>
1170+ </property>
1171+ <property name="minimumSize">
1172+ <size>
1173+ <width>0</width>
1174+ <height>0</height>
1175+ </size>
1176+ </property>
1177+ <property name="maximumSize">
1178+ <size>
1179+ <width>70</width>
1180+ <height>16777215</height>
1181+ </size>
1182+ </property>
1183+ <property name="frame">
1184+ <bool>true</bool>
1185+ </property>
1186+ <property name="alignment">
1187+ <set>Qt::AlignCenter</set>
1188+ </property>
1189+ <property name="buttonSymbols">
1190+ <enum>QAbstractSpinBox::UpDownArrows</enum>
1191+ </property>
1192+ <property name="decimals">
1193+ <number>2</number>
1194+ </property>
1195+ <property name="minimum">
1196+ <double>3.000000000000000</double>
1197+ </property>
1198+ <property name="maximum">
1199+ <double>21.000000000000000</double>
1200+ </property>
1201+ <property name="singleStep">
1202+ <double>0.250000000000000</double>
1203+ </property>
1204+ <property name="value">
1205+ <double>8.500000000000000</double>
1206+ </property>
1207+ </widget>
1208+ </item>
1209+ <item row="2" column="0">
1210+ <widget class="QCheckBox" name="nebulaLimitMagnitudeCheckBox">
1211+ <property name="toolTip">
1212+ <string>Nebulas to magitude</string>
1213+ </property>
1214+ <property name="text">
1215+ <string>Nebulas</string>
1216+ </property>
1217+ </widget>
1218+ </item>
1219+ <item row="1" column="1">
1220+ <widget class="QDoubleSpinBox" name="starLimitMagnitudeDoubleSpinBox">
1221+ <property name="sizePolicy">
1222+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
1223+ <horstretch>0</horstretch>
1224+ <verstretch>0</verstretch>
1225+ </sizepolicy>
1226+ </property>
1227+ <property name="minimumSize">
1228+ <size>
1229+ <width>0</width>
1230+ <height>0</height>
1231+ </size>
1232+ </property>
1233+ <property name="maximumSize">
1234+ <size>
1235+ <width>70</width>
1236+ <height>16777215</height>
1237+ </size>
1238+ </property>
1239+ <property name="frame">
1240+ <bool>true</bool>
1241+ </property>
1242+ <property name="alignment">
1243+ <set>Qt::AlignCenter</set>
1244+ </property>
1245+ <property name="buttonSymbols">
1246+ <enum>QAbstractSpinBox::UpDownArrows</enum>
1247+ </property>
1248+ <property name="decimals">
1249+ <number>2</number>
1250+ </property>
1251+ <property name="minimum">
1252+ <double>0.000000000000000</double>
1253+ </property>
1254+ <property name="maximum">
1255+ <double>21.000000000000000</double>
1256+ </property>
1257+ <property name="singleStep">
1258+ <double>0.100000000000000</double>
1259+ </property>
1260+ <property name="value">
1261+ <double>6.500000000000000</double>
1262+ </property>
1263+ </widget>
1264+ </item>
1265+ </layout>
1266+ </widget>
1267+ </item>
1268 </layout>
1269 </widget>
1270 <widget class="QWidget" name="page_2">
1271@@ -1733,7 +1849,6 @@
1272 <tabstop>planetScaleMoonCheckBox</tabstop>
1273 <tabstop>showAtmosphereCheckBox</tabstop>
1274 <tabstop>lightPollutionSpinBox</tabstop>
1275- <tabstop>pushButtonAtmosphereDetails</tabstop>
1276 <tabstop>starLabelCheckBox</tabstop>
1277 <tabstop>starsLabelsHorizontalSlider</tabstop>
1278 <tabstop>nebulaLabelCheckBox</tabstop>
1279
1280=== modified file 'textures/CMakeLists.txt'
1281--- textures/CMakeLists.txt 2012-10-09 14:36:41 +0000
1282+++ textures/CMakeLists.txt 2013-03-02 19:13:21 +0000
1283@@ -1,6 +1,6 @@
1284 ########### install files ###############
1285
1286-INSTALL(FILES amalthea.png proteus.png triton.png pluto.png charon.png moon.png mercury.png venus.png earth_cmap.png earth-clouds.png earthmap.png mars.png jupiter.png saturn.png uranus.png neptune.png earth-shadow.png saturn_rings_radial.png uranus_rings.png neptune_rings.png lune.png phobos.png deimos.png io.png europa.png ganymede.png callisto.png mimas.png enceladus.png tethys.png dione.png rhea.png titan.png hyperion.png iapetus.png miranda.png ariel.png umbriel.png titania.png oberon.png fog.png milkyway.png fogridge.png ocl.png gcl.png pnb.png neb.png halo.png pointeur2.png pointeur4.png pointeur5.png star16x16.png sun.png nomap.png haloLune.png planet-indicator.png corona.png DESTINATION share/${PACKAGE}/textures)
1287+INSTALL(FILES neb.png neb_dif.png neb_gal.png neb_gcl.png neb_ocl.png neb_ocln.png neb_pnb.png amalthea.png proteus.png triton.png pluto.png charon.png moon.png mercury.png venus.png earth_cmap.png earth-clouds.png earthmap.png mars.png jupiter.png saturn.png uranus.png neptune.png earth-shadow.png saturn_rings_radial.png uranus_rings.png neptune_rings.png lune.png phobos.png deimos.png io.png europa.png ganymede.png callisto.png mimas.png enceladus.png tethys.png dione.png rhea.png titan.png hyperion.png iapetus.png miranda.png ariel.png umbriel.png titania.png oberon.png fog.png milkyway.png fogridge.png halo.png pointeur2.png pointeur4.png pointeur5.png star16x16.png sun.png nomap.png haloLune.png planet-indicator.png corona.png DESTINATION share/${PACKAGE}/textures)
1288
1289 ADD_CUSTOM_TARGET(splash ALL)
1290 SET(_splashFile logo24bits.png)
1291
1292=== added file 'textures/neb_dif.png'
1293Binary files textures/neb_dif.png 1970-01-01 00:00:00 +0000 and textures/neb_dif.png 2013-03-02 19:13:21 +0000 differ
1294=== added file 'textures/neb_gal.png'
1295Binary files textures/neb_gal.png 1970-01-01 00:00:00 +0000 and textures/neb_gal.png 2013-03-02 19:13:21 +0000 differ
1296=== renamed file 'textures/gcl.png' => 'textures/neb_gcl.png'
1297=== renamed file 'textures/ocl.png' => 'textures/neb_ocl.png'
1298=== added file 'textures/neb_ocln.png'
1299Binary files textures/neb_ocln.png 1970-01-01 00:00:00 +0000 and textures/neb_ocln.png 2013-03-02 19:13:21 +0000 differ
1300=== added file 'textures/neb_ocln.tif'
1301Binary files textures/neb_ocln.tif 1970-01-01 00:00:00 +0000 and textures/neb_ocln.tif 2013-03-02 19:13:21 +0000 differ
1302=== renamed file 'textures/pnb.png' => 'textures/neb_pnb.png'