StelSkyLayerMgr.cpp   StelSkyLayerMgr.cpp 
skipping to change at line 169 skipping to change at line 169
StelPainter sPainter(core->getProjection(StelCore::FrameJ2000)); StelPainter sPainter(core->getProjection(StelCore::FrameJ2000));
glBlendFunc(GL_ONE, GL_ONE); glBlendFunc(GL_ONE, GL_ONE);
glEnable(GL_BLEND); glEnable(GL_BLEND);
foreach (SkyLayerElem* s, allSkyLayers) foreach (SkyLayerElem* s, allSkyLayers)
{ {
if (s->show) if (s->show)
s->layer->draw(core, sPainter, 1.); s->layer->draw(core, sPainter, 1.);
} }
} }
void noDelete(StelSkyLayer* o) {;} void noDelete(StelSkyLayer*) {;}
// Called when loading of data started or stopped for one collection // Called when loading of data started or stopped for one collection
void StelSkyLayerMgr::loadingStateChanged(bool b) void StelSkyLayerMgr::loadingStateChanged(bool b)
{ {
StelSkyLayer* tile = qobject_cast<StelSkyLayer*>(QObject::sender()); StelSkyLayer* tile = qobject_cast<StelSkyLayer*>(QObject::sender());
Q_ASSERT(tile!=0); Q_ASSERT(tile!=0);
SkyLayerElem* elem = skyLayerElemForLayer(tile); SkyLayerElem* elem = skyLayerElemForLayer(tile);
Q_ASSERT(elem!=NULL); Q_ASSERT(elem!=NULL);
if (b) if (b)
{ {
skipping to change at line 318 skipping to change at line 318
if (allSkyLayers.contains(id)) if (allSkyLayers.contains(id))
if (allSkyLayers.value(id)!=NULL) if (allSkyLayers.value(id)!=NULL)
return allSkyLayers.value(id)->show; return allSkyLayers.value(id)->show;
return false; return false;
} }
//! Get the list of all the currently loaded layers. //! Get the list of all the currently loaded layers.
QMap<QString, StelSkyLayerP> StelSkyLayerMgr::getAllSkyLayers() const QMap<QString, StelSkyLayerP> StelSkyLayerMgr::getAllSkyLayers() const
{ {
QMap<QString, StelSkyLayerP> res; QMap<QString, StelSkyLayerP> res;
for (QMap<QString, StelSkyLayerMgr::SkyLayerElem*>::const_iterator i ter=allSkyLayers.begin();iter!=allSkyLayers.end();++iter) for (QMap<QString, StelSkyLayerMgr::SkyLayerElem*>::ConstIterator it er=allSkyLayers.constBegin();iter!=allSkyLayers.constEnd();++iter)
{ {
qDebug() << iter.key() << iter.value()->layer->getShortName( ); //qDebug() << iter.key() << iter.value()->layer->getShortNam e();
res.insert(iter.key(), iter.value()->layer); res.insert(iter.key(), iter.value()->layer);
} }
return res; return res;
} }
StelSkyLayerP StelSkyLayerMgr::getSkyLayer(const QString& key) const StelSkyLayerP StelSkyLayerMgr::getSkyLayer(const QString& key) const
{ {
if (allSkyLayers.contains(key)) if (allSkyLayers.contains(key))
return allSkyLayers[key]->layer; return allSkyLayers[key]->layer;
return StelSkyLayerP(); return StelSkyLayerP();
 End of changes. 3 change blocks. 
3 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/