Supernovae.cpp   Supernovae.cpp 
skipping to change at line 229 skipping to change at line 229
Vec3d pos=obj->getJ2000EquatorialPos(core); Vec3d pos=obj->getJ2000EquatorialPos(core);
Vec3d screenpos; Vec3d screenpos;
// Compute 2D pos and return if outside screen // Compute 2D pos and return if outside screen
if (!painter.getProjector()->project(pos, screenpos)) if (!painter.getProjector()->project(pos, screenpos))
return; return;
const Vec3f& c(obj->getInfoColor()); const Vec3f& c(obj->getInfoColor());
painter.setColor(c[0],c[1],c[2]); painter.setColor(c[0],c[1],c[2]);
texPointer->bind(); texPointer->bind();
painter.enableTexture2d(true); painter.setBlending(true);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal
transparency mode
painter.drawSprite2dMode(screenpos[0], screenpos[1], 13.f, S telApp::getInstance().getTotalRunTime()*40.); painter.drawSprite2dMode(screenpos[0], screenpos[1], 13.f, S telApp::getInstance().getTotalRunTime()*40.);
} }
} }
QList<StelObjectP> Supernovae::searchAround(const Vec3d& av, double limitFo v, const StelCore*) const QList<StelObjectP> Supernovae::searchAround(const Vec3d& av, double limitFo v, const StelCore*) const
{ {
QList<StelObjectP> result; QList<StelObjectP> result;
Vec3d v(av); Vec3d v(av);
v.normalize(); v.normalize();
skipping to change at line 556 skipping to change at line 554
} }
int Supernovae::getSecondsToUpdate(void) int Supernovae::getSecondsToUpdate(void)
{ {
QDateTime nextUpdate = lastUpdate.addSecs(updateFrequencyDays * 3600 * 24); QDateTime nextUpdate = lastUpdate.addSecs(updateFrequencyDays * 3600 * 24);
return QDateTime::currentDateTime().secsTo(nextUpdate); return QDateTime::currentDateTime().secsTo(nextUpdate);
} }
void Supernovae::checkForUpdate(void) void Supernovae::checkForUpdate(void)
{ {
if (updatesEnabled && lastUpdate.addSecs(updateFrequencyDays * 3600 * 24) <= QDateTime::currentDateTime()) if (updatesEnabled && lastUpdate.addSecs(updateFrequencyDays * 3600 * 24) <= QDateTime::currentDateTime() && downloadMgr->networkAccessible()== QNetworkAccessManager::Accessible)
updateJSON(); updateJSON();
} }
void Supernovae::updateJSON(void) void Supernovae::updateJSON(void)
{ {
if (updateState==Supernovae::Updating) if (updateState==Supernovae::Updating)
{ {
qWarning() << "[Supernovae] already updating... will not st art again current update is complete."; qWarning() << "[Supernovae] already updating... will not st art again current update is complete.";
return; return;
} }
 End of changes. 2 change blocks. 
5 lines changed or deleted 2 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/