Exoplanet.cpp   Exoplanet.cpp 
skipping to change at line 44 skipping to change at line 44
#include <QDebug> #include <QDebug>
#include <QVariant> #include <QVariant>
#include <QVariantMap> #include <QVariantMap>
#include <QVariant> #include <QVariant>
#include <QList> #include <QList>
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;
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)
, EPCount(0) , EPCount(0)
, PHEPCount(0) , PHEPCount(0)
, designation("") , designation("")
, RA(0.) , RA(0.)
, DE(0.) , DE(0.)
skipping to change at line 593 skipping to change at line 594
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(NULL)*M_PI/180.*painter->getProj ector()->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) ;
if (labelsFader.getInterstate()<=0.f && !distributionMode && float coeff = 4.5f + std::log10(sradius + 0.1f);
(mag+1.f)<mlimit && smgr->getFlagLabels()) 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. 2 change blocks. 
2 lines changed or deleted 4 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/