Quasar.cpp   Quasar.cpp 
skipping to change at line 76 skipping to change at line 76
redshift = map.value("z").toFloat(); redshift = map.value("z").toFloat();
initialized = true; initialized = true;
} }
Quasar::~Quasar() Quasar::~Quasar()
{ {
// //
} }
QVariantMap Quasar::getMap(void) QVariantMap Quasar::getMap(void) const
{ {
QVariantMap map; QVariantMap map;
map["designation"] = designation; map["designation"] = designation;
map["Vmag"] = VMagnitude; map["Vmag"] = VMagnitude;
map["Amag"] = AMagnitude; map["Amag"] = AMagnitude;
map["bV"] = bV; map["bV"] = bV;
map["RA"] = qRA; map["RA"] = qRA;
map["DE"] = qDE; map["DE"] = qDE;
map["z"] = redshift; map["z"] = redshift;
skipping to change at line 140 skipping to change at line 140
if (redshift>0) if (redshift>0)
{ {
oss << q_("Z (redshift): %1").arg(redshift) << "<br />"; oss << q_("Z (redshift): %1").arg(redshift) << "<br />";
} }
} }
postProcessInfoString(str, flags); postProcessInfoString(str, flags);
return str; return str;
} }
QVariantMap Quasar::getInfoMap(const StelCore *core) const
{
QVariantMap map = StelObject::getInfoMap(core);
map["amag"] = AMagnitude;
map["bV"] = bV;
map["redshift"] = redshift;
return map;
}
Vec3f Quasar::getInfoColor(void) const Vec3f Quasar::getInfoColor(void) const
{ {
return Vec3f(1.0, 1.0, 1.0); return Vec3f(1.0, 1.0, 1.0);
} }
float Quasar::getVMagnitude(const StelCore* core) const float Quasar::getVMagnitude(const StelCore* core) const
{ {
Q_UNUSED(core); Q_UNUSED(core);
return VMagnitude; return VMagnitude;
} }
skipping to change at line 183 skipping to change at line 194
Vec3f color = sd->indexToColor(BvToColorIndex(bV))*0.75f; Vec3f color = sd->indexToColor(BvToColorIndex(bV))*0.75f;
RCMag rcMag; RCMag rcMag;
float size, shift=0; float size, shift=0;
double mag; double mag;
StelUtils::spheToRect(qRA, qDE, XYZ); StelUtils::spheToRect(qRA, qDE, XYZ);
mag = getVMagnitudeWithExtinction(core); mag = getVMagnitudeWithExtinction(core);
if (distributionMode) if (distributionMode)
{ {
glEnable(GL_BLEND); painter.setBlending(true, GL_ONE, GL_ONE);
glBlendFunc(GL_ONE, GL_ONE);
painter.setColor(markerColor[0], markerColor[1], markerColor [2], 1); painter.setColor(markerColor[0], markerColor[1], markerColor [2], 1);
Quasar::markerTexture->bind(); Quasar::markerTexture->bind();
//size = getAngularSize(NULL)*M_PI/180.*painter.getProjector ()->getPixelPerRadAtCenter(); //size = getAngularSize(NULL)*M_PI/180.*painter.getProjector ()->getPixelPerRadAtCenter();
if (labelsFader.getInterstate()<=0.f) if (labelsFader.getInterstate()<=0.f)
{ {
painter.drawSprite2dMode(XYZ, 4); painter.drawSprite2dMode(XYZ, 4);
} }
} }
else else
 End of changes. 3 change blocks. 
3 lines changed or deleted 13 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/