gpredict-svn Mailing List for Gpredict (Page 26)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 341
          http://gpredict.svn.sourceforge.net/gpredict/?rev=341&view=rev
Author:   csete
Date:     2009-08-03 19:17:28 +0000 (Mon, 03 Aug 2009)

Log Message:
-----------
Separate QTH data I/O from SAT data I/O.

Modified Paths:
--------------
    trunk/src/gtk-sat-data.c
    trunk/src/gtk-sat-data.h
    trunk/src/gtk-sat-module.c
    trunk/src/gtk-sat-module.h
    trunk/src/qth-editor.c
    trunk/src/qth-editor.h
    trunk/src/sat-pref-qth.c

Modified: trunk/src/gtk-sat-data.c
===================================================================

--- trunk/src/gtk-sat-data.c	2009-08-03 18:39:16 UTC (rev 340)
+++ trunk/src/gtk-sat-data.c	2009-08-03 19:17:28 UTC (rev 341)
@@ -40,366 +40,8 @@
 #include "time-tools.h"
 
 
-/** \brief Read QTH data from file.
- *  \param filename The file to read from.
- *  \param qth Pointer to a qth_t data structure where the data will be stored.
- *  \return FALSE if an error occurred, TRUE otherwise.
- *
- *  \note The function uses the new key=value file parser from glib.
- */
-gint
-gtk_sat_data_read_qth (const gchar *filename, qth_t *qth)
-{
-    GError *error = NULL;
-    gchar  *buff;
-    gchar  **buffv;
 
-    qth->data = g_key_file_new ();
-    g_key_file_set_list_separator (qth->data, ';');
 
-    /* bail out with error message if data can not be read */
-    if (!g_key_file_load_from_file (qth->data, filename,
-                                    G_KEY_FILE_KEEP_COMMENTS, &error)) {
-
-        g_key_file_free (qth->data);
-
-        sat_log_log (SAT_LOG_LEVEL_ERROR,
-                     _("%s: Could not load data from %s (%s)"),
-                     __FUNCTION__, filename, error->message);
-
-        return FALSE;
-    }
-
-    /* send a debug message, then read data */
-    sat_log_log (SAT_LOG_LEVEL_DEBUG,
-                 _("%s: QTH data: %s"),
-                 __FUNCTION__, filename);
-
-    /*** FIXME: should check that strings are UTF-8? */
-    /* QTH Name */
-    buff = g_path_get_basename (filename);
-    buffv = g_strsplit (buff, ".qth", 0);
-    qth->name = g_strdup (buffv[0]);
-
-    g_free (buff);
-    g_strfreev (buffv);
-    /* g_key_file_get_string (qth->data, */
-    /*                        QTH_CFG_MAIN_SECTION, */
-    /*                        QTH_CFG_NAME_KEY, */
-    /*                        &error); */
-    if (error != NULL) {
-        sat_log_log (SAT_LOG_LEVEL_ERROR, 
-                     _("%s: Error reading QTH name (%s)."),
-                     __FUNCTION__, error->message);
-
-        qth->name = g_strdup (_("ERROR"));
-        g_clear_error (&error);
-    }
-
-    /* QTH location */
-    qth->loc = g_key_file_get_string (qth->data,
-                                      QTH_CFG_MAIN_SECTION,
-                                      QTH_CFG_LOC_KEY,
-                                      &error);
-    if (error != NULL) {
-        sat_log_log (SAT_LOG_LEVEL_MSG,
-                     _("%s: QTH has no location (%s)."),
-                     __FUNCTION__, error->message);
-
-        qth->loc = g_strdup ("");
-        g_clear_error (&error);
-    }
-
-    /* QTH description */
-    qth->desc = g_key_file_get_string (qth->data,
-                                       QTH_CFG_MAIN_SECTION,
-                                       QTH_CFG_DESC_KEY,
-                                       &error);
-    if ((qth->desc == NULL) || (error != NULL)) {
-        sat_log_log (SAT_LOG_LEVEL_MSG,
-                     _("%s: QTH has no description."),
-                     __FUNCTION__);
-
-        qth->desc = g_strdup ("");
-        g_clear_error (&error);
-    }
-
-    /* Weather station */
-    qth->wx = g_key_file_get_string (qth->data,
-                                     QTH_CFG_MAIN_SECTION,
-                                     QTH_CFG_WX_KEY,
-                                     &error);
-    if ((qth->wx == NULL) || (error != NULL)) {
-        sat_log_log (SAT_LOG_LEVEL_MSG,
-                     _("%s: QTH has no weather station."),
-                     __FUNCTION__);
-
-        qth->wx = g_strdup ("");
-        g_clear_error (&error);
-    }
-
-    /* QTH Latitude */
-    buff = g_key_file_get_string (qth->data,
-                                  QTH_CFG_MAIN_SECTION,
-                                  QTH_CFG_LAT_KEY,
-                                  &error);
-    if (error != NULL) {
-        sat_log_log (SAT_LOG_LEVEL_ERROR,
-                     _("%s: Error reading QTH latitude (%s)."),
-                     __FUNCTION__, error->message);
-
-        g_clear_error (&error);
-
-        if (buff != NULL)
-            g_free (buff);
-
-        qth->lat = 0.0;
-    }
-    else {
-        qth->lat = g_ascii_strtod (buff, NULL);
-        g_free (buff);
-    }
-
-    /* QTH Longitude */
-    buff = g_key_file_get_string (qth->data,
-                                  QTH_CFG_MAIN_SECTION,
-                                  QTH_CFG_LON_KEY,
-                                  &error);
-    if (error != NULL) {
-        sat_log_log (SAT_LOG_LEVEL_ERROR,
-                     _("%s: Error reading QTH longitude (%s)."),
-                     __FUNCTION__, error->message);
-
-        g_clear_error (&error);
-
-        if (buff != NULL)
-            g_free (buff);
-
-        qth->lon = 0.0;
-    }
-    else {
-        qth->lon = g_ascii_strtod (buff, NULL);
-        g_free (buff);
-    }
-
-    /* QTH Altitude */
-    qth->alt = g_key_file_get_integer (qth->data,
-                                       QTH_CFG_MAIN_SECTION,
-                                       QTH_CFG_ALT_KEY,
-                                       &error);
-    if (error != NULL) {
-        sat_log_log (SAT_LOG_LEVEL_ERROR,
-                     _("%s: Error reading QTH altitude (%s)."),
-                     __FUNCTION__, error->message);
-
-        g_clear_error (&error);
-
-        if (buff != NULL)
-            g_free (buff);
-
-        qth->alt = 0;
-    }
-    else {
-    }
-
-    /* Now, send debug message and return */
-    sat_log_log (SAT_LOG_LEVEL_MSG,
-                 _("%s: QTH data: %s, %.4f, %.4f, %d"),
-                 __FUNCTION__,
-                 qth->name,
-                 qth->lat,
-                 qth->lon,
-                 qth->alt);
-
-    return TRUE;
-}
-
-
-/** \brief Save the QTH data to a file.
- * \param filename The file to save to.
- * \param qth Pointer to a qth_t data structure from which the data will be read.
- */
-gint
-gtk_sat_data_save_qth (const gchar *filename, qth_t *qth)
-{
-    GError     *error = NULL;
-    gchar      *buff;
-    GIOChannel *cfgfile;
-    gsize       length;
-    gsize       written;
-    gchar      *cfgstr;
-    gint        ok = 1;
-
-    qth->data = g_key_file_new ();
-    g_key_file_set_list_separator (qth->data, ';');
-
-    /* name */
-    /*     if (qth->name) { */
-    /*         g_key_file_set_string (qth->data, */
-    /*                        QTH_CFG_MAIN_SECTION, */
-    /*                        QTH_CFG_NAME_KEY, */
-    /*                        qth->name); */
-    /*     } */
-
-    /* description */
-    if (qth->desc && (g_utf8_strlen (qth->desc, -1) > 0)) {
-        g_key_file_set_string (qth->data,
-                               QTH_CFG_MAIN_SECTION,
-                               QTH_CFG_DESC_KEY,
-                               qth->desc);
-    }
-    
-    /* location */
-    if (qth->loc && (g_utf8_strlen (qth->loc, -1) > 0)) {
-        g_key_file_set_string (qth->data,
-                               QTH_CFG_MAIN_SECTION,
-                               QTH_CFG_LOC_KEY,
-                               qth->loc);
-    }
-
-    /* latitude */
-    /*    buff = g_strdup_printf ("%.4f", qth->lat);*/
-    buff = g_malloc (10);
-    buff = g_ascii_dtostr (buff, 9, qth->lat);
-    g_key_file_set_string (qth->data,
-                           QTH_CFG_MAIN_SECTION,
-                           QTH_CFG_LAT_KEY,
-                           buff);
-    g_free (buff);
-
-    /* longitude */
-    /*     buff = g_strdup_printf ("%.4f", qth->lon); */
-    buff = g_malloc (10);
-    buff = g_ascii_dtostr (buff, 9, qth->lon);
-    g_key_file_set_string (qth->data,
-                           QTH_CFG_MAIN_SECTION,
-                           QTH_CFG_LON_KEY,
-                           buff);
-    g_free (buff);
-
-    /* altitude */
-    g_key_file_set_integer (qth->data,
-                            QTH_CFG_MAIN_SECTION,
-                            QTH_CFG_ALT_KEY,
-                            qth->alt);
-
-    /* weather station */
-    if (qth->wx && (g_utf8_strlen (qth->wx, -1) > 0)) {
-        g_key_file_set_string (qth->data,
-                               QTH_CFG_MAIN_SECTION,
-                               QTH_CFG_WX_KEY,
-                               qth->wx);
-    }
-
-    /* saving code */
-
-    /* convert configuration data struct to charachter string */
-    cfgstr = g_key_file_to_data (qth->data, &length, &error);
-
-    if (error != NULL) {
-        sat_log_log (SAT_LOG_LEVEL_ERROR,
-                     _("%s: Could not create QTH data (%s)."),
-                     __FUNCTION__, error->message);
-
-        g_clear_error (&error);
-
-        ok = 0;
-    }
-    else {
-
-        cfgfile = g_io_channel_new_file (filename, "w", &error);
-
-        if (error != NULL) {
-            sat_log_log (SAT_LOG_LEVEL_ERROR,
-                         _("%s: Could not create QTH file %s\n%s."),
-                         __FUNCTION__, filename, error->message);
-
-            g_clear_error (&error);
-
-            ok = 0;
-        }
-        else {
-            g_io_channel_write_chars (cfgfile,
-                                      cfgstr,
-                                      length,
-                                      &written,
-                                      &error);
-
-            g_io_channel_shutdown (cfgfile, TRUE, NULL);
-            g_io_channel_unref (cfgfile);
-
-            if (error != NULL) {
-                sat_log_log (SAT_LOG_LEVEL_ERROR,
-                             _("%s: Error writing QTH data (%s)."),
-                             __FUNCTION__, error->message);
-
-                g_clear_error (&error);
-
-                ok = 0;
-            }
-            else if (length != written) {
-                sat_log_log (SAT_LOG_LEVEL_WARN,
-                             _("%s: Wrote only %d out of %d chars."),
-                             __FUNCTION__, written, length);
-
-                ok = 0;
-            }
-            else {
-                sat_log_log (SAT_LOG_LEVEL_MSG,
-                             _("%s: QTH data saved."),
-                             __FUNCTION__);
-
-                ok = 1;
-            }
-        }
-
-        g_free (cfgstr);
-    }
-
-    return ok;
-}
-
-
-/** \brief Free QTH resources.
- *  \param qth The qth data structure to free.
- */
-void
-gtk_sat_data_free_qth (qth_t *qth)
-{
-    if (qth->name) {
-        g_free (qth->name);
-        qth->name = NULL;
-    }
-
-    if (qth->loc) {
-        g_free (qth->loc);
-        qth->loc = NULL;
-    }
-
-    if (qth->desc) {
-        g_free (qth->desc);
-        qth->desc = NULL;
-    }
-
-    if (qth->qra) {
-        g_free (qth->qra);
-        qth->qra = NULL;
-    }
-
-    if (qth->wx) {
-        g_free (qth->wx);
-        qth->wx = NULL;
-    }
-
-    if (qth->data) {
-        g_key_file_free (qth->data);
-        qth->data = NULL;
-    }
-
-    g_free (qth);
-}
-
-
 /** \brief Read TLE data for a given satellite into memory.
  *  \param catnum The catalog number of the satellite.
  *  \param sat Pointerto a valid sat_t structure.

Modified: trunk/src/gtk-sat-data.h
===================================================================
--- trunk/src/gtk-sat-data.h	2009-08-03 18:39:16 UTC (rev 340)
+++ trunk/src/gtk-sat-data.h	2009-08-03 19:17:28 UTC (rev 341)
@@ -30,27 +30,9 @@
 
 #include <glib.h>
 #include "sgpsdp/sgp4sdp4.h"
+#include "qth-data.h"
 
 
-
-/** \brief QTH data structure in human readable form. */
-typedef struct {
-	gchar    *name;   /*!< Name, eg. callsign. */
-	gchar    *loc;    /*!< Location, eg City, Country. */
-	gchar    *desc;   /*!< Short description. */
-	gdouble   lat;    /*!< Latitude in dec. deg. North. */
-	gdouble   lon;    /*!< Longitude in dec. deg. East. */
-	gint      alt;    /*!< Altitude above sea level in meters. */
-	gchar    *qra;    /*!< QRA locator */
-	gchar    *wx;     /*!< Weather station code (4 chars). */
-
-	GKeyFile *data;   /*!< Raw data from cfg file. */
-} qth_t;
-
-
-gint gtk_sat_data_read_qth (const gchar *filename, qth_t *qth);
-gint gtk_sat_data_save_qth (const gchar *filename, qth_t *qth);
-void gtk_sat_data_free_qth (qth_t *qth);
 gint gtk_sat_data_read_sat (gint catnum, sat_t *sat);
 void gtk_sat_data_init_sat (sat_t *sat, qth_t *qth);
 void gtk_sat_data_copy_sat (const sat_t *source, sat_t *dest, qth_t *qth);

Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c	2009-08-03 18:39:16 UTC (rev 340)
+++ trunk/src/gtk-sat-module.c	2009-08-03 19:17:28 UTC (rev 341)
@@ -222,7 +222,7 @@
 
     /* clean up QTH */
     if (module->qth) {
-        gtk_sat_data_free_qth (module->qth);
+        qth_data_free (module->qth);
         module->qth = NULL;
     }
 
