Quasar.cpp   Quasar.cpp 
skipping to change at line 38 skipping to change at line 38
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.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 Quasar::QUASAR_TYPE = QStringLiteral("Quasar");
StelTextureSP Quasar::markerTexture; StelTextureSP Quasar::markerTexture;
bool Quasar::distributionMode = false; bool Quasar::distributionMode = false;
Vec3f Quasar::markerColor = Vec3f(1.0f,0.5f,0.4f); Vec3f Quasar::markerColor = Vec3f(1.0f,0.5f,0.4f);
Quasar::Quasar(const QVariantMap& map) Quasar::Quasar(const QVariantMap& map)
: initialized(false) : initialized(false)
, designation("") , designation("")
, VMagnitude(21.) , VMagnitude(21.)
, AMagnitude(21.) , AMagnitude(21.)
skipping to change at line 198 skipping to change at line 199
StelUtils::spheToRect(qRA, qDE, XYZ); StelUtils::spheToRect(qRA, qDE, XYZ);
mag = getVMagnitudeWithExtinction(core); mag = getVMagnitudeWithExtinction(core);
if (distributionMode) if (distributionMode)
{ {
painter.setBlending(true, GL_ONE, GL_ONE); painter.setBlending(true, GL_ONE, GL_ONE);
painter.setColor(markerColor[0], markerColor[1], markerColor [2], 1); painter.setColor(markerColor[0], markerColor[1], markerColor [2], 1);
Quasar::markerTexture->bind(); Quasar::markerTexture->bind();
//size = getAngularSize(NULL)*M_PI/180.*painter.getProjector ()->getPixelPerRadAtCenter(); //size = getAngularSize(Q_NULLPTR)*M_PI/180.*painter.getProj ector()->getPixelPerRadAtCenter();
if (labelsFader.getInterstate()<=0.f) if (labelsFader.getInterstate()<=0.f)
{ {
painter.drawSprite2dMode(XYZ, 4); painter.drawSprite2dMode(XYZ, 4);
} }
} }
else else
{ {
sd->preDrawPointSource(&painter); sd->preDrawPointSource(&painter);
if (mag <= sd->getLimitMagnitude()) if (mag <= sd->getLimitMagnitude())
{ {
sd->computeRCMag(mag, &rcMag); sd->computeRCMag(mag, &rcMag);
sd->drawPointSource(&painter, Vec3f(XYZ[0],XYZ[1],XY Z[2]), rcMag, sd->indexToColor(BvToColorIndex(bV)), true); sd->drawPointSource(&painter, Vec3f(XYZ[0],XYZ[1],XY Z[2]), rcMag, sd->indexToColor(BvToColorIndex(bV)), true);
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.getPro jector()->getPixelPerRadAtCenter(); size = getAngularSize(Q_NULLPTR)*M_PI/180.*painter.g etProjector()->getPixelPerRadAtCenter();
shift = 6.f + size/1.8f; shift = 6.f + size/1.8f;
if (labelsFader.getInterstate()<=0.f) if (labelsFader.getInterstate()<=0.f)
{ {
painter.drawText(XYZ, designation, 0, shift, shift, false); painter.drawText(XYZ, designation, 0, shift, shift, false);
} }
} }
sd->postDrawPointSource(&painter); sd->postDrawPointSource(&painter);
} }
} }
 End of changes. 3 change blocks. 
2 lines changed or deleted 3 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/