~georg-zotti/stellarium/refraction

« back to all changes in this revision

Viewing changes to src/core/StelMovementMgr.cpp

Committer: Georg Zotti
Date: 2011-02-18 12:37:55 UTC
mfrom: (4821.1.54 trunk)
Revision ID: georg.zotti@univie.ac.at-20110218123755-9wcuyyah7g0m1qs7

Merge-update from Trunk R4875

files removed:
plugins/Oculars/src/gui/StelDialogOculars.cpp

plugins/Oculars/src/gui/StelDialogOculars.hpp

files modified:
.bzrignore

CHANGES-FROM-TRUNK.txt

CMakeLists.txt

data/Info.plist

plugins/CMakeLists.txt

plugins/Oculars/CMakeLists.txt

plugins/Oculars/resources/default_ocular.ini

plugins/Oculars/src/CCD.cpp

plugins/Oculars/src/CCD.hpp

plugins/Oculars/src/CMakeLists.txt

plugins/Oculars/src/Ocular.cpp

plugins/Oculars/src/Ocular.hpp

plugins/Oculars/src/Oculars.cpp

plugins/Oculars/src/Oculars.hpp

plugins/Oculars/src/gui/OcularDialog.cpp

plugins/Oculars/src/gui/OcularDialog.hpp

plugins/Oculars/src/gui/PropertyBasedTableModel.cpp

plugins/Oculars/src/gui/PropertyBasedTableModel.hpp

plugins/Oculars/src/gui/ocularDialog.ui

plugins/Satellites/src/Satellites.cpp

plugins/Satellites/src/Satellites.hpp

plugins/Satellites/src/gsatellite/gMatrixTempl.hpp

plugins/Satellites/src/gui/SatellitesDialog.cpp

plugins/Satellites/src/gui/SatellitesDialog.hpp

plugins/SolarSystemEditor/src/SolarSystemEditor.cpp

plugins/SolarSystemEditor/src/SolarSystemEditor.hpp

plugins/SolarSystemEditor/src/gui/ManualImportWindow.cpp

plugins/SolarSystemEditor/src/gui/ManualImportWindow.hpp

plugins/SolarSystemEditor/src/gui/MpcImportWindow.cpp

plugins/SolarSystemEditor/src/gui/MpcImportWindow.hpp

plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.cpp

plugins/SolarSystemEditor/src/gui/SolarSystemManagerWindow.hpp

plugins/TelescopeControl/src/TelescopeControl.cpp

plugins/TelescopeControl/src/TelescopeControl.hpp

plugins/TelescopeControl/src/gui/SlewDialog.cpp

plugins/TelescopeControl/src/gui/SlewDialog.hpp

plugins/TelescopeControl/src/gui/StelDialogTelescopeControl.hpp

plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.cpp

plugins/TelescopeControl/src/gui/TelescopeConfigurationDialog.hpp

plugins/TelescopeControl/src/gui/TelescopeDialog.cpp

plugins/TelescopeControl/src/gui/TelescopeDialog.hpp

plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.cpp

plugins/TimeZoneConfiguration/src/gui/DefineTimeZoneWindow.hpp

plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.cpp

plugins/TimeZoneConfiguration/src/gui/TimeZoneConfigurationWindow.hpp

src/CMakeLists.txt

src/core/StelApp.cpp

src/core/StelApp.hpp

src/core/StelGuiBase.hpp

src/core/StelModule.hpp

src/core/StelMovementMgr.cpp

src/core/StelMovementMgr.hpp

src/core/StelObjectMgr.cpp

src/core/StelObjectMgr.hpp

src/core/StelSkyLayerMgr.hpp

src/core/modules/ConstellationMgr.cpp

src/core/modules/ConstellationMgr.hpp

src/core/modules/GridLinesMgr.cpp

src/core/modules/GridLinesMgr.hpp

src/core/modules/Landscape.cpp

src/core/modules/LandscapeMgr.cpp

src/core/modules/LandscapeMgr.hpp

src/core/modules/NebulaMgr.cpp

src/core/modules/NebulaMgr.hpp

src/core/modules/Planet.cpp

src/core/modules/Planet.hpp

src/core/modules/SolarSystem.cpp

src/core/modules/SolarSystem.hpp

src/core/modules/StarMgr.cpp

src/core/modules/StarMgr.hpp

src/core/planetsephems/stellplanet.c

src/gui/AddRemoveLandscapesDialog.cpp

src/gui/AddRemoveLandscapesDialog.hpp

src/gui/ConfigurationDialog.cpp

src/gui/ConfigurationDialog.hpp

src/gui/DateTimeDialog.cpp

src/gui/DateTimeDialog.hpp

src/gui/HelpDialog.cpp

src/gui/HelpDialog.hpp

src/gui/LocationDialog.cpp

src/gui/LocationDialog.hpp

src/gui/ScriptConsole.cpp

src/gui/ScriptConsole.hpp

src/gui/SearchDialog.cpp

src/gui/SearchDialog.hpp

src/gui/SkyGui.cpp

src/gui/SkyGui.hpp

src/gui/StelDialog.cpp

src/gui/StelDialog.hpp

src/gui/StelGui.cpp

src/gui/StelGui.hpp

src/gui/ViewDialog.cpp

src/gui/ViewDialog.hpp

stellarium.iss.cmake

util/macosx_bundle.sh *

util/pkgApp.pl

Show diffs side-by-side

added added

removed removed

src/core/StelMovementMgr.cpp

objectMgr = GETSTELMODULE(StelObjectMgr);

Q_ASSERT(conf);

Q_ASSERT(objectMgr);

connect(objectMgr, SIGNAL(selectedObjectChanged(StelModule::StelModuleSelectAction)),

this, SLOT(selectedObjectChange(StelModule::StelModuleSelectAction)));

movementsSpeedFactor=1.;

flagEnableMoveAtScreenEdge = conf->value("navigation/flag_enable_move_at_screen_edge",false).toBool();

mouseZoomSpeed = conf->value("navigation/mouse_zoom",30).toInt();

385

387

/*************************************************************************

386

388

The selected objects changed, follow it it we were already following another one

387

389

*************************************************************************/

388

void StelMovementMgr::selectedObjectChangeCallBack(StelModuleSelectAction)

390

void StelMovementMgr::selectedObjectChange(StelModule::StelModuleSelectAction)

389

391

{

390

392

// If an object was selected keep the earth following

391

393

if (objectMgr->getWasSelected())

Older »