← Back to branch summary

~registry/stellarium/socis2015-de430

« back to all changes in this revision

Viewing changes to src/core/modules/SolarSystem.cpp

  • Committer: georg-zotti
  • Date: 2015-12-14 13:02:24 UTC
  • mfrom: (7721.1.367 trunk)
  • Revision ID: georg.zotti@univie.ac.at-20151214130224-g5sqnc31ghcmw0ux
merge-in trunk r8088

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/modules/SolarSystem.cpp
64
64
        , moonScale(1.)
65
65
        , labelsAmount(false)
66
66
        , flagOrbits(false)
67
 
        , flagLightTravelTime(false)
 
67
        , flagLightTravelTime(true)
68
68
        , flagShow(false)
69
69
        , flagMarker(false)
70
70
        , flagNativeNames(false)
145
145
        setFlagLabels(conf->value("astro/flag_planets_labels", true).toBool());
146
146
        setLabelsAmount(conf->value("astro/labels_amount", 3.).toFloat());
147
147
        setFlagOrbits(conf->value("astro/flag_planets_orbits").toBool());
148
 
        setFlagLightTravelTime(conf->value("astro/flag_light_travel_time", false).toBool());
 
148
        setFlagLightTravelTime(conf->value("astro/flag_light_travel_time", true).toBool());
149
149
        setFlagMarkers(conf->value("astro/flag_planets_markers", true).toBool());
150
150
        // Set the algorithm from Astronomical Almanac for computation of apparent magnitudes for
151
151
        // planets in case  observer on the Earth by default
154
154
        // Is enabled the showing of isolated trails for selected objects only?
155
155
        setFlagIsolatedTrails(conf->value("viewing/flag_isolated_trails", true).toBool());
156
156
        setFlagIsolatedOrbits(conf->value("viewing/flag_isolated_orbits", true).toBool());
 
157
        setFlagPermanentOrbits(conf->value("astro/flag_permanent_orbits", false).toBool());
157
158
 
158
159
        recreateTrails();
159
160
 
1739
1740
        return getEarth()->getApparentMagnitudeAlgorithmString();
1740
1741
}
1741
1742
 
 
1743
void SolarSystem::setFlagPermanentOrbits(bool b)
 
1744
{
 
1745
        Planet::permanentDrawingOrbits=b;
 
1746
}
 
1747
 
1742
1748
double SolarSystem::getEclipseFactor(const StelCore* core) const
1743
1749
{
1744
1750
        Vec3d Lp = sun->getEclipticPos();