SolarSystem.cpp   SolarSystem.cpp 
skipping to change at line 157 skipping to change at line 157
setFlagOrbits(conf->value("astro/flag_planets_orbits").toBool()); setFlagOrbits(conf->value("astro/flag_planets_orbits").toBool());
setFlagLightTravelTime(conf->value("astro/flag_light_travel_time", f alse).toBool()); setFlagLightTravelTime(conf->value("astro/flag_light_travel_time", f alse).toBool());
setFlagMarkers(conf->value("astro/flag_planets_markers", true).toBoo l()); setFlagMarkers(conf->value("astro/flag_planets_markers", true).toBoo l());
// Set the algorithm from Astronomical Almanac for computation of ap parent magnitudes for // Set the algorithm from Astronomical Almanac for computation of ap parent magnitudes for
// planets in case observer on the Earth by default // planets in case observer on the Earth by default
setApparentMagnitudeAlgorithmOnEarth(conf->value("astro/apparent_mag nitude_algorithm", "Harris").toString()); setApparentMagnitudeAlgorithmOnEarth(conf->value("astro/apparent_mag nitude_algorithm", "Harris").toString());
setFlagNativeNames(conf->value("viewing/flag_planets_native_names", true).toBool()); setFlagNativeNames(conf->value("viewing/flag_planets_native_names", true).toBool());
// Is enabled the showing of isolated trails for selected objects on ly? // Is enabled the showing of isolated trails for selected objects on ly?
setFlagIsolatedTrails(conf->value("viewing/flag_isolated_trails", tr ue).toBool()); setFlagIsolatedTrails(conf->value("viewing/flag_isolated_trails", tr ue).toBool());
setFlagIsolatedOrbits(conf->value("viewing/flag_isolated_orbits", tr ue).toBool()); setFlagIsolatedOrbits(conf->value("viewing/flag_isolated_orbits", tr ue).toBool());
setFlagPermanentOrbits(conf->value("astro/flag_permanent_orbits", fa lse).toBool());
recreateTrails(); recreateTrails();
setFlagTrails(conf->value("astro/flag_object_trails", false).toBool( )); setFlagTrails(conf->value("astro/flag_object_trails", false).toBool( ));
StelObjectMgr *objectManager = GETSTELMODULE(StelObjectMgr); StelObjectMgr *objectManager = GETSTELMODULE(StelObjectMgr);
objectManager->registerStelObjectMgr(this); objectManager->registerStelObjectMgr(this);
connect(objectManager, SIGNAL(selectedObjectChanged(StelModule::Stel ModuleSelectAction)), connect(objectManager, SIGNAL(selectedObjectChanged(StelModule::Stel ModuleSelectAction)),
this, SLOT(selectedObjectChange(StelModule::StelModu leSelectAction))); this, SLOT(selectedObjectChange(StelModule::StelModu leSelectAction)));
skipping to change at line 1733 skipping to change at line 1734
{ {
getEarth()->setApparentMagnitudeAlgorithm(algorithm); getEarth()->setApparentMagnitudeAlgorithm(algorithm);
} }
// Get the algorithm used for computation of apparent magnitudes for planet s in case observer on the Earth // Get the algorithm used for computation of apparent magnitudes for planet s in case observer on the Earth
QString SolarSystem::getApparentMagnitudeAlgorithmOnEarth() const QString SolarSystem::getApparentMagnitudeAlgorithmOnEarth() const
{ {
return getEarth()->getApparentMagnitudeAlgorithmString(); return getEarth()->getApparentMagnitudeAlgorithmString();
} }
void SolarSystem::setFlagPermanentOrbits(bool b)
{
Planet::permanentDrawingOrbits=b;
}
double SolarSystem::getEclipseFactor(const StelCore* core) const double SolarSystem::getEclipseFactor(const StelCore* core) const
{ {
Vec3d Lp = sun->getEclipticPos(); Vec3d Lp = sun->getEclipticPos();
Vec3d P3 = core->getObserverHeliocentricEclipticPos(); Vec3d P3 = core->getObserverHeliocentricEclipticPos();
const double RS = sun->getRadius(); const double RS = sun->getRadius();
double final_illumination = 1.0; double final_illumination = 1.0;
foreach (const PlanetP& planet, systemPlanets) foreach (const PlanetP& planet, systemPlanets)
{ {
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/