SVN commit 1128232 by asimha: Improve efficiency in drawing deep-sky objects. Earlier, we would loop through the NGC and IC catalogs even if they were disabled, if Messier catalog images were enabled. This avoids that from happening. M +2 -3 deepskycomponent.cpp M +1 -1 deepskycomponent.h --- trunk/KDE/kdeedu/kstars/kstars/skycomponents/deepskycomponent.cpp #1128231:1128232 @@ -294,7 +294,7 @@ drawFlag = Options::showMessier() && ! ( Options::hideOnSlew() && Options::hideMessier() && SkyMap::IsSlewing() ); - drawDeepSkyCatalog( psky, drawFlag, &m_MessierIndex, "MessColor" ); + drawDeepSkyCatalog( psky, drawFlag, &m_MessierIndex, "MessColor", Options::showMessierImages() ); drawFlag = Options::showNGC() && ! ( Options::hideOnSlew() && Options::hideNGC() && SkyMap::IsSlewing() ); @@ -313,9 +313,8 @@ } void DeepSkyComponent::drawDeepSkyCatalog( QPainter& psky, bool drawObject, - DeepSkyIndex* dsIndex, const QString& colorString) + DeepSkyIndex* dsIndex, const QString& colorString, bool drawImage) { - bool drawImage = Options::showMessierImages(); if ( ! ( drawObject || drawImage ) ) return; SkyMap *map = SkyMap::Instance(); --- trunk/KDE/kdeedu/kstars/kstars/skycomponents/deepskycomponent.h #1128231:1128232 @@ -144,7 +144,7 @@ void mergeSplitFiles(); void drawDeepSkyCatalog( QPainter& psky, bool drawObject, DeepSkyIndex* dsIndex, - const QString& colorString); + const QString& colorString, bool drawImage = false); QList m_DeepSkyList; QList m_MessierList;