Pulsar.cpp   Pulsar.cpp 
skipping to change at line 114 skipping to change at line 114
} }
initialized = true; initialized = true;
} }
Pulsar::~Pulsar() Pulsar::~Pulsar()
{ {
// //
} }
QVariantMap Pulsar::getMap(void) QVariantMap Pulsar::getMap(void) const
{ {
QVariantMap map; QVariantMap map;
map["designation"] = designation; map["designation"] = designation;
map["parallax"] = parallax; map["parallax"] = parallax;
map["bperiod"] = bperiod; map["bperiod"] = bperiod;
map["frequency"] = frequency; map["frequency"] = frequency;
map["pfrequency"] = pfrequency; map["pfrequency"] = pfrequency;
map["pderivative"] = pderivative; map["pderivative"] = pderivative;
map["dmeasure"] = dmeasure; map["dmeasure"] = dmeasure;
map["eccentricity"] = eccentricity; map["eccentricity"] = eccentricity;
skipping to change at line 271 skipping to change at line 271
if (notes.length()>0) if (notes.length()>0)
{ {
oss << "<br>" << q_("Notes: %1").arg(getPulsarTypeIn foString(notes)) << "<br>"; oss << "<br>" << q_("Notes: %1").arg(getPulsarTypeIn foString(notes)) << "<br>";
} }
} }
postProcessInfoString(str, flags); postProcessInfoString(str, flags);
return str; return str;
} }
QVariantMap Pulsar::getInfoMap(const StelCore *core) const
{
QVariantMap map = StelObject::getInfoMap(core);
map["parallax"] = parallax;
map["bperiod"] = bperiod;
map["frequency"] = frequency;
map["pfrequency"] = pfrequency;
map["pderivative"] = pderivative;
map["dmeasure"] = dmeasure;
map["eccentricity"] = eccentricity;
map["period"] = period;
map["w50"] = w50;
map["s400"] = s400;
map["s600"] = s600;
map["s1400"] = s1400;
map["distance"] = distance;
map["glitch"] = glitch;
map["notes"] = notes;
return map;
}
Vec3f Pulsar::getInfoColor(void) const Vec3f Pulsar::getInfoColor(void) const
{ {
return Vec3f(1.0, 1.0, 1.0); return Vec3f(1.0, 1.0, 1.0);
} }
float Pulsar::getVMagnitude(const StelCore* core) const float Pulsar::getVMagnitude(const StelCore* core) const
{ {
Q_UNUSED(core); Q_UNUSED(core);
// Calculate fake visual magnitude as function by distance - minimal magnitude is 6 // Calculate fake visual magnitude as function by distance - minimal magnitude is 6
float vmag = distance + 6.f; float vmag = distance + 6.f;
skipping to change at line 386 skipping to change at line 408
{ {
StelSkyDrawer* sd = core->getSkyDrawer(); StelSkyDrawer* sd = core->getSkyDrawer();
double mag = getVMagnitudeWithExtinction(core); double mag = getVMagnitudeWithExtinction(core);
StelUtils::spheToRect(RA, DE, XYZ); StelUtils::spheToRect(RA, DE, XYZ);
Vec3d win; Vec3d win;
// Check visibility of pulsar // Check visibility of pulsar
if (!(painter->getProjector()->projectCheck(XYZ, win))) if (!(painter->getProjector()->projectCheck(XYZ, win)))
return; return;
glEnable(GL_BLEND); painter->setBlending(true, GL_ONE, GL_ONE);
glBlendFunc(GL_ONE, GL_ONE);
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(NULL)*M_PI/180.*painter->getProj ector()->getPixelPerRadAtCenter();
 End of changes. 3 change blocks. 
3 lines changed or deleted 25 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/