StelMovementMgr.cpp   StelMovementMgr.cpp 
skipping to change at line 39 skipping to change at line 39
#include <cmath> #include <cmath>
#include <QString> #include <QString>
#include <QTextStream> #include <QTextStream>
#include <QSettings> #include <QSettings>
#include <QKeyEvent> #include <QKeyEvent>
#include <QDebug> #include <QDebug>
StelMovementMgr::StelMovementMgr(StelCore* acore) StelMovementMgr::StelMovementMgr(StelCore* acore)
: currentFov(60.) : currentFov(60.)
, initFov(60.) , initFov(60.)
, minFov(0.0001) , minFov(0.001389)
, maxFov(100.) , maxFov(100.)
, initConstellationIntensity(0.45) , initConstellationIntensity(0.45)
, core(acore) , core(acore)
, objectMgr(NULL) , objectMgr(NULL)
, flagLockEquPos(false) , flagLockEquPos(false)
, flagTracking(false) , flagTracking(false)
, isMouseMovingHoriz(false) , isMouseMovingHoriz(false)
, isMouseMovingVert(false) , isMouseMovingVert(false)
, flagEnableMoveAtScreenEdge(false) , flagEnableMoveAtScreenEdge(false)
, flagEnableMouseNavigation(true) , flagEnableMouseNavigation(true)
skipping to change at line 105 skipping to change at line 105
mouseZoomSpeed = conf->value("navigation/mouse_zoom",30).toInt(); mouseZoomSpeed = conf->value("navigation/mouse_zoom",30).toInt();
flagEnableZoomKeys = conf->value("navigation/flag_enable_zoom_keys") .toBool(); flagEnableZoomKeys = conf->value("navigation/flag_enable_zoom_keys") .toBool();
flagEnableMoveKeys = conf->value("navigation/flag_enable_move_keys") .toBool(); flagEnableMoveKeys = conf->value("navigation/flag_enable_move_keys") .toBool();
keyMoveSpeed = conf->value("navigation/move_speed",0.0004f).toFloat( ); keyMoveSpeed = conf->value("navigation/move_speed",0.0004f).toFloat( );
keyZoomSpeed = conf->value("navigation/zoom_speed", 0.0004f).toFloat (); keyZoomSpeed = conf->value("navigation/zoom_speed", 0.0004f).toFloat ();
autoMoveDuration = conf->value ("navigation/auto_move_duration",1.5f ).toFloat(); autoMoveDuration = conf->value ("navigation/auto_move_duration",1.5f ).toFloat();
flagManualZoom = conf->value("navigation/flag_manual_zoom").toBool() ; flagManualZoom = conf->value("navigation/flag_manual_zoom").toBool() ;
flagAutoZoomOutResetsDirection = conf->value("navigation/auto_zoom_o ut_resets_direction", true).toBool(); flagAutoZoomOutResetsDirection = conf->value("navigation/auto_zoom_o ut_resets_direction", true).toBool();
flagEnableMouseNavigation = conf->value("navigation/flag_enable_mous e_navigation",true).toBool(); flagEnableMouseNavigation = conf->value("navigation/flag_enable_mous e_navigation",true).toBool();
minFov = 0.0001; minFov = 0.001389; // minimal FOV = 5"
maxFov = 100.; maxFov = 100.;
initFov = conf->value("navigation/init_fov",60.f).toFloat(); initFov = conf->value("navigation/init_fov",60.f).toFloat();
currentFov = initFov; currentFov = initFov;
setInitConstellationIntensity(conf->value("viewing/constellation_art _intensity", 0.5f).toFloat()); setInitConstellationIntensity(conf->value("viewing/constellation_art _intensity", 0.5f).toFloat());
Vec3f tmp = StelUtils::strToVec3f(conf->value("navigation/init_view_ pos").toString()); Vec3f tmp = StelUtils::strToVec3f(conf->value("navigation/init_view_ pos").toString());
initViewPos.set(tmp[0], tmp[1], tmp[2]); initViewPos.set(tmp[0], tmp[1], tmp[2]);
viewDirectionJ2000 = core->altAzToJ2000(initViewPos, StelCore::Refra ctionOff); viewDirectionJ2000 = core->altAzToJ2000(initViewPos, StelCore::Refra ctionOff);
QString tmpstr = conf->value("navigation/viewing_mode", "horizon").t oString(); QString tmpstr = conf->value("navigation/viewing_mode", "horizon").t oString();
skipping to change at line 323 skipping to change at line 323
e.jd=core->getJDay(); e.jd=core->getJDay();
e.x=x; e.x=x;
e.y=y; e.y=y;
timeDragHistory.append(e); timeDragHistory.append(e);
if (timeDragHistory.size()>3) if (timeDragHistory.size()>3)
timeDragHistory.removeFirst(); timeDragHistory.removeFirst();
} }
bool StelMovementMgr::handlePinch(qreal scale, bool started) bool StelMovementMgr::handlePinch(qreal scale, bool started)
{ {
#ifdef Q_OS_WIN
if (flagEnableMouseNavigation == false) if (flagEnableMouseNavigation == false)
return true; return true;
#endif
static double previousFov = 0; static double previousFov = 0;
if (started) if (started)
previousFov = getAimFov(); previousFov = getAimFov();
if (scale>0) if (scale>0)
zoomTo(previousFov/scale, 0); zoomTo(previousFov/scale, 0);
return true; return true;
} }
void StelMovementMgr::handleMouseClicks(QMouseEvent* event) void StelMovementMgr::handleMouseClicks(QMouseEvent* event)
 End of changes. 4 change blocks. 
2 lines changed or deleted 4 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/