StelSkyLayerMgr.cpp   StelSkyLayerMgr.cpp 
skipping to change at line 88 skipping to change at line 88
{ {
if (key=="clilayer") if (key=="clilayer")
insertSkyImage(uri, "Command-line layer"); insertSkyImage(uri, "Command-line layer");
else else
insertSkyImage(uri); insertSkyImage(uri);
} }
} }
conf->endGroup(); conf->endGroup();
setFlagShow(!conf->value("astro/flag_nebula_display_no_texture", fal se).toBool()); setFlagShow(!conf->value("astro/flag_nebula_display_no_texture", fal se).toBool());
addAction("actionShow_DSS", N_("Display Options"), N_("Deep-sky obje cts background images"), "visible", "I"); addAction("actionShow_DSS", N_("Display Options"), N_("Deep-sky obje cts background images"), "flagShow", "I");
} }
QString StelSkyLayerMgr::insertSkyLayer(StelSkyLayerP tile, const QString& keyHint, bool ashow) QString StelSkyLayerMgr::insertSkyLayer(StelSkyLayerP tile, const QString& keyHint, bool ashow)
{ {
SkyLayerElem* bEl = new SkyLayerElem(tile, ashow); SkyLayerElem* bEl = new SkyLayerElem(tile, ashow);
QString key = tile->getKeyHint(); QString key = tile->getKeyHint();
if (key.isEmpty() || key=="no name") if (key.isEmpty() || key=="no name")
{ {
if (!keyHint.isEmpty()) if (!keyHint.isEmpty())
{ {
skipping to change at line 386 skipping to change at line 386
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
qWarning() << e.what(); qWarning() << e.what();
return false; return false;
} }
} }
void StelSkyLayerMgr::showLayer(const QString& id, bool b) void StelSkyLayerMgr::showLayer(const QString& id, bool b)
{ {
if (allSkyLayers.contains(id)) if (allSkyLayers.contains(id))
if (allSkyLayers.value(id)!=NULL) {
if (allSkyLayers[id]!=NULL)
allSkyLayers[id]->show = b; allSkyLayers[id]->show = b;
}
} }
bool StelSkyLayerMgr::getShowLayer(const QString& id) const bool StelSkyLayerMgr::getShowLayer(const QString& id) const
{ {
if (allSkyLayers.contains(id)) if (allSkyLayers.contains(id))
if (allSkyLayers.value(id)!=NULL) {
return allSkyLayers.value(id)->show; if (allSkyLayers[id]!=NULL)
return allSkyLayers[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*>::ConstIterator it er=allSkyLayers.constBegin();iter!=allSkyLayers.constEnd();++iter) for (QMap<QString, StelSkyLayerMgr::SkyLayerElem*>::ConstIterator it er=allSkyLayers.constBegin();iter!=allSkyLayers.constEnd();++iter)
{ {
//qDebug() << iter.key() << iter.value()->layer->getShortNam e(); //qDebug() << iter.key() << iter.value()->layer->getShortNam e();
 End of changes. 4 change blocks. 
4 lines changed or deleted 8 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/