MeteorShower.cpp   MeteorShower.cpp 
skipping to change at line 33 skipping to change at line 33
#include "MeteorShower.hpp" #include "MeteorShower.hpp"
#include "MeteorShowers.hpp" #include "MeteorShowers.hpp"
#include "SporadicMeteorMgr.hpp" #include "SporadicMeteorMgr.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelObjectMgr.hpp" #include "StelObjectMgr.hpp"
#include "StelTexture.hpp" #include "StelTexture.hpp"
#include "StelUtils.hpp" #include "StelUtils.hpp"
const QString MeteorShower::METEORSHOWER_TYPE = QStringLiteral("MeteorShowe
r");
MeteorShower::MeteorShower(MeteorShowersMgr* mgr, const QVariantMap& map) MeteorShower::MeteorShower(MeteorShowersMgr* mgr, const QVariantMap& map)
: m_mgr(mgr) : m_mgr(mgr)
, m_status(INVALID) , m_status(INVALID)
, m_speed(0) , m_speed(0)
, m_rAlphaPeak(0) , m_rAlphaPeak(0)
, m_rDeltaPeak(0) , m_rDeltaPeak(0)
, m_driftAlpha(0) , m_driftAlpha(0)
, m_driftDelta(0) , m_driftDelta(0)
, m_pidx(0) , m_pidx(0)
, m_radiantAlpha(0) , m_radiantAlpha(0)
skipping to change at line 368 skipping to change at line 370
Vec3d win; Vec3d win;
if (m_mgr->getEnableMarker() && painter.getProjector()->projectCheck (m_position, win) && mag<=mlimit) if (m_mgr->getEnableMarker() && painter.getProjector()->projectCheck (m_position, win) && mag<=mlimit)
{ {
m_mgr->getRadiantTexture()->bind(); m_mgr->getRadiantTexture()->bind();
painter.drawSprite2dMode(XY[0], XY[1], 45); painter.drawSprite2dMode(XY[0], XY[1], 45);
if (m_mgr->getEnableLabels()) if (m_mgr->getEnableLabels())
{ {
painter.setFont(m_mgr->getFont()); painter.setFont(m_mgr->getFont());
float size = getAngularSize(NULL)*M_PI/180.*painter. getProjector()->getPixelPerRadAtCenter(); float size = getAngularSize(Q_NULLPTR)*M_PI/180.*pai nter.getProjector()->getPixelPerRadAtCenter();
float shift = 8.f + size/1.8f; float shift = 8.f + size/1.8f;
if ((mag+1.f)<mlimit) if ((mag+1.f)<mlimit)
painter.drawText(XY[0]+shift, XY[1]+shift, g etNameI18n(), 0, 0, 0, false); painter.drawText(XY[0]+shift, XY[1]+shift, g etNameI18n(), 0, 0, 0, false);
} }
} }
} }
void MeteorShower::drawMeteors(StelCore *core) void MeteorShower::drawMeteors(StelCore *core)
{ {
if (!core->getSkyDrawer()->getFlagHasAtmosphere()) if (!core->getSkyDrawer()->getFlagHasAtmosphere())
 End of changes. 2 change blocks. 
1 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/