@@ -580,7 +580,7 @@
                            ".gpredict2",  G_DIR_SEPARATOR_S,
                            buffer, NULL);
     /* load QTH data */
-    if (!gtk_sat_data_read_qth (qthfile, module->qth)) {
+    if (!qth_data_read (qthfile, module->qth)) {
 
         /* QTH file was not found for some reason */
         g_free (buffer);
@@ -601,7 +601,7 @@
                                ".gpredict2",  G_DIR_SEPARATOR_S,
                                buffer, NULL);
 
-        if (!gtk_sat_data_read_qth (qthfile, module->qth)) {
+        if (!qth_data_read (qthfile, module->qth)) {
 
             sat_log_log (SAT_LOG_LEVEL_ERROR,
                          _("%s: Can not load default QTH file %s; using built-in defaults"),

Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h	2009-08-03 18:39:16 UTC (rev 340)
+++ trunk/src/gtk-sat-module.h	2009-08-03 19:17:28 UTC (rev 341)
@@ -32,6 +32,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkvbox.h>
 #include "gtk-sat-data.h"
+#include "qth-data.h"
 
 
 #ifdef __cplusplus

Modified: trunk/src/qth-editor.c
===================================================================
--- trunk/src/qth-editor.c	2009-08-03 18:39:16 UTC (rev 340)
+++ trunk/src/qth-editor.c	2009-08-03 19:17:28 UTC (rev 341)
@@ -533,7 +533,7 @@
 						 ".qth",
 						 NULL);
 
-	retcode = gtk_sat_data_save_qth (fname, qth);
+    retcode = qth_data_save (fname, qth);
 	g_free (fname);
 
 	return retcode;

Modified: trunk/src/qth-editor.h
===================================================================
--- trunk/src/qth-editor.h	2009-08-03 18:39:16 UTC (rev 340)
+++ trunk/src/qth-editor.h	2009-08-03 19:17:28 UTC (rev 341)
@@ -30,6 +30,7 @@
 
 #include <gtk/gtk.h>
 #include "gtk-sat-data.h"
+#include "qth-data.h"
 
 GtkResponseType qth_editor_run (qth_t *qth, GtkWindow *parent);
 

Modified: trunk/src/sat-pref-qth.c
===================================================================
--- trunk/src/sat-pref-qth.c	2009-08-03 18:39:16 UTC (rev 340)
+++ trunk/src/sat-pref-qth.c	2009-08-03 19:17:28 UTC (rev 341)
@@ -34,7 +34,7 @@
 #include "gpredict-utils.h"
 #include "sat-cfg.h"
 #include "sat-log.h"
-#include "gtk-sat-data.h"
+#include "qth-data.h"
 #include "sat-pref-qth.h"
 #include "sat-pref-qth-data.h"
 #include "sat-pref-qth-editor.h"
@@ -380,7 +380,7 @@
 	}
 
 	/* read data from file */
-	if (!gtk_sat_data_read_qth (filename, qth)) {
+    if (!qth_data_read (filename, qth)) {
 		g_free (qth);
 		return FALSE;
 	}
@@ -454,7 +454,7 @@
 	g_free (fname);
 
 	/* we are finished with this qth, free it */
-	gtk_sat_data_free_qth (qth);
+    qth_data_free (qth);
 
 	return TRUE;
 }
@@ -856,7 +856,7 @@
 		qth.alt = (guint) FT_TO_M(qth.alt);
 	}	
 	
-	if (gtk_sat_data_save_qth (filename, &qth)) {
+    if (qth_data_save (filename, &qth)) {
 		
 		/* saved ok, go on check whether qth is default */
 		if (def) {


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




2008	Jan (24)	Feb	Mar (6)	Apr (14)	May (9)	Jun	Jul	Aug (25)	Sep (60)	Oct (26)	Nov	Dec (20)
2009	Jan	Feb (2)	Mar (22)	Apr (61)	May (57)	Jun	Jul (3)	Aug (83)	Sep (35)	Oct (50)	Nov (28)	Dec (34)
2010	Jan (29)	Feb (15)	Mar (2)	Apr	May (6)	Jun (2)	Jul (24)	Aug (2)	Sep (9)	Oct (43)	Nov (22)	Dec (6)
2011	Jan (24)	Feb (22)	Mar (31)	Apr (13)	May (10)	Jun (10)	Jul (43)	Aug (12)	Sep (18)	Oct (33)	Nov (18)	Dec (4)

gpredict-svn Mailing List for Gpredict (Page 26)

Real time satellite tracking and orbit prediction

gpredict-svn — Subversion commit archive for Gpredict.