Stellarium

Merge lp:~alexwolf/stellarium/horizon into lp:stellarium

  1. horizon
  2. Merge into trunk
Proposed by Alexander Wolf
Status: Merged
Merged at revision: 4903
Proposed branch: lp:~alexwolf/stellarium/horizon
Merge into: lp:stellarium
Diff against target: 245 lines (+54/-7)
6 files modified
data/default_config.ini (+4/-1)
src/core/modules/GridLinesMgr.cpp (+24/-6)
src/core/modules/GridLinesMgr.hpp (+10/-0)
src/gui/StelGui.cpp (+3/-0)
src/gui/ViewDialog.cpp (+5/-0)
src/gui/viewDialog.ui (+8/-0)
To merge this branch: bzr merge lp:~alexwolf/stellarium/horizon
Reviewer Review Type Date Requested Status
treaves Approve
Review via email: mp+65169@code.launchpad.net
To post a comment you must log in.
lp:~alexwolf/stellarium/horizon updated
4902. By Alexander Wolf

Fixes

4903. By Alexander Wolf

Update default config.ini

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

Fix bug #785574

Revision history for this message
treaves (treaves) :
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 2010-12-05 08:56:01 +0000
3+++ data/default_config.ini 2011-06-20 09:53:24 +0000
4@@ -98,10 +98,11 @@
5 azimuthal_color = 0.3,0.2,0.1
6 equatorial_color = 0.1,0.2,0.3
7 equatorial_J2000_color = 0.1,0.3,0.4
8-galactic_color = 0.0,0.3,0.2
9+galactic_color = 0.0,0.3,0.2
10 equator_color = 0.2,0.2,0.6
11 ecliptic_color = 0.6,0.2,0.2
12 meridian_color = 0.2,0.6,0.2
13+horizon_color = 0.2,0.6,0.2
14 const_lines_color = 0.13,0.19,0.24
15 const_names_color = 0.31,0.38,0.46
16 const_boundary_color = 0.3,0.1,0.1
17@@ -129,6 +130,7 @@
18 equator_color = 0.2,0.2,0.6
19 ecliptic_color = 0.6,0.2,0.2
20 meridian_color = 0.2,0.6,0.2
21+horizon_color = 0.2,0.6,0.2
22 const_lines_color = 0.5,0.1,0.1
23 const_names_color = 0.8,0.2,0.2
24 const_boundary_color = 0.8,0.3,0.3
25@@ -190,6 +192,7 @@
26 flag_equator_line = false
27 flag_ecliptic_line = false
28 flag_meridian_line = false
29+flag_horizon_line = false
30 flag_cardinal_points = true
31 flag_gravity_labels = false
32 flag_moon_scaled = false
33
34=== modified file 'src/core/modules/GridLinesMgr.cpp'
35--- src/core/modules/GridLinesMgr.cpp 2011-05-31 13:06:03 +0000
36+++ src/core/modules/GridLinesMgr.cpp 2011-06-20 09:53:24 +0000
37@@ -70,7 +70,8 @@
38 {
39 EQUATOR,
40 ECLIPTIC,
41- MERIDIAN
42+ MERIDIAN,
43+ HORIZON
44 };
45 // Create and precompute positions of a SkyGrid
46 SkyLine(SKY_LINE_TYPE _line_type = EQUATOR);
47@@ -524,6 +525,10 @@
48 frameType = StelCore::FrameEquinoxEqu;
49 label = q_("Equator");
50 break;
51+ case HORIZON:
52+ frameType = StelCore::FrameAltAz;
53+ label = q_("Horizon");
54+ break;
55 }
56 }
57
58@@ -552,18 +557,17 @@
59 glEnable(GL_BLEND);
60 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
61
62- Vec4f textColor(color[0], color[1], color[2], 0);
63+ Vec4f textColor(color[0], color[1], color[2], 0);
64 textColor*=2;
65 textColor[3]=fader.getInterstate();
66
67- ViewportEdgeIntersectCallbackData userData(&sPainter);
68+ ViewportEdgeIntersectCallbackData userData(&sPainter);
69 sPainter.setFont(font);
70- userData.textColor = textColor;
71+ userData.textColor = textColor;
72 userData.text = label;
73-
74 /////////////////////////////////////////////////
75 // Draw the line
76- SphericalCap meridianSphericalCap(Vec3d(0,0,1), 0);
77+ SphericalCap meridianSphericalCap(Vec3d(0,0,1), 0);
78 Vec3d fpt(1,0,0);
79 if (line_type==MERIDIAN)
80 {
81@@ -591,6 +595,7 @@
82 return;
83 }
84
85+
86 Vec3d middlePoint = p1+p2;
87 middlePoint.normalize();
88 if (!viewPortSphericalCap.contains(middlePoint))
89@@ -616,6 +621,7 @@
90 equatorLine = new SkyLine(SkyLine::EQUATOR);
91 eclipticLine = new SkyLine(SkyLine::ECLIPTIC);
92 meridianLine = new SkyLine(SkyLine::MERIDIAN);
93+ horizonLine = new SkyLine(SkyLine::HORIZON);
94 }
95
96 GridLinesMgr::~GridLinesMgr()
97@@ -627,6 +633,7 @@
98 delete equatorLine;
99 delete eclipticLine;
100 delete meridianLine;
101+ delete horizonLine;
102 }
103
104 /*************************************************************************
105@@ -651,6 +658,7 @@
106 setFlagEquatorLine(conf->value("viewing/flag_equator_line").toBool());
107 setFlagEclipticLine(conf->value("viewing/flag_ecliptic_line").toBool());
108 setFlagMeridianLine(conf->value("viewing/flag_meridian_line").toBool());
109+ setFlagHorizonLine(conf->value("viewing/flag_horizon_line").toBool());
110 connect(&StelApp::getInstance(), SIGNAL(colorSchemeChanged(const QString&)), this, SLOT(setStelStyle(const QString&)));
111 }
112
113@@ -664,6 +672,7 @@
114 equatorLine->update(deltaTime);
115 eclipticLine->update(deltaTime);
116 meridianLine->update(deltaTime);
117+ horizonLine->update(deltaTime);
118 }
119
120 void GridLinesMgr::draw(StelCore* core)
121@@ -675,6 +684,7 @@
122 equatorLine->draw(core);
123 eclipticLine->draw(core);
124 meridianLine->draw(core);
125+ horizonLine->draw(core);
126 }
127
128 void GridLinesMgr::setStelStyle(const QString& section)
129@@ -690,6 +700,7 @@
130 setColorEquatorLine(StelUtils::strToVec3f(conf->value(section+"/equator_color", defaultColor).toString()));
131 setColorEclipticLine(StelUtils::strToVec3f(conf->value(section+"/ecliptic_color", defaultColor).toString()));
132 setColorMeridianLine(StelUtils::strToVec3f(conf->value(section+"/meridian_color", defaultColor).toString()));
133+ setColorHorizonLine(StelUtils::strToVec3f(conf->value(section+"/horizon_color", defaultColor).toString()));
134 }
135
136 //! Set flag for displaying Azimuthal Grid
137@@ -735,6 +746,12 @@
138 bool GridLinesMgr::getFlagMeridianLine(void) const {return meridianLine->getFlagshow();}
139 Vec3f GridLinesMgr::getColorMeridianLine(void) const {return meridianLine->getColor();}
140
141+//! Set flag for displaying Horizon Line
142+void GridLinesMgr::setFlagHorizonLine(bool b) {horizonLine->setFlagshow(b);}
143+//! Get flag for displaying Horizon Line
144+bool GridLinesMgr::getFlagHorizonLine(void) const {return horizonLine->getFlagshow();}
145+Vec3f GridLinesMgr::getColorHorizonLine(void) const {return horizonLine->getColor();}
146+
147 void GridLinesMgr::setColorAzimuthalGrid(const Vec3f& v) { aziGrid->setColor(v);}
148 void GridLinesMgr::setColorEquatorGrid(const Vec3f& v) { equGrid->setColor(v);}
149 void GridLinesMgr::setColorEquatorJ2000Grid(const Vec3f& v) { equJ2000Grid->setColor(v);}
150@@ -742,3 +759,4 @@
151 void GridLinesMgr::setColorEquatorLine(const Vec3f& v) { equatorLine->setColor(v);}
152 void GridLinesMgr::setColorEclipticLine(const Vec3f& v) { eclipticLine->setColor(v);}
153 void GridLinesMgr::setColorMeridianLine(const Vec3f& v) { meridianLine->setColor(v);}
154+void GridLinesMgr::setColorHorizonLine(const Vec3f& v) { horizonLine->setColor(v);}
155
156=== modified file 'src/core/modules/GridLinesMgr.hpp'
157--- src/core/modules/GridLinesMgr.hpp 2011-01-29 18:14:28 +0000
158+++ src/core/modules/GridLinesMgr.hpp 2011-06-20 09:53:24 +0000
159@@ -127,6 +127,15 @@
160 //! Set the color of the Meridian Line.
161 void setColorMeridianLine(const Vec3f& v);
162
163+ //! Set flag for displaying Horizon Line.
164+ void setFlagHorizonLine(bool b);
165+ //! Get flag for displaying Horizon Line.
166+ bool getFlagHorizonLine(void) const;
167+ //! Get the current color of the Horizon Line.
168+ Vec3f getColorHorizonLine(void) const;
169+ //! Set the color of the Horizon Line.
170+ void setColorHorizonLine(const Vec3f& v);
171+
172 private slots:
173 //! Sets the colors of: grids and great circles, Equatorial Grid, Azimuthal Grid,
174 //! Meridian Line, Equator Line and Ecliptic Line.
175@@ -140,6 +149,7 @@
176 SkyLine * equatorLine; // Celestial Equator line
177 SkyLine * eclipticLine; // Ecliptic line
178 SkyLine * meridianLine; // Meridian line
179+ SkyLine * horizonLine; // Horizon line
180 };
181
182 #endif // _GRIDLINESMGR_HPP_
183
184=== modified file 'src/gui/StelGui.cpp'
185--- src/gui/StelGui.cpp 2011-05-31 13:06:03 +0000
186+++ src/gui/StelGui.cpp 2011-06-20 09:53:24 +0000
187@@ -108,6 +108,7 @@
188 addGuiActions("actionShow_Ecliptic_Line", N_("Ecliptic line"), ",", group, true, false);
189 addGuiActions("actionShow_Equator_Line", N_("Equator line"), ".", group, true, false);
190 addGuiActions("actionShow_Meridian_Line", N_("Meridian line"), ";", group, true, false);
191+ addGuiActions("actionShow_Horizon_Line", N_("Horizon line"), "", group, true, false);
192 addGuiActions("actionShow_Cardinal_Points", N_("Cardinal points"), "Q", group, true, false);
193
194 addGuiActions("actionShow_Ground", N_("Ground"), "G", group, true, false);
195@@ -205,6 +206,8 @@
196 getGuiActions("actionShow_Equator_Line")->setChecked(gmgr->getFlagEquatorLine());
197 connect(getGuiActions("actionShow_Meridian_Line"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagMeridianLine(bool)));
198 getGuiActions("actionShow_Meridian_Line")->setChecked(gmgr->getFlagMeridianLine());
199+ connect(getGuiActions("actionShow_Horizon_Line"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagHorizonLine(bool)));
200+ getGuiActions("actionShow_Horizon_Line")->setChecked(gmgr->getFlagHorizonLine());
201 connect(getGuiActions("actionShow_Equatorial_J2000_Grid"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagEquatorJ2000Grid(bool)));
202 getGuiActions("actionShow_Equatorial_J2000_Grid")->setChecked(gmgr->getFlagEquatorJ2000Grid());
203 connect(getGuiActions("actionShow_Galactic_Grid"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagGalacticGrid(bool)));
204
205=== modified file 'src/gui/ViewDialog.cpp'
206--- src/gui/ViewDialog.cpp 2011-06-08 14:32:05 +0000
207+++ src/gui/ViewDialog.cpp 2011-06-20 09:53:24 +0000
208@@ -237,6 +237,11 @@
209 connect(a, SIGNAL(toggled(bool)), ui->showMeridianLineCheckBox, SLOT(setChecked(bool)));
210 connect(ui->showMeridianLineCheckBox, SIGNAL(toggled(bool)), a, SLOT(setChecked(bool)));
211
212+ ui->showHorizonLineCheckBox->setChecked(glmgr->getFlagHorizonLine());
213+ a = gui->getGuiActions("actionShow_Horizon_Line");
214+ connect(a, SIGNAL(toggled(bool)), ui->showHorizonLineCheckBox, SLOT(setChecked(bool)));
215+ connect(ui->showHorizonLineCheckBox, SIGNAL(toggled(bool)), a, SLOT(setChecked(bool)));
216+
217 ui->showEquatorialGridCheckBox->setChecked(glmgr->getFlagEquatorGrid());
218 a = gui->getGuiActions("actionShow_Equatorial_Grid");
219 connect(a, SIGNAL(toggled(bool)), ui->showEquatorialGridCheckBox, SLOT(setChecked(bool)));
220
221=== modified file 'src/gui/viewDialog.ui'
222--- src/gui/viewDialog.ui 2011-06-08 14:32:05 +0000
223+++ src/gui/viewDialog.ui 2011-06-20 09:53:24 +0000
224@@ -1060,6 +1060,13 @@
225 </widget>
226 </item>
227 <item>
228+ <widget class="QCheckBox" name="showHorizonLineCheckBox">
229+ <property name="text">
230+ <string>Horizon line</string>
231+ </property>
232+ </widget>
233+ </item>
234+ <item>
235 <widget class="QCheckBox" name="showEclipticLineCheckBox">
236 <property name="text">
237 <string>Ecliptic line</string>
238@@ -1621,6 +1628,7 @@
239 <tabstop>zhr144000</tabstop>
240 <tabstop>showEquatorLineCheckBox</tabstop>
241 <tabstop>showMeridianLineCheckBox</tabstop>
242+ <tabstop>showHorizonLineCheckBox</tabstop>
243 <tabstop>showEclipticLineCheckBox</tabstop>
244 <tabstop>showCardinalPointsCheckBox</tabstop>
245 <tabstop>showConstellationLinesCheckBox</tabstop>