SolarSystem.cpp   SolarSystem.cpp 
skipping to change at line 123 skipping to change at line 123
setMoonScale(conf->value("viewing/moon_scale", 5.0).toDouble()); setMoonScale(conf->value("viewing/moon_scale", 5.0).toDouble());
setFlagPlanets(conf->value("astro/flag_planets").toBool()); setFlagPlanets(conf->value("astro/flag_planets").toBool());
setFlagHints(conf->value("astro/flag_planets_hints").toBool()); setFlagHints(conf->value("astro/flag_planets_hints").toBool());
setFlagLabels(conf->value("astro/flag_planets_labels", true).toBool( )); setFlagLabels(conf->value("astro/flag_planets_labels", true).toBool( ));
setLabelsAmount(conf->value("astro/labels_amount", 3.).toDouble()); setLabelsAmount(conf->value("astro/labels_amount", 3.).toDouble());
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());
setFlagTrails(conf->value("astro/flag_object_trails", false).toBool( )); setFlagTrails(conf->value("astro/flag_object_trails", false).toBool( ));
startTrails(conf->value("astro/flag_object_trails", false).toBool()) ; startTrails(conf->value("astro/flag_object_trails", false).toBool()) ;
StelApp::getInstance().getStelObjectMgr().registerStelObjectMgr(this ); GETSTELMODULE(StelObjectMgr)->registerStelObjectMgr(this);
StelApp::getInstance().getTextureManager().setDefaultParams(); StelApp::getInstance().getTextureManager().setDefaultParams();
StelApp::getInstance().getTextureManager().setMinFilter(GL_LINEAR); StelApp::getInstance().getTextureManager().setMinFilter(GL_LINEAR);
texPointer = StelApp::getInstance().getTextureManager().createTextur e("pointeur4.png"); texPointer = StelApp::getInstance().getTextureManager().createTextur e("pointeur4.png");
Planet::hintCircleTex = StelApp::getInstance().getTextureManager().c reateTexture("planet-indicator.png"); Planet::hintCircleTex = StelApp::getInstance().getTextureManager().c reateTexture("planet-indicator.png");
} }
void SolarSystem::drawPointer(const StelCore* core) void SolarSystem::drawPointer(const StelCore* core)
{ {
const StelNavigator* nav = core->getNavigator(); const StelNavigator* nav = core->getNavigator();
const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000) ; const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000) ;
const QList<StelObjectP> newSelected = StelApp::getInstance().getSte lObjectMgr().getSelectedObject("Planet"); const QList<StelObjectP> newSelected = GETSTELMODULE(StelObjectMgr)- >getSelectedObject("Planet");
if (!newSelected.empty()) if (!newSelected.empty())
{ {
const StelObjectP obj = newSelected[0]; const StelObjectP obj = newSelected[0];
Vec3d pos=obj->getJ2000EquatorialPos(nav); Vec3d pos=obj->getJ2000EquatorialPos(nav);
Vec3d screenpos; Vec3d screenpos;
// Compute 2D pos and return if outside screen // Compute 2D pos and return if outside screen
if (!prj->project(pos, screenpos)) if (!prj->project(pos, screenpos))
return; return;
StelPainter sPainter(prj); StelPainter sPainter(prj);
skipping to change at line 800 skipping to change at line 800
// Draw the elements // Draw the elements
float maxMagLabel=core->getSkyDrawer()->getLimitMagnitude()*0.80+(la belsAmount*1.2f)-2.f; float maxMagLabel=core->getSkyDrawer()->getLimitMagnitude()*0.80+(la belsAmount*1.2f)-2.f;
iter = systemPlanets.begin(); iter = systemPlanets.begin();
while (iter != systemPlanets.end()) while (iter != systemPlanets.end())
{ {
(*iter)->draw(core, maxMagLabel); (*iter)->draw(core, maxMagLabel);
++iter; ++iter;
} }
drawPointer(core); if (GETSTELMODULE(StelObjectMgr)->getFlagSelectedObjectPointer())
drawPointer(core);
} }
void SolarSystem::setStelStyle(const StelStyle& style) void SolarSystem::setStelStyle(const StelStyle& style)
{ {
// Load colors from config file // Load colors from config file
QSettings* conf = StelApp::getInstance().getSettings(); QSettings* conf = StelApp::getInstance().getSettings();
QString section = style.confSectionName; QString section = style.confSectionName;
QString defaultColor = conf->value(section+"/default_color").toStrin g(); QString defaultColor = conf->value(section+"/default_color").toStrin g();
setLabelsColor(StelUtils::strToVec3f(conf->value(section+"/planet_na mes_color", defaultColor).toString())); setLabelsColor(StelUtils::strToVec3f(conf->value(section+"/planet_na mes_color", defaultColor).toString()));
skipping to change at line 1111 skipping to change at line 1112
result << (*iter)->getNameI18n(); result << (*iter)->getNameI18n();
if (result.size()==maxNbItem) if (result.size()==maxNbItem)
return result; return result;
} }
} }
return result; return result;
} }
void SolarSystem::selectedObjectChangeCallBack(StelModuleSelectAction actio n) void SolarSystem::selectedObjectChangeCallBack(StelModuleSelectAction actio n)
{ {
const QList<StelObjectP> newSelected = StelApp::getInstance().getSte lObjectMgr().getSelectedObject("Planet"); const QList<StelObjectP> newSelected = GETSTELMODULE(StelObjectMgr)- >getSelectedObject("Planet");
if (!newSelected.empty()) if (!newSelected.empty())
setSelected(newSelected[0].get()); setSelected(newSelected[0].get());
} }
// Activate/Deactivate planets display // Activate/Deactivate planets display
void SolarSystem::setFlagPlanets(bool b) void SolarSystem::setFlagPlanets(bool b)
{ {
flagShow=b; flagShow=b;
} }
 End of changes. 4 change blocks. 
4 lines changed or deleted 5 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/