[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kstars/kstars/skycomponents
From:       Alexey Khudyakov <alexey.skladnoy () gmail ! com>
Date:       2010-02-23 11:52:04
Message-ID: 1266925924.184385.3512.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1094932 by khudyakov:

Remove unused data members

 M  +4 -12     starcomponent.cpp  
 M  +0 -6      starcomponent.h  


--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/starcomponent.cpp #1094931:1094932
@@ -63,8 +63,6 @@
     m_reindexInterval = StarObject::reindexInterval( 304.0 );
 
     m_zoomMagLimit = 0.0;
-    m_reloadSplash = m_reindexSplash = 0;
-    m_validLineNums = false;
 
     for ( int i = 0; i <= MAX_LINENUMBER_MAG; i++ )
         m_labelList[ i ] = new LabelList;
@@ -273,11 +271,10 @@
     UpdateID updateID = data->updateID();
 
     bool checkSlewing = ( map->isSlewing() && Options::hideOnSlew() );
-    m_hideLabels = ( map->isSlewing() && Options::hideLabels() ) ||
-                  !( Options::showStarMagnitudes() || Options::showStarNames() );
+    m_hideLabels = checkSlewing || !( Options::showStarMagnitudes() || \
Options::showStarNames() );  
     //shortcuts to inform whether to draw different objects
-    bool hideFaintStars( checkSlewing && Options::hideStars() );
+    bool hideFaintStars = checkSlewing && Options::hideStars();
     double hideStarsMag = Options::magLimitHideStar();
     reindex( data->updateNum() );
 
@@ -302,8 +299,6 @@
 
     int nTrixels = 0;
 
-    visibleStarCount = 0;
-
     while( region.hasNext() ) {
         ++nTrixels;
         Trixel currentRegion = region.next();
@@ -330,7 +325,6 @@
                 continue;
 
             curStar->draw( psky, o, starRenderingSize( mag ) );
-            visibleStarCount++;
             
             if ( m_hideLabels || mag > labelMagLim )
                 continue;
@@ -347,7 +341,6 @@
             QPointF o = map->toScreen( focusStar );
             if ( map->onScreen( o ) ) {
                 focusStar->draw( psky, o, starRenderingSize( mag ) );
-                visibleStarCount++;
             }
         }
     }
@@ -368,7 +361,8 @@
 
 void StarComponent::drawLabels( QPainter& psky )
 {
-    if ( m_hideLabels ) return;
+    if( m_hideLabels )
+        return;
 
     psky.setPen( QColor( KStarsData::Instance()->colorScheme()->colorNamed( \
"SNameColor" ) ) );  
@@ -677,7 +671,6 @@
     printf( "Number of visible StarBlocks                 = %8d\n", nBlocks );
     printf( "Number of StarBlocks allocated via SBF       = %8d\n", \
                m_StarBlockFactory.getBlockCount() );
     printf( "Number of unnamed stars in memory            = %8ld\n", nStars );
-    printf( "Number of visible stars (named + unnamed)    = %8ld\n", \
                visibleStarCount );
     printf( "Magnitude of the faintest star in memory     = %8.2f\n", faintMag );
     printf( "Target magnitude limit                       = %8.2f\n", magLim );
     printf( "Size of each StarBlock                       = %8d bytes\n", sizeof( \
StarBlock ) ); @@ -690,7 +683,6 @@
     printf( "Time taken for dynamic load of data          = %8ld ms\n", \
                t_dynamicLoad );
     printf( "Time taken for updating LRU cache            = %8ld ms\n", \
                t_updateCache );
     printf( "Time taken for drawing unnamed stars         = %8ld ms\n", \
                t_drawUnnamed );
-    printf( "Average Number of stars draw per millisecond = %8.2f stars/ms\n", ( \
                (double)visibleStarCount ) / ( t_drawUnnamed + t_drawNamed ) );
     printf( "================================================================\n" );
 }
 
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/starcomponent.h #1094931:1094932
@@ -158,10 +158,7 @@
     KSNumbers      m_reindexNum;
     double         m_reindexInterval;
 
-    int            m_lineNumber[ MAX_LINENUMBER_MAG + 1 ];
     LabelList*     m_labelList[  MAX_LINENUMBER_MAG + 1 ];
-    int            m_lastLineNum;
-    bool           m_validLineNums;
     bool           m_hideLabels;
 
     float          m_zoomMagLimit;
@@ -169,13 +166,10 @@
     float          m_FaintMagnitude; // Limiting magnitude of the catalog currently \
loaded  bool           starsLoaded;
     float          magLim;           // Current limiting magnitude for visible stars
-    unsigned long  visibleStarCount;
-    quint16        MSpT;             // Maximum number of stars in any given trixel
 
     StarObject     m_starObject;
     StarObject     *focusStar;       // This object is always drawn
 
-    KStarsSplash*  m_reloadSplash;
     KStarsSplash*  m_reindexSplash;
 
     StarBlockFactory *m_StarBlockFactory;


[prev in list] [next in list] [prev in thread] [next in thread]