Supernova.cpp   Supernova.cpp 
skipping to change at line 77 skipping to change at line 77
map["maxMagnitude"] = maxMagnitude; map["maxMagnitude"] = maxMagnitude;
map["peakJD"] = peakJD; map["peakJD"] = peakJD;
map["snra"] = snra; map["snra"] = snra;
map["snde"] = snde; map["snde"] = snde;
map["note"] = note; map["note"] = note;
map["distance"] = distance; map["distance"] = distance;
return map; return map;
} }
float Supernova::getSelectPriority(const StelCore*) const float Supernova::getSelectPriority(const StelCore* core) const
{ {
return -10.f; //Same as StarWrapper::getSelectPriority()
return getVMagnitude(core);
} }
QString Supernova::getInfoString(const StelCore* core, const InfoStringGrou p& flags) const QString Supernova::getInfoString(const StelCore* core, const InfoStringGrou p& flags) const
{ {
QString str; QString str;
QTextStream oss(&str); QTextStream oss(&str);
double mag = getVMagnitude(core); double mag = getVMagnitude(core);
if (flags&Name) if (flags&Name)
{ {
skipping to change at line 182 skipping to change at line 183
vmag = maxMagnitude; vmag = maxMagnitude;
return vmag; return vmag;
} }
double Supernova::getAngularSize(const StelCore*) const double Supernova::getAngularSize(const StelCore*) const
{ {
return 0.00001; return 0.00001;
} }
void Supernova::update(double) void Supernova::update(double deltaTime)
{ {
// labelsFader.update((int)(deltaTime*1000));
} }
void Supernova::draw(StelCore* core, StelPainter& painter) void Supernova::draw(StelCore* core, StelPainter& painter)
{ {
StelSkyDrawer* sd = core->getSkyDrawer(); StelSkyDrawer* sd = core->getSkyDrawer();
Vec3f color = Vec3f(1.f,1.f,1.f); Vec3f color = Vec3f(1.f,1.f,1.f);
float rcMag[2], size, shift; float rcMag[2], size, shift;
double mag; double mag;
StelUtils::spheToRect(snra, snde, XYZ); StelUtils::spheToRect(snra, snde, XYZ);
mag = getVMagnitude(core); mag = getVMagnitude(core);
if (mag <= sd->getLimitMagnitude()) if (mag <= sd->getLimitMagnitude())
{ {
sd->computeRCMag(mag, rcMag); sd->computeRCMag(mag, rcMag);
sd->drawPointSource(&painter, Vec3f(XYZ[0], XYZ[1], XYZ[2]), rcMag, color, false); sd->drawPointSource(&painter, Vec3f(XYZ[0], XYZ[1], XYZ[2]), rcMag, color, false);
painter.setColor(color[0], color[1], color[2], 1); painter.setColor(color[0], color[1], color[2], 1);
size = getAngularSize(NULL)*M_PI/180.*painter.getProjector() ->getPixelPerRadAtCenter(); size = getAngularSize(NULL)*M_PI/180.*painter.getProjector() ->getPixelPerRadAtCenter();
shift = 6.f + size/1.8f; shift = 6.f + size/1.8f;
painter.drawText(XYZ, designation, 0, shift, shift, false); if (labelsFader.getInterstate()<=0.f)
{
painter.drawText(XYZ, designation, 0, shift, shift,
false);
}
} }
} }
 End of changes. 5 change blocks. 
5 lines changed or deleted 10 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/