[Gpredict-svn] SF.net SVN: gpredict:[833] trunk

[<aa...@us...>]

Revision: 833
          http://gpredict.svn.sourceforge.net/gpredict/?rev=833&view=rev
Author:   aa1vs
Date:     2011-06-20 13:07:45 +0000 (Mon, 20 Jun 2011)

Log Message:
-----------
Change naos logic to avoid a daynum 2458849.5 (Y2021?) problem.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/gtk-polar-view.c
    trunk/src/gtk-sat-map.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-06-19 13:00:23 UTC (rev 832)
+++ trunk/ChangeLog	2011-06-20 13:07:45 UTC (rev 833)
@@ -1,3 +1,10 @@
+2011-06-20 Charles Suprin <hamaa1vs at gmail.com>
+
+    * src/gtk-sat-map.c
+    * src/gtk-polar-view.c
+    Change naos logic to avoid a daynum 2458849.5 (Y2021?) problem.
+
+
 2011-06-19 Charles Suprin <hamaa1vs at gmail.com>
 
     * src/gtk-sat-map.c

Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c	2011-06-19 13:00:23 UTC (rev 832)
+++ trunk/src/gtk-polar-view.c	2011-06-20 13:07:45 UTC (rev 833)
@@ -150,7 +150,7 @@
     polview->sats      = NULL;
     polview->qth       = NULL;
     polview->obj       = NULL;
-    polview->naos      = 2458849.5;
+    polview->naos      = 0.0;
     polview->ncat      = 0;
     polview->size      = 0;
     polview->r         = 0;
@@ -693,7 +693,7 @@
     else {
         /* reset data */
         polv->counter = 1;
-        polv->naos = 2458849.5;
+        polv->naos = 0.0;
         polv->ncat = 0;
 
         /* update sats */
@@ -787,9 +787,11 @@
     now = polv->tstamp;
 
     /* update next AOS */
-    if ((sat->aos > now) && (sat->aos < polv->naos)) {
-        polv->naos = sat->aos;
-        polv->ncat = sat->tle.catnr;
+    if (sat->aos > now) {
+        if ((sat->aos < polv->naos)|| (polv->naos == 0.0)) {
+            polv->naos = sat->aos;
+            polv->ncat = sat->tle.catnr;
+        }
     }
 
     /* if sat is out of range */

Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c	2011-06-19 13:00:23 UTC (rev 832)
+++ trunk/src/gtk-sat-map.c	2011-06-20 13:07:45 UTC (rev 833)
@@ -170,7 +170,7 @@
     satmap->sats      = NULL;
     satmap->qth       = NULL;
     satmap->obj       = NULL;
-    satmap->naos      = 2458849.5;
+    satmap->naos      = 0.0;
     satmap->ncat      = 0;
     satmap->tstamp    = 2458849.5;
     satmap->x0        = 0;
@@ -656,7 +656,7 @@
     else {
         /* reset data */
         satmap->counter = 1;
-        satmap->naos = 2458849.5;
+        satmap->naos = 0.0;
         satmap->ncat = 0;
 
         /* QTH */
@@ -1934,9 +1934,11 @@
     now = satmap->tstamp;
 
     /* update next AOS */
-    if ((sat->aos > now) && (sat->aos < satmap->naos)) {
-        satmap->naos = sat->aos;
-        satmap->ncat = sat->tle.catnr;
+    if (sat->aos > now) {
+        if ((sat->aos < satmap->naos)|| (satmap->naos == 0.0)) {
+            satmap->naos = sat->aos;
+            satmap->ncat = sat->tle.catnr;
+        }
     }
 
     obj = SAT_MAP_OBJ (g_hash_table_lookup (satmap->obj, catnum));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.