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

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

Revision: 944
          http://gpredict.svn.sourceforge.net/gpredict/?rev=944&view=rev
Author:   aa1vs
Date:     2011-11-03 12:27:21 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Maintain Maidenhead grid (length 4 characters) for qth in qra field.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/qth-data.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-10-29 21:46:55 UTC (rev 943)
+++ trunk/ChangeLog	2011-11-03 12:27:21 UTC (rev 944)
@@ -1,3 +1,9 @@
+2011-11-03 Charles Suprin <hamaa1vs at gmail.com>
+
+    * src/qth-data.c
+    Maintain Maidenhead grid (length 4 characters) for qth in qra field.
+
+
 2011-10-29 Charles Suprin <hamaa1vs at gmail.com>
 
     * data/trsp/37841.trsp

Modified: trunk/src/qth-data.c
===================================================================
--- trunk/src/qth-data.c	2011-10-29 21:46:55 UTC (rev 943)
+++ trunk/src/qth-data.c	2011-11-03 12:27:21 UTC (rev 944)
@@ -258,6 +258,13 @@
         g_clear_error (&error);
     }
 
+    /* set QRA based on data */
+    if (longlat2locator (qth->lon, qth->lat, qth->qra,2) != RIG_OK) {
+        sat_log_log (SAT_LOG_LEVEL_ERROR,
+                     _("%s: Could not set QRA for %s at %f, %f."),
+                     __FUNCTION__, qth->name, qth->lon, qth->lat);
+    }
+    
     qth_validate(qth);
 
     /* Now, send debug message and return */
@@ -539,6 +546,14 @@
     }
     /* check that data is valid */
     qth_validate(qth);
+
+    /* update qra */
+    if (longlat2locator (qth->lon, qth->lat, qth->qra,2) != RIG_OK) {
+        sat_log_log (SAT_LOG_LEVEL_ERROR,
+                     _("%s: Could not set QRA for %s at %f, %f."),
+                     __FUNCTION__, qth->name, qth->lon, qth->lat);
+    }
+
     return retval;
 }
 
@@ -671,6 +686,7 @@
     qth->gpsd_server=NULL;
     qth->gpsd_update=0.0;
     qth->gpsd_connected=0.0;
+    qth->qra = g_strdup ("AA00");
 }
 
 /** \brief Load safe values into the qth_t data structure

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