[Kstars-devel] KDE/kdeedu/kstars/kstars

[Akarsh Simha]

SVN commit 834833 by asimha:

Fixing typo in skymap.h

CCMAIL: kstars-devel at kde.org



 M  +16 -0     data/tools/Makefile  
 M  +2 -2      data/tools/nomaddatatomysql.pl  
 M  +2 -2      skymap.h  


--- trunk/KDE/kdeedu/kstars/kstars/data/tools/Makefile #834832:834833
@@ -10,17 +10,26 @@
 
 MYSQL_CONFIG=/usr/bin/mysql_config
 KSTARS_MYSQL_DB_TO_BIN=./mysql2bin
+KSTARS_NOMAD_MYSQL_DB_TO_BIN=./nomadmysql2bin
 KSTARS_MYSQL_DB_DB=$(KSTARS_MYSQL_DB_USER)
 KSTARS_MYSQL_DB_TBL=tycho2
+KSTARS_NOMAD_MYSQL_DB_TBL=nomad_test # TODO: Change to nomad
 
 all: mysql2bin binfiletester
 
 mysql2bin: mysql2bin.c
 	$(CC) $(CFLAGS) `$(MYSQL_CONFIG) --cflags` $@.c $(LDFLAGS) `$(MYSQL_CONFIG) --libs` -o $@
 
+nomadmysql2bin: nomadmysql2bin.c
+	$(CC) $(CFLAGS) `$(MYSQL_CONFIG) --cflags` $@.c $(LDFLAGS) `$(MYSQL_CONFIG) --libs` -o $@
+
 binfiletester: binfiletester.c
 	$(CC) $(CFLAGS) $@.c $(LDFLAGS) -lm -o $@
 
+nomadbinfiletester: nomadbinfiletester.c
+	$(CC) $(CFLAGS) $@.c $(LDFLAGS) -lm -o $@
+
+
 clean:
 	-rm binfiletester mysql2bin
 	-rm ushf usdf nshf nsdf nf
@@ -32,5 +41,12 @@
 	cat nshf nsdf > ../shallowstars.dat
 	cat nf > ../starnames.dat
 	rm ushf usdf nshf nsdf nf
+
+nomaddatafiles: nomadmysql2bin
+	echo "If this step hangs, please reduce the value of MYSQL_STARS_PER_QUERY in mysql2bin.c and try again."
+	./nomadmysql2bin $(KSTARS_MYSQL_DB_USER) $(KSTARS_MYSQL_DB_PASS) usdf ushf $(KSTARS_MYSQL_DB_DB) $(KSTARS_NOMAD_MYSQL_DB_TBL)
+	cat ushf usdf > nomad_test,dat    # TODO: Change
+	rm ushf usdf
+
 install:
 # Install nothing
--- trunk/KDE/kdeedu/kstars/kstars/data/tools/nomaddatatomysql.pl #834832:834833
@@ -63,7 +63,7 @@
 my $tbl_trunc_query = qq/TRUNCATE TABLE `$db_tbl`/;
 
 # For the HTMesh
-my $level = 3;
+my $level = 6;
 
 # Create a new HTMesh, of level $level
 my $mesh = new HTMesh($level);
@@ -77,7 +77,7 @@
 $dbh->do($db_query);
 $dbh->do($db_select_query);
 $dbh->do($tbl_query);
-$dbh->do($tbl_trunc_query);
+#$dbh->do($tbl_trunc_query);                 # Avoid truncating the table, because we might want to process split files
 $dbh->commit();
 
 if( $VERBOSE ) {
--- trunk/KDE/kdeedu/kstars/kstars/skymap.h #834832:834833
@@ -430,11 +430,11 @@
     QRect scaledRect();
 
     /**
-        *@return whether the give QPoint is on the SkyMap.
+        *@return whether the given QPoint is on the SkyMap.
         */
     bool onScreen( QPoint &point );
     /**
-        *@return whether the give QPointF is on the SkyMap.
+        *@return whether the given QPointF is on the SkyMap.
         */
 
     bool onScreen( QPointF &pointF );