Exoplanet.cpp   Exoplanet.cpp 
skipping to change at line 40 skipping to change at line 40
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StarMgr.hpp" #include "StarMgr.hpp"
#include <QTextStream> #include <QTextStream>
#include <QDebug> #include <QDebug>
#include <QVariant> #include <QVariant>
#include <QVariantMap> #include <QVariantMap>
#include <QVariant> #include <QVariant>
#include <QList> #include <QList>
const QString Exoplanet::EXOPLANET_TYPE=QStringLiteral("Exoplanet");
StelTextureSP Exoplanet::markerTexture; StelTextureSP Exoplanet::markerTexture;
bool Exoplanet::distributionMode = false; bool Exoplanet::distributionMode = false;
bool Exoplanet::timelineMode = false; bool Exoplanet::timelineMode = false;
bool Exoplanet::habitableMode = false; bool Exoplanet::habitableMode = false;
bool Exoplanet::showDesignations = false; bool Exoplanet::showDesignations = false;
Vec3f Exoplanet::exoplanetMarkerColor = Vec3f(0.4f,0.9f,0.5f); Vec3f Exoplanet::exoplanetMarkerColor = Vec3f(0.4f,0.9f,0.5f);
Vec3f Exoplanet::habitableExoplanetMarkerColor = Vec3f(1.f,0.5f,0.f); Vec3f Exoplanet::habitableExoplanetMarkerColor = Vec3f(1.f,0.5f,0.f);
Exoplanet::Exoplanet(const QVariantMap& map) Exoplanet::Exoplanet(const QVariantMap& map)
: initialized(false) : initialized(false)
skipping to change at line 94 skipping to change at line 95
PHEPCount=0; PHEPCount=0;
eccentricityList.clear(); eccentricityList.clear();
semiAxisList.clear(); semiAxisList.clear();
massList.clear(); massList.clear();
radiusList.clear(); radiusList.clear();
periodList.clear(); periodList.clear();
angleDistanceList.clear(); angleDistanceList.clear();
englishNames.clear(); englishNames.clear();
translatedNames.clear(); translatedNames.clear();
exoplanetDesignations.clear(); exoplanetDesignations.clear();
effectiveTempHostStarList.clear();
yearDiscoveryList.clear();
metallicityHostStarList.clear();
vMagHostStarList.clear();
raHostStarList.clear();
decHostStarList.clear();
distanceHostStarList.clear();
massHostStarList.clear();
radiusHostStarList.clear();
if (map.contains("exoplanets")) if (map.contains("exoplanets"))
{ {
foreach(const QVariant &expl, map.value("exoplanets").toList ()) foreach(const QVariant &expl, map.value("exoplanets").toList ())
{ {
QVariantMap exoplanetMap = expl.toMap(); QVariantMap exoplanetMap = expl.toMap();
exoplanetData p; exoplanetData p;
EPCount++; EPCount++;
if (exoplanetMap.contains("planetName")) if (exoplanetMap.contains("planetName"))
{ {
p.planetName = exoplanetMap.value("planetNam e").toString(); p.planetName = exoplanetMap.value("planetNam e").toString();
skipping to change at line 157 skipping to change at line 167
if (p.angleDistance>0) if (p.angleDistance>0)
angleDistanceList.append(p.angleDistance); angleDistanceList.append(p.angleDistance);
else else
angleDistanceList.append(0); angleDistanceList.append(0);
if (p.period>0) if (p.period>0)
periodList.append(p.period); periodList.append(p.period);
else else
periodList.append(0); periodList.append(0);
if (p.discovered>0)
yearDiscoveryList.append(p.discovered);
effectiveTempHostStarList.append(effectiveTemp);
metallicityHostStarList.append(smetal);
if (Vmag<99)
vMagHostStarList.append(Vmag);
raHostStarList.append(RA);
decHostStarList.append(DE);
distanceHostStarList.append(distance);
massHostStarList.append(smass);
radiusHostStarList.append(sradius);
} }
} }
initialized = true; initialized = true;
} }
Exoplanet::~Exoplanet() Exoplanet::~Exoplanet()
{ {
// //
} }
skipping to change at line 607 skipping to change at line 630
Vec3d win; Vec3d win;
// Check visibility of exoplanet system // Check visibility of exoplanet system
if(!visible || !(painter->getProjector()->projectCheck(XYZ, win))) { return;} if(!visible || !(painter->getProjector()->projectCheck(XYZ, win))) { return;}
float mlimit = sd->getLimitMagnitude(); float mlimit = sd->getLimitMagnitude();
if (mag <= mlimit) if (mag <= mlimit)
{ {
Exoplanet::markerTexture->bind(); Exoplanet::markerTexture->bind();
float size = getAngularSize(NULL)*M_PI/180.*painter->getProj ector()->getPixelPerRadAtCenter(); float size = getAngularSize(Q_NULLPTR)*M_PI/180.*painter->ge tProjector()->getPixelPerRadAtCenter();
float shift = 5.f + size/1.6f; float shift = 5.f + size/1.6f;
painter->drawSprite2dMode(XYZ, distributionMode ? 4.f : 5.f) ; painter->drawSprite2dMode(XYZ, distributionMode ? 4.f : 5.f) ;
float coeff = 4.5f + std::log10(sradius + 0.1f); float coeff = 4.5f + std::log10(sradius + 0.1f);
if (labelsFader.getInterstate()<=0.f && !distributionMode && (mag+coeff)<mlimit && smgr->getFlagLabels() && showDesignations) if (labelsFader.getInterstate()<=0.f && !distributionMode && (mag+coeff)<mlimit && smgr->getFlagLabels() && showDesignations)
{ {
painter->drawText(XYZ, getNameI18n(), 0, shift, shif t, false); painter->drawText(XYZ, getNameI18n(), 0, shift, shif t, false);
} }
} }
 End of changes. 4 change blocks. 
1 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/