Merge lp:~georg-zotti/stellarium/gz_galactic-equator-rename into lp:stellarium
- gz_galactic-equator-rename
- Merge into trunk
Proposed by
gzotti
Status: | Merged |
---|---|
Approved by: | Alexander Wolf |
Approved revision: | 7033 |
Merged at revision: | 7033 |
Proposed branch: | lp:~georg-zotti/stellarium/gz_galactic-equator-rename |
Merge into: | lp:stellarium |
Diff against target: |
473 lines (+87/-76) 13 files modified
ChangeLog (+8/-1) data/default_config.ini.cmake (+2/-2) plugins/Oculars/src/Oculars.cpp (+4/-4) plugins/Oculars/src/Oculars.hpp (+1/-1) plugins/TextUserInterface/src/TextUserInterface.cpp (+3/-3) scripts/save_state.inc (+2/-2) src/core/modules/GridLinesMgr.cpp (+30/-30) src/core/modules/GridLinesMgr.hpp (+25/-21) src/gui/ConfigurationDialog.cpp (+1/-1) src/gui/ViewDialog.cpp (+1/-1) src/gui/viewDialog.ui (+5/-5) src/scripting/StelMainScriptAPI.cpp (+3/-3) src/scripting/StratoscriptPreprocessor.cpp (+2/-2) |
To merge this branch: | bzr merge lp:~georg-zotti/stellarium/gz_galactic-equator-rename |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexander Wolf | Approve | ||
Review via email: mp+234103@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
gzotti (georg-zotti) wrote : | # |
Right ... Like this?
I hope a single script on this planet ever made use of it ;-)
Revision history for this message
Alexander Wolf (alexwolf) wrote : | # |
Yes!
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2014-07-19 07:32:26 +0000 |
3 | +++ ChangeLog 2014-09-10 14:02:26 +0000 |
4 | @@ -1,11 +1,18 @@ |
5 | +- Fixed: Galactic plane renamed to correct: Galactic equator |
6 | +- Fixed: Speed issues when computing lots of comets |
7 | +- Added: Light layer for old_style landscapes |
8 | +- Added: Auto-detect location via network lookup. |
9 | + |
10 | 0.13.0 [2014-07-19] |
11 | -This version based on Qt 5 and has new modulated core, and new features (example: normal mapping) and fixes for 115 bugs, includes: |
12 | +This version based on Qt 5 and has new modulated core, and new features (example: normal mapping) and fixes for 115 bugs, including: |
13 | New plugin: Equation of Time - provides solution for Equation of Time. |
14 | New plugin: Field of View - provides shortcuts for quick changes field of view. |
15 | New plugin: Navigational Stars - marks 58 navigational stars on the sky. |
16 | New plugin: Pointer Coordinates - shows the coordinates of the mouse pointer. |
17 | New plugin: Meteor Showers - provides visualization of meteor showers. |
18 | New translatable strings and new textures. |
19 | +Improved Landscapes: New Polygonal type, texture saving for shperical, and optional light pollution/streetlight layer. |
20 | +Comet Tails |
21 | New version of the Satellites plugin: introduces star-like satellites and bug fixes. |
22 | New version of the Exoplanets plugin: displaying of the potential habitable exoplanets; improvements for performance and code refactoring. |
23 | New version of the Angle Measure plugin: displaying of the position angle. |
24 | |
25 | === modified file 'data/default_config.ini.cmake' |
26 | --- data/default_config.ini.cmake 2014-09-06 16:19:46 +0000 |
27 | +++ data/default_config.ini.cmake 2014-09-10 14:02:26 +0000 |
28 | @@ -125,7 +125,7 @@ |
29 | equatorial_color = 0.1,0.2,0.3 |
30 | equatorial_J2000_color = 0.1,0.3,0.4 |
31 | galactic_color = 0.0,0.3,0.2 |
32 | -galactic_plane_color = 0.5,0.3,0.1 |
33 | +galactic_equator_color = 0.5,0.3,0.1 |
34 | equator_color = 0.2,0.2,0.6 |
35 | ecliptic_color = 0.6,0.2,0.2 |
36 | ecliptic_J2000_color = 0.3,0.3,0.1 |
37 | @@ -198,7 +198,7 @@ |
38 | flag_equatorial_J2000_grid = false |
39 | flag_ecliptic_J2000_grid = false |
40 | flag_galactic_grid = false |
41 | -flag_galactic_plane_line = false |
42 | +flag_galactic_equator_line = false |
43 | flag_equator_line = false |
44 | flag_ecliptic_line = false |
45 | flag_meridian_line = false |
46 | |
47 | === modified file 'plugins/Oculars/src/Oculars.cpp' |
48 | --- plugins/Oculars/src/Oculars.cpp 2014-08-10 10:34:05 +0000 |
49 | +++ plugins/Oculars/src/Oculars.cpp 2014-09-10 14:02:26 +0000 |
50 | @@ -110,7 +110,7 @@ |
51 | flagEclipticJ2000Grid(false), |
52 | flagMeridianLine(false), |
53 | flagHorizonLine(false), |
54 | - flagGalacticPlaneLine(false), |
55 | + flagGalacticEquatorLine(false), |
56 | flagAdaptation(false), |
57 | flagLimitStars(false), |
58 | magLimitStars(0.0), |
59 | @@ -1773,7 +1773,7 @@ |
60 | gridManager->setFlagEclipticJ2000Grid(flagEclipticJ2000Grid); |
61 | gridManager->setFlagMeridianLine(flagMeridianLine); |
62 | gridManager->setFlagHorizonLine(flagHorizonLine); |
63 | - gridManager->setFlagGalacticPlaneLine(flagGalacticPlaneLine); |
64 | + gridManager->setFlagGalacticEquatorLine(flagGalacticEquatorLine); |
65 | skyManager->setFlagLuminanceAdaptation(flagAdaptation); |
66 | skyManager->setFlagStarMagnitudeLimit(flagLimitStars); |
67 | skyManager->setFlagNebulaMagnitudeLimit(flagLimitDSOs); |
68 | @@ -1816,7 +1816,7 @@ |
69 | flagEclipticJ2000Grid = gridManager->getFlagEclipticJ2000Grid(); |
70 | flagMeridianLine = gridManager->getFlagMeridianLine(); |
71 | flagHorizonLine = gridManager->getFlagHorizonLine(); |
72 | - flagGalacticPlaneLine = gridManager->getFlagGalacticPlaneLine(); |
73 | + flagGalacticEquatorLine = gridManager->getFlagGalacticEquatorLine(); |
74 | |
75 | StelSkyDrawer *skyManager = core->getSkyDrawer(); |
76 | // Current state |
77 | @@ -1856,7 +1856,7 @@ |
78 | gridManager->setFlagEclipticJ2000Grid(false); |
79 | gridManager->setFlagMeridianLine(false); |
80 | gridManager->setFlagHorizonLine(false); |
81 | - gridManager->setFlagGalacticPlaneLine(false); |
82 | + gridManager->setFlagGalacticEquatorLine(false); |
83 | skyManager->setFlagLuminanceAdaptation(false); |
84 | |
85 | movementManager->setFlagTracking(true); |
86 | |
87 | === modified file 'plugins/Oculars/src/Oculars.hpp' |
88 | --- plugins/Oculars/src/Oculars.hpp 2014-05-03 13:54:43 +0000 |
89 | +++ plugins/Oculars/src/Oculars.hpp 2014-09-10 14:02:26 +0000 |
90 | @@ -218,7 +218,7 @@ |
91 | bool flagEclipticJ2000Grid; //!< Flag to track if EclipticJ2000Grid was displayed at activation. |
92 | bool flagMeridianLine; //!< Flag to track if MeridianLine was displayed at activation. |
93 | bool flagHorizonLine; //!< Flag to track if HorizonLine was displayed at activation. |
94 | - bool flagGalacticPlaneLine; //!< Flag to track if GalacticPlaneLine was displayed at activation. |
95 | + bool flagGalacticEquatorLine; //!< Flag to track if GalacticEquatorLine was displayed at activation. |
96 | bool flagAdaptation; //!< Flag to track if adaptationCheckbox was enabled at activation. |
97 | |
98 | bool flagLimitStars; //!< Flag to track limit magnitude for stars |
99 | |
100 | === modified file 'plugins/TextUserInterface/src/TextUserInterface.cpp' |
101 | --- plugins/TextUserInterface/src/TextUserInterface.cpp 2014-04-15 19:00:10 +0000 |
102 | +++ plugins/TextUserInterface/src/TextUserInterface.cpp 2014-09-10 14:02:26 +0000 |
103 | @@ -367,10 +367,10 @@ |
104 | SLOT(setColorGalacticGrid(Vec3f)), |
105 | gridLinesMgr->getColorGalacticGrid(), |
106 | m5, m5_18); |
107 | - TuiNode* m5_20 = new TuiNodeColor(N_("Galactic plane line"), |
108 | + TuiNode* m5_20 = new TuiNodeColor(N_("Galactic equator line"), |
109 | gridLinesMgr, |
110 | - SLOT(setColorGalacticPlaneLine(Vec3f)), |
111 | - gridLinesMgr->getColorGalacticPlaneLine(), |
112 | + SLOT(setColorGalacticEquatorLine(Vec3f)), |
113 | + gridLinesMgr->getColorGalacticEquatorLine(), |
114 | m5, m5_19); |
115 | |
116 | m5_1->setNextNode(m5_2); |
117 | |
118 | === modified file 'scripts/save_state.inc' |
119 | --- scripts/save_state.inc 2012-07-27 14:48:25 +0000 |
120 | +++ scripts/save_state.inc 2014-09-10 14:02:26 +0000 |
121 | @@ -37,7 +37,7 @@ |
122 | savedStates[stateName]["GridLinesMgrFlagEquatorJ2000Grid"] = GridLinesMgr.getFlagEquatorJ2000Grid(); |
123 | savedStates[stateName]["GridLinesMgrFlagEclipticJ2000Grid"] = GridLinesMgr.getFlagEclipticJ2000Grid(); |
124 | savedStates[stateName]["GridLinesMgrFlagGalacticGrid"] = GridLinesMgr.getFlagGalacticGrid(); |
125 | - savedStates[stateName]["GridLinesMgrFlagGalacticPlaneLine"] = GridLinesMgr.getFlagGalacticPlaneLine(); |
126 | + savedStates[stateName]["GridLinesMgrFlagGalacticEquatorLine"] = GridLinesMgr.getFlagGalacticEquatorLine(); |
127 | savedStates[stateName]["ConstellationMgrFlagLines"] = ConstellationMgr.getFlagLines(); |
128 | savedStates[stateName]["ConstellationMgrFlagLabels"] = ConstellationMgr.getFlagLabels(); |
129 | savedStates[stateName]["ConstellationMgrFlagBoundaries"] = ConstellationMgr.getFlagBoundaries(); |
130 | @@ -139,7 +139,7 @@ |
131 | GridLinesMgr.setFlagEquatorJ2000Grid(savedStates[stateName]["GridLinesMgrFlagEquatorJ2000Grid"]); |
132 | GridLinesMgr.setFlagEclipticJ2000Grid(savedStates[stateName]["GridLinesMgrFlagEclipticJ2000Grid"]); |
133 | GridLinesMgr.setFlagGalacticGrid(savedStates[stateName]["GridLinesMgrFlagGalacticGrid"]); |
134 | - GridLinesMgr.setFlagGalacticPlaneLine(savedStates[stateName]["GridLinesMgrFlagGalacticPlaneLine"]); |
135 | + GridLinesMgr.setFlagGalacticEquatorLine(savedStates[stateName]["GridLinesMgrFlagGalacticEquatorLine"]); |
136 | ConstellationMgr.setFlagLines(savedStates[stateName]["ConstellationMgrFlagLines"]); |
137 | ConstellationMgr.setFlagLabels(savedStates[stateName]["ConstellationMgrFlagLabels"]); |
138 | ConstellationMgr.setFlagBoundaries(savedStates[stateName]["ConstellationMgrFlagBoundaries"]); |
139 | |
140 | === modified file 'src/core/modules/GridLinesMgr.cpp' |
141 | --- src/core/modules/GridLinesMgr.cpp 2014-08-10 10:34:05 +0000 |
142 | +++ src/core/modules/GridLinesMgr.cpp 2014-09-10 14:02:26 +0000 |
143 | @@ -72,7 +72,7 @@ |
144 | ECLIPTIC, |
145 | MERIDIAN, |
146 | HORIZON, |
147 | - GALACTICPLANE |
148 | + GALACTICEQUATOR |
149 | }; |
150 | // Create and precompute positions of a SkyGrid |
151 | SkyLine(SKY_LINE_TYPE _line_type = EQUATOR); |
152 | @@ -559,9 +559,9 @@ |
153 | frameType = StelCore::FrameAltAz; |
154 | label = q_("Horizon"); |
155 | break; |
156 | - case GALACTICPLANE: |
157 | + case GALACTICEQUATOR: |
158 | frameType = StelCore::FrameGalactic; |
159 | - label = q_("Galactic Plane"); |
160 | + label = q_("Galactic Equator"); |
161 | break; |
162 | } |
163 | } |
164 | @@ -647,7 +647,7 @@ |
165 | eclipticLine = new SkyLine(SkyLine::ECLIPTIC); |
166 | meridianLine = new SkyLine(SkyLine::MERIDIAN); |
167 | horizonLine = new SkyLine(SkyLine::HORIZON); |
168 | - galacticPlaneLine = new SkyLine(SkyLine::GALACTICPLANE); |
169 | + galacticEquatorLine = new SkyLine(SkyLine::GALACTICEQUATOR); |
170 | } |
171 | |
172 | GridLinesMgr::~GridLinesMgr() |
173 | @@ -661,7 +661,7 @@ |
174 | delete eclipticLine; |
175 | delete meridianLine; |
176 | delete horizonLine; |
177 | - delete galacticPlaneLine; |
178 | + delete galacticEquatorLine; |
179 | } |
180 | |
181 | /************************************************************************* |
182 | @@ -688,7 +688,7 @@ |
183 | setFlagEclipticLine(conf->value("viewing/flag_ecliptic_line").toBool()); |
184 | setFlagMeridianLine(conf->value("viewing/flag_meridian_line").toBool()); |
185 | setFlagHorizonLine(conf->value("viewing/flag_horizon_line").toBool()); |
186 | - setFlagGalacticPlaneLine(conf->value("viewing/flag_galactic_plane_line").toBool()); |
187 | + setFlagGalacticEquatorLine(conf->value("viewing/flag_galactic_equator_line").toBool()); |
188 | |
189 | StelApp& app = StelApp::getInstance(); |
190 | connect(&app, SIGNAL(colorSchemeChanged(const QString&)), this, SLOT(setStelStyle(const QString&))); |
191 | @@ -704,7 +704,7 @@ |
192 | addAction("actionShow_Equatorial_J2000_Grid", displayGroup, N_("Equatorial J2000 grid"), "equatorJ2000GridDisplayed"); |
193 | addAction("actionShow_Ecliptic_J2000_Grid", displayGroup, N_("Ecliptic J2000 grid"), "eclipticJ2000GridDisplayed"); |
194 | addAction("actionShow_Galactic_Grid", displayGroup, N_("Galactic grid"), "galacticGridDisplayed"); |
195 | - addAction("actionShow_Galactic_Plane_Line", displayGroup, N_("Galactic plane"), "galacticPlaneLineDisplayed"); |
196 | + addAction("actionShow_Galactic_Equator_Line", displayGroup, N_("Galactic equator"), "galacticEquatorLineDisplayed"); |
197 | } |
198 | |
199 | void GridLinesMgr::update(double deltaTime) |
200 | @@ -719,7 +719,7 @@ |
201 | eclipticLine->update(deltaTime); |
202 | meridianLine->update(deltaTime); |
203 | horizonLine->update(deltaTime); |
204 | - galacticPlaneLine->update(deltaTime); |
205 | + galacticEquatorLine->update(deltaTime); |
206 | } |
207 | |
208 | void GridLinesMgr::draw(StelCore* core) |
209 | @@ -733,7 +733,7 @@ |
210 | eclipticLine->draw(core); |
211 | meridianLine->draw(core); |
212 | horizonLine->draw(core); |
213 | - galacticPlaneLine->draw(core); |
214 | + galacticEquatorLine->draw(core); |
215 | } |
216 | |
217 | void GridLinesMgr::setStelStyle(const QString& section) |
218 | @@ -751,7 +751,7 @@ |
219 | setColorEclipticLine(StelUtils::strToVec3f(conf->value(section+"/ecliptic_color", defaultColor).toString())); |
220 | setColorMeridianLine(StelUtils::strToVec3f(conf->value(section+"/meridian_color", defaultColor).toString())); |
221 | setColorHorizonLine(StelUtils::strToVec3f(conf->value(section+"/horizon_color", defaultColor).toString())); |
222 | - setColorGalacticPlaneLine(StelUtils::strToVec3f(conf->value(section+"/galactic_plane_color", defaultColor).toString())); |
223 | + setColorGalacticEquatorLine(StelUtils::strToVec3f(conf->value(section+"/galactic_equator_color", defaultColor).toString())); |
224 | } |
225 | |
226 | void GridLinesMgr::updateLineLabels() |
227 | @@ -760,7 +760,7 @@ |
228 | eclipticLine->updateLabel(); |
229 | meridianLine->updateLabel(); |
230 | horizonLine->updateLabel(); |
231 | - galacticPlaneLine->updateLabel(); |
232 | + galacticEquatorLine->updateLabel(); |
233 | } |
234 | |
235 | //! Set flag for displaying Azimuthal Grid |
236 | @@ -989,27 +989,27 @@ |
237 | } |
238 | } |
239 | |
240 | -//! Set flag for displaying GalacticPlane Line |
241 | -void GridLinesMgr::setFlagGalacticPlaneLine(const bool displayed) |
242 | +//! Set flag for displaying Galactic Equator Line |
243 | +void GridLinesMgr::setFlagGalacticEquatorLine(const bool displayed) |
244 | { |
245 | - if(displayed != galacticPlaneLine->isDisplayed()) { |
246 | - galacticPlaneLine->setDisplayed(displayed); |
247 | - emit galacticPlaneLineDisplayedChanged(displayed); |
248 | + if(displayed != galacticEquatorLine->isDisplayed()) { |
249 | + galacticEquatorLine->setDisplayed(displayed); |
250 | + emit galacticEquatorLineDisplayedChanged(displayed); |
251 | } |
252 | } |
253 | -//! Get flag for displaying GalacticPlane Line |
254 | -bool GridLinesMgr::getFlagGalacticPlaneLine(void) const |
255 | -{ |
256 | - return galacticPlaneLine->isDisplayed(); |
257 | -} |
258 | -Vec3f GridLinesMgr::getColorGalacticPlaneLine(void) const |
259 | -{ |
260 | - return galacticPlaneLine->getColor(); |
261 | -} |
262 | -void GridLinesMgr::setColorGalacticPlaneLine(const Vec3f& newColor) |
263 | -{ |
264 | - if(newColor != galacticPlaneLine->getColor()) { |
265 | - galacticPlaneLine->setColor(newColor); |
266 | - emit galacticPlaneLineColorChanged(newColor); |
267 | +//! Get flag for displaying Galactic Equator Line |
268 | +bool GridLinesMgr::getFlagGalacticEquatorLine(void) const |
269 | +{ |
270 | + return galacticEquatorLine->isDisplayed(); |
271 | +} |
272 | +Vec3f GridLinesMgr::getColorGalacticEquatorLine(void) const |
273 | +{ |
274 | + return galacticEquatorLine->getColor(); |
275 | +} |
276 | +void GridLinesMgr::setColorGalacticEquatorLine(const Vec3f& newColor) |
277 | +{ |
278 | + if(newColor != galacticEquatorLine->getColor()) { |
279 | + galacticEquatorLine->setColor(newColor); |
280 | + emit galacticEquatorLineColorChanged(newColor); |
281 | } |
282 | } |
283 | |
284 | === modified file 'src/core/modules/GridLinesMgr.hpp' |
285 | --- src/core/modules/GridLinesMgr.hpp 2014-02-16 17:25:44 +0000 |
286 | +++ src/core/modules/GridLinesMgr.hpp 2014-09-10 14:02:26 +0000 |
287 | @@ -100,14 +100,14 @@ |
288 | READ getColorHorizonLine |
289 | WRITE setColorHorizonLine |
290 | NOTIFY horizonLineColorChanged) |
291 | - Q_PROPERTY(bool galacticPlaneLineDisplayed |
292 | - READ getFlagGalacticPlaneLine |
293 | - WRITE setFlagGalacticPlaneLine |
294 | - NOTIFY galacticPlaneLineDisplayedChanged) |
295 | - Q_PROPERTY(Vec3f galacticPlaneLineColor |
296 | - READ getColorGalacticPlaneLine |
297 | - WRITE setColorGalacticPlaneLine |
298 | - NOTIFY galacticPlaneLineColorChanged) |
299 | + Q_PROPERTY(bool galacticEquatorLineDisplayed |
300 | + READ getFlagGalacticEquatorLine |
301 | + WRITE setFlagGalacticEquatorLine |
302 | + NOTIFY galacticEquatorLineDisplayedChanged) |
303 | + Q_PROPERTY(Vec3f galacticEquatorLineColor |
304 | + READ getColorGalacticEquatorLine |
305 | + WRITE setColorGalacticEquatorLine |
306 | + NOTIFY galacticEquatorLineColorChanged) |
307 | |
308 | public: |
309 | GridLinesMgr(); |
310 | @@ -266,19 +266,23 @@ |
311 | //! @endcode |
312 | void setColorHorizonLine(const Vec3f& newColor); |
313 | |
314 | - //! Setter for displaying Galactic Plane Line. |
315 | - void setFlagGalacticPlaneLine(const bool displayed); |
316 | - //! Accessor for displaying Galactic Plane Line. |
317 | - bool getFlagGalacticPlaneLine(void) const; |
318 | - //! Get the current color of the Galactic Plane Line. |
319 | - Vec3f getColorGalacticPlaneLine(void) const; |
320 | - //! Set the color of the Galactic Plane Line. |
321 | - //! @param newColor The color of galactic plane line |
322 | + //! Setter for displaying Galactic Equator Line. |
323 | + void setFlagGalacticEquatorLine(const bool displayed); |
324 | + //! Deprecated: Setter for displaying Galactic "Plane" (i.e., Equator) Line. Left here for compatibility with older scripts. |
325 | + void setFlagGalacticPlaneLine(const bool displayed) { setFlagGalacticEquatorLine(displayed); } |
326 | + //! Accessor for displaying Galactic Equator Line. |
327 | + bool getFlagGalacticEquatorLine(void) const; |
328 | + //! Deprecated: Accessor for displaying Galactic "Plane" (i.e., Equator) Line. Left here for compatibility with older scripts. |
329 | + bool getFlagGalacticPlaneLine(void) const { return getFlagGalacticEquatorLine(); } |
330 | + //! Get the current color of the Galactic Equator Line. |
331 | + Vec3f getColorGalacticEquatorLine(void) const; |
332 | + //! Set the color of the Galactic Equator Line. |
333 | + //! @param newColor The color of galactic equator line |
334 | //! @code |
335 | //! // example of usage in scripts |
336 | - //! GridLinesMgr.setColorGalacticPlaneLine(Vec3f(1.0,0.0,0.0)); |
337 | + //! GridLinesMgr.setColorGalacticEquatorLine(Vec3f(1.0,0.0,0.0)); |
338 | //! @endcode |
339 | - void setColorGalacticPlaneLine(const Vec3f& newColor); |
340 | + void setColorGalacticEquatorLine(const Vec3f& newColor); |
341 | signals: |
342 | void azimuthalGridDisplayedChanged(const bool) const; |
343 | void azimuthalGridColorChanged(const Vec3f & newColor) const; |
344 | @@ -298,8 +302,8 @@ |
345 | void meridianLineColorChanged(const Vec3f & newColor) const; |
346 | void horizonLineDisplayedChanged(const bool displayed) const; |
347 | void horizonLineColorChanged(const Vec3f & newColor) const; |
348 | - void galacticPlaneLineDisplayedChanged(const bool displayed) const; |
349 | - void galacticPlaneLineColorChanged(const Vec3f & newColor) const; |
350 | + void galacticEquatorLineDisplayedChanged(const bool displayed) const; |
351 | + void galacticEquatorLineColorChanged(const Vec3f & newColor) const; |
352 | |
353 | |
354 | private slots: |
355 | @@ -320,7 +324,7 @@ |
356 | SkyLine * eclipticLine; // Ecliptic line |
357 | SkyLine * meridianLine; // Meridian line |
358 | SkyLine * horizonLine; // Horizon line |
359 | - SkyLine * galacticPlaneLine; // line depciting the Galacitc plane as defined by the IAU definition of Galactic coordinates |
360 | + SkyLine * galacticEquatorLine; // line depicting the Galactic equator as defined by the IAU definition of Galactic coordinates (System II, 1958) |
361 | }; |
362 | |
363 | #endif // _GRIDLINESMGR_HPP_ |
364 | |
365 | === modified file 'src/gui/ConfigurationDialog.cpp' |
366 | --- src/gui/ConfigurationDialog.cpp 2014-09-08 12:47:22 +0000 |
367 | +++ src/gui/ConfigurationDialog.cpp 2014-09-10 14:02:26 +0000 |
368 | @@ -532,7 +532,7 @@ |
369 | conf->setValue("viewing/flag_horizon_line", glmgr->getFlagHorizonLine()); |
370 | conf->setValue("viewing/flag_equatorial_J2000_grid", glmgr->getFlagEquatorJ2000Grid()); |
371 | conf->setValue("viewing/flag_galactic_grid", glmgr->getFlagGalacticGrid()); |
372 | - conf->setValue("viewing/flag_galactic_plane_line", glmgr->getFlagGalacticPlaneLine()); |
373 | + conf->setValue("viewing/flag_galactic_equator_line", glmgr->getFlagGalacticEquatorLine()); |
374 | conf->setValue("viewing/flag_cardinal_points", lmgr->getFlagCardinalsPoints()); |
375 | conf->setValue("viewing/flag_constellation_drawing", cmgr->getFlagLines()); |
376 | conf->setValue("viewing/flag_constellation_name", cmgr->getFlagLabels()); |
377 | |
378 | === modified file 'src/gui/ViewDialog.cpp' |
379 | --- src/gui/ViewDialog.cpp 2014-09-08 15:51:22 +0000 |
380 | +++ src/gui/ViewDialog.cpp 2014-09-10 14:02:26 +0000 |
381 | @@ -267,7 +267,7 @@ |
382 | connectCheckBox(ui->showHorizonLineCheckBox, "actionShow_Horizon_Line"); |
383 | connectCheckBox(ui->showEquatorialGridCheckBox, "actionShow_Equatorial_Grid"); |
384 | connectCheckBox(ui->showGalacticGridCheckBox, "actionShow_Galactic_Grid"); |
385 | - connectCheckBox(ui->showGalacticPlaneLineCheckBox, "actionShow_Galactic_Plane_Line"); |
386 | + connectCheckBox(ui->showGalacticEquatorLineCheckBox, "actionShow_Galactic_Equator_Line"); |
387 | connectCheckBox(ui->showAzimuthalGridCheckBox, "actionShow_Azimuthal_Grid"); |
388 | connectCheckBox(ui->showEquatorialJ2000GridCheckBox, "actionShow_Equatorial_J2000_Grid"); |
389 | connectCheckBox(ui->showEclipticGridJ2000CheckBox, "actionShow_Ecliptic_J2000_Grid"); |
390 | |
391 | === modified file 'src/gui/viewDialog.ui' |
392 | --- src/gui/viewDialog.ui 2014-04-06 13:22:22 +0000 |
393 | +++ src/gui/viewDialog.ui 2014-09-10 14:02:26 +0000 |
394 | @@ -346,7 +346,7 @@ |
395 | <item alignment="Qt::AlignTop"> |
396 | <widget class="QStackedWidget" name="stackedWidget"> |
397 | <property name="currentIndex"> |
398 | - <number>0</number> |
399 | + <number>1</number> |
400 | </property> |
401 | <widget class="QWidget" name="page"> |
402 | <layout class="QGridLayout" name="gridLayout"> |
403 | @@ -1455,12 +1455,12 @@ |
404 | </widget> |
405 | </item> |
406 | <item> |
407 | - <widget class="QCheckBox" name="showGalacticPlaneLineCheckBox"> |
408 | + <widget class="QCheckBox" name="showGalacticEquatorLineCheckBox"> |
409 | <property name="toolTip"> |
410 | - <string>Show Galactic plane line</string> |
411 | + <string>Show Galactic equator line</string> |
412 | </property> |
413 | <property name="text"> |
414 | - <string>Galactic plane</string> |
415 | + <string>Galactic equator</string> |
416 | </property> |
417 | </widget> |
418 | </item> |
419 | @@ -2016,7 +2016,7 @@ |
420 | <tabstop>showMeridianLineCheckBox</tabstop> |
421 | <tabstop>showHorizonLineCheckBox</tabstop> |
422 | <tabstop>showEclipticLineCheckBox</tabstop> |
423 | - <tabstop>showGalacticPlaneLineCheckBox</tabstop> |
424 | + <tabstop>showGalacticEquatorLineCheckBox</tabstop> |
425 | <tabstop>showConstellationLinesCheckBox</tabstop> |
426 | <tabstop>showConstellationLabelsCheckBox</tabstop> |
427 | <tabstop>showConstellationBoundariesCheckBox</tabstop> |
428 | |
429 | === modified file 'src/scripting/StelMainScriptAPI.cpp' |
430 | --- src/scripting/StelMainScriptAPI.cpp 2014-08-10 14:36:53 +0000 |
431 | +++ src/scripting/StelMainScriptAPI.cpp 2014-09-10 14:02:26 +0000 |
432 | @@ -904,7 +904,7 @@ |
433 | glmgr->setFlagEclipticLine(false); |
434 | glmgr->setFlagMeridianLine(false); |
435 | glmgr->setFlagHorizonLine(false); |
436 | - glmgr->setFlagGalacticPlaneLine(false); |
437 | + glmgr->setFlagGalacticEquatorLine(false); |
438 | glmgr->setFlagEquatorJ2000Grid(false); |
439 | lmgr->setFlagCardinalsPoints(false); |
440 | cmgr->setFlagLines(false); |
441 | @@ -936,7 +936,7 @@ |
442 | glmgr->setFlagEclipticLine(false); |
443 | glmgr->setFlagMeridianLine(false); |
444 | glmgr->setFlagHorizonLine(false); |
445 | - glmgr->setFlagGalacticPlaneLine(false); |
446 | + glmgr->setFlagGalacticEquatorLine(false); |
447 | glmgr->setFlagEquatorJ2000Grid(false); |
448 | lmgr->setFlagCardinalsPoints(false); |
449 | cmgr->setFlagLines(true); |
450 | @@ -968,7 +968,7 @@ |
451 | glmgr->setFlagEclipticLine(false); |
452 | glmgr->setFlagMeridianLine(false); |
453 | glmgr->setFlagHorizonLine(false); |
454 | - glmgr->setFlagGalacticPlaneLine(false); |
455 | + glmgr->setFlagGalacticEquatorLine(false); |
456 | glmgr->setFlagEquatorJ2000Grid(false); |
457 | lmgr->setFlagCardinalsPoints(false); |
458 | cmgr->setFlagLines(false); |
459 | |
460 | === modified file 'src/scripting/StratoscriptPreprocessor.cpp' |
461 | --- src/scripting/StratoscriptPreprocessor.cpp 2013-07-23 13:51:31 +0000 |
462 | +++ src/scripting/StratoscriptPreprocessor.cpp 2014-09-10 14:02:26 +0000 |
463 | @@ -150,8 +150,8 @@ |
464 | line = QString("GridLinesMgr.setFlagMeridianLine(%1);").arg(strToBool(args.at(2))); |
465 | else if (args.at(1) == "horizon_line") |
466 | line = QString("GridLinesMgr.setFlagHorizonLine(%1);").arg(strToBool(args.at(2))); |
467 | - else if (args.at(1) == "galactic_plane_line") |
468 | - line = QString("GridLinesMgr.setFlagGalacticPlaneLine(%1);").arg(strToBool(args.at(2))); |
469 | + else if ((args.at(1) == "galactic_equator_line") || (args.at(1) == "galactic_plane_line")) // "plane" for legacy scripts before 0.13.1. |
470 | + line = QString("GridLinesMgr.setFlagGalacticEquatorLine(%1);").arg(strToBool(args.at(2))); |
471 | else if (args.at(1) == "milky_way") |
472 | line = QString("MilkyWay.setFlagShow(%1);").arg(strToBool(args.at(2))); |
473 | else if (args.at(1) == "nebulae") |
It's OK for me, but IMHO we should introduce layer with backward compatibility for scripting engine - e.g. call getFlagGalactic EquatorLine( ) in the getFlagGalactic PlaneLine( ), plus marked getFlagGalactic PlaneLine( ) as deprecated.