Pulsar.cpp   Pulsar.cpp 
skipping to change at line 41 skipping to change at line 41
#include <QTextStream> #include <QTextStream>
#include <QDebug> #include <QDebug>
#include <QVariant> #include <QVariant>
#include <QVariantMap> #include <QVariantMap>
#include <QVariant> #include <QVariant>
#include <QList> #include <QList>
#define PSR_INERTIA 1.0e45 /* Typical moment of inertia for a pulsar */ #define PSR_INERTIA 1.0e45 /* Typical moment of inertia for a pulsar */
const QString Pulsar::PULSAR_TYPE = QStringLiteral("Pulsar");
StelTextureSP Pulsar::markerTexture; StelTextureSP Pulsar::markerTexture;
bool Pulsar::distributionMode = false; bool Pulsar::distributionMode = false;
bool Pulsar::glitchFlag = false; bool Pulsar::glitchFlag = false;
Vec3f Pulsar::markerColor = Vec3f(0.4f,0.5f,1.0f); Vec3f Pulsar::markerColor = Vec3f(0.4f,0.5f,1.0f);
Vec3f Pulsar::glitchColor = Vec3f(0.2f,0.3f,1.0f); Vec3f Pulsar::glitchColor = Vec3f(0.2f,0.3f,1.0f);
Pulsar::Pulsar(const QVariantMap& map) Pulsar::Pulsar(const QVariantMap& map)
: initialized(false) : initialized(false)
, designation("") , designation("")
skipping to change at line 419 skipping to change at line 420
if (glitch>0 && glitchFlag) if (glitch>0 && glitchFlag)
painter->setColor(glitchColor[0], glitchColor[1], glitchColo r[2], 1.f); painter->setColor(glitchColor[0], glitchColor[1], glitchColo r[2], 1.f);
else else
painter->setColor(markerColor[0], markerColor[1], markerColo r[2], 1.f); painter->setColor(markerColor[0], markerColor[1], markerColo r[2], 1.f);
float mlimit = sd->getLimitMagnitude(); float mlimit = sd->getLimitMagnitude();
if (mag <= mlimit) if (mag <= mlimit)
{ {
Pulsar::markerTexture->bind(); Pulsar::markerTexture->bind();
float size = getAngularSize(NULL)*M_PI/180.*painter->getProj ector()->getPixelPerRadAtCenter(); float size = getAngularSize(Q_NULLPTR)*M_PI/180.*painter->ge tProjector()->getPixelPerRadAtCenter();
float shift = 5.f + size/1.6f; float shift = 5.f + size/1.6f;
painter->drawSprite2dMode(XYZ, distributionMode ? 4.f : 5.f) ; painter->drawSprite2dMode(XYZ, distributionMode ? 4.f : 5.f) ;
if (labelsFader.getInterstate()<=0.f && !distributionMode && (mag+2.f)<mlimit) if (labelsFader.getInterstate()<=0.f && !distributionMode && (mag+2.f)<mlimit)
{ {
painter->drawText(XYZ, designation, 0, shift, shift, false); painter->drawText(XYZ, designation, 0, shift, shift, false);
} }
} }
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 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/