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
=== modified file 'data/default_config.ini'
--- data/default_config.ini 2010-12-05 08:56:01 +0000
+++ data/default_config.ini 2011-06-20 09:53:24 +0000
@@ -98,10 +98,11 @@
98azimuthal_color = 0.3,0.2,0.198azimuthal_color = 0.3,0.2,0.1
99equatorial_color = 0.1,0.2,0.399equatorial_color = 0.1,0.2,0.3
100equatorial_J2000_color = 0.1,0.3,0.4100equatorial_J2000_color = 0.1,0.3,0.4
101galactic_color = 0.0,0.3,0.2101galactic_color = 0.0,0.3,0.2
102equator_color = 0.2,0.2,0.6102equator_color = 0.2,0.2,0.6
103ecliptic_color = 0.6,0.2,0.2103ecliptic_color = 0.6,0.2,0.2
104meridian_color = 0.2,0.6,0.2104meridian_color = 0.2,0.6,0.2
105horizon_color = 0.2,0.6,0.2
105const_lines_color = 0.13,0.19,0.24106const_lines_color = 0.13,0.19,0.24
106const_names_color = 0.31,0.38,0.46107const_names_color = 0.31,0.38,0.46
107const_boundary_color = 0.3,0.1,0.1108const_boundary_color = 0.3,0.1,0.1
@@ -129,6 +130,7 @@
129equator_color = 0.2,0.2,0.6130equator_color = 0.2,0.2,0.6
130ecliptic_color = 0.6,0.2,0.2131ecliptic_color = 0.6,0.2,0.2
131meridian_color = 0.2,0.6,0.2132meridian_color = 0.2,0.6,0.2
133horizon_color = 0.2,0.6,0.2
132const_lines_color = 0.5,0.1,0.1134const_lines_color = 0.5,0.1,0.1
133const_names_color = 0.8,0.2,0.2135const_names_color = 0.8,0.2,0.2
134const_boundary_color = 0.8,0.3,0.3136const_boundary_color = 0.8,0.3,0.3
@@ -190,6 +192,7 @@
190flag_equator_line = false192flag_equator_line = false
191flag_ecliptic_line = false193flag_ecliptic_line = false
192flag_meridian_line = false194flag_meridian_line = false
195flag_horizon_line = false
193flag_cardinal_points = true196flag_cardinal_points = true
194flag_gravity_labels = false197flag_gravity_labels = false
195flag_moon_scaled = false198flag_moon_scaled = false
196199
=== modified file 'src/core/modules/GridLinesMgr.cpp'
--- src/core/modules/GridLinesMgr.cpp 2011-05-31 13:06:03 +0000
+++ src/core/modules/GridLinesMgr.cpp 2011-06-20 09:53:24 +0000
@@ -70,7 +70,8 @@
70 {70 {
71 EQUATOR,71 EQUATOR,
72 ECLIPTIC,72 ECLIPTIC,
73 MERIDIAN73 MERIDIAN,
74 HORIZON
74 };75 };
75 // Create and precompute positions of a SkyGrid76 // Create and precompute positions of a SkyGrid
76 SkyLine(SKY_LINE_TYPE _line_type = EQUATOR);77 SkyLine(SKY_LINE_TYPE _line_type = EQUATOR);
@@ -524,6 +525,10 @@
524 frameType = StelCore::FrameEquinoxEqu;525 frameType = StelCore::FrameEquinoxEqu;
525 label = q_("Equator");526 label = q_("Equator");
526 break;527 break;
528 case HORIZON:
529 frameType = StelCore::FrameAltAz;
530 label = q_("Horizon");
531 break;
527 }532 }
528}533}
529534
@@ -552,18 +557,17 @@
552 glEnable(GL_BLEND);557 glEnable(GL_BLEND);
553 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode558 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
554559
555 Vec4f textColor(color[0], color[1], color[2], 0);560 Vec4f textColor(color[0], color[1], color[2], 0);
556 textColor*=2;561 textColor*=2;
557 textColor[3]=fader.getInterstate();562 textColor[3]=fader.getInterstate();
558563
559 ViewportEdgeIntersectCallbackData userData(&sPainter);564 ViewportEdgeIntersectCallbackData userData(&sPainter);
560 sPainter.setFont(font);565 sPainter.setFont(font);
561 userData.textColor = textColor;566 userData.textColor = textColor;
562 userData.text = label;567 userData.text = label;
563
564 /////////////////////////////////////////////////568 /////////////////////////////////////////////////
565 // Draw the line569 // Draw the line
566 SphericalCap meridianSphericalCap(Vec3d(0,0,1), 0);570 SphericalCap meridianSphericalCap(Vec3d(0,0,1), 0);
567 Vec3d fpt(1,0,0);571 Vec3d fpt(1,0,0);
568 if (line_type==MERIDIAN)572 if (line_type==MERIDIAN)
569 {573 {
@@ -591,6 +595,7 @@
591 return;595 return;
592 }596 }
593597
598
594 Vec3d middlePoint = p1+p2;599 Vec3d middlePoint = p1+p2;
595 middlePoint.normalize();600 middlePoint.normalize();
596 if (!viewPortSphericalCap.contains(middlePoint))601 if (!viewPortSphericalCap.contains(middlePoint))
@@ -616,6 +621,7 @@
616 equatorLine = new SkyLine(SkyLine::EQUATOR);621 equatorLine = new SkyLine(SkyLine::EQUATOR);
617 eclipticLine = new SkyLine(SkyLine::ECLIPTIC);622 eclipticLine = new SkyLine(SkyLine::ECLIPTIC);
618 meridianLine = new SkyLine(SkyLine::MERIDIAN);623 meridianLine = new SkyLine(SkyLine::MERIDIAN);
624 horizonLine = new SkyLine(SkyLine::HORIZON);
619}625}
620626
621GridLinesMgr::~GridLinesMgr()627GridLinesMgr::~GridLinesMgr()
@@ -627,6 +633,7 @@
627 delete equatorLine;633 delete equatorLine;
628 delete eclipticLine;634 delete eclipticLine;
629 delete meridianLine;635 delete meridianLine;
636 delete horizonLine;
630}637}
631638
632/*************************************************************************639/*************************************************************************
@@ -651,6 +658,7 @@
651 setFlagEquatorLine(conf->value("viewing/flag_equator_line").toBool());658 setFlagEquatorLine(conf->value("viewing/flag_equator_line").toBool());
652 setFlagEclipticLine(conf->value("viewing/flag_ecliptic_line").toBool());659 setFlagEclipticLine(conf->value("viewing/flag_ecliptic_line").toBool());
653 setFlagMeridianLine(conf->value("viewing/flag_meridian_line").toBool());660 setFlagMeridianLine(conf->value("viewing/flag_meridian_line").toBool());
661 setFlagHorizonLine(conf->value("viewing/flag_horizon_line").toBool());
654 connect(&StelApp::getInstance(), SIGNAL(colorSchemeChanged(const QString&)), this, SLOT(setStelStyle(const QString&)));662 connect(&StelApp::getInstance(), SIGNAL(colorSchemeChanged(const QString&)), this, SLOT(setStelStyle(const QString&)));
655}663}
656664
@@ -664,6 +672,7 @@
664 equatorLine->update(deltaTime);672 equatorLine->update(deltaTime);
665 eclipticLine->update(deltaTime);673 eclipticLine->update(deltaTime);
666 meridianLine->update(deltaTime);674 meridianLine->update(deltaTime);
675 horizonLine->update(deltaTime);
667}676}
668677
669void GridLinesMgr::draw(StelCore* core)678void GridLinesMgr::draw(StelCore* core)
@@ -675,6 +684,7 @@
675 equatorLine->draw(core);684 equatorLine->draw(core);
676 eclipticLine->draw(core);685 eclipticLine->draw(core);
677 meridianLine->draw(core);686 meridianLine->draw(core);
687 horizonLine->draw(core);
678}688}
679689
680void GridLinesMgr::setStelStyle(const QString& section)690void GridLinesMgr::setStelStyle(const QString& section)
@@ -690,6 +700,7 @@
690 setColorEquatorLine(StelUtils::strToVec3f(conf->value(section+"/equator_color", defaultColor).toString()));700 setColorEquatorLine(StelUtils::strToVec3f(conf->value(section+"/equator_color", defaultColor).toString()));
691 setColorEclipticLine(StelUtils::strToVec3f(conf->value(section+"/ecliptic_color", defaultColor).toString()));701 setColorEclipticLine(StelUtils::strToVec3f(conf->value(section+"/ecliptic_color", defaultColor).toString()));
692 setColorMeridianLine(StelUtils::strToVec3f(conf->value(section+"/meridian_color", defaultColor).toString()));702 setColorMeridianLine(StelUtils::strToVec3f(conf->value(section+"/meridian_color", defaultColor).toString()));
703 setColorHorizonLine(StelUtils::strToVec3f(conf->value(section+"/horizon_color", defaultColor).toString()));
693}704}
694705
695//! Set flag for displaying Azimuthal Grid706//! Set flag for displaying Azimuthal Grid
@@ -735,6 +746,12 @@
735bool GridLinesMgr::getFlagMeridianLine(void) const {return meridianLine->getFlagshow();}746bool GridLinesMgr::getFlagMeridianLine(void) const {return meridianLine->getFlagshow();}
736Vec3f GridLinesMgr::getColorMeridianLine(void) const {return meridianLine->getColor();}747Vec3f GridLinesMgr::getColorMeridianLine(void) const {return meridianLine->getColor();}
737748
749//! Set flag for displaying Horizon Line
750void GridLinesMgr::setFlagHorizonLine(bool b) {horizonLine->setFlagshow(b);}
751//! Get flag for displaying Horizon Line
752bool GridLinesMgr::getFlagHorizonLine(void) const {return horizonLine->getFlagshow();}
753Vec3f GridLinesMgr::getColorHorizonLine(void) const {return horizonLine->getColor();}
754
738void GridLinesMgr::setColorAzimuthalGrid(const Vec3f& v) { aziGrid->setColor(v);}755void GridLinesMgr::setColorAzimuthalGrid(const Vec3f& v) { aziGrid->setColor(v);}
739void GridLinesMgr::setColorEquatorGrid(const Vec3f& v) { equGrid->setColor(v);}756void GridLinesMgr::setColorEquatorGrid(const Vec3f& v) { equGrid->setColor(v);}
740void GridLinesMgr::setColorEquatorJ2000Grid(const Vec3f& v) { equJ2000Grid->setColor(v);}757void GridLinesMgr::setColorEquatorJ2000Grid(const Vec3f& v) { equJ2000Grid->setColor(v);}
@@ -742,3 +759,4 @@
742void GridLinesMgr::setColorEquatorLine(const Vec3f& v) { equatorLine->setColor(v);}759void GridLinesMgr::setColorEquatorLine(const Vec3f& v) { equatorLine->setColor(v);}
743void GridLinesMgr::setColorEclipticLine(const Vec3f& v) { eclipticLine->setColor(v);}760void GridLinesMgr::setColorEclipticLine(const Vec3f& v) { eclipticLine->setColor(v);}
744void GridLinesMgr::setColorMeridianLine(const Vec3f& v) { meridianLine->setColor(v);}761void GridLinesMgr::setColorMeridianLine(const Vec3f& v) { meridianLine->setColor(v);}
762void GridLinesMgr::setColorHorizonLine(const Vec3f& v) { horizonLine->setColor(v);}
745763
=== modified file 'src/core/modules/GridLinesMgr.hpp'
--- src/core/modules/GridLinesMgr.hpp 2011-01-29 18:14:28 +0000
+++ src/core/modules/GridLinesMgr.hpp 2011-06-20 09:53:24 +0000
@@ -127,6 +127,15 @@
127 //! Set the color of the Meridian Line.127 //! Set the color of the Meridian Line.
128 void setColorMeridianLine(const Vec3f& v);128 void setColorMeridianLine(const Vec3f& v);
129129
130 //! Set flag for displaying Horizon Line.
131 void setFlagHorizonLine(bool b);
132 //! Get flag for displaying Horizon Line.
133 bool getFlagHorizonLine(void) const;
134 //! Get the current color of the Horizon Line.
135 Vec3f getColorHorizonLine(void) const;
136 //! Set the color of the Horizon Line.
137 void setColorHorizonLine(const Vec3f& v);
138
130private slots:139private slots:
131 //! Sets the colors of: grids and great circles, Equatorial Grid, Azimuthal Grid, 140 //! Sets the colors of: grids and great circles, Equatorial Grid, Azimuthal Grid,
132 //! Meridian Line, Equator Line and Ecliptic Line.141 //! Meridian Line, Equator Line and Ecliptic Line.
@@ -140,6 +149,7 @@
140 SkyLine * equatorLine; // Celestial Equator line149 SkyLine * equatorLine; // Celestial Equator line
141 SkyLine * eclipticLine; // Ecliptic line150 SkyLine * eclipticLine; // Ecliptic line
142 SkyLine * meridianLine; // Meridian line151 SkyLine * meridianLine; // Meridian line
152 SkyLine * horizonLine; // Horizon line
143};153};
144154
145#endif // _GRIDLINESMGR_HPP_155#endif // _GRIDLINESMGR_HPP_
146156
=== modified file 'src/gui/StelGui.cpp'
--- src/gui/StelGui.cpp 2011-05-31 13:06:03 +0000
+++ src/gui/StelGui.cpp 2011-06-20 09:53:24 +0000
@@ -108,6 +108,7 @@
108 addGuiActions("actionShow_Ecliptic_Line", N_("Ecliptic line"), ",", group, true, false);108 addGuiActions("actionShow_Ecliptic_Line", N_("Ecliptic line"), ",", group, true, false);
109 addGuiActions("actionShow_Equator_Line", N_("Equator line"), ".", group, true, false);109 addGuiActions("actionShow_Equator_Line", N_("Equator line"), ".", group, true, false);
110 addGuiActions("actionShow_Meridian_Line", N_("Meridian line"), ";", group, true, false);110 addGuiActions("actionShow_Meridian_Line", N_("Meridian line"), ";", group, true, false);
111 addGuiActions("actionShow_Horizon_Line", N_("Horizon line"), "", group, true, false);
111 addGuiActions("actionShow_Cardinal_Points", N_("Cardinal points"), "Q", group, true, false);112 addGuiActions("actionShow_Cardinal_Points", N_("Cardinal points"), "Q", group, true, false);
112113
113 addGuiActions("actionShow_Ground", N_("Ground"), "G", group, true, false);114 addGuiActions("actionShow_Ground", N_("Ground"), "G", group, true, false);
@@ -205,6 +206,8 @@
205 getGuiActions("actionShow_Equator_Line")->setChecked(gmgr->getFlagEquatorLine());206 getGuiActions("actionShow_Equator_Line")->setChecked(gmgr->getFlagEquatorLine());
206 connect(getGuiActions("actionShow_Meridian_Line"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagMeridianLine(bool)));207 connect(getGuiActions("actionShow_Meridian_Line"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagMeridianLine(bool)));
207 getGuiActions("actionShow_Meridian_Line")->setChecked(gmgr->getFlagMeridianLine());208 getGuiActions("actionShow_Meridian_Line")->setChecked(gmgr->getFlagMeridianLine());
209 connect(getGuiActions("actionShow_Horizon_Line"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagHorizonLine(bool)));
210 getGuiActions("actionShow_Horizon_Line")->setChecked(gmgr->getFlagHorizonLine());
208 connect(getGuiActions("actionShow_Equatorial_J2000_Grid"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagEquatorJ2000Grid(bool)));211 connect(getGuiActions("actionShow_Equatorial_J2000_Grid"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagEquatorJ2000Grid(bool)));
209 getGuiActions("actionShow_Equatorial_J2000_Grid")->setChecked(gmgr->getFlagEquatorJ2000Grid());212 getGuiActions("actionShow_Equatorial_J2000_Grid")->setChecked(gmgr->getFlagEquatorJ2000Grid());
210 connect(getGuiActions("actionShow_Galactic_Grid"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagGalacticGrid(bool)));213 connect(getGuiActions("actionShow_Galactic_Grid"), SIGNAL(toggled(bool)), gmgr, SLOT(setFlagGalacticGrid(bool)));
211214
=== modified file 'src/gui/ViewDialog.cpp'
--- src/gui/ViewDialog.cpp 2011-06-08 14:32:05 +0000
+++ src/gui/ViewDialog.cpp 2011-06-20 09:53:24 +0000
@@ -237,6 +237,11 @@
237 connect(a, SIGNAL(toggled(bool)), ui->showMeridianLineCheckBox, SLOT(setChecked(bool)));237 connect(a, SIGNAL(toggled(bool)), ui->showMeridianLineCheckBox, SLOT(setChecked(bool)));
238 connect(ui->showMeridianLineCheckBox, SIGNAL(toggled(bool)), a, SLOT(setChecked(bool)));238 connect(ui->showMeridianLineCheckBox, SIGNAL(toggled(bool)), a, SLOT(setChecked(bool)));
239239
240 ui->showHorizonLineCheckBox->setChecked(glmgr->getFlagHorizonLine());
241 a = gui->getGuiActions("actionShow_Horizon_Line");
242 connect(a, SIGNAL(toggled(bool)), ui->showHorizonLineCheckBox, SLOT(setChecked(bool)));
243 connect(ui->showHorizonLineCheckBox, SIGNAL(toggled(bool)), a, SLOT(setChecked(bool)));
244
240 ui->showEquatorialGridCheckBox->setChecked(glmgr->getFlagEquatorGrid());245 ui->showEquatorialGridCheckBox->setChecked(glmgr->getFlagEquatorGrid());
241 a = gui->getGuiActions("actionShow_Equatorial_Grid");246 a = gui->getGuiActions("actionShow_Equatorial_Grid");
242 connect(a, SIGNAL(toggled(bool)), ui->showEquatorialGridCheckBox, SLOT(setChecked(bool)));247 connect(a, SIGNAL(toggled(bool)), ui->showEquatorialGridCheckBox, SLOT(setChecked(bool)));
243248
=== modified file 'src/gui/viewDialog.ui'
--- src/gui/viewDialog.ui 2011-06-08 14:32:05 +0000
+++ src/gui/viewDialog.ui 2011-06-20 09:53:24 +0000
@@ -1060,6 +1060,13 @@
1060 </widget>1060 </widget>
1061 </item>1061 </item>
1062 <item>1062 <item>
1063 <widget class="QCheckBox" name="showHorizonLineCheckBox">
1064 <property name="text">
1065 <string>Horizon line</string>
1066 </property>
1067 </widget>
1068 </item>
1069 <item>
1063 <widget class="QCheckBox" name="showEclipticLineCheckBox">1070 <widget class="QCheckBox" name="showEclipticLineCheckBox">
1064 <property name="text">1071 <property name="text">
1065 <string>Ecliptic line</string>1072 <string>Ecliptic line</string>
@@ -1621,6 +1628,7 @@
1621 <tabstop>zhr144000</tabstop>1628 <tabstop>zhr144000</tabstop>
1622 <tabstop>showEquatorLineCheckBox</tabstop>1629 <tabstop>showEquatorLineCheckBox</tabstop>
1623 <tabstop>showMeridianLineCheckBox</tabstop>1630 <tabstop>showMeridianLineCheckBox</tabstop>
1631 <tabstop>showHorizonLineCheckBox</tabstop>
1624 <tabstop>showEclipticLineCheckBox</tabstop>1632 <tabstop>showEclipticLineCheckBox</tabstop>
1625 <tabstop>showCardinalPointsCheckBox</tabstop>1633 <tabstop>showCardinalPointsCheckBox</tabstop>
1626 <tabstop>showConstellationLinesCheckBox</tabstop>1634 <tabstop>showConstellationLinesCheckBox</tabstop>