Nebula.cpp   Nebula.cpp 
skipping to change at line 344 skipping to change at line 344
if (!getMorphologicalTypeDescription().isEmpty()) if (!getMorphologicalTypeDescription().isEmpty())
oss << q_("Morphological description: ") << getMorph ologicalTypeDescription() << ".<br>"; oss << q_("Morphological description: ") << getMorph ologicalTypeDescription() << ".<br>";
} }
postProcessInfoString(str, flags); postProcessInfoString(str, flags);
return str; return str;
} }
QVariantMap Nebula::getInfoMap(const StelCore *core) const
{
QVariantMap map = StelObject::getInfoMap(core);
map["type"]=getTypeString(); // replace "Nebula" type by detail. Thi
s is localized. Maybe add argument such as getTypeString(bool translated=tr
ue)?
map.insert("morpho", getMorphologicalTypeString());
map.insert("surface-brightness", getSurfaceBrightness(core));
map.insert("bmag", bMag);
if (vMag < 50 && bMag < 50)
map.insert("bV", bMag-vMag);
if (redshift<99.f)
map.insert("redshift", redshift);
// TODO: more? Names? Data?
return map;
}
QString Nebula::getEnglishAliases() const QString Nebula::getEnglishAliases() const
{ {
QString aliases = ""; QString aliases = "";
if (englishAliases.size()!=0) if (englishAliases.size()!=0)
aliases = englishAliases.join(" - "); aliases = englishAliases.join(" - ");
return aliases; return aliases;
} }
QString Nebula::getI18nAliases() const QString Nebula::getI18nAliases() const
{ {
skipping to change at line 480 skipping to change at line 497
} }
if (lim>maxMagHints) if (lim>maxMagHints)
return; return;
Vec3d win; Vec3d win;
// Check visibility of DSO hints // Check visibility of DSO hints
if (!(sPainter.getProjector()->projectCheck(XYZ, win))) if (!(sPainter.getProjector()->projectCheck(XYZ, win)))
return; return;
glEnable(GL_BLEND); sPainter.setBlending(true, GL_ONE, GL_ONE);
glBlendFunc(GL_ONE, GL_ONE);
float lum = 1.f;//qMin(1,4.f/getOnScreenSize(core))*0.8; float lum = 1.f;//qMin(1,4.f/getOnScreenSize(core))*0.8;
Vec3f color=circleColor; Vec3f color=circleColor;
switch (nType) switch (nType)
{ {
case NebGx: case NebGx:
Nebula::texGalaxy->bind(); Nebula::texGalaxy->bind();
color=galaxyColor; color=galaxyColor;
break; break;
case NebIGx: case NebIGx:
 End of changes. 2 change blocks. 
2 lines changed or deleted 20 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/