StelObserver.cpp   StelObserver.cpp 
skipping to change at line 24 skipping to change at line 24
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#include "StelObserver.hpp" #include "StelObserver.hpp"
#include "StelUtils.hpp" #include "StelUtils.hpp"
#include "SolarSystem.hpp" #include "SolarSystem.hpp"
#include "Planet.hpp" #include "Planet.hpp"
#include "StelLocaleMgr.hpp"
#include "StelTranslator.hpp" #include "StelTranslator.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelLocationMgr.hpp" #include "StelLocationMgr.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "LandscapeMgr.hpp" #include "LandscapeMgr.hpp"
#include <QDebug> #include <QDebug>
#include <QSettings> #include <QSettings>
skipping to change at line 282 skipping to change at line 283
else else
ls->setCurrentLandscapeID(ls->getDefaultLand scapeID()); ls->setCurrentLandscapeID(ls->getDefaultLand scapeID());
} }
} }
else else
{ {
if (artificialPlanet) if (artificialPlanet)
{ {
// Update SpaceShip position // Update SpaceShip position
static_cast<ArtificialPlanet*>(artificialPlanet.data ())->computeAverage(timeToGo/(timeToGo + deltaTime)); static_cast<ArtificialPlanet*>(artificialPlanet.data ())->computeAverage(timeToGo/(timeToGo + deltaTime));
// TRANSLATORS: "Planet name" displayed when "flying currentLocation.planetName = "SpaceShip";
" to another planet with Ctrl+G. const StelTranslator& trans = StelApp::getInstance()
currentLocation.planetName = N_("SpaceShip"); .getLocaleMgr().getSkyTranslator();
currentLocation.name = q_(moveStartLocation.planetNa currentLocation.name = trans.qtranslate(moveStartLoc
me) + " -> " + q_(moveTargetLocation.planetName); ation.planetName) + " -> " + trans.qtranslate(moveTargetLocation.planetName
);
} }
else else
{ {
currentLocation.name = moveStartLocation.name + " -> " + moveTargetLocation.name; currentLocation.name = moveStartLocation.name + " -> " + moveTargetLocation.name;
currentLocation.planetName = moveTargetLocation.plan etName; currentLocation.planetName = moveTargetLocation.plan etName;
} }
// Move the lon/lat/alt on the planet // Move the lon/lat/alt on the planet
const double moveToMult = 1.-(timeToGo/transitSeconds); const double moveToMult = 1.-(timeToGo/transitSeconds);
currentLocation.latitude = moveStartLocation.latitude - move ToMult*(moveStartLocation.latitude-moveTargetLocation.latitude); currentLocation.latitude = moveStartLocation.latitude - move ToMult*(moveStartLocation.latitude-moveTargetLocation.latitude);
 End of changes. 2 change blocks. 
5 lines changed or deleted 7 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/