[Kstars-devel] kdeedu/kstars/kstars

[Jason Harris]

CVS commit by harris: 

two fixes related to FindDialog:

1. many objects were incorrectly omitted from the list of named objects.  
The FindDialog::filter() function had recently gained a feature that 
excludes objects fainter than the magLimitDrawStar parameter.  However, it 
dumbly applied this to non-star objects also.  For now, I have 
simply removed the faint limit feature from the FindDialog.

2. There was an object named "M 0", which turned out to be due to a 
comment line in the ngcic01.dat file.  Added code to ignore comment lines 
(lines which begin with '#') in ngcic??.dat.

TODO:  I noticed an object at RA=0, Dec=0 named "Earth" (!).  Definitely 
should not be there.


CCMAIL: kstars-devel at kde.org


  M +1 -4      finddialog.cpp   1.18
  M +8 -1      kstarsdata.cpp   1.108


--- kdeedu/kstars/kstars/finddialog.cpp  #1.17:1.18
@@ -114,8 +114,5 @@ void FindDialog::filter() {  //Filter th
                 for ( SkyObjectName *name = ObjNames.first( searchFor ); name; name = ObjNames.next() ) {
                         if ( name->text().lower().startsWith( searchFor ) ) {
-                                // show only visible objects
-                                if (name->skyObject()->mag() <= p->options()->currentMagLimitDrawStar()) {
                                         new SkyObjectNameListItem ( SearchList, name );
-                                }
 /*                              if ( i++ >= 5000 ) {              //Every 5000 name insertions,
                                         kapp->processEvents ( 50 );             //spend 50 msec processing KApplication events

--- kdeedu/kstars/kstars/kstarsdata.cpp  #1.107:1.108
@@ -790,4 +790,6 @@ bool KStarsData::readDeepSkyData( void )
 
                                 line = fileReader.readLine();
+                                //Ignore comment lines
+                                while ( line.at(0) == '#' && fileReader.hasMoreLines() ) line = fileReader.readLine();
 
                                 iflag = line.at( 0 ); //check for NGC/IC catalog flag
@@ -870,4 +872,9 @@ bool KStarsData::readDeepSkyData( void )
                                 }
 
+                                //DEBUG
+                                if ( name == "M 0" ) {
+                                        kdDebug() << "M 0: " << line << endl;
+                                }
+                                
                                 // create new deepskyobject
                                 DeepSkyObject *o = 0;