Exoplanet.cpp   Exoplanet.cpp 
skipping to change at line 168 skipping to change at line 168
} }
initialized = true; initialized = true;
} }
Exoplanet::~Exoplanet() Exoplanet::~Exoplanet()
{ {
// //
} }
QVariantMap Exoplanet::getMap(void) QVariantMap Exoplanet::getMap(void) const
{ {
QVariantMap map; QVariantMap map;
map["designation"] = designation; map["designation"] = designation;
if (!starProperName.isEmpty()) map["starProperName"] = starProperNam e; if (!starProperName.isEmpty()) map["starProperName"] = starProperNam e;
map["RA"] = RA; map["RA"] = RA;
map["DE"] = DE; map["DE"] = DE;
map["distance"] = distance; map["distance"] = distance;
map["stype"] = stype; map["stype"] = stype;
map["smass"] = smass; map["smass"] = smass;
map["smetal"] = smetal; map["smetal"] = smetal;
skipping to change at line 469 skipping to change at line 469
oss << "<tr>" << ESILabel << "</tr>"; oss << "<tr>" << ESILabel << "</tr>";
} }
oss << "</table>"; oss << "</table>";
} }
} }
postProcessInfoString(str, flags); postProcessInfoString(str, flags);
return str; return str;
} }
QVariantMap Exoplanet::getInfoMap(const StelCore *core) const
{
QVariantMap map = StelObject::getInfoMap(core);
// Tentatively add a few more strings. Details are left to the plugi
n author.
if (!starProperName.isEmpty()) map["starProperName"] = starProperNam
e;
map["distance"] = distance;
map["stype"] = stype;
map["smass"] = smass;
map["smetal"] = smetal;
// map["Vmag"] = Vmag; // maybe same as getVmagnitude?
map["sradius"] = sradius;
map["effectiveTemp"] = effectiveTemp;
map["hasHabitablePlanets"] = hasHabitableExoplanets;
map["type"] = "ExoplanetSystem"; // Replace default but confusing "E
xoplanet" from class name.
// TODO: Maybe add number of habitables? Add details?
return map;
}
QString Exoplanet::getPlanetaryClassI18n(QString ptype) const QString Exoplanet::getPlanetaryClassI18n(QString ptype) const
{ {
QString result = ""; QString result = "";
QRegExp dataRx("^(\\w)-(\\w+)\\s(\\w+)$"); QRegExp dataRx("^(\\w)-(\\w+)\\s(\\w+)$");
if (dataRx.exactMatch(ptype)) if (dataRx.exactMatch(ptype))
{ {
QString spectral = dataRx.capturedTexts().at(1).trimmed(); QString spectral = dataRx.capturedTexts().at(1).trimmed();
QString zone = dataRx.capturedTexts().at(2).trimmed(); QString zone = dataRx.capturedTexts().at(2).trimmed();
QString size = dataRx.capturedTexts().at(3).trimmed(); QString size = dataRx.capturedTexts().at(3).trimmed();
skipping to change at line 561 skipping to change at line 580
StelSkyDrawer* sd = core->getSkyDrawer(); StelSkyDrawer* sd = core->getSkyDrawer();
StarMgr* smgr = GETSTELMODULE(StarMgr); // It's need for checking di splaying of labels for stars StarMgr* smgr = GETSTELMODULE(StarMgr); // It's need for checking di splaying of labels for stars
Vec3f color = exoplanetMarkerColor; Vec3f color = exoplanetMarkerColor;
if (hasHabitableExoplanets) if (hasHabitableExoplanets)
color = habitableExoplanetMarkerColor; color = habitableExoplanetMarkerColor;
StelUtils::spheToRect(RA, DE, XYZ); StelUtils::spheToRect(RA, DE, XYZ);
double mag = getVMagnitudeWithExtinction(core); double mag = getVMagnitudeWithExtinction(core);
glEnable(GL_BLEND); painter->setBlending(true, GL_ONE, GL_ONE);
glBlendFunc(GL_ONE, GL_ONE);
painter->setColor(color[0], color[1], color[2], 1); painter->setColor(color[0], color[1], color[2], 1);
if (timelineMode) if (timelineMode)
{ {
visible = isDiscovered(core); visible = isDiscovered(core);
} }
else else
{ {
visible = true; visible = true;
} }
 End of changes. 3 change blocks. 
3 lines changed or deleted 24 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/