LocationDialog.cpp   LocationDialog.cpp 
skipping to change at line 377 skipping to change at line 377
// Called when the planet name is changed by hand // Called when the planet name is changed by hand
void LocationDialog::moveToAnotherPlanet(const QString&) void LocationDialog::moveToAnotherPlanet(const QString&)
{ {
reportEdit(); reportEdit();
StelLocation loc = locationFromFields(); StelLocation loc = locationFromFields();
StelCore* stelCore = StelApp::getInstance().getCore(); StelCore* stelCore = StelApp::getInstance().getCore();
LandscapeMgr* ls = GETSTELMODULE(LandscapeMgr); LandscapeMgr* ls = GETSTELMODULE(LandscapeMgr);
if (loc.planetName != stelCore->getCurrentLocation().planetName) if (loc.planetName != stelCore->getCurrentLocation().planetName)
{ {
setFieldsFromLocation(loc); setFieldsFromLocation(loc);
// If we have a landscape for selected planet then set it, o if (ls->getFlagLandscapeAutoSelection())
therwise use default landscape {
// Details: https://bugs.launchpad.net/stellarium/+bug/11732 // If we have a landscape for selected planet then s
54 et it, otherwise use default landscape
if (ls->getAllLandscapeNames().indexOf(loc.planetName)>0) // Details: https://bugs.launchpad.net/stellarium/+b
ls->setCurrentLandscapeName(loc.planetName); ug/1173254
else if (ls->getAllLandscapeNames().indexOf(loc.planetNam
ls->setCurrentLandscapeID(ls->getDefaultLandscapeID( e)>0)
)); ls->setCurrentLandscapeName(loc.planetName);
else
ls->setCurrentLandscapeID(ls->getDefaultLand
scapeID());
}
} }
// Planet transition time also set to null to prevent uglyness when // Planet transition time also set to null to prevent uglyness when
// "use landscape location" is enabled for that planet's landscape. --BM // "use landscape location" is enabled for that planet's landscape. --BM
// NOTE: I think it also makes sense in the other cases. --BM // NOTE: I think it also makes sense in the other cases. --BM
// FIXME: Avoid the unnecessary change of the location anyway. --BM // FIXME: Avoid the unnecessary change of the location anyway. --BM
stelCore->moveObserverTo(loc, 0., 0.); stelCore->moveObserverTo(loc, 0., 0.);
} }
void LocationDialog::setPositionFromCoords(int ) void LocationDialog::setPositionFromCoords(int )
 End of changes. 1 change blocks. 
9 lines changed or deleted 13 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/