gpredict-svn Mailing List for Gpredict (Page 23)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn — Subversion commit archive for Gpredict.
You can subscribe to this list here.
| 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) |
|
From: <cs...@us...> - 2009-08-14 10:27:44
|
Revision: 416
http://gpredict.svn.sourceforge.net/gpredict/?rev=416&view=rev
Author: csete
Date: 2009-08-14 10:27:35 +0000 (Fri, 14 Aug 2009)
Log Message:
-----------
Fixed indent.
Modified Paths:
--------------
trunk/src/gtk-sat-module.h
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2009-08-14 10:21:55 UTC (rev 415)
+++ trunk/src/gtk-sat-module.h 2009-08-14 10:27:35 UTC (rev 416)
@@ -11,17 +11,17 @@
More details can be found at the project home page:
http://gpredict.oz9aec.net/
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, visit http://www.fsf.org/
*/
@@ -42,40 +42,40 @@
/** \brief The state of a module */
typedef enum {
- GTK_SAT_MOD_STATE_DOCKED = 0, /*!< The module is docked into the notebook. */
- GTK_SAT_MOD_STATE_WINDOW, /*!< The module is in it's own window. */
- GTK_SAT_MOD_STATE_FULLSCREEN /*!< The module is in FULLSCREEN mode :-) */
+ GTK_SAT_MOD_STATE_DOCKED = 0, /*!< The module is docked into the notebook. */
+ GTK_SAT_MOD_STATE_WINDOW, /*!< The module is in it's own window. */
+ GTK_SAT_MOD_STATE_FULLSCREEN /*!< The module is in FULLSCREEN mode :-) */
} gtk_sat_mod_state_t;
/** \brief Module layout */
typedef enum {
- GTK_SAT_MOD_LAYOUT_1 = 0, /*!< one view */
- GTK_SAT_MOD_LAYOUT_2, /*!< Two views, one above the other */
- GTK_SAT_MOD_LAYOUT_3, /*!< Three views, big one on top, two small one at bottom */
- GTK_SAT_MOD_LAYOUT_4 /*!< Three views, big one on bottom, small ones on top */
+ GTK_SAT_MOD_LAYOUT_1 = 0, /*!< one view */
+ GTK_SAT_MOD_LAYOUT_2, /*!< Two views, one above the other */
+ GTK_SAT_MOD_LAYOUT_3, /*!< Three views, big one on top, two small one at bottom */
+ GTK_SAT_MOD_LAYOUT_4 /*!< Three views, big one on bottom, small ones on top */
} gtk_sat_mod_layout_t;
/** \brief View types */
typedef enum {
- GTK_SAT_MOD_VIEW_LIST = 0, /*!< GtkSatList */
- GTK_SAT_MOD_VIEW_MAP, /*!< GtkSatMap */
- GTK_SAT_MOD_VIEW_POLAR, /*!< GtkPolarView */
- GTK_SAT_MOD_VIEW_SINGLE, /*!< GtkSingleSat */
- GTK_SAT_MOD_VIEW_MET, /*!< GtkMet */
+ GTK_SAT_MOD_VIEW_LIST = 0, /*!< GtkSatList */
+ GTK_SAT_MOD_VIEW_MAP, /*!< GtkSatMap */
+ GTK_SAT_MOD_VIEW_POLAR, /*!< GtkPolarView */
+ GTK_SAT_MOD_VIEW_SINGLE, /*!< GtkSingleSat */
+ GTK_SAT_MOD_VIEW_MET, /*!< GtkMet */
} gtk_sat_mod_view_t;
#define GTK_TYPE_SAT_MODULE (gtk_sat_module_get_type ())
#define GTK_SAT_MODULE(obj) GTK_CHECK_CAST (obj,\
- gtk_sat_module_get_type (), \
- GtkSatModule)
+ gtk_sat_module_get_type (), \
+ GtkSatModule)
#define GTK_SAT_MODULE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
- gtk_sat_module_get_type (),\
- GtkSatModuleClass)
+gtk_sat_module_get_type (),\
+GtkSatModuleClass)
#define IS_GTK_SAT_MODULE(obj) GTK_CHECK_TYPE (obj, gtk_sat_module_get_type ())
@@ -85,86 +85,86 @@
struct _gtk_sat_module
{
- GtkVBox vbox;
+ GtkVBox vbox;
- gchar *name; /*!< The module name */
+ gchar *name; /*!< The module name */
- GtkWidget *popup_button; /*!< popup menu button. */
- GtkWidget *close_button; /*!< The close button */
+ GtkWidget *popup_button; /*!< popup menu button. */
+ GtkWidget *close_button; /*!< The close button */
- GtkWidget *win; /*!< Window when module is not docked */
+ GtkWidget *win; /*!< Window when module is not docked */
GtkWidget *rotctrlwin; /*!< Rotator controller window */
GtkWidget *rotctrl;
GtkWidget *rigctrlwin; /*!< Radio controller window */
GtkWidget *rigctrl;
- GtkWidget *header;
- guint head_count;
- guint head_timeout;
- guint event_count;
- guint event_timeout;
+ GtkWidget *header;
+ guint head_count;
+ guint head_timeout;
+ guint event_count;
+ guint event_timeout;
- /* layout */
- GtkWidget *vpaned; /*!< Vertical space divider */
- GtkWidget *hpaned; /*!< Horizontal space divider */
+ /* layout */
+ GtkWidget *vpaned; /*!< Vertical space divider */
+ GtkWidget *hpaned; /*!< Horizontal space divider */
- /* these are needed when docking */
- gint vpanedpos; /*!< Stored position of vpaned */
- gint hpanedpos; /*!< Stored pos of hpaned */
+ /* these are needed when docking */
+ gint vpanedpos; /*!< Stored position of vpaned */
+ gint hpanedpos; /*!< Stored pos of hpaned */
- /* children */
- GtkWidget *child_1;
- GtkWidget *child_2;
- GtkWidget *child_3;
+ /* children */
+ GtkWidget *child_1;
+ GtkWidget *child_2;
+ GtkWidget *child_3;
- GKeyFile *cfgdata; /*!< Configuration data. */
- qth_t *qth; /*!< QTH information. */
-
- GHashTable *satellites; /*!< Satellites. */
+ GKeyFile *cfgdata; /*!< Configuration data. */
+ qth_t *qth; /*!< QTH information. */
- guint32 timeout; /*!< Timeout value [msec] */
+ GHashTable *satellites; /*!< Satellites. */
- gtk_sat_mod_state_t state; /*!< The state of the module. */
- gtk_sat_mod_layout_t layout; /*!< module layout */
- gtk_sat_mod_view_t view_1;
- gtk_sat_mod_view_t view_2;
- gtk_sat_mod_view_t view_3;
+ guint32 timeout; /*!< Timeout value [msec] */
- guint timerid; /*!< The timeout ID (FIXME: REMOVE) */
- gboolean busy; /*!< Flag indicating whether timeout has
- finished or not. Also used for blocking
- the module during TLE update.
- */
+ gtk_sat_mod_state_t state; /*!< The state of the module. */
+ gtk_sat_mod_layout_t layout; /*!< module layout */
+ gtk_sat_mod_view_t view_1;
+ gtk_sat_mod_view_t view_2;
+ gtk_sat_mod_view_t view_3;
- /* time keeping */
- gdouble rtNow; /*!< Real-time in this cycle */
- gdouble rtPrev; /*!< Real-time in previous cycle */
+ guint timerid; /*!< The timeout ID (FIXME: REMOVE) */
+ gboolean busy; /*!< Flag indicating whether timeout has
+ finished or not. Also used for blocking
+ the module during TLE update.
+ */
- gint throttle; /*!< Time throttle. */
- gdouble tmgPdnum; /*!< Daynum at previous update. */
- gdouble tmgCdnum; /*!< Daynum at current update. */
- gboolean tmgActive; /*!< Flag indicating whether time mgr is active */
- GtkWidget *tmgFactor; /*!< Spin button for throttle value selection 2..10 */
- GtkWidget *tmgCal; /*!< Calendar widget for selecting date */
- GtkWidget *tmgHour; /*!< Spin button for setting the hour */
- GtkWidget *tmgMin; /*!< Spin button for setting the minutes */
- GtkWidget *tmgSec; /*!< Spin button for setting the seconds */
- GtkWidget *tmgMsec; /*!< Spin button for setting the milliseconds */
- GtkWidget *tmgSlider; /*!< Slider for manual time "dragging" */
- GtkWidget *tmgStop; /*!< Stop button; throttle = 0 */
- GtkWidget *tmgFwd; /*!< Forward */
- GtkWidget *tmgBwd; /*!< Backward */
- GtkWidget *tmgReset; /*!< Reset button */
- GtkWidget *tmgWin; /*!< Window containing the widgets. */
- GtkWidget *tmgState; /*!< Status label indicating RT/SRT/MAN */
+ /* time keeping */
+ gdouble rtNow; /*!< Real-time in this cycle */
+ gdouble rtPrev; /*!< Real-time in previous cycle */
- gboolean reset; /*!< Flag indicating whether time reset is in progress */
+ gint throttle; /*!< Time throttle. */
+ gdouble tmgPdnum; /*!< Daynum at previous update. */
+ gdouble tmgCdnum; /*!< Daynum at current update. */
+ gboolean tmgActive; /*!< Flag indicating whether time mgr is active */
+ GtkWidget *tmgFactor; /*!< Spin button for throttle value selection 2..10 */
+ GtkWidget *tmgCal; /*!< Calendar widget for selecting date */
+ GtkWidget *tmgHour; /*!< Spin button for setting the hour */
+ GtkWidget *tmgMin; /*!< Spin button for setting the minutes */
+ GtkWidget *tmgSec; /*!< Spin button for setting the seconds */
+ GtkWidget *tmgMsec; /*!< Spin button for setting the milliseconds */
+ GtkWidget *tmgSlider; /*!< Slider for manual time "dragging" */
+ GtkWidget *tmgStop; /*!< Stop button; throttle = 0 */
+ GtkWidget *tmgFwd; /*!< Forward */
+ GtkWidget *tmgBwd; /*!< Backward */
+ GtkWidget *tmgReset; /*!< Reset button */
+ GtkWidget *tmgWin; /*!< Window containing the widgets. */
+ GtkWidget *tmgState; /*!< Status label indicating RT/SRT/MAN */
+
+ gboolean reset; /*!< Flag indicating whether time reset is in progress */
};
struct _GtkSatModuleClass
{
- GtkVBoxClass parent_class;
+ GtkVBoxClass parent_class;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-14 10:22:07
|
Revision: 415
http://gpredict.svn.sourceforge.net/gpredict/?rev=415&view=rev
Author: csete
Date: 2009-08-14 10:21:55 +0000 (Fri, 14 Aug 2009)
Log Message:
-----------
Implemented wrap around for the days as well.
Modified Paths:
--------------
trunk/src/gtk-sat-module-tmg.c
Modified: trunk/src/gtk-sat-module-tmg.c
===================================================================
--- trunk/src/gtk-sat-module-tmg.c 2009-08-12 17:04:03 UTC (rev 414)
+++ trunk/src/gtk-sat-module-tmg.c 2009-08-14 10:21:55 UTC (rev 415)
@@ -746,22 +746,109 @@
static void tmg_cal_add_one_day (GtkSatModule *mod)
{
guint year, month, day;
+ gint hr, min, sec, msec;
+ struct tm tim,utim;
+ gdouble jd;
+
+ /* calculate the new time as in tmg_time_set */
gtk_calendar_get_date (GTK_CALENDAR (mod->tmgCal), &year, &month, &day);
+ hr = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgHour));
+ min = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgMin));
+ sec = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgSec));
+ msec = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgMsec));
- /* calculate the new time as in tmg_time_set then call tmg_update_widgets */
+ /* build struct_tm */
+ tim.tm_year = (int) (year);
+ tim.tm_mon = (int) (month+1);
+ tim.tm_mday = (int) day;
+ tim.tm_hour = (int) hr;
+ tim.tm_min = (int) min;
+ tim.tm_sec = (int) sec;
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: %d/%d/%d %d:%d:%d.%d"),
+ __FUNCTION__,
+ tim.tm_year, tim.tm_mon, tim.tm_mday,
+ tim.tm_hour, tim.tm_min, tim.tm_sec, msec);
+
+ /* convert UTC time to Julian Date */
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) {
+ /* convert local time to UTC */
+ utim = Time_to_UTC (&tim);
+
+ /* Convert to JD */
+ jd = Julian_Date (&utim);
+ }
+ else {
+ /* Already UTC, just convert to JD */
+ jd = Julian_Date (&tim);
+ }
+
+ jd = jd + (gdouble)msec/8.64e+7;
+
+ /* add one day */
+ jd += 1;
+
+ mod->tmgCdnum = jd;
+
+ /* now call tmg_update_widgets */
+ tmg_update_widgets (mod);
}
+
/** \brief Substract one day from the calendar */
static void tmg_cal_sub_one_day (GtkSatModule *mod)
{
guint year, month, day;
+ gint hr, min, sec, msec;
+ struct tm tim,utim;
+ gdouble jd;
+
+ /* calculate the new time as in tmg_time_set */
gtk_calendar_get_date (GTK_CALENDAR (mod->tmgCal), &year, &month, &day);
+ hr = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgHour));
+ min = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgMin));
+ sec = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgSec));
+ msec = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgMsec));
- /* calculate the new time as in tmg_time_set then call tmg_update_widgets */
+ /* build struct_tm */
+ tim.tm_year = (int) (year);
+ tim.tm_mon = (int) (month+1);
+ tim.tm_mday = (int) day;
+ tim.tm_hour = (int) hr;
+ tim.tm_min = (int) min;
+ tim.tm_sec = (int) sec;
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: %d/%d/%d %d:%d:%d.%d"),
+ __FUNCTION__,
+ tim.tm_year, tim.tm_mon, tim.tm_mday,
+ tim.tm_hour, tim.tm_min, tim.tm_sec, msec);
+
+ /* convert UTC time to Julian Date */
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) {
+ /* convert local time to UTC */
+ utim = Time_to_UTC (&tim);
+
+ /* Convert to JD */
+ jd = Julian_Date (&utim);
+ }
+ else {
+ /* Already UTC, just convert to JD */
+ jd = Julian_Date (&tim);
+ }
+
+ jd = jd + (gdouble)msec/8.64e+7;
+
+ /* substract one day */
+ jd -= 1;
+
+ mod->tmgCdnum = jd;
+
+ /* now call tmg_update_widgets */
+ tmg_update_widgets (mod);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-12 17:04:13
|
Revision: 414
http://gpredict.svn.sourceforge.net/gpredict/?rev=414&view=rev
Author: csete
Date: 2009-08-12 17:04:03 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-08-12 17:03:37 UTC (rev 413)
+++ trunk/ChangeLog 2009-08-12 17:04:03 UTC (rev 414)
@@ -1,3 +1,9 @@
+2009-08-12 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/gtk-sat-module-tmg.c:
+ Fixed bug 2836265: Time controls should wrap around their limits.
+
+
2009-08-09 Alexandru Csete <oz9aec at gmail.com>
* src/compat.[ch]:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-08-12 17:03:37 UTC (rev 413)
+++ trunk/NEWS 2009-08-12 17:04:03 UTC (rev 414)
@@ -1,7 +1,15 @@
Changes in version 1.1 (TBD)
+- New satellite selector in the module config dialog that makes it easier
+ to locate and select satellites.
+- User configuration on Unix is now stored in $HOME/.config/Gpredict/
+ The old configuration is imported automatically and one can still use
+ Gpredict 1.0 with the old configuration stored in $HOME/.gpredict2/
+- Distribution now includes all satellites from CelesTrak.
+* Added new Satellite Editor that allows adding/editing/deleting satellite
+ data in a convenient UI, includ
- Fixed bug 2116693: List view does not sort properly for all time formats.
-
+* Fixed bug 2836265: Time controls should wrap around their limits.
* Binary packages for Windows, Mac OS X, Ubuntu and generic Linux.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-12 17:03:47
|
Revision: 413
http://gpredict.svn.sourceforge.net/gpredict/?rev=413&view=rev
Author: csete
Date: 2009-08-12 17:03:37 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
Worked on bug 2836265: Time controls should wrap around their limits. Day, month and year still TBD.
Modified Paths:
--------------
trunk/src/gtk-sat-module-tmg.c
Modified: trunk/src/gtk-sat-module-tmg.c
===================================================================
--- trunk/src/gtk-sat-module-tmg.c 2009-08-09 23:20:21 UTC (rev 412)
+++ trunk/src/gtk-sat-module-tmg.c 2009-08-12 17:03:37 UTC (rev 413)
@@ -11,7 +11,7 @@
More details can be found at the project home page:
http://gpredict.oz9aec.net/
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -46,43 +46,47 @@
static void tmg_reset (GtkWidget *widget, gpointer data);
static void tmg_throttle (GtkWidget *widget, gpointer data);
static void tmg_time_set (GtkWidget *widget, gpointer data);
+static void tmg_hour_wrap (GtkWidget *widget, gpointer data);
+static void tmg_min_wrap (GtkWidget *widget, gpointer data);
+static void tmg_sec_wrap (GtkWidget *widget, gpointer data);
+static void tmg_msec_wrap (GtkWidget *widget, gpointer data);
+static void tmg_cal_add_one_day (GtkSatModule *mod);
+static void tmg_cal_sub_one_day (GtkSatModule *mod);
-
/** \brief Create and initialise time controller widgets.
* \param module The parent GtkSatModule
*
*/
-void
-tmg_create (GtkSatModule *mod)
+void tmg_create (GtkSatModule *mod)
{
GtkWidget *vbox, *hbox, *table;
GtkWidget *image;
- GtkWidget *label;
+ GtkWidget *label;
GtkTooltips *tips;
gchar *title;
- gchar *buff;
+ gchar *buff;
/* make sure controller is not already active */
if (mod->tmgActive) {
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Time Controller for %s is already active"),
- __FUNCTION__, mod->name);
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Time Controller for %s is already active"),
+ __FUNCTION__, mod->name);
- /* try to make window visible in case it is covered
- by something else */
- gtk_window_present (GTK_WINDOW (mod->tmgWin));
+ /* try to make window visible in case it is covered
+ by something else */
+ gtk_window_present (GTK_WINDOW (mod->tmgWin));
return;
- }
+ }
/* create hbox containing the controls
the controls are implemented as radiobuttons in order
to inherit the mutual exclusion behaviour
*/
hbox = gtk_hbox_new (FALSE, 0);
-
+
/* FWD */
mod->tmgFwd = gtk_radio_button_new (NULL);
@@ -109,143 +113,157 @@
mod->tmgBwd = gtk_radio_button_new_from_widget (GTK_RADIO_BUTTON (mod->tmgFwd));
gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (mod->tmgBwd), FALSE);
image = gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_BUTTON);
- gtk_widget_set_direction (image, GTK_TEXT_DIR_RTL);
+ gtk_widget_set_direction (image, GTK_TEXT_DIR_RTL);
gtk_container_add (GTK_CONTAINER (mod->tmgBwd), image);
tips = gtk_tooltips_new ();
gtk_tooltips_set_tip (tips, mod->tmgBwd, _("Play backwards"), NULL);
g_signal_connect (mod->tmgBwd, "toggled", G_CALLBACK (tmg_bwd), mod);
gtk_box_pack_end (GTK_BOX (hbox), mod->tmgBwd, FALSE, FALSE, 0);
- /* reset time */
- mod->tmgReset = gtk_button_new_with_label (_("Reset"));
+ /* reset time */
+ mod->tmgReset = gtk_button_new_with_label (_("Reset"));
tips = gtk_tooltips_new ();
gtk_tooltips_set_tip (tips, mod->tmgReset, _("Reset to current date and time"), NULL);
g_signal_connect (mod->tmgReset, "clicked", G_CALLBACK (tmg_reset), mod);
gtk_box_pack_end (GTK_BOX (hbox), mod->tmgReset, FALSE, FALSE, 10);
- /* status label */
- mod->tmgState = gtk_label_new (NULL);
- gtk_misc_set_alignment (GTK_MISC (mod->tmgState), 0.0, 0.5);
- gtk_label_set_markup (GTK_LABEL (mod->tmgState), _("<b>Real-Time</b>"));
+ /* status label */
+ mod->tmgState = gtk_label_new (NULL);
+ gtk_misc_set_alignment (GTK_MISC (mod->tmgState), 0.0, 0.5);
+ gtk_label_set_markup (GTK_LABEL (mod->tmgState), _("<b>Real-Time</b>"));
gtk_box_pack_start (GTK_BOX (hbox), mod->tmgState, TRUE, TRUE, 10);
-
+
/* create table containing the date and time widgets */
- table = gtk_table_new (5, 3, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 0);
+ table = gtk_table_new (5, 3, FALSE);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 0);
- mod->tmgCal = gtk_calendar_new ();
- gtk_calendar_set_display_options (GTK_CALENDAR (mod->tmgCal),
- GTK_CALENDAR_SHOW_HEADING |
- GTK_CALENDAR_SHOW_DAY_NAMES |
- GTK_CALENDAR_WEEK_START_MONDAY);
- g_signal_connect (mod->tmgCal, "day-selected",
- G_CALLBACK (tmg_time_set), mod);
- gtk_table_attach (GTK_TABLE (table), mod->tmgCal,
- 0, 1, 0, 5, GTK_SHRINK, GTK_SHRINK,
- 0, 0);
+ mod->tmgCal = gtk_calendar_new ();
+ gtk_calendar_set_display_options (GTK_CALENDAR (mod->tmgCal),
+ GTK_CALENDAR_SHOW_HEADING |
+ GTK_CALENDAR_SHOW_DAY_NAMES |
+ GTK_CALENDAR_WEEK_START_MONDAY);
+ g_signal_connect (mod->tmgCal, "day-selected",
+ G_CALLBACK (tmg_time_set), mod);
+ gtk_table_attach (GTK_TABLE (table), mod->tmgCal,
+ 0, 1, 0, 5, GTK_SHRINK, GTK_SHRINK,
+ 0, 0);
- /* hour */
- label = gtk_label_new (_(" Hour:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label,
- 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 5, 0);
- mod->tmgHour = gtk_spin_button_new_with_range (0, 23, 1);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgHour), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgHour),
- GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgHour), 0);
- //FIXME gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgHour), 2);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, mod->tmgHour,
- _("Use this control to set the hour"),
- NULL);
- g_signal_connect (mod->tmgHour, "value-changed",
- G_CALLBACK (tmg_time_set), mod);
- gtk_table_attach (GTK_TABLE (table), mod->tmgHour,
- 2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ /* Time controllers.
+ Note that the controllers for hours, minutes, and seconds have ranges;
+ however, they can wrap around their limits in order to ensure a smooth
+ and continuous control of the time
+ */
- /* minutes */
- label = gtk_label_new (_(" Min:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label,
- 1, 2, 1, 2, GTK_SHRINK, GTK_SHRINK, 5, 0);
- mod->tmgMin = gtk_spin_button_new_with_range (0, 59, 1);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgMin), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgMin),
- GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgMin), 0);
- //FIXME gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMin), 2);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, mod->tmgMin,
- _("Use this control to set the minutes"),
- NULL);
- g_signal_connect (mod->tmgMin, "value-changed",
- G_CALLBACK (tmg_time_set), mod);
- gtk_table_attach (GTK_TABLE (table), mod->tmgMin,
- 2, 3, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ /* hour */
+ label = gtk_label_new (_(" Hour:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach (GTK_TABLE (table), label,
+ 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 5, 0);
+ mod->tmgHour = gtk_spin_button_new_with_range (0, 23, 1);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgHour), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgHour),
+ GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgHour), 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (mod->tmgHour), TRUE);
+ //FIXME gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgHour), 2);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, mod->tmgHour,
+ _("Use this control to set the hour"),
+ NULL);
+ g_signal_connect (mod->tmgHour, "value-changed",
+ G_CALLBACK (tmg_time_set), mod);
+ g_signal_connect (mod->tmgHour, "wrapped", G_CALLBACK (tmg_hour_wrap), mod);
+ gtk_table_attach (GTK_TABLE (table), mod->tmgHour,
+ 2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
- /* seconds */
- label = gtk_label_new (_(" Sec:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label,
- 1, 2, 2, 3, GTK_SHRINK, GTK_SHRINK, 5, 0);
- mod->tmgSec = gtk_spin_button_new_with_range (0, 59, 1);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgSec), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgSec),
- GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgSec), 0);
- //FIXME gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgSec), 2);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, mod->tmgSec,
- _("Use this control to set the seconds"),
- NULL);
- g_signal_connect (mod->tmgSec, "value-changed",
- G_CALLBACK (tmg_time_set), mod);
- gtk_table_attach (GTK_TABLE (table), mod->tmgSec,
- 2, 3, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ /* minutes */
+ label = gtk_label_new (_(" Min:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach (GTK_TABLE (table), label,
+ 1, 2, 1, 2, GTK_SHRINK, GTK_SHRINK, 5, 0);
+ mod->tmgMin = gtk_spin_button_new_with_range (0, 59, 1);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgMin), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgMin),
+ GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgMin), 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (mod->tmgMin), TRUE);
+ //FIXME gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMin), 2);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, mod->tmgMin,
+ _("Use this control to set the minutes"),
+ NULL);
+ g_signal_connect (mod->tmgMin, "value-changed",
+ G_CALLBACK (tmg_time_set), mod);
+ g_signal_connect (mod->tmgMin, "wrapped", G_CALLBACK (tmg_min_wrap), mod);
+ gtk_table_attach (GTK_TABLE (table), mod->tmgMin,
+ 2, 3, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
- /* milliseconds */
- label = gtk_label_new (_(" Msec:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label,
- 1, 2, 3, 4, GTK_SHRINK, GTK_SHRINK, 5, 0);
- mod->tmgMsec = gtk_spin_button_new_with_range (0, 999, 1);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgMsec), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgMsec),
- GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgMsec), 0);
- //FIXME gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMsec), 2);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, mod->tmgMsec,
- _("Use this control to set the milliseconds"),
- NULL);
- g_signal_connect (mod->tmgMsec, "value-changed",
- G_CALLBACK (tmg_time_set), mod);
- gtk_table_attach (GTK_TABLE (table), mod->tmgMsec,
- 2, 3, 3, 4, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ /* seconds */
+ label = gtk_label_new (_(" Sec:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach (GTK_TABLE (table), label,
+ 1, 2, 2, 3, GTK_SHRINK, GTK_SHRINK, 5, 0);
+ mod->tmgSec = gtk_spin_button_new_with_range (0, 59, 1);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgSec), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgSec),
+ GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgSec), 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (mod->tmgSec), TRUE);
+ //FIXME gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgSec), 2);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, mod->tmgSec,
+ _("Use this control to set the seconds"),
+ NULL);
+ g_signal_connect (mod->tmgSec, "value-changed",
+ G_CALLBACK (tmg_time_set), mod);
+ g_signal_connect (mod->tmgSec, "wrapped", G_CALLBACK (tmg_sec_wrap), mod);
+ gtk_table_attach (GTK_TABLE (table), mod->tmgSec,
+ 2, 3, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
- /* time throttle */
- label = gtk_label_new (_("Throttle:"));
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label,
- 1, 2, 4, 5, GTK_SHRINK, GTK_SHRINK, 5, 0);
- mod->tmgFactor = gtk_spin_button_new_with_range (1, 100, 1);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgFactor), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgFactor),
- GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgFactor), 0);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgFactor), 1);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, mod->tmgFactor,
- _("Time throttle / compression factor"),
- NULL);
- g_signal_connect (mod->tmgFactor, "value-changed",
- G_CALLBACK (tmg_throttle), mod);
- gtk_table_attach (GTK_TABLE (table), mod->tmgFactor,
- 2, 3, 4, 5, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ /* milliseconds */
+ label = gtk_label_new (_(" Msec:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach (GTK_TABLE (table), label,
+ 1, 2, 3, 4, GTK_SHRINK, GTK_SHRINK, 5, 0);
+ mod->tmgMsec = gtk_spin_button_new_with_range (0, 999, 1);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgMsec), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgMsec),
+ GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgMsec), 0);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (mod->tmgMsec), TRUE);
+ //FIXME gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMsec), 2);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, mod->tmgMsec,
+ _("Use this control to set the milliseconds"),
+ NULL);
+ g_signal_connect (mod->tmgMsec, "value-changed",
+ G_CALLBACK (tmg_time_set), mod);
+ g_signal_connect (mod->tmgMsec, "wrapped", G_CALLBACK (tmg_msec_wrap), mod);
+ gtk_table_attach (GTK_TABLE (table), mod->tmgMsec,
+ 2, 3, 3, 4, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ /* time throttle */
+ label = gtk_label_new (_("Throttle:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach (GTK_TABLE (table), label,
+ 1, 2, 4, 5, GTK_SHRINK, GTK_SHRINK, 5, 0);
+ mod->tmgFactor = gtk_spin_button_new_with_range (1, 100, 1);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mod->tmgFactor), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (mod->tmgFactor),
+ GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (mod->tmgFactor), 0);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgFactor), 1);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, mod->tmgFactor,
+ _("Time throttle / compression factor"),
+ NULL);
+ g_signal_connect (mod->tmgFactor, "value-changed",
+ G_CALLBACK (tmg_throttle), mod);
+ gtk_table_attach (GTK_TABLE (table), mod->tmgFactor,
+ 2, 3, 4, 5, GTK_SHRINK, GTK_SHRINK, 0, 0);
+
/* create the vertical box */
vbox = gtk_vbox_new (FALSE, 0);
@@ -255,7 +273,7 @@
/* add slider */
-
+
/* create main window */
mod->tmgWin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
title = g_strconcat (_("Time Controller"), " / ", mod->name, NULL);
@@ -269,18 +287,18 @@
G_CALLBACK (tmg_destroy), mod);
/* window icon */
- buff = icon_file_name ("gpredict-clock.png");
- gtk_window_set_icon_from_file (GTK_WINDOW (mod->tmgWin), buff, NULL);
- g_free (buff);
+ buff = icon_file_name ("gpredict-clock.png");
+ gtk_window_set_icon_from_file (GTK_WINDOW (mod->tmgWin), buff, NULL);
+ g_free (buff);
gtk_container_add (GTK_CONTAINER (mod->tmgWin), vbox);
gtk_widget_show_all (mod->tmgWin);
-
+
mod->tmgActive = TRUE;
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Time Controller for %s launched"),
- __FUNCTION__, mod->name);
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Time Controller for %s launched"),
+ __FUNCTION__, mod->name);
}
@@ -288,16 +306,14 @@
/** \brief Manage tmg window delete events
* \return FALSE to indicate that window should be destroyed.
*/
-static gint
-tmg_delete (GtkWidget *tmg, GdkEvent *event, gpointer data)
+static gint tmg_delete (GtkWidget *tmg, GdkEvent *event, gpointer data)
{
return FALSE;
}
-static void
-tmg_destroy (GtkWidget *tmg, gpointer data)
+static void tmg_destroy (GtkWidget *tmg, gpointer data)
{
GtkSatModule *mod = GTK_SAT_MODULE (data);
@@ -306,12 +322,12 @@
mod->throttle = 1;
mod->tmgActive = FALSE;
- /* reset time */
- tmg_reset (NULL, data);
+ /* reset time */
+ tmg_reset (NULL, data);
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Time Controller for %s closed. Time reset."),
- __FUNCTION__, mod->name);
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Time Controller for %s closed. Time reset."),
+ __FUNCTION__, mod->name);
}
@@ -324,8 +340,7 @@
* If the button state is active (pressed in) the function sets the
* throttle parameter of the module to 0.
*/
-static void
-tmg_stop (GtkWidget *widget, gpointer data)
+static void tmg_stop (GtkWidget *widget, gpointer data)
{
GtkSatModule *mod = GTK_SAT_MODULE (data);
@@ -350,8 +365,7 @@
* If the button state is active (pressed in) the function sets the
* throttle parameter of the module to 1.
*/
-static void
-tmg_fwd (GtkWidget *widget, gpointer data)
+static void tmg_fwd (GtkWidget *widget, gpointer data)
{
GtkSatModule *mod = GTK_SAT_MODULE (data);
@@ -375,8 +389,7 @@
* If the button state is active (pressed in) the function sets the
* throttle parameter of the module to -1.
*/
-static void
-tmg_bwd (GtkWidget *widget, gpointer data)
+static void tmg_bwd (GtkWidget *widget, gpointer data)
{
GtkSatModule *mod = GTK_SAT_MODULE (data);
@@ -402,41 +415,39 @@
* mod->tmgCdnum = mod->rtNow;
*
*/
-static void
-tmg_reset (GtkWidget *widget, gpointer data)
+static void tmg_reset (GtkWidget *widget, gpointer data)
{
GtkSatModule *mod = GTK_SAT_MODULE (data);
- /* set reset flag in order to block
- widget signals */
- mod->reset = TRUE;
+ /* set reset flag in order to block
+ widget signals */
+ mod->reset = TRUE;
- mod->tmgPdnum = mod->rtPrev;
- mod->tmgCdnum = mod->rtNow;
+ mod->tmgPdnum = mod->rtPrev;
+ mod->tmgCdnum = mod->rtNow;
- /* update widgets; widget signals will have no effect
- since the tmgReset flag is TRUE */
- tmg_update_widgets (mod);
+ /* update widgets; widget signals will have no effect
+ since the tmgReset flag is TRUE */
+ tmg_update_widgets (mod);
- /* clear reset flag */
- mod->reset = FALSE;
+ /* clear reset flag */
+ mod->reset = FALSE;
}
-static void
-tmg_throttle (GtkWidget *widget, gpointer data)
+static void tmg_throttle (GtkWidget *widget, gpointer data)
{
GtkSatModule *mod = GTK_SAT_MODULE (data);
- /* FFWD mode */
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mod->tmgFwd))) {
- mod->throttle = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
- }
- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mod->tmgBwd))) {
- mod->throttle = -gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
- }
+ /* FFWD mode */
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mod->tmgFwd))) {
+ mod->throttle = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
+ }
+ else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (mod->tmgBwd))) {
+ mod->throttle = -gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
+ }
}
@@ -447,11 +458,10 @@
* This function is called when the user changes the date or time in the time
* controller. If we are in manual time control mode, the function reads the
* date and time set in the control widget and calculates the new time for
- * the module. The function does nothing in real time and suimulated real
+ * the module. The function does nothing in real time and simulated real
* time modes.
*/
-static void
-tmg_time_set (GtkWidget *widget, gpointer data)
+static void tmg_time_set (GtkWidget *widget, gpointer data)
{
GtkSatModule *mod = GTK_SAT_MODULE (data);
guint year, month, day;
@@ -459,12 +469,13 @@
struct tm tim,utim;
gdouble jd;
+
/* update time only if we are in manual time control */
if (!mod->throttle && !mod->reset) {
/* get date and time from widgets */
gtk_calendar_get_date (GTK_CALENDAR (mod->tmgCal),
- &year, &month, &day);
+ &year, &month, &day);
hr = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgHour));
min = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (mod->tmgMin));
@@ -480,10 +491,10 @@
tim.tm_sec = (int) sec;
sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: %d/%d/%d %d:%d:%d.%d"),
- __FUNCTION__,
- tim.tm_year, tim.tm_mon, tim.tm_mday,
- tim.tm_hour, tim.tm_min, tim.tm_sec, msec);
+ _("%s: %d/%d/%d %d:%d:%d.%d"),
+ __FUNCTION__,
+ tim.tm_year, tim.tm_mon, tim.tm_mday,
+ tim.tm_hour, tim.tm_min, tim.tm_sec, msec);
/* convert UTC time to Julian Date */
if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) {
@@ -505,47 +516,200 @@
}
+/** \brief Hour controller wrap
+ * \param widget Pointer to the hour controller widget
+ * \param data Pointer to the GtkSatModule structure.
+ *
+ * This function is called when the hour controller wraps around its
+ * limits. The current day is incremented or decremented according to
+ * the wrap direction, then the current time is updated.
+ */
+static void tmg_hour_wrap (GtkWidget *widget, gpointer data)
+{
+ GtkSatModule *mod = GTK_SAT_MODULE (data);
+ gint hour;
+ hour = gtk_spin_button_get_value (GTK_SPIN_BUTTON (mod->tmgHour));
+
+ if (hour == 0) {
+ /* 23 -> 0 wrap: increment date */
+ tmg_cal_add_one_day (mod);
+ }
+ else {
+ /* 0 -> 23 wrap: decrement data */
+ tmg_cal_sub_one_day (mod);
+ }
+
+}
+
+/** \brief Minute controller wrap
+ * \param widget Pointer to the minute controller widget
+ * \param data Pointer to the GtkSatModule structure.
+ *
+ * This function is called when the minute controller wraps around its
+ * limits. The current hour is incremented or decremented according to
+ * the wrap direction, then the current time is updated.
+ */
+static void tmg_min_wrap (GtkWidget *widget, gpointer data)
+{
+ GtkSatModule *mod = GTK_SAT_MODULE (data);
+ gint hr, min;
+
+ hr = gtk_spin_button_get_value (GTK_SPIN_BUTTON (mod->tmgHour));
+ min = gtk_spin_button_get_value (GTK_SPIN_BUTTON (mod->tmgMin));
+
+ if (min == 0) {
+ /* 59 -> 0 wrap: increment hour */
+ if (hr == 23) {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgHour), 0);
+ tmg_hour_wrap (mod->tmgHour, data);
+ }
+ else {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgHour), hr+1);
+ }
+ }
+ else {
+ /* 0 -> 59 wrap: decrement hour */
+ if (hr == 0) {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgHour), 23);
+ tmg_hour_wrap (mod->tmgHour, data);
+ }
+ else {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgHour), hr-1);
+ }
+ }
+
+ /* Note that the time will be updated automatically since the
+ _set_value(hour) will trigger the "value-changed" signal */
+}
+
+
+/** \brief Seconds controller wrap
+ * \param widget Pointer to the seconds controller widget
+ * \param data Pointer to the GtkSatModule structure.
+ *
+ * This function is called when the seconds controller wraps around its
+ * limits. The current minute is incremented or decremented according to
+ * the wrap direction, then the current time is updated.
+ */
+static void tmg_sec_wrap (GtkWidget *widget, gpointer data)
+{
+ GtkSatModule *mod = GTK_SAT_MODULE (data);
+ gint min, sec;
+
+ sec = gtk_spin_button_get_value (GTK_SPIN_BUTTON (mod->tmgSec));
+ min = gtk_spin_button_get_value (GTK_SPIN_BUTTON (mod->tmgMin));
+
+ if (sec == 0) {
+ /* 59 -> 0 wrap: increment minute */
+ if (min == 59) {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMin), 0);
+ tmg_min_wrap (mod->tmgMin, data);
+ }
+ else {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMin), min+1);
+ }
+ }
+ else {
+ /* 0 -> 59 wrap: decrement minute */
+ if (min == 0) {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMin), 59);
+ tmg_min_wrap (mod->tmgMin, data);
+ }
+ else {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMin), min-1);
+ }
+ }
+
+ /* Note that the time will be updated automatically since the
+ _set_value(minute) will trigger the "value-changed" signal */
+}
+
+
+/** \brief Millisecond controller wrap
+ * \param widget Pointer to the millisecond controller widget
+ * \param data Pointer to the GtkSatmodule structure.
+ *
+ * This function is called when the muillisecond controller wraps around its
+ * limits. The current second is incremented or decremented according to
+ * the wrap direction, then the current time is updated.
+ */
+static void tmg_msec_wrap (GtkWidget *widget, gpointer data)
+{
+ GtkSatModule *mod = GTK_SAT_MODULE (data);
+ gint msec, sec;
+
+ sec = gtk_spin_button_get_value (GTK_SPIN_BUTTON (mod->tmgSec));
+ msec = gtk_spin_button_get_value (GTK_SPIN_BUTTON (mod->tmgMsec));
+
+ if (msec == 0) {
+ /* 999 -> 0 wrap: increment seconds */
+ if (sec == 59) {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgSec), 0);
+ tmg_sec_wrap (mod->tmgSec, data);
+ }
+ else {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgSec), sec+1);
+ }
+ }
+ else {
+ /* 0 -> 999 wrap: decrement seconds */
+ if (sec == 0) {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgSec), 59);
+ tmg_sec_wrap (mod->tmgSec, data);
+ }
+ else {
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgSec), sec-1);
+ }
+ }
+
+ /* Note that the time will be updated automatically since the
+ _set_value(sec) will trigger the "value-changed" signal */
+}
+
+
+
+
+
/** \brief Update Time controller widgets
* \param mod Pointer to the GtkSatModule widget
*/
-void
-tmg_update_widgets (GtkSatModule *mod)
+void tmg_update_widgets (GtkSatModule *mod)
{
- struct tm tim;
- time_t t;
+ struct tm tim;
+ time_t t;
- /* update time widgets */
- t = (mod->tmgCdnum - 2440587.5)*86400.;
-
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) {
- tim = *localtime (&t);
- }
- else {
- tim = *gmtime (&t);
- }
-
- /* hour */
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgHour),
- tim.tm_hour);
-
- /* min */
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMin),
- tim.tm_min);
-
- /* sec */
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgSec),
- tim.tm_sec);
-
- /* msec: alway 0 in RT and SRT modes */
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMsec), 0);
+ /* update time widgets */
+ t = (mod->tmgCdnum - 2440587.5)*86400.;
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) {
+ tim = *localtime (&t);
+ }
+ else {
+ tim = *gmtime (&t);
+ }
- /* calendar */
- gtk_calendar_select_month (GTK_CALENDAR (mod->tmgCal),
- tim.tm_mon, tim.tm_year+1900);
- gtk_calendar_select_day (GTK_CALENDAR (mod->tmgCal), tim.tm_mday);
+ /* hour */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgHour),
+ tim.tm_hour);
+ /* min */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMin),
+ tim.tm_min);
+
+ /* sec */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgSec),
+ tim.tm_sec);
+
+ /* msec: alway 0 in RT and SRT modes */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (mod->tmgMsec), 0);
+
+
+ /* calendar */
+ gtk_calendar_select_month (GTK_CALENDAR (mod->tmgCal),
+ tim.tm_mon, tim.tm_year+1900);
+ gtk_calendar_select_day (GTK_CALENDAR (mod->tmgCal), tim.tm_mday);
+
}
@@ -556,24 +720,48 @@
* whether the time control is in RT, SRT, or MAN mode.
*
*/
-void
-tmg_update_state (GtkSatModule *mod)
+void tmg_update_state (GtkSatModule *mod)
{
- if (mod->rtPrev != mod->tmgPdnum) {
- if (mod->throttle) {
- gtk_label_set_markup (GTK_LABEL (mod->tmgState),
- _("<b>Simulated Real-Time</b>"));
- }
- else {
- gtk_label_set_markup (GTK_LABEL (mod->tmgState),
- _("<b>Manual Control</b>"));
- }
- }
- else
- gtk_label_set_markup (GTK_LABEL (mod->tmgState),
- _("<b>Real-Time</b>"));
+ if (mod->rtPrev != mod->tmgPdnum) {
+ if (mod->throttle) {
+ gtk_label_set_markup (GTK_LABEL (mod->tmgState),
+ _("<b>Simulated Real-Time</b>"));
+ }
+ else {
+ gtk_label_set_markup (GTK_LABEL (mod->tmgState),
+ _("<b>Manual Control</b>"));
+ }
+ }
+ else
+ gtk_label_set_markup (GTK_LABEL (mod->tmgState),
+ _("<b>Real-Time</b>"));
}
+
+
+/** \brief Add one day to the calendar */
+static void tmg_cal_add_one_day (GtkSatModule *mod)
+{
+ guint year, month, day;
+
+ gtk_calendar_get_date (GTK_CALENDAR (mod->tmgCal), &year, &month, &day);
+
+ /* calculate the new time as in tmg_time_set then call tmg_update_widgets */
+
+}
+
+/** \brief Substract one day from the calendar */
+static void tmg_cal_sub_one_day (GtkSatModule *mod)
+{
+ guint year, month, day;
+
+ gtk_calendar_get_date (GTK_CALENDAR (mod->tmgCal), &year, &month, &day);
+
+ /* calculate the new time as in tmg_time_set then call tmg_update_widgets */
+
+}
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-09 23:20:27
|
Revision: 412
http://gpredict.svn.sourceforge.net/gpredict/?rev=412&view=rev
Author: csete
Date: 2009-08-09 23:20:21 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Update now works, but new sats are still not added properly.
Modified Paths:
--------------
trunk/src/tle-update.c
trunk/src/tle-update.h
Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c 2009-08-09 00:46:12 UTC (rev 411)
+++ trunk/src/tle-update.c 2009-08-09 23:20:21 UTC (rev 412)
@@ -49,13 +49,6 @@
/* private function prototypes */
-#if 0
-static void copy_tle (tle_t *source, tle_t *target);
-static gint compare_epoch (tle_t *tle1, tle_t *tle2);
-static tle_t *gchar_to_tle (tle_type_t type, const gchar *lines);
-static gchar *tle_to_gchar (tle_type_t type, tle_t *tle);
-#endif
-
static size_t my_write_func (void *ptr, size_t size, size_t nmemb, FILE *stream);
static gint read_fresh_tle (const gchar *dir, const gchar *fnam, GHashTable *data);
@@ -173,7 +166,7 @@
while (g_main_context_iteration (NULL, FALSE));
/* give user a chance to follow progress */
- g_usleep (G_USEC_PER_SEC / 10);
+ g_usleep (G_USEC_PER_SEC / 100);
}
/* now, do read the fresh data */
@@ -194,7 +187,7 @@
/* close directory since we don't need it anymore */
g_dir_close (cache_dir);
- /* now it is time to read gpredict-tle into memory, too */
+ /* now we load each .sat file and update if we have new data */
userconfdir = get_user_conf_dir ();
ldname = g_strconcat (userconfdir, G_DIR_SEPARATOR_S, "satdata", NULL);
g_free (userconfdir);
@@ -241,6 +234,8 @@
}
}
+ g_dir_rewind (loc_dir);
+
/* update TLE files one by one */
while ((fnam = g_dir_read_name (loc_dir)) != NULL) {
/* only consider .sat files */
@@ -264,7 +259,7 @@
updated += updated_tmp;
skipped += skipped_tmp;
nodata += nodata_tmp;
- total += total_tmp;
+ total = updated+skipped+nodata;
if (!silent) {
@@ -304,10 +299,9 @@
while (g_main_context_iteration (NULL, FALSE));
/* give user a chance to follow progress */
- g_usleep (G_USEC_PER_SEC / 10);
+ g_usleep (G_USEC_PER_SEC / 1000);
}
}
-
}
/* close directory handle */
@@ -357,6 +351,7 @@
}
+
/** \brief Check if satellite is new, if so, add it to local database */
static void check_and_add_sat (gpointer key, gpointer value, gpointer user_data)
{
@@ -366,13 +361,16 @@
GIOChannel *satfile;
gchar *cfgstr, *cfgfile;
gsize length, written;
- guint catnum = GPOINTER_TO_UINT (key);
GError *err = NULL;
+ g_print ("==> Add new sat %d?\n", ntle->catnum);
+
/* check if sat is new */
if (ntle->isnew) {
+ g_print ("-----> YES!\n");
+
/* create config data */
satdata = g_key_file_new ();
@@ -387,7 +385,7 @@
cfgstr = g_key_file_to_data (satdata, &length, NULL);
/* create an I/O channel and store data */
- cfgfile = sat_file_name_from_catnum (catnum);
+ cfgfile = sat_file_name_from_catnum (ntle->catnum);
satfile = g_io_channel_new_file (cfgfile, "w", &err);
if (err != NULL) {
@@ -404,18 +402,18 @@
if (err != NULL) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: Error writing satellite data for %d (%s)."),
- __FUNCTION__, catnum, err->message);
+ __FUNCTION__, ntle->catnum, err->message);
g_clear_error (&err);
}
else if (length != written) {
sat_log_log (SAT_LOG_LEVEL_WARN,
_("%s: Wrote only %d out of %d chars for satellite data %d."),
- __FUNCTION__, written, length, catnum);
+ __FUNCTION__, written, length, ntle->catnum);
}
else {
sat_log_log (SAT_LOG_LEVEL_MSG,
_("%s: Satellite data written for %d."),
- __FUNCTION__, catnum);
+ __FUNCTION__, ntle->catnum);
*num += 1;
}
}
@@ -445,7 +443,7 @@
g_clear_error (&err);
}
else {
- cfgstr = g_strdup_printf ("%d\n", catnum);
+ cfgstr = g_strdup_printf ("%d\n", ntle->catnum);
g_io_channel_write_chars (satfile, cfgstr, -1, NULL, &err);
g_io_channel_shutdown (satfile, TRUE, NULL);
g_io_channel_unref (satfile);
@@ -454,13 +452,13 @@
if (err != NULL) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: Error adding %d to %s (%s)."),
- __FUNCTION__, catnum, cfgfile, err->message);
+ __FUNCTION__, ntle->catnum, cfgfile, err->message);
g_clear_error (&err);
}
else {
sat_log_log (SAT_LOG_LEVEL_MSG,
_("%s: Added satellite %d to %s."),
- __FUNCTION__, catnum, cfgfile);
+ __FUNCTION__, ntle->catnum, cfgfile);
}
}
@@ -468,7 +466,7 @@
g_free (cfgfile);
g_strfreev (buff);
}
-
+
}
@@ -476,13 +474,14 @@
static guint add_new_sats (GHashTable *data)
{
guint num = 0;
-
+
g_hash_table_foreach (data, check_and_add_sat, &num);
-
+
return num;
}
+
/** \brief Update TLE files from network.
* \param silent TRUE if function should execute without graphical status indicator.
* \param progress Pointer to a GtkProgressBar progress indicator (can be NULL)
@@ -724,6 +723,9 @@
b = fgets (tle_str[1], 80, fp);
b = fgets (tle_str[2], 80, fp);
+ tle_str[1][69] = '\0';
+ tle_str[2][69] = '\0';
+
/* copy catnum and convert to integer */
for (i = 2; i < 7; i++) {
catstr[i-2] = tle_str[1][i];
@@ -754,6 +756,7 @@
/* create new_tle structure */
ntle = g_try_new (new_tle_t, 1);
+ ntle->catnum = catnr;
ntle->epoch = tle.epoch;
ntle->satname = g_strdup (tle_str[0]);
ntle->line1 = g_strdup (tle_str[1]);
@@ -864,11 +867,14 @@
/* check if obsolete sats should be deleted */
/**** FIXME: This is dangereous, so we omit it */
- sat_log_log (SAT_LOG_LEVEL_MSG,
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: No new TLE data found for %d. Satellite might be obsolete."),
__FUNCTION__, catnr);
}
else {
+ /* This satellite is not new */
+ ntle->isnew = FALSE;
+
/* get TLE data */
tlestr1 = g_key_file_get_string (satdata, "Satellite", "TLE1", NULL);
tlestr2 = g_key_file_get_string (satdata, "Satellite", "TLE2", NULL);
@@ -930,12 +936,11 @@
updated++;
}
}
-
g_free (cfgstr);
-
- /* mark this satellite as not new */
- ntle->isnew = FALSE;
}
+ else {
+ skipped++;
+ }
}
g_strfreev (catstr);
}
@@ -952,84 +957,8 @@
-#if 0
-/** \brief Copy a TLE structure.
- * \param source The TLE structure to copy from.
- * \param target The TLE structure to copy to.
- *
- */
-static void
- copy_tle (tle_t *source, tle_t *target)
-{
- target->epoch = source->epoch;
- target->epoch_year = source->epoch_year;
- target->epoch_day = source->epoch_day;
- target->epoch_fod = source->epoch_fod;
- target->xndt2o = source->xndt2o;
- target->xndd6o = source->xndd6o;
- target->bstar = source->bstar;
- target->xincl = source->xincl;
- target->xnodeo = source->xnodeo;
- target->eo = source->eo;
- target->omegao = source->omegao;
- target->xmo = source->xmo;
- target->xno = source->xno;
- /*target->catnr = source->catnr;*/
- target->elset = source->elset;
- target->revnum = source->revnum;
- target->status = source->status;
- /*
- target->xincl1 = source->xincl1;
- target->xnodeo1 = source->xnodeo1;
- target->omegao1 = source->omegao1;
- */
-}
-
-
-/** \brief Compare EPOCH of two element sets
- * \param tle1 The first element set.
- * \param tle2 The second element set.
- * \return 0 if the epochs are equal, -1 if tle1->epoch < tle2->epoch, and
- * +1 if tle1->epoch > tle2->epoch.
- */
-static gint
- compare_epoch (tle_t *tle1, tle_t *tle2)
-{
- gint retval = 0;
-
-
- if (tle1->epoch > tle2->epoch)
- retval = 1;
- else if (tle1->epoch < tle2->epoch)
- retval = -1;
- else
- retval = 0;
-
-
- return retval;
-}
-
-
-static tle_t *
- gchar_to_tle (tle_type_t type, const gchar *lines)
-{
- return NULL;
-}
-
-
-static gchar *
- tle_to_gchar (tle_type_t type, tle_t *tle)
-{
- return NULL;
-}
-#endif
-
-
-
-
-
const gchar *freq_to_str[TLE_AUTO_UPDATE_NUM] = {
N_("Never"),
N_("Monthly"),
Modified: trunk/src/tle-update.h
===================================================================
--- trunk/src/tle-update.h 2009-08-09 00:46:12 UTC (rev 411)
+++ trunk/src/tle-update.h 2009-08-09 23:20:21 UTC (rev 412)
@@ -58,6 +58,7 @@
/** \brief Data structure to hold a TLE set. */
typedef struct {
+ guint catnum; /*!< Catalog number. */
gdouble epoch; /*!< Epoch. */
gchar *satname; /*!< Satellite name. */
gchar *line1; /*!< Line 1. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-09 00:46:19
|
Revision: 411
http://gpredict.svn.sourceforge.net/gpredict/?rev=411&view=rev
Author: csete
Date: 2009-08-09 00:46:12 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-08-09 00:45:01 UTC (rev 410)
+++ trunk/ChangeLog 2009-08-09 00:46:12 UTC (rev 411)
@@ -3,8 +3,22 @@
* src/compat.[ch]:
Added sat_file_name_from_catnum_s (gchar *catnum).
+ * src/tle-update.[ch]:
+ Updated to new .sat and .cat files.
+ * src/main.c:
+ * src/qth-data.c
+ Avoid using tle-lookup.
+ * src/tle-lookup.[ch]:
+ Deleted.
+
+ * src/sat-cfg.[ch]:
+ Include new TLE files in default.
+ Introduced configuration version number.
+ Reset SAT_CFG_STR_TLE_FILES if version is < 1.1.
+
+
2009-08-07 Alexandru Csete <oz9aec at gmail.com>
* data/satdata/*.sat:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-09 00:45:10
|
Revision: 410
http://gpredict.svn.sourceforge.net/gpredict/?rev=410&view=rev
Author: csete
Date: 2009-08-09 00:45:01 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Updated to new .sat and .cat files. Buggy (both cat and sat).
Modified Paths:
--------------
trunk/src/tle-update.c
trunk/src/tle-update.h
Modified: trunk/src/tle-update.c
===================================================================
--- trunk/src/tle-update.c 2009-08-09 00:37:09 UTC (rev 409)
+++ trunk/src/tle-update.c 2009-08-09 00:45:01 UTC (rev 410)
@@ -11,17 +11,17 @@
More details can be found at the project home page:
http://gpredict.oz9aec.net/
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, visit http://www.fsf.org/
*/
@@ -36,7 +36,7 @@
#include "sgpsdp/sgp4sdp4.h"
#include "sat-log.h"
#include "sat-cfg.h"
-#include "tle-lookup.h"
+#include "compat.h"
#include "tle-update.h"
@@ -60,12 +60,12 @@
static gint read_fresh_tle (const gchar *dir, const gchar *fnam, GHashTable *data);
static void update_tle_in_file (const gchar *ldname,
- const gchar *fname,
- GHashTable *data,
- guint *sat_upd,
- guint *sat_ski,
- guint *sat_nod,
- guint *sat_tot);
+ const gchar *fname,
+ GHashTable *data,
+ guint *sat_upd,
+ guint *sat_ski,
+ guint *sat_nod,
+ guint *sat_tot);
static guint add_new_sats (GHashTable *data);
@@ -81,6 +81,7 @@
g_free (tle->satname);
g_free (tle->line1);
g_free (tle->line2);
+ g_free (tle->srcfile);
g_free (tle);
}
@@ -103,10 +104,9 @@
* Functional description: TBD
*
*/
-void
-tle_update_from_files (const gchar *dir, const gchar *filter,
- gboolean silent, GtkWidget *progress,
- GtkWidget *label1, GtkWidget *label2)
+void tle_update_from_files (const gchar *dir, const gchar *filter,
+ gboolean silent, GtkWidget *progress,
+ GtkWidget *label1, GtkWidget *label2)
{
GHashTable *data; /* hash table with fresh TLE data */
GDir *cache_dir; /* directory to scan fresh TLE */
@@ -114,6 +114,7 @@
GError *err = NULL;
gchar *text;
gchar *ldname;
+ gchar *userconfdir;
const gchar *fnam;
guint num = 0;
guint updated,updated_tmp;
@@ -137,14 +138,14 @@
/* send an error message */
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error opening directory %s (%s)"),
- __FUNCTION__, dir, err->message);
+ _("%s: Error opening directory %s (%s)"),
+ __FUNCTION__, dir, err->message);
/* insert error message into the status string, too */
if (!silent && (label1 != NULL)) {
text = g_strdup_printf (_("<b>ERROR</b> opening directory %s\n%s"),
dir, err->message);
-
+
gtk_label_set_markup (GTK_LABEL (label1), text);
g_free (text);
@@ -163,14 +164,14 @@
text = g_strdup_printf (_("Reading data from %s"), fnam);
gtk_label_set_text (GTK_LABEL (label1), text);
g_free (text);
-
+
/* Force the drawing queue to be processed otherwise there will
not be any visual feedback, ie. frozen GUI
- see Gtk+ FAQ http://www.gtk.org/faq/#AEN602
*/
while (g_main_context_iteration (NULL, FALSE));
-
+
/* give user a chance to follow progress */
g_usleep (G_USEC_PER_SEC / 10);
}
@@ -180,29 +181,24 @@
if (num < 1) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: No valid TLE data found in %s"),
- __FUNCTION__, fnam);
+ _("%s: No valid TLE data found in %s"),
+ __FUNCTION__, fnam);
}
else {
sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Read %d sats from %s into memory"),
- __FUNCTION__, num, fnam);
+ _("%s: Read %d sats from %s into memory"),
+ __FUNCTION__, num, fnam);
}
}
/* close directory since we don't need it anymore */
g_dir_close (cache_dir);
- /* store number of available sats */
- num = tle_lookup_count ();
-
-
/* now it is time to read gpredict-tle into memory, too */
- ldname = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
- ".gpredict2", G_DIR_SEPARATOR_S,
- "tle", NULL);
+ userconfdir = get_user_conf_dir ();
+ ldname = g_strconcat (userconfdir, G_DIR_SEPARATOR_S, "satdata", NULL);
+ g_free (userconfdir);
-
/* open directory and read files one by one */
loc_dir = g_dir_open (ldname, 0, &err);
@@ -210,14 +206,14 @@
/* send an error message */
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error opening directory %s (%s)"),
- __FUNCTION__, dir, err->message);
+ _("%s: Error opening directory %s (%s)"),
+ __FUNCTION__, dir, err->message);
/* insert error message into the status string, too */
if (!silent && (label1 != NULL)) {
text = g_strdup_printf (_("<b>ERROR</b> opening directory %s\n%s"),
dir, err->message);
-
+
gtk_label_set_markup (GTK_LABEL (label1), text);
g_free (text);
}
@@ -236,12 +232,20 @@
if (progress != NULL)
start = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress));
+ /* This is insane but I don't know how else to count the number of sats */
+ num = 0;
+ while ((fnam = g_dir_read_name (loc_dir)) != NULL) {
+ /* only consider .sat files */
+ if (g_strrstr (fnam, ".sat")) {
+ num++;
+ }
+ }
+
/* update TLE files one by one */
while ((fnam = g_dir_read_name (loc_dir)) != NULL) {
+ /* only consider .sat files */
+ if (g_strrstr (fnam, ".sat")) {
- /* skip 'cache' directory */
- if (g_ascii_strcasecmp (fnam, "cache")) {
-
/* clear stat bufs */
updated_tmp = 0;
skipped_tmp = 0;
@@ -271,8 +275,8 @@
if (label2 != NULL) {
text = g_strdup_printf (_("Satellites updated:\t %d\n"\
- "Satellites skipped:\t %d\n"\
- "Missing Satellites:\t %d\n"),
+ "Satellites skipped:\t %d\n"\
+ "Missing Satellites:\t %d\n"),
updated, skipped, nodata);
gtk_label_set_text (GTK_LABEL (label2), text);
g_free (text);
@@ -289,7 +293,7 @@
fraction = 0.98;
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress),
- fraction);
+ fraction);
}
@@ -303,7 +307,7 @@
g_usleep (G_USEC_PER_SEC / 10);
}
}
-
+
}
/* close directory handle */
@@ -319,7 +323,7 @@
"Satellites skipped:\t %d\n"\
"Missing Satellites:\t %d\n"\
"New Satellites:\t\t %d"),
- updated, skipped, nodata, newsats);
+ updated, skipped, nodata, newsats);
gtk_label_set_text (GTK_LABEL (label2), text);
g_free (text);
@@ -327,7 +331,7 @@
sat_log_log (SAT_LOG_LEVEL_MSG,
_("%s: Added %d new satellites to local database"),
- __FUNCTION__, newsats);
+ __FUNCTION__, newsats);
}
/* store time of update if we have updated something */
@@ -343,8 +347,8 @@
g_free (ldname);
sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: TLE elements updated."),
- __FUNCTION__);
+ _("%s: TLE elements updated."),
+ __FUNCTION__);
}
/* destroy hash tables */
@@ -356,34 +360,113 @@
/** \brief Check if satellite is new, if so, add it to local database */
static void check_and_add_sat (gpointer key, gpointer value, gpointer user_data)
{
- gchar *ofn;
- FILE *fp;
- new_tle_t *ntle = (new_tle_t *) value;
- guint *num = user_data;
+ new_tle_t *ntle = (new_tle_t *) value;
+ guint *num = user_data;
+ GKeyFile *satdata;
+ GIOChannel *satfile;
+ gchar *cfgstr, *cfgfile;
+ gsize length, written;
+ guint catnum = GPOINTER_TO_UINT (key);
+ GError *err = NULL;
+
/* check if sat is new */
if (ntle->isnew) {
-
- /* Open $HOME/.gpredict2/tle/new.tle */
- ofn = g_strconcat (g_get_home_dir(), G_DIR_SEPARATOR_S,
- ".gpredict2", G_DIR_SEPARATOR_S,
- "tle", G_DIR_SEPARATOR_S,
- "new.tle", NULL);
- fp = g_fopen (ofn, "a");
- g_free (ofn);
-
- /* store tle data to file */
- if (fp) {
- fputs (ntle->satname, fp);
- fputs (ntle->line1, fp);
- fputs (ntle->line2, fp);
-
- /* close file */
- fclose (fp);
-
- /* update data */
- *num += 1;
+
+ /* create config data */
+ satdata = g_key_file_new ();
+
+ /* store data */
+ g_key_file_set_string (satdata, "Satellite", "VERSION", "1.1");
+ g_key_file_set_string (satdata, "Satellite", "NAME", ntle->satname);
+ g_key_file_set_string (satdata, "Satellite", "NICKNAME", ntle->satname);
+ g_key_file_set_string (satdata, "Satellite", "TLE1", ntle->line1);
+ g_key_file_set_string (satdata, "Satellite", "TLE2", ntle->line2);
+
+ /* convert data to text */
+ cfgstr = g_key_file_to_data (satdata, &length, NULL);
+
+ /* create an I/O channel and store data */
+ cfgfile = sat_file_name_from_catnum (catnum);
+ satfile = g_io_channel_new_file (cfgfile, "w", &err);
+
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create satellite file (%s)."),
+ __FUNCTION__, err->message);
+ g_clear_error (&err);
}
+ else {
+ g_io_channel_write_chars (satfile, cfgstr, length, &written, &err);
+ g_io_channel_shutdown (satfile, TRUE, NULL);
+ g_io_channel_unref (satfile);
+
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error writing satellite data for %d (%s)."),
+ __FUNCTION__, catnum, err->message);
+ g_clear_error (&err);
+ }
+ else if (length != written) {
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Wrote only %d out of %d chars for satellite data %d."),
+ __FUNCTION__, written, length, catnum);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Satellite data written for %d."),
+ __FUNCTION__, catnum);
+ *num += 1;
+ }
+ }
+
+ /* clean up memory */
+ g_free (cfgstr);
+ g_free (cfgfile);
+ g_key_file_free (satdata);
+
+
+ /**** FIXME: NEED TO CREATE COPY of cache */
+ /* finally, new satellite must be added to proper category */
+ gchar *catfile;
+ gchar **buff;
+
+ buff = g_strsplit (ntle->srcfile, ".", 0);
+ cfgfile = g_strconcat (buff[0], ".cat", NULL);
+ catfile = sat_file_name (cfgfile);
+
+ /* g_io_channel */
+ satfile = g_io_channel_new_file (catfile, "a", &err);
+
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not open category file file %s (%s)."),
+ __FUNCTION__, cfgfile, err->message);
+ g_clear_error (&err);
+ }
+ else {
+ cfgstr = g_strdup_printf ("%d\n", catnum);
+ g_io_channel_write_chars (satfile, cfgstr, -1, NULL, &err);
+ g_io_channel_shutdown (satfile, TRUE, NULL);
+ g_io_channel_unref (satfile);
+ g_free (cfgstr);
+
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error adding %d to %s (%s)."),
+ __FUNCTION__, catnum, cfgfile, err->message);
+ g_clear_error (&err);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Added satellite %d to %s."),
+ __FUNCTION__, catnum, cfgfile);
+ }
+ }
+
+ g_free (catfile);
+ g_free (cfgfile);
+ g_strfreev (buff);
}
}
@@ -406,12 +489,11 @@
* \param label1 GtkLabel for activity string.
* \param label2 GtkLabel for statistics string.
*/
-void
-tle_update_from_network (gboolean silent,
- GtkWidget *progress,
- GtkWidget *label1,
- GtkWidget *label2)
- {
+void tle_update_from_network (gboolean silent,
+ GtkWidget *progress,
+ GtkWidget *label1,
+ GtkWidget *label2)
+{
gchar *server;
gchar *proxy = NULL;
gchar *files_tmp;
@@ -419,6 +501,7 @@
guint numfiles,i;
gchar *curfile;
gchar *locfile;
+ gchar *userconfdir;
CURL *curl;
CURLcode res;
gboolean error = FALSE;
@@ -448,8 +531,8 @@
if (numfiles < 1) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: No files to fetch from network."),
- __FUNCTION__);
+ _("%s: No files to fetch from network."),
+ __FUNCTION__);
/* set activity string, so user knows why nothing happens */
if (!silent && (label1 != NULL)) {
@@ -492,12 +575,12 @@
while (g_main_context_iteration (NULL, FALSE));
}
- /* create local file */
- locfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
- ".gpredict2", G_DIR_SEPARATOR_S,
- "tle", G_DIR_SEPARATOR_S,
- "cache", G_DIR_SEPARATOR_S,
- files[i], NULL);
+ /* creae local cache file */
+ userconfdir = get_user_conf_dir ();
+ locfile = g_strconcat (userconfdir, G_DIR_SEPARATOR_S,
+ "satdata", G_DIR_SEPARATOR_S,
+ "cache", G_DIR_SEPARATOR_S,
+ files[i], NULL);
outfile = g_fopen (locfile, "wb");
curl_easy_setopt (curl, CURLOPT_WRITEDATA, outfile);
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, my_write_func);
@@ -507,14 +590,14 @@
if (res != CURLE_OK) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error fetching %s (%s)"),
- __FUNCTION__, curfile, curl_easy_strerror (res));
+ _("%s: Error fetching %s (%s)"),
+ __FUNCTION__, curfile, curl_easy_strerror (res));
error = TRUE;
}
else {
sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Successfully fetched %s"),
- __FUNCTION__, curfile);
+ _("%s: Successfully fetched %s"),
+ __FUNCTION__, curfile);
success++;
}
@@ -533,6 +616,7 @@
}
+ g_free (userconfdir);
g_free (curfile);
g_free (locfile);
fclose (outfile);
@@ -543,14 +627,11 @@
/* continue update if we have fetched at least one file */
if (success > 0) {
/* call update_from_files */
- cache = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
- ".gpredict2", G_DIR_SEPARATOR_S,
- "tle", G_DIR_SEPARATOR_S,
- "cache", NULL);
+ cache = sat_file_name ("cache");
tle_update_from_files (cache, NULL, silent, progress, label1, label2);
g_free (cache);
}
-
+
}
/* clear cache and memory */
@@ -561,17 +642,14 @@
g_free (proxy);
/* open cache */
- cache = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
- ".gpredict2", G_DIR_SEPARATOR_S,
- "tle", G_DIR_SEPARATOR_S,
- "cache", NULL);
+ cache = sat_file_name ("cache");
dir = g_dir_open (cache, 0, &err);
if (err != NULL) {
/* send an error message */
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error opening %s (%s)"),
- __FUNCTION__, dir, err->message);
+ _("%s: Error opening %s (%s)"),
+ __FUNCTION__, dir, err->message);
g_clear_error (&err);
}
else {
@@ -579,7 +657,7 @@
while ((fname = g_dir_read_name (dir)) != NULL) {
locfile = g_strconcat (cache, G_DIR_SEPARATOR_S,
- fname, NULL);
+ fname, NULL);
g_remove (locfile);
g_free (locfile);
@@ -606,8 +684,7 @@
* This function writes the received data to the file pointed to by stream.
* It is used as write callback by to curl exec function.
*/
-static size_t
-my_write_func (void *ptr, size_t size, size_t nmemb, FILE *stream)
+static size_t my_write_func (void *ptr, size_t size, size_t nmemb, FILE *stream)
{
/*** FIXME: TBC whether this works in wintendo */
return fwrite (ptr, size, nmemb, stream);
@@ -621,8 +698,7 @@
* \param fresh_data Hash table where the data should be stored.
* \return The number of satellites successfully read.
*/
-static gint
-read_fresh_tle (const gchar *dir, const gchar *fnam, GHashTable *data)
+static gint read_fresh_tle (const gchar *dir, const gchar *fnam, GHashTable *data)
{
new_tle_t *ntle;
tle_t tle;
@@ -659,21 +735,21 @@
if (Get_Next_Tle_Set (tle_str, &tle) != 1) {
/* TLE data not good */
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Invalid data for %d"),
- __FILE__, __FUNCTION__, catnr);
+ _("%s:%s: Invalid data for %d"),
+ __FILE__, __FUNCTION__, catnr);
}
else {
/* DATA OK, phew... */
- /* sat_log_log (SAT_LOG_LEVEL_DEBUG, */
- /* _("%s: Good data for %d"), */
- /* __FUNCTION__, */
- /* catnr); */
+ /* sat_log_log (SAT_LOG_LEVEL_DEBUG, */
+ /* _("%s: Good data for %d"), */
+ /* __FUNCTION__, */
+ /* catnr); */
/* add data to hash table */
key = g_try_new0 (guint, 1);
*key = catnr;
-
+ /* check if satellite already in hash table */
if (g_hash_table_lookup (data, key) == NULL) {
/* create new_tle structure */
@@ -682,6 +758,7 @@
ntle->satname = g_strdup (tle_str[0]);
ntle->line1 = g_strdup (tle_str[1]);
ntle->line2 = g_strdup (tle_str[2]);
+ ntle->srcfile = g_strdup (fnam);
ntle->isnew = TRUE; /* flag will be reset when using data */
@@ -702,8 +779,8 @@
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Failed to open %s"),
- __FILE__, __FUNCTION__, path);
+ _("%s:%s: Failed to open %s"),
+ __FILE__, __FUNCTION__, path);
}
g_free (path);
@@ -730,180 +807,139 @@
* When all sats have been copied ldname/fnam is deleted and temp_file
* is renamed to ldname/fnam.
*/
-static void
-update_tle_in_file (const gchar *ldname,
- const gchar *fname,
- GHashTable *data,
- guint *sat_upd,
- guint *sat_ski,
- guint *sat_nod,
- guint *sat_tot)
+static void update_tle_in_file (const gchar *ldname,
+ const gchar *fname,
+ GHashTable *data,
+ guint *sat_upd,
+ guint *sat_ski,
+ guint *sat_nod,
+ guint *sat_tot)
{
gchar *path;
- gchar *tmp_path;
guint updated = 0; /* number of updated sats */
guint nodata = 0; /* no sats for which no fresh data available */
guint skipped = 0; /* no. sats where fresh data is older */
guint total = 0; /* total no. of sats in gpredict tle file */
- gchar tle_str[3][80];
- gchar catstr[6];
- gchar *b;
- FILE *fp;
- FILE *tmp;
- guint catnr,i;
+ gchar **catstr;
+ guint catnr;
guint *key = NULL;
tle_t tle;
new_tle_t *ntle;
- gint retcode = 0;
+ GError *error = NULL;
+ GKeyFile *satdata;
+ gchar *tlestr1, *tlestr2, *rawtle;
+ gchar *cfgstr;
+ GIOChannel *cfgfile;
+ gsize length, written;
/* open input file (file containing old tle) */
path = g_strconcat (ldname, G_DIR_SEPARATOR_S, fname, NULL);
- fp = g_fopen (path, "r");
+ satdata = g_key_file_new ();
+ if (!g_key_file_load_from_file (satdata, path, G_KEY_FILE_KEEP_COMMENTS, &error)) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error loading %s (%s)"),
+ __FUNCTION__, path, error->message);
+ g_clear_error (&error);
- if (fp != NULL) {
+ skipped++;
- /* open output temp file */
- tmp_path = g_strconcat (ldname, G_DIR_SEPARATOR_S, "TLEUPDATE.tmp", NULL);
- tmp = g_fopen (tmp_path, "w");
+ }
- if (tmp != NULL) {
+ else {
- /* read 3 lines at a time */
- while (fgets (tle_str[0], 80, fp)) {
- /* read second and third lines */
- b = fgets (tle_str[1], 80, fp);
- b = fgets (tle_str[2], 80, fp);
+ /* get catalog number for this satellite */
+ catstr = g_strsplit (fname, ".sat", 0);
+ catnr = (guint) g_ascii_strtod (catstr[0], NULL);
- /* stats */
- total++;
+ /* see if we have new data for this satellite */
+ key = g_try_new0 (guint, 1);
+ *key = catnr;
+ ntle = (new_tle_t *) g_hash_table_lookup (data, key);
+ g_free (key);
- /* copy catnum and convert to integer */
- for (i = 2; i < 7; i++) {
- catstr[i-2] = tle_str[1][i];
- }
- catstr[5] = '\0';
- catnr = (guint) g_ascii_strtod (catstr, NULL);
+ if (ntle == NULL) {
+ /* no new data found for this sat => obsolete */
+ nodata++;
+ /* check if obsolete sats should be deleted */
+ /**** FIXME: This is dangereous, so we omit it */
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: No new TLE data found for %d. Satellite might be obsolete."),
+ __FUNCTION__, catnr);
+ }
+ else {
+ /* get TLE data */
+ tlestr1 = g_key_file_get_string (satdata, "Satellite", "TLE1", NULL);
+ tlestr2 = g_key_file_get_string (satdata, "Satellite", "TLE2", NULL);
+ rawtle = g_strconcat (tlestr1, tlestr2, NULL);
- if (Get_Next_Tle_Set (tle_str, &tle) != 1) {
- /* TLE data not good */
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Original data for %d seems to be bad"),
- __FILE__, __FUNCTION__, catnr);
- }
-
- /* get data from hash table */
- key = g_try_new0 (guint, 1);
- *key = catnr;
- ntle = (new_tle_t *) g_hash_table_lookup (data, key);
- g_free (key);
+ if (!Good_Elements (rawtle)) {
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Current TLE data for %d appears to be bad"),
+ __FUNCTION__, catnr);
+ }
+ Convert_Satellite_Data (rawtle, &tle);
- if (ntle == NULL) {
+ g_free (tlestr1);
+ g_free (tlestr2);
+ g_free (rawtle);
- /* no new data found for this sat => obsolete */
- nodata++;
-
- /* check if obsolete sats should be deleted */
- /**** FIXME: This is dangereous, so we omit it */
+ if (tle.epoch < ntle->epoch) {
+ /* new data is newer than what we already have */
+ /* store new data */
+ g_key_file_set_string (satdata, "Satellite", "TLE1", ntle->line1);
+ g_key_file_set_string (satdata, "Satellite", "TLE2", ntle->line2);
+ /* convert configuration data struct to charachter string */
+ cfgstr = g_key_file_to_data (satdata, &length, NULL); /* this function never reports error */
+
+ /* create and open a file for writing */
+ cfgfile = g_io_channel_new_file (path, "w", &error);
+
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create satellite data file (%s)."),
+ __FUNCTION__, error->message);
+ g_clear_error (&error);
+ skipped++;
}
else {
+ g_io_channel_write_chars (cfgfile, cfgstr, length, &written, &error);
- /* new data is available for this sat */
- if (tle.epoch < ntle->epoch) {
- /* fresh data is newer than original
- => update
- */
- updated++;
+ g_io_channel_shutdown (cfgfile, TRUE, NULL);
+ g_io_channel_unref (cfgfile);
- /* write new data to file */
- fputs (ntle->satname, tmp);
- fputs (ntle->line1, tmp);
- fputs (ntle->line2, tmp);
-
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error writing satellite data (%s)."),
+ __FUNCTION__, error->message);
+ g_clear_error (&error);
+ skipped++;
}
- else {
- /* fresh data is older than original
- => don't update
- */
+ else if (length != written) {
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Wrote only %d out of %d chars for satellite data."),
+ __FUNCTION__, written, length);
skipped++;
-
- /* write current data back to tle file */
- fputs (tle_str[0], tmp);
- fputs (tle_str[1], tmp);
- fputs (tle_str[2], tmp);
}
-
- /* clear isnew flag */
- ntle->isnew = FALSE;
-
+ else {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Satellite data written for %d."),
+ __FUNCTION__, catnr);
+ updated++;
+ }
}
- }
+ g_free (cfgstr);
- fclose (tmp);
- fclose (fp);
-
- /* if there is at least one updated sat */
- if (updated > 0) {
-
- /* remove old tle file fp */
- retcode = g_remove (path);
-
- if (retcode != 0) {
- /* could not remove file */
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not remove %s (file open?)"),
- __FUNCTION__, path);
- }
-
- /* rename temp file tmp to old tle file */
- retcode = g_rename (tmp_path, path);
-
- if (retcode != 0) {
- /* could not rename file */
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not rename %s to %s"),
- __FUNCTION__, tmp_path, path);
- }
-
+ /* mark this satellite as not new */
+ ntle->isnew = FALSE;
}
- else {
- /* we have to remove the temp file */
- g_remove (tmp_path);
- }
-
}
- else {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to open temp file %s"),
- __FUNCTION__, tmp_path);
-
- /* close input TLE file */
- fclose (fp);
- }
-
- /* close input TLE file */
- //fclose (fp);
-
- /* free path to tmp file */
- g_free (tmp_path);
-
- /* print stats */
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Update statistics for %s (U/O/N/T): %d/%d/%d/%d"),
- __FUNCTION__, fname,
- updated, skipped, nodata, total);
-
+ g_strfreev (catstr);
}
-
- else {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to open %s"),
- __FUNCTION__, path);
- }
-
+ g_key_file_free (satdata);
g_free (path);
/* update out parameters */
@@ -923,32 +959,32 @@
*
*/
static void
-copy_tle (tle_t *source, tle_t *target)
+ copy_tle (tle_t *source, tle_t *target)
{
- target->epoch = source->epoch;
- target->epoch_year = source->epoch_year;
- target->epoch_day = source->epoch_day;
- target->epoch_fod = source->epoch_fod;
- target->xndt2o = source->xndt2o;
- target->xndd6o = source->xndd6o;
- target->bstar = source->bstar;
- target->xincl = source->xincl;
- target->xnodeo = source->xnodeo;
- target->eo = source->eo;
- target->omegao = source->omegao;
- target->xmo = source->xmo;
- target->xno = source->xno;
- /*target->catnr = source->catnr;*/
- target->elset = source->elset;
- target->revnum = source->revnum;
- target->status = source->status;
+ target->epoch = source->epoch;
+ target->epoch_year = source->epoch_year;
+ target->epoch_day = source->epoch_day;
+ target->epoch_fod = source->epoch_fod;
+ target->xndt2o = source->xndt2o;
+ target->xndd6o = source->xndd6o;
+ target->bstar = source->bstar;
+ target->xincl = source->xincl;
+ target->xnodeo = source->xnodeo;
+ target->eo = source->eo;
+ target->omegao = source->omegao;
+ target->xmo = source->xmo;
+ target->xno = source->xno;
+ /*target->catnr = source->catnr;*/
+ target->elset = source->elset;
+ target->revnum = source->revnum;
+ target->status = source->status;
- /*
- target->xincl1 = source->xincl1;
- target->xnodeo1 = source->xnodeo1;
- target->omegao1 = source->omegao1;
- */
+ /*
+ target->xincl1 = source->xincl1;
+ target->xnodeo1 = source->xnodeo1;
+ target->omegao1 = source->omegao1;
+ */
}
@@ -959,32 +995,32 @@
* +1 if tle1->epoch > tle2->epoch.
*/
static gint
-compare_epoch (tle_t *tle1, tle_t *tle2)
+ compare_epoch (tle_t *tle1, tle_t *tle2)
{
- gint retval = 0;
+ gint retval = 0;
- if (tle1->epoch > tle2->epoch)
- retval = 1;
- else if (tle1->epoch < tle2->epoch)
- retval = -1;
- else
- retval = 0;
+ if (tle1->epoch > tle2->epoch)
+ retval = 1;
+ else if (tle1->epoch < tle2->epoch)
+ retval = -1;
+ else
+ retval = 0;
- return retval;
+ return retval;
}
static tle_t *
-gchar_to_tle (tle_type_t type, const gchar *lines)
+ gchar_to_tle (tle_type_t type, const gchar *lines)
{
- return NULL;
+ return NULL;
}
static gchar *
-tle_to_gchar (tle_type_t type, tle_t *tle)
+ tle_to_gchar (tle_type_t type, tle_t *tle)
{
return NULL;
}
@@ -1002,7 +1038,7 @@
};
const gchar *
-tle_update_freq_to_str (tle_auto_upd_freq_t freq)
+ tle_update_freq_to_str (tle_auto_upd_freq_t freq)
{
if ((freq < TLE_AUTO_UPDATE_NEVER) ||
(freq >= TLE_AUTO_UPDATE_NUM)) {
Modified: trunk/src/tle-update.h
===================================================================
--- trunk/src/tle-update.h 2009-08-09 00:37:09 UTC (rev 409)
+++ trunk/src/tle-update.h 2009-08-09 00:45:01 UTC (rev 410)
@@ -11,7 +11,7 @@
More details can be found at the project home page:
http://gpredict.oz9aec.net/
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -34,56 +34,57 @@
/** \brief TLE format type flags. */
typedef enum {
- TLE_TYPE_NASA = 0 /*!< NASA two-line format (3 lines with name). */
-} tle_type_t;
+ TLE_TYPE_NASA = 0 /*!< NASA two-line format (3 lines with name). */
+ } tle_type_t;
/** \brief TLE auto update frequency. */
typedef enum {
- TLE_AUTO_UPDATE_NEVER = 0, /*!< No auto-update, just warn after one week. */
- TLE_AUTO_UPDATE_MONTHLY = 1,
- TLE_AUTO_UPDATE_WEEKLY = 2,
- TLE_AUTO_UPDATE_DAILY = 3,
- TLE_AUTO_UPDATE_NUM
+ TLE_AUTO_UPDATE_NEVER = 0, /*!< No auto-update, just warn after one week. */
+ TLE_AUTO_UPDATE_MONTHLY = 1,
+ TLE_AUTO_UPDATE_WEEKLY = 2,
+ TLE_AUTO_UPDATE_DAILY = 3,
+ TLE_AUTO_UPDATE_NUM
} tle_auto_upd_freq_t;
/** \brief Action to perform when it's time to update TLE. */
typedef enum {
- TLE_AUTO_UPDATE_NOACT = 0, /*!< No action (not a valid option). */
- TLE_AUTO_UPDATE_NOTIFY = 1, /*!< Notify user. */
- TLE_AUTO_UPDATE_GOAHEAD = 2 /*!< Perform unattended update. */
+ TLE_AUTO_UPDATE_NOACT = 0, /*!< No action (not a valid option). */
+ TLE_AUTO_UPDATE_NOTIFY = 1, /*!< Notify user. */
+ TLE_AUTO_UPDATE_GOAHEAD = 2 /*!< Perform unattended update. */
} tle_auto_upd_action_t;
/** \brief Data structure to hold a TLE set. */
typedef struct {
- gdouble epoch; /*!< Epoch. */
- gchar *satname; /*!< Satellite name. */
- gchar *line1; /*!< Line 1. */
- gchar *line2; /*!< Line 2. */
+ gdouble epoch; /*!< Epoch. */
+ gchar *satname; /*!< Satellite name. */
+ gchar *line1; /*!< Line 1. */
+ gchar *line2; /*!< Line 2. */
+ gchar *srcfile; /*!< The file where TLE comes from (needed for cat) */
gboolean isnew; /*!< Flag indicating whether sat is new. */
} new_tle_t;
/** \brief Data structure to hold local TLE data. */
typedef struct {
- tle_t tle; /*!< TLE data. */
- gchar *filename; /*!< File name where the TLE data is from */
+ tle_t tle; /*!< TLE data. */
+ gchar *filename; /*!< File name where the TLE data is from */
} loc_tle_t;
void tle_update_from_files (const gchar *dir,
- const gchar *filter,
- gboolean silent,
- GtkWidget *progress,
- GtkWidget *label1,
- GtkWidget *label2);
+ const gchar *filter,
+ gboolean silent,
+ GtkWidget *progress,
+ GtkWidget *label1,
+ GtkWidget *label2);
void tle_update_from_network (gboolean silent,
- GtkWidget *progress,
- GtkWidget *label1,
- GtkWidget *label2);
+ GtkWidget *progress,
+ GtkWidget *label1,
+ GtkWidget *label2);
const gchar *tle_update_freq_to_str (tle_auto_upd_freq_t freq);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-09 00:37:17
|
Revision: 409
http://gpredict.svn.sourceforge.net/gpredict/?rev=409&view=rev
Author: csete
Date: 2009-08-09 00:37:09 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Reduce amount of noise in log file.
Modified Paths:
--------------
trunk/src/first-time.c
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2009-08-09 00:33:08 UTC (rev 408)
+++ trunk/src/first-time.c 2009-08-09 00:37:09 UTC (rev 409)
@@ -493,7 +493,7 @@
/* first, check if this satellite already has a .sat file */
targetfilename = sat_file_name_from_catnum_s (satellites[i]);
if (g_file_test (targetfilename, G_FILE_TEST_EXISTS)) {
- sat_log_log (SAT_LOG_LEVEL_MSG,
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
_("%s: %s.sat already exists. Skipped."),
__FUNCTION__, satellites[i]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-09 00:33:16
|
Revision: 408
http://gpredict.svn.sourceforge.net/gpredict/?rev=408&view=rev
Author: csete
Date: 2009-08-09 00:33:08 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Include new TLE files in default. Introduced configuration version number.
Modified Paths:
--------------
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
Modified: trunk/src/sat-cfg.c
===================================================================
--- trunk/src/sat-cfg.c 2009-08-08 23:42:09 UTC (rev 407)
+++ trunk/src/sat-cfg.c 2009-08-09 00:33:08 UTC (rev 408)
@@ -140,6 +140,8 @@
/** \brief Array containing the integer configuration parameters */
sat_cfg_int_t sat_cfg_int[SAT_CFG_INT_NUM] = {
+ { "VERSION", "MAJOR", 0},
+ { "VERSION", "MINOR", 0},
{ "MODULES", "DATA_TIMEOUT", 300},
{ "MODULES", "LAYOUT", GTK_SAT_MOD_LAYOUT_3},
{ "MODULES", "VIEW_1", GTK_SAT_MOD_VIEW_MAP},
@@ -214,12 +216,16 @@
{ "MODULES", "MAP_FONT", "Sans 10"},
{ "MODULES", "POLAR_FONT", "Sans 10"},
{ "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"},
- { "TLE", "FILES", "amateur.txt;cubesat.txt;galileo.txt;geo.txt;gps-ops.txt;"\
- "iridium.txt;military.txt;radar.txt;science.txt;weather.txt"},
-{ "TLE", "PROXY", NULL},
-{ "TLE", "FILE_DIR", NULL},
-{ "TLE", "EXTENSION", "*.*"},
-{ "PREDICT", "SAVE_DIR", NULL}
+ { "TLE", "FILES", "amateur.txt;cubesat.txt;dmc.txt;education.txt;"\
+ "engineering.txt;galileo.txt;geo.txt;geodetic.txt;globalstar.txt;"\
+ "glo-ops.txt;goes.txt;gorizont.txt;gps-ops.txt;intelsat.txt;"\
+ "iridium.txt;military.txt;molniya.txt;musson.txt;nnss.txt;noaa.txt;"\
+ "orbcomm.txt;other.txt;other-comm.txt;radar.txt;raduga.txt;resource.txt;"\
+ "sarsat.txt;sbas.txt;science.txt;tle-new.txt;visual.txt;weather.txt;x-comm.txt"},
+ { "TLE", "PROXY", NULL},
+ { "TLE", "FILE_DIR", NULL},
+ { "TLE", "EXTENSION", "*.*"},
+ { "PREDICT", "SAVE_DIR", NULL}
};
@@ -239,8 +245,7 @@
* The the configuration data in memory is already "loaded" the data will
* be ereased first.
*/
-guint
- sat_cfg_load ()
+guint sat_cfg_load ()
{
gchar *keyfile,*confdir;
GError *error = NULL;
@@ -277,6 +282,16 @@
_("%s: Everything OK."), __FUNCTION__);
}
+ /* if config version is < 1.1; reset SAT_CFG_STR_TLE_FILES */
+ guint ver;
+ ver = 10*sat_cfg_get_int (SAT_CFG_INT_VERSION_MAJOR) + sat_cfg_get_int (SAT_CFG_INT_VERSION_MINOR);
+ if (ver < 11) {
+ sat_cfg_reset_str (SAT_CFG_STR_TLE_FILES);
+ sat_cfg_set_int (SAT_CFG_INT_VERSION_MAJOR, 1);
+ sat_cfg_set_int (SAT_CFG_INT_VERSION_MINOR, 1);
+ }
+
+
return 0;
}
Modified: trunk/src/sat-cfg.h
===================================================================
--- trunk/src/sat-cfg.h 2009-08-08 23:42:09 UTC (rev 407)
+++ trunk/src/sat-cfg.h 2009-08-09 00:33:08 UTC (rev 408)
@@ -62,7 +62,9 @@
/** \brief Symbolic references for integer config values. */
typedef enum {
- SAT_CFG_INT_MODULE_TIMEOUT = 0, /*!< Module refresh rate */
+ SAT_CFG_INT_VERSION_MAJOR = 0, /*!< Configuration version number (major) */
+ SAT_CFG_INT_VERSION_MINOR, /*!< Configuration version number (minor) */
+ SAT_CFG_INT_MODULE_TIMEOUT, /*!< Module refresh rate */
SAT_CFG_INT_MODULE_LAYOUT, /*!< Module layout */
SAT_CFG_INT_MODULE_VIEW_1, /*!< Type of view 1 */
SAT_CFG_INT_MODULE_VIEW_2, /*!< Type of view 2 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 23:42:16
|
Revision: 407
http://gpredict.svn.sourceforge.net/gpredict/?rev=407&view=rev
Author: csete
Date: 2009-08-08 23:42:09 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Removed obsolete files.
Removed Paths:
-------------
trunk/src/tle-lookup.c
trunk/src/tle-lookup.h
Deleted: trunk/src/tle-lookup.c
===================================================================
--- trunk/src/tle-lookup.c 2009-08-08 23:41:24 UTC (rev 406)
+++ trunk/src/tle-lookup.c 2009-08-08 23:42:09 UTC (rev 407)
@@ -1,304 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/gpredict/
- More details can be found at the project home page:
-
- http://gpredict.oz9aec.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-/** \defgroup tle_lookup TLE Link Manager
- * \ingroup utils
- *
- * The TLE link manager maintains a mapping between satellite catalog numbers
- * and the .tle files found in the user's data directory, usually
- * $HOME/.gpredict/tle/
- */
-/** \defgroup tle_lookup_if Interface
- * \ingroup tle_lookup
- */
-/** \defgroup tle_lookup_priv Private
- * \ingroup tle_lookup
- */
-#include <glib.h>
-#include <glib/gi18n.h>
-#ifdef HAVE_CONFIG_H
-# include <build-config.h>
-#endif
-#include "sat-log.h"
-#include "tle-lookup.h"
-
-
-/** \brief The has tanle containing the links.
- * \ingroup tle_lookup_priv
- */
-GHashTable *linktable = NULL;
-
-/** \brief Key used when accessing the hash table.
- * \ingroup tle_lookup_priv
- */
-guint *key = NULL;
-
-
-/* private function prototypes */
-static guint tle_lookup_scan_file (const gchar *name);
-
-
-
-/** \brief Create and initialise hash table.
- * \param tledir Directory to scan (optional).
- * \return Error code indicating whether the process has been successful
- * (TLE_LOOKUP_INIT_OK) or not.
- * \ingroup tle_lookup_if
- *
- * The function creates and initialises the lookup hash table. It then scans
- * the specified directory for tle files and adds each sattelite (catnum,file)
- * to the hash table. If the specified directory is NULL, $HOME/.gpredict/tle/
- * is used.
- *
- * \note The error TLE_LOOKUP_NO_MEM is fatal and the main program should exit
- * immediately in such case.
- */
-gint
-tle_lookup_init (const gchar *tledir)
-{
- GDir *dir;
- gchar *dirname;
- const gchar *name;
- gchar *msg;
- guint num;
-
- /* create hash table */
- linktable = g_hash_table_new_full (g_int_hash,
- g_int_equal,
- g_free,
- g_free);
-
- if (!linktable) {
- return TLE_LOOKUP_NO_MEM;
- }
-
- /* open directory */
- if (tledir != NULL) {
- dirname = g_strdup (tledir);
- }
- else {
- dirname = g_strdup_printf ("%s%s.gpredict2%stle",
- g_get_home_dir (),
- G_DIR_SEPARATOR_S,
- G_DIR_SEPARATOR_S);
- }
-
- /* debug message */
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Directory is: %s"),
- __FUNCTION__, dirname);
-
- dir = g_dir_open (dirname, 0, NULL);
-
- /* no tle files */
- if (!dir) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: No .tle files found in %s."),
- __FUNCTION__, dirname);
-
- return TLE_LOOKUP_EMPTY_DIR;
- }
-
- /* Scan data directory for .tle files.
- For each file scan through the file and
- add entry to the hash table.
- */
- while ((name = g_dir_read_name (dir))) {
-
- if (g_strrstr (name, ".tle")) {
-
- msg = g_strconcat (dirname, G_DIR_SEPARATOR_S,
- name, NULL);
- num = tle_lookup_scan_file (msg);
- g_free (msg);
-
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Read %d sats from %s "),
- __FUNCTION__, num, name);
- }
-
- }
-
- g_dir_close (dir);
- g_free (dirname);
-
- return TLE_LOOKUP_INIT_OK;
-}
-
-
-/** \brief Close link table and free resources.
- * \ingroup tle_lookup_if
- *
- * This function destroys the link table freeing any memory that has been
- * allocated to it.
- */
-void
-tle_lookup_close ()
-{
-
- g_hash_table_destroy (linktable);
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Hash table destroyed, resources freed."),
- __FUNCTION__);
-}
-
-
-/** \brief Get number of satellites in link table */
-guint
-tle_lookup_count ()
-{
- if (!linktable) {
-
- return 0;
- }
-
- return g_hash_table_size (linktable);
-}
-
-
-/** \brief Look up satellite
- * \return copy of the file name in which the satellite can be found or
- * NULL if the satellite can not be found.
- *
- * \note The returned string should be freed when no onger needed, unless
- * it is already NULL :-P
- */
-gchar *
-tle_lookup (gint catnum)
-{
- gchar *filename = NULL;
- guint *key;
-
- if (!linktable) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Link table is NULL!"),
- __FUNCTION__);
-
- return NULL;
- }
-
- key = g_new0 (guint, 1);
- *key = (guint) catnum;
-
- /* GUINT_TO_POINTER(catnum) does not work */
- filename = (gchar *) g_hash_table_lookup (linktable, key);
-
- g_free (key);
-
- if (filename) {
- return g_strdup (filename);
- }
- else {
- return NULL;
- }
-}
-
-
-/** \brief Scan TLE file for satellites.
- * \param name The TLE file to scan.
- * \return The number of satellites found.
- * \ingroup tle_lookup_priv
- *
- * This function scans the specified TLE file and adds each satellite
- * to the hash table. It returns the number of satellites found in the
- * file.
- *
- * FIXME: USE GError
- */
-static guint
-tle_lookup_scan_file (const gchar *name)
-{
- guint i = 0;
- guint j;
- GIOChannel *tlefile;
- gchar *line;
- gsize length;
- gchar catstr[6];
-
- /* open IO channel and read 3 lines at a time */
- tlefile = g_io_channel_new_file (name, "r", NULL);
-
- if (tlefile) {
-
- /*** FIXME: add error handling */
-
- while (g_io_channel_read_line (tlefile, &line, &length, NULL, NULL) != G_IO_STATUS_EOF) {
-
- /* free line */
- g_free (line);
-
- /* extract catnum from second line; index 2..6 */
- g_io_channel_read_line (tlefile, &line, &length,
- NULL, NULL);
-
- for (j = 2; j < 7; j++) {
- catstr[j-2] = line[j];
- }
- catstr[5] = '\0';
-
- key = g_try_malloc (sizeof (guint));
- if (key) {
- *key = (guint) g_ascii_strtod (catstr, NULL);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not allocate memory for KEY"),
- __FUNCTION__);
-
- /* FIXME: What to do now? We should try to bail out! */
- }
-
- /* add (catnum,name) to hash table;
- warn if key already exists...
- */
- if (g_hash_table_lookup (linktable, key)) {
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Catnum %d found more than once."),
- __FUNCTION__, *key);
- }
-
- g_hash_table_insert (linktable, key, g_path_get_basename (name));
-
- /* free line */
- g_free (line);
-
- /* read the third line */
- g_io_channel_read_line (tlefile, &line, &length, NULL, NULL);
-
- /* free line */
- g_free (line);
-
- i++;
- }
-
- /* close IO chanel; don't care about status */
- g_io_channel_shutdown (tlefile, TRUE, NULL);
- g_io_channel_unref (tlefile);
- }
-
- return i;
-}
Deleted: trunk/src/tle-lookup.h
===================================================================
--- trunk/src/tle-lookup.h 2009-08-08 23:41:24 UTC (rev 406)
+++ trunk/src/tle-lookup.h 2009-08-08 23:42:09 UTC (rev 407)
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/gpredict/
- More details can be found at the project home page:
-
- http://gpredict.oz9aec.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-#ifndef TLE_LOOKUP_H
-#define TLE_LOOKUP_H 1
-
-#include <glib.h>
-
-
-/** \brief TLE lookup error codes
- \ingroup tle_lookup_if
- */
-typedef enum {
- TLE_LOOKUP_INIT_OK = 0, /*!< No errors. */
- TLE_LOOKUP_EMPTY_DIR = 1, /*!< TLE directory empty, nothing loaded. */
- TLE_LOOKUP_NO_MEM = 2 /*!< Insufficient memory (fatal). */
-} tle_lookup_err_t;
-
-gint tle_lookup_init (const gchar *tledir);
-void tle_lookup_close (void);
-gchar *tle_lookup (gint catnum);
-guint tle_lookup_count (void);
-
-
-#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 23:41:32
|
Revision: 406
http://gpredict.svn.sourceforge.net/gpredict/?rev=406&view=rev
Author: csete
Date: 2009-08-08 23:41:24 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Don't use tle-lookup.
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/src/main.c
trunk/src/qth-data.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2009-08-08 21:30:15 UTC (rev 405)
+++ trunk/src/Makefile.am 2009-08-08 23:41:24 UTC (rev 406)
@@ -68,11 +68,11 @@
pass-popup-menu.c pass-popup-menu.h \
pass-to-txt.c pass-to-txt.h \
predict-tools.c predict-tools.h \
- qth-data.c qth-data.h \
+ qth-data.c qth-data.h \
qth-editor.c qth-editor.h \
radio-conf.c radio-conf.h \
rotor-conf.c rotor-conf.h \
- trsp-conf.c trsp-conf.h \
+ trsp-conf.c trsp-conf.h \
sat-cfg.c sat-cfg.h \
sat-info.c sat-info.h \
sat-log.c sat-log.h \
@@ -107,7 +107,6 @@
sat-vis.c sat-vis.h \
save-pass.c save-pass.h \
time-tools.c time-tools.h \
- tle-lookup.c tle-lookup.h \
tle-tools.c tle-tools.h \
tle-update.c tle-update.h \
sat-debugger.c sat-debugger.h
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2009-08-08 21:30:15 UTC (rev 405)
+++ trunk/src/main.c 2009-08-08 23:41:24 UTC (rev 406)
@@ -49,7 +49,6 @@
#include "compat.h"
#include "gui.h"
#include "mod-mgr.h"
-#include "tle-lookup.h"
#include "tle-update.h"
#include "sat-cfg.h"
#include "sat-debugger.h"
@@ -158,8 +157,7 @@
* gpredict_gui package.
*
*/
-static void
- gpredict_app_create ()
+static void gpredict_app_create ()
{
gchar *title; /* window title */
gchar *icon; /* icon file name */
@@ -279,9 +277,6 @@
/* stop timeouts */
- /* stop other sub-systems */
- tle_lookup_close ();
-
/* configuration data */
mod_mgr_save_state ();
Modified: trunk/src/qth-data.c
===================================================================
--- trunk/src/qth-data.c 2009-08-08 21:30:15 UTC (rev 405)
+++ trunk/src/qth-data.c 2009-08-08 23:41:24 UTC (rev 406)
@@ -32,7 +32,6 @@
#include "qth-data.h"
#include "sat-log.h"
#include "config-keys.h"
-#include "tle-lookup.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 21:30:23
|
Revision: 405
http://gpredict.svn.sourceforge.net/gpredict/?rev=405&view=rev
Author: csete
Date: 2009-08-08 21:30:15 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Removed redundant erro check.
Modified Paths:
--------------
trunk/src/first-time.c
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2009-08-08 15:14:07 UTC (rev 404)
+++ trunk/src/first-time.c 2009-08-08 21:30:15 UTC (rev 405)
@@ -519,56 +519,48 @@
g_key_file_set_string (target, "Satellite", "TLE2", tle2);
/* convert configuration data struct to charachter string */
- cfgstr = g_key_file_to_data (target, &length, &err);
+ cfgstr = g_key_file_to_data (target, &length, NULL); /* this function never reports error */
+ /* create and open a file for writing */
+ cfgfile = g_io_channel_new_file (targetfilename, "w", &err);
+
if (err != NULL) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not create satellite data file (%s)."),
+ _("%s: Could not create satellite file (%s)."),
__FUNCTION__, err->message);
g_clear_error (&err);
*error |= FTC_ERROR_STEP_05;
}
else {
- /* create and open a file for writing */
- cfgfile = g_io_channel_new_file (targetfilename, "w", &err);
+ g_io_channel_write_chars (cfgfile,
+ cfgstr,
+ length,
+ &written,
+ &err);
+ g_io_channel_shutdown (cfgfile, TRUE, NULL);
+ g_io_channel_unref (cfgfile);
+
if (err != NULL) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not create satellite file (%s)."),
+ _("%s: Error writing satellite data (%s)."),
__FUNCTION__, err->message);
g_clear_error (&err);
*error |= FTC_ERROR_STEP_05;
}
+ else if (length != written) {
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Wrote only %d out of %d chars for satellite data."),
+ __FUNCTION__, written, length);
+ }
else {
- g_io_channel_write_chars (cfgfile,
- cfgstr,
- length,
- &written,
- &err);
-
- g_io_channel_shutdown (cfgfile, TRUE, NULL);
- g_io_channel_unref (cfgfile);
-
- if (err != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error writing satellite data (%s)."),
- __FUNCTION__, err->message);
- g_clear_error (&err);
- *error |= FTC_ERROR_STEP_05;
- }
- else if (length != written) {
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Wrote only %d out of %d chars for satellite data."),
- __FUNCTION__, written, length);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Satellite data written for %s."),
- __FUNCTION__, satellites[i]);
- newsats++;
- }
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Satellite data written for %s."),
+ __FUNCTION__, satellites[i]);
+ newsats++;
}
}
+
g_key_file_free (target);
g_free (cfgstr);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 15:14:15
|
Revision: 404
http://gpredict.svn.sourceforge.net/gpredict/?rev=404&view=rev
Author: csete
Date: 2009-08-08 15:14:07 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/first-time.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-08-08 15:12:04 UTC (rev 403)
+++ trunk/ChangeLog 2009-08-08 15:14:07 UTC (rev 404)
@@ -1,3 +1,17 @@
+2009-08-09 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/compat.[ch]:
+ Added sat_file_name_from_catnum_s (gchar *catnum).
+
+
+
+2009-08-07 Alexandru Csete <oz9aec at gmail.com>
+
+ * data/satdata/*.sat:
+ Packaged .sat files into one satellites.dat file for distribution because
+ SF subversion was useless with many small files.
+
+
2009-08-06 Alexandru Csete <oz9aec at gmail.com>
* src/gtk-rig-ctrl.c:
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2009-08-08 15:12:04 UTC (rev 403)
+++ trunk/src/first-time.c 2009-08-08 15:14:07 UTC (rev 404)
@@ -572,6 +572,7 @@
g_key_file_free (target);
g_free (cfgstr);
+ g_free (cfgver);
g_free (name);
g_free (nickname);
g_free (tle1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 15:12:12
|
Revision: 403
http://gpredict.svn.sourceforge.net/gpredict/?rev=403&view=rev
Author: csete
Date: 2009-08-08 15:12:04 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Treat cfg version as string in this scope.
Modified Paths:
--------------
trunk/src/first-time.c
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2009-08-08 15:05:54 UTC (rev 402)
+++ trunk/src/first-time.c 2009-08-08 15:12:04 UTC (rev 403)
@@ -459,8 +459,8 @@
guint i;
guint newsats = 0;
- gdouble cfgver;
- gchar *name, *nickname, *website, *tle1, *tle2;
+ //gdouble cfgver;
+ gchar *name, *nickname, *website, *tle1, *tle2, *cfgver;
GIOChannel *cfgfile;
GDir *srcdir;
@@ -499,7 +499,7 @@
}
else {
/* read data for this satellite */
- cfgver = g_key_file_get_double (satfile, satellites[i], "VERSION", NULL);
+ cfgver = g_key_file_get_string (satfile, satellites[i], "VERSION", NULL);
name = g_key_file_get_string (satfile, satellites[i], "NAME", NULL);
nickname = g_key_file_get_string (satfile, satellites[i], "NICKNAME", NULL);
website = g_key_file_get_string (satfile, satellites[i], "WEBSITE", NULL);
@@ -508,7 +508,7 @@
/* create output .sat file */
target = g_key_file_new ();
- g_key_file_set_double (target, "Satellite", "VERSION", cfgver);
+ g_key_file_set_string (target, "Satellite", "VERSION", cfgver);
g_key_file_set_string (target, "Satellite", "NAME", name);
g_key_file_set_string (target, "Satellite", "NICKNAME", nickname);
if (website != NULL) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 15:06:01
|
Revision: 402
http://gpredict.svn.sourceforge.net/gpredict/?rev=402&view=rev
Author: csete
Date: 2009-08-08 15:05:54 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Minor tweaks and fixes.
Modified Paths:
--------------
trunk/src/first-time.c
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2009-08-08 14:36:07 UTC (rev 401)
+++ trunk/src/first-time.c 2009-08-08 15:05:54 UTC (rev 402)
@@ -484,9 +484,7 @@
*error |= FTC_ERROR_STEP_05;
}
else {
- g_print ("read sats\n");
satellites = g_key_file_get_groups (satfile, &num);
- g_print ("read sats %d\n", num);
sat_log_log (SAT_LOG_LEVEL_MSG,
_("%s: Found %d satellites in %s"),
__FUNCTION__, num, satfilename);
@@ -513,11 +511,13 @@
g_key_file_set_double (target, "Satellite", "VERSION", cfgver);
g_key_file_set_string (target, "Satellite", "NAME", name);
g_key_file_set_string (target, "Satellite", "NICKNAME", nickname);
- g_key_file_set_string (target, "Satellite", "WEBSITE", website);
+ if (website != NULL) {
+ g_key_file_set_string (target, "Satellite", "WEBSITE", website);
+ g_free (website);
+ }
g_key_file_set_string (target, "Satellite", "TLE1", tle1);
g_key_file_set_string (target, "Satellite", "TLE2", tle2);
-
/* convert configuration data struct to charachter string */
cfgstr = g_key_file_to_data (target, &length, &err);
@@ -574,7 +574,6 @@
g_free (cfgstr);
g_free (name);
g_free (nickname);
- g_free (website);
g_free (tle1);
g_free (tle2);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 14:36:16
|
Revision: 401
http://gpredict.svn.sourceforge.net/gpredict/?rev=401&view=rev
Author: csete
Date: 2009-08-08 14:36:07 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Added new .sat file extraction scheme.
Modified Paths:
--------------
trunk/src/first-time.c
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2009-08-08 13:55:15 UTC (rev 400)
+++ trunk/src/first-time.c 2009-08-08 14:36:07 UTC (rev 401)
@@ -77,8 +77,9 @@
* USER_CONF_DIR/modules/
* 4. Check for the existence of USER_CONF_DIR/satdata directory and create it if
* it does not exist.
- * 5. Copy PACKAGE_DATA_DIR/data/satdata/xxx.sat to USER_CONF_DIR/satdata/ if it
- * does not already exist. Do the same with .cat files.
+ * 5. Check if there are any .sat files in USER_CONF_DIR/satdata/ - if not extract
+ * PACKAGE_DATA_DIR/data/satdata/satellites.dat to .sat files.
+ * Do the same with .cat files.
* 6. Check for the existence of USER_CONF_DIR/satdata/cache directory. This
* directory is used to store temporary TLE files when updating from
* network.
@@ -436,76 +437,209 @@
/** \brief Execute step 5 of the first time checks.
*
- * 5. Copy PACKAGE_DATA_DIR/data/satdata/xxx.sat to USER_CONF_DIR/satdata/ if it
- * does not already exist. Do the same with .cat files.
+ * 5. Check if there are any .sat files in USER_CONF_DIR/satdata/ - if not extract
+ * PACKAGE_DATA_DIR/data/satdata/satellites.dat to .sat files.
+ * Do the same with .cat files.
*
+ * \bug Thus function could probably need some clean-up
+ *
*/
static void
first_time_check_step_05 (guint *error)
{
+ gchar *satfilename,*targetfilename;
+ gchar *datadir;
+ gchar **satellites;
+ gchar *cfgstr;
+ GKeyFile *satfile,*target;
+ gsize length;
+ gsize written;
+ gsize num;
+ GError *err = NULL;
+ guint i;
+ guint newsats = 0;
+
+ gdouble cfgver;
+ gchar *name, *nickname, *website, *tle1, *tle2;
+ GIOChannel *cfgfile;
+
GDir *srcdir;
- gchar *buff,*srcdirname,*targetdirname;
+ gchar *srcdirname;
const gchar *filename;
- guint i = 0;
- /* source directory */
- buff = get_data_dir ();
- srcdirname = g_strconcat (buff, G_DIR_SEPARATOR_S, "satdata", NULL);
- g_free (buff);
+ /* open datellites.dat and load into memory */
+ datadir = get_data_dir ();
+ satfilename = g_strconcat (datadir, G_DIR_SEPARATOR_S, "satdata",
+ G_DIR_SEPARATOR_S, "satellites.dat", NULL);
- /* target directory */
- targetdirname = get_satdata_dir ();
+ satfile = g_key_file_new ();
+ if (!g_key_file_load_from_file (satfile, satfilename, G_KEY_FILE_KEEP_COMMENTS, &err)) {
+ /* an error occurred */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Failed to load data from %s (%s)"),
+ __FUNCTION__, satfilename, err->message);
- srcdir = g_dir_open (srcdirname, 0, NULL);
+ g_clear_error (&err);
+ *error |= FTC_ERROR_STEP_05;
+ }
+ else {
+ g_print ("read sats\n");
+ satellites = g_key_file_get_groups (satfile, &num);
+ g_print ("read sats %d\n", num);
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Found %d satellites in %s"),
+ __FUNCTION__, num, satfilename);
+ for (i = 0; i < num; i++) {
+ /* first, check if this satellite already has a .sat file */
+ targetfilename = sat_file_name_from_catnum_s (satellites[i]);
+ if (g_file_test (targetfilename, G_FILE_TEST_EXISTS)) {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: %s.sat already exists. Skipped."),
+ __FUNCTION__, satellites[i]);
+ }
+ else {
+ /* read data for this satellite */
+ cfgver = g_key_file_get_double (satfile, satellites[i], "VERSION", NULL);
+ name = g_key_file_get_string (satfile, satellites[i], "NAME", NULL);
+ nickname = g_key_file_get_string (satfile, satellites[i], "NICKNAME", NULL);
+ website = g_key_file_get_string (satfile, satellites[i], "WEBSITE", NULL);
+ tle1 = g_key_file_get_string (satfile, satellites[i], "TLE1", NULL);
+ tle2 = g_key_file_get_string (satfile, satellites[i], "TLE2", NULL);
+
+ /* create output .sat file */
+ target = g_key_file_new ();
+ g_key_file_set_double (target, "Satellite", "VERSION", cfgver);
+ g_key_file_set_string (target, "Satellite", "NAME", name);
+ g_key_file_set_string (target, "Satellite", "NICKNAME", nickname);
+ g_key_file_set_string (target, "Satellite", "WEBSITE", website);
+ g_key_file_set_string (target, "Satellite", "TLE1", tle1);
+ g_key_file_set_string (target, "Satellite", "TLE2", tle2);
+
+
+ /* convert configuration data struct to charachter string */
+ cfgstr = g_key_file_to_data (target, &length, &err);
+
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create satellite data file (%s)."),
+ __FUNCTION__, err->message);
+ g_clear_error (&err);
+ *error |= FTC_ERROR_STEP_05;
+ }
+ else {
+ /* create and open a file for writing */
+ cfgfile = g_io_channel_new_file (targetfilename, "w", &err);
+
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create satellite file (%s)."),
+ __FUNCTION__, err->message);
+ g_clear_error (&err);
+ *error |= FTC_ERROR_STEP_05;
+ }
+ else {
+ g_io_channel_write_chars (cfgfile,
+ cfgstr,
+ length,
+ &written,
+ &err);
+
+ g_io_channel_shutdown (cfgfile, TRUE, NULL);
+ g_io_channel_unref (cfgfile);
+
+ if (err != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error writing satellite data (%s)."),
+ __FUNCTION__, err->message);
+ g_clear_error (&err);
+ *error |= FTC_ERROR_STEP_05;
+ }
+ else if (length != written) {
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Wrote only %d out of %d chars for satellite data."),
+ __FUNCTION__, written, length);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Satellite data written for %s."),
+ __FUNCTION__, satellites[i]);
+ newsats++;
+ }
+ }
+ }
+ g_key_file_free (target);
+
+ g_free (cfgstr);
+ g_free (name);
+ g_free (nickname);
+ g_free (website);
+ g_free (tle1);
+ g_free (tle2);
+ }
+ g_free (targetfilename);
+ }
+ g_strfreev (satellites);
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Written %d new satellite to user config"),
+ __FUNCTION__, newsats);
+ }
+
+ g_key_file_free (satfile);
+ g_free (satfilename);
+
+
+ /* .cat files: if .cat file does not exist, copy it, otherwise skip */
+ srcdirname = g_strconcat (datadir, G_DIR_SEPARATOR_S, "satdata", NULL);
+ g_free (datadir);
+ //targetdirname = get_satdata_dir ();
+ srcdir = g_dir_open (srcdirname, 0, &err);
+
/* directory does not exist, something went wrong in step 4 */
if (!srcdir) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not open %s."),
- __FUNCTION__, srcdirname);
-
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not open %s (%s)."),
+ __FUNCTION__, srcdirname, err->message);
+
/* no reason to continue */
+ g_clear_error (&err);
*error |= FTC_ERROR_STEP_05;
}
else {
+
+ /* get each .cat file and check if they already exist in user conf */
/* read files one by one, if any; count number of .tle files */
while ((filename = g_dir_read_name (srcdir))) {
/* note: filename is not a newly allocated gchar *,
so we must not free it
*/
+ if (g_strrstr (filename, ".cat")) {
- /* check whether .sat or .cat file exisits in user conf */
- gchar *target = sat_file_name (filename);
+ /* check whether .cat file exisits in user conf */
+ gchar *catfilename = sat_file_name (filename);
- if (!g_file_test (target, G_FILE_TEST_EXISTS)) {
- /* copy file to target dir */
- gchar *source = g_strconcat (srcdirname, G_DIR_SEPARATOR_S, filename, NULL);
- if (gpredict_file_copy (source, target)) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to copy %s"),
- __FUNCTION__, filename);
+ if (!g_file_test (catfilename, G_FILE_TEST_EXISTS)) {
+ /* copy file to target dir */
+ gchar *source = g_strconcat (srcdirname, G_DIR_SEPARATOR_S, filename, NULL);
+ if (gpredict_file_copy (source, catfilename)) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Failed to copy %s"),
+ __FUNCTION__, filename);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Successfully copied %s"),
+ __FUNCTION__, filename);
+ }
+ g_free (source);
}
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Successfully copied %s"),
- __FUNCTION__, filename);
- }
- g_free (source);
- i++;
}
- g_free (target);
-
}
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Copied %d files to %s"),
- __FUNCTION__, i, targetdirname);
-
g_dir_close (srcdir);
}
g_free (srcdirname);
- g_free (targetdirname);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 13:55:22
|
Revision: 400
http://gpredict.svn.sourceforge.net/gpredict/?rev=400&view=rev
Author: csete
Date: 2009-08-08 13:55:15 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Correct function name.
Modified Paths:
--------------
trunk/src/compat.c
Modified: trunk/src/compat.c
===================================================================
--- trunk/src/compat.c 2009-08-08 12:52:24 UTC (rev 399)
+++ trunk/src/compat.c 2009-08-08 13:55:15 UTC (rev 400)
@@ -334,7 +334,7 @@
/** \brief Build satellite file path from catnum (string) */
-gchar *sat_file_name_from_catnum (gchar *catnum)
+gchar *sat_file_name_from_catnum_s (gchar *catnum)
{
gchar *filename;
gchar *buff;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-08 12:52:33
|
Revision: 399
http://gpredict.svn.sourceforge.net/gpredict/?rev=399&view=rev
Author: csete
Date: 2009-08-08 12:52:24 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Added sat_file_name_from_catnum_s (gchar *catnum).
Modified Paths:
--------------
trunk/src/compat.c
trunk/src/compat.h
Modified: trunk/src/compat.c
===================================================================
--- trunk/src/compat.c 2009-08-07 23:40:48 UTC (rev 398)
+++ trunk/src/compat.c 2009-08-08 12:52:24 UTC (rev 399)
@@ -314,7 +314,7 @@
}
-/** \brief Build satellite file path from catnum */
+/** \brief Build satellite file path from catnum (integer) */
gchar *sat_file_name_from_catnum (guint catnum)
{
gchar *filename;
@@ -333,7 +333,27 @@
}
+/** \brief Build satellite file path from catnum (string) */
+gchar *sat_file_name_from_catnum (gchar *catnum)
+{
+ gchar *filename;
+ gchar *buff;
+ gchar *dir;
+ buff = g_strdup_printf ("%s.sat", catnum);
+ dir = get_satdata_dir ();
+
+ filename = g_strconcat (dir, G_DIR_SEPARATOR_S, buff, NULL);
+
+ g_free (buff);
+ g_free (dir);
+
+ return filename;
+}
+
+
+
+
/** \brief Get full path of a .trsp file
* \param trspfile The file name for the satellite
* \return A newly allocated gchar * that should be freed when no longer needed
Modified: trunk/src/compat.h
===================================================================
--- trunk/src/compat.h 2009-08-07 23:40:48 UTC (rev 398)
+++ trunk/src/compat.h 2009-08-08 12:52:24 UTC (rev 399)
@@ -46,5 +46,6 @@
gchar *hw_file_name (const gchar *hwfile);
gchar *sat_file_name_from_catnum (guint catnum);
+gchar *sat_file_name_from_catnum_s (gchar *catnum);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-07 23:40:57
|
Revision: 398
http://gpredict.svn.sourceforge.net/gpredict/?rev=398&view=rev
Author: csete
Date: 2009-08-07 23:40:48 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Switch from .sat files to .dat file.
Modified Paths:
--------------
trunk/data/satdata/Makefile.am
Modified: trunk/data/satdata/Makefile.am
===================================================================
--- trunk/data/satdata/Makefile.am 2009-08-07 23:38:30 UTC (rev 397)
+++ trunk/data/satdata/Makefile.am 2009-08-07 23:40:48 UTC (rev 398)
@@ -1,7 +1,7 @@
gpredict_satdir = $(pkgdatadir)/data/satdata
-gpredict_sat_DATA = *.sat *.cat
+gpredict_sat_DATA = satellites.dat *.cat
EXTRA_DIST = $(gpredict_sat_DATA)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-07 23:38:45
|
Revision: 397
http://gpredict.svn.sourceforge.net/gpredict/?rev=397&view=rev
Author: csete
Date: 2009-08-07 23:38:30 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Removing individual .sat files. Use .dat for distribution.
Removed Paths:
-------------
trunk/data/satdata/10061.sat
trunk/data/satdata/10114.sat
trunk/data/satdata/10457.sat
trunk/data/satdata/10637.sat
trunk/data/satdata/10703.sat
trunk/data/satdata/10861.sat
trunk/data/satdata/10953.sat
trunk/data/satdata/10967.sat
trunk/data/satdata/11060.sat
trunk/data/satdata/11267.sat
trunk/data/satdata/11416.sat
trunk/data/satdata/11574.sat
trunk/data/satdata/11672.sat
trunk/data/satdata/11849.sat
trunk/data/satdata/11933.sat
trunk/data/satdata/11964.sat
trunk/data/satdata/12054.sat
trunk/data/satdata/12139.sat
trunk/data/satdata/12309.sat
trunk/data/satdata/12389.sat
trunk/data/satdata/12458.sat
trunk/data/satdata/12465.sat
trunk/data/satdata/12472.sat
trunk/data/satdata/12553.sat
trunk/data/satdata/12585.sat
trunk/data/satdata/12904.sat
trunk/data/satdata/1293.sat
trunk/data/satdata/13068.sat
trunk/data/satdata/13154.sat
trunk/data/satdata/13367.sat
trunk/data/satdata/13402.sat
trunk/data/satdata/13403.sat
trunk/data/satdata/1361.sat
trunk/data/satdata/13631.sat
trunk/data/satdata/13777.sat
trunk/data/satdata/13819.sat
trunk/data/satdata/13923.sat
trunk/data/satdata/13969.sat
trunk/data/satdata/14050.sat
trunk/data/satdata/14129.sat
trunk/data/satdata/14207.sat
trunk/data/satdata/14208.sat
trunk/data/satdata/14372.sat
trunk/data/satdata/14484.sat
trunk/data/satdata/14699.sat
trunk/data/satdata/14780.sat
trunk/data/satdata/14781.sat
trunk/data/satdata/14819.sat
trunk/data/satdata/14820.sat
trunk/data/satdata/1512.sat
trunk/data/satdata/1520.sat
trunk/data/satdata/15354.sat
trunk/data/satdata/15362.sat
trunk/data/satdata/15427.sat
trunk/data/satdata/15483.sat
trunk/data/satdata/15677.sat
trunk/data/satdata/15772.sat
trunk/data/satdata/15873.sat
trunk/data/satdata/15935.sat
trunk/data/satdata/15936.sat
trunk/data/satdata/15945.sat
trunk/data/satdata/16111.sat
trunk/data/satdata/16182.sat
trunk/data/satdata/16496.sat
trunk/data/satdata/16792.sat
trunk/data/satdata/16882.sat
trunk/data/satdata/16908.sat
trunk/data/satdata/16909.sat
trunk/data/satdata/16969.sat
trunk/data/satdata/17070.sat
trunk/data/satdata/17295.sat
trunk/data/satdata/17561.sat
trunk/data/satdata/17567.sat
trunk/data/satdata/17589.sat
trunk/data/satdata/17590.sat
trunk/data/satdata/17912.sat
trunk/data/satdata/17973.sat
trunk/data/satdata/18153.sat
trunk/data/satdata/18187.sat
trunk/data/satdata/18361.sat
trunk/data/satdata/18362.sat
trunk/data/satdata/18749.sat
trunk/data/satdata/18958.sat
trunk/data/satdata/19046.sat
trunk/data/satdata/19070.sat
trunk/data/satdata/19071.sat
trunk/data/satdata/19120.sat
trunk/data/satdata/19210.sat
trunk/data/satdata/19223.sat
trunk/data/satdata/19257.sat
trunk/data/satdata/19419.sat
trunk/data/satdata/19420.sat
trunk/data/satdata/19483.sat
trunk/data/satdata/19531.sat
trunk/data/satdata/19548.sat
trunk/data/satdata/19573.sat
trunk/data/satdata/19574.sat
trunk/data/satdata/19650.sat
trunk/data/satdata/19688.sat
trunk/data/satdata/19822.sat
trunk/data/satdata/19883.sat
trunk/data/satdata/20261.sat
trunk/data/satdata/20262.sat
trunk/data/satdata/20315.sat
trunk/data/satdata/20322.sat
trunk/data/satdata/20323.sat
trunk/data/satdata/20410.sat
trunk/data/satdata/20436.sat
trunk/data/satdata/20437.sat
trunk/data/satdata/20438.sat
trunk/data/satdata/20439.sat
trunk/data/satdata/20440.sat
trunk/data/satdata/20441.sat
trunk/data/satdata/20442.sat
trunk/data/satdata/20453.sat
trunk/data/satdata/20465.sat
trunk/data/satdata/20466.sat
trunk/data/satdata/20479.sat
trunk/data/satdata/20480.sat
trunk/data/satdata/20511.sat
trunk/data/satdata/20523.sat
trunk/data/satdata/20558.sat
trunk/data/satdata/20580.sat
trunk/data/satdata/20608.sat
trunk/data/satdata/20625.sat
trunk/data/satdata/20638.sat
trunk/data/satdata/20643.sat
trunk/data/satdata/20663.sat
trunk/data/satdata/20666.sat
trunk/data/satdata/20693.sat
trunk/data/satdata/20712.sat
trunk/data/satdata/20775.sat
trunk/data/satdata/20776.sat
trunk/data/satdata/20777.sat
trunk/data/satdata/20813.sat
trunk/data/satdata/20872.sat
trunk/data/satdata/20873.sat
trunk/data/satdata/20918.sat
trunk/data/satdata/20946.sat
trunk/data/satdata/20959.sat
trunk/data/satdata/21087.sat
trunk/data/satdata/21088.sat
trunk/data/satdata/21089.sat
trunk/data/satdata/21111.sat
trunk/data/satdata/21118.sat
trunk/data/satdata/21140.sat
trunk/data/satdata/21149.sat
trunk/data/satdata/21196.sat
trunk/data/satdata/21263.sat
trunk/data/satdata/21397.sat
trunk/data/satdata/21422.sat
trunk/data/satdata/21423.sat
trunk/data/satdata/21426.sat
trunk/data/satdata/21552.sat
trunk/data/satdata/21574.sat
trunk/data/satdata/21575.sat
trunk/data/satdata/21576.sat
trunk/data/satdata/21577.sat
trunk/data/satdata/21578.sat
trunk/data/satdata/21610.sat
trunk/data/satdata/21639.sat
trunk/data/satdata/21653.sat
trunk/data/satdata/21701.sat
trunk/data/satdata/21706.sat
trunk/data/satdata/21726.sat
trunk/data/satdata/21765.sat
trunk/data/satdata/21803.sat
trunk/data/satdata/21819.sat
trunk/data/satdata/21820.sat
trunk/data/satdata/21876.sat
trunk/data/satdata/21890.sat
trunk/data/satdata/21906.sat
trunk/data/satdata/21922.sat
trunk/data/satdata/21938.sat
trunk/data/satdata/21940.sat
trunk/data/satdata/22012.sat
trunk/data/satdata/22014.sat
trunk/data/satdata/22028.sat
trunk/data/satdata/22041.sat
trunk/data/satdata/22076.sat
trunk/data/satdata/22077.sat
trunk/data/satdata/22078.sat
trunk/data/satdata/22108.sat
trunk/data/satdata/22117.sat
trunk/data/satdata/22175.sat
trunk/data/satdata/22178.sat
trunk/data/satdata/22195.sat
trunk/data/satdata/22220.sat
trunk/data/satdata/22245.sat
trunk/data/satdata/22269.sat
trunk/data/satdata/22285.sat
trunk/data/satdata/22286.sat
trunk/data/satdata/22314.sat
trunk/data/satdata/22566.sat
trunk/data/satdata/22626.sat
trunk/data/satdata/22653.sat
trunk/data/satdata/22654.sat
trunk/data/satdata/22671.sat
trunk/data/satdata/22698.sat
trunk/data/satdata/22700.sat
trunk/data/satdata/22724.sat
trunk/data/satdata/22729.sat
trunk/data/satdata/22739.sat
trunk/data/satdata/22796.sat
trunk/data/satdata/22803.sat
trunk/data/satdata/22824.sat
trunk/data/satdata/22825.sat
trunk/data/satdata/22826.sat
trunk/data/satdata/22827.sat
trunk/data/satdata/22828.sat
trunk/data/satdata/22829.sat
trunk/data/satdata/22830.sat
trunk/data/satdata/22871.sat
trunk/data/satdata/22877.sat
trunk/data/satdata/22880.sat
trunk/data/satdata/22907.sat
trunk/data/satdata/22911.sat
trunk/data/satdata/22912.sat
trunk/data/satdata/22921.sat
trunk/data/satdata/22931.sat
trunk/data/satdata/22949.sat
trunk/data/satdata/22970.sat
trunk/data/satdata/23027.sat
trunk/data/satdata/23051.sat
trunk/data/satdata/23087.sat
trunk/data/satdata/23088.sat
trunk/data/satdata/23108.sat
trunk/data/satdata/23124.sat
trunk/data/satdata/23125.sat
trunk/data/satdata/23126.sat
trunk/data/satdata/23175.sat
trunk/data/satdata/23176.sat
trunk/data/satdata/23185.sat
trunk/data/satdata/23192.sat
trunk/data/satdata/23199.sat
trunk/data/satdata/23227.sat
trunk/data/satdata/23305.sat
trunk/data/satdata/23313.sat
trunk/data/satdata/23314.sat
trunk/data/satdata/23319.sat
trunk/data/satdata/23331.sat
trunk/data/satdata/23343.sat
trunk/data/satdata/23405.sat
trunk/data/satdata/23420.sat
trunk/data/satdata/23439.sat
trunk/data/satdata/23448.sat
trunk/data/satdata/23455.sat
trunk/data/satdata/23461.sat
trunk/data/satdata/23522.sat
trunk/data/satdata/23528.sat
trunk/data/satdata/23536.sat
trunk/data/satdata/23545.sat
trunk/data/satdata/23546.sat
trunk/data/satdata/23547.sat
trunk/data/satdata/23553.sat
trunk/data/satdata/23560.sat
trunk/data/satdata/23561.sat
trunk/data/satdata/23571.sat
trunk/data/satdata/23581.sat
trunk/data/satdata/23598.sat
trunk/data/satdata/23605.sat
trunk/data/satdata/23606.sat
trunk/data/satdata/23607.sat
trunk/data/satdata/23613.sat
trunk/data/satdata/23636.sat
trunk/data/satdata/23642.sat
trunk/data/satdata/23653.sat
trunk/data/satdata/23670.sat
trunk/data/satdata/23680.sat
trunk/data/satdata/23686.sat
trunk/data/satdata/23705.sat
trunk/data/satdata/23710.sat
trunk/data/satdata/23711.sat
trunk/data/satdata/23723.sat
trunk/data/satdata/23730.sat
trunk/data/satdata/23754.sat
trunk/data/satdata/23757.sat
trunk/data/satdata/23764.sat
trunk/data/satdata/23765.sat
trunk/data/satdata/23768.sat
trunk/data/satdata/23775.sat
trunk/data/satdata/23779.sat
trunk/data/satdata/23814.sat
trunk/data/satdata/23816.sat
trunk/data/satdata/23833.sat
trunk/data/satdata/23839.sat
trunk/data/satdata/23842.sat
trunk/data/satdata/23846.sat
trunk/data/satdata/23864.sat
trunk/data/satdata/23865.sat
trunk/data/satdata/23877.sat
trunk/data/satdata/23880.sat
trunk/data/satdata/23915.sat
trunk/data/satdata/23940.sat
trunk/data/satdata/23943.sat
trunk/data/satdata/23949.sat
trunk/data/satdata/23953.sat
trunk/data/satdata/24209.sat
trunk/data/satdata/24273.sat
trunk/data/satdata/24277.sat
trunk/data/satdata/24278.sat
trunk/data/satdata/24285.sat
trunk/data/satdata/24298.sat
trunk/data/satdata/24305.sat
trunk/data/satdata/24307.sat
trunk/data/satdata/24313.sat
trunk/data/satdata/24315.sat
trunk/data/satdata/24320.sat
trunk/data/satdata/24652.sat
trunk/data/satdata/24653.sat
trunk/data/satdata/24665.sat
trunk/data/satdata/24674.sat
trunk/data/satdata/24713.sat
trunk/data/satdata/24714.sat
trunk/data/satdata/24732.sat
trunk/data/satdata/24742.sat
trunk/data/satdata/24748.sat
trunk/data/satdata/24769.sat
trunk/data/satdata/24786.sat
trunk/data/satdata/24792.sat
trunk/data/satdata/24793.sat
trunk/data/satdata/24794.sat
trunk/data/satdata/24795.sat
trunk/data/satdata/24796.sat
trunk/data/satdata/24798.sat
trunk/data/satdata/24808.sat
trunk/data/satdata/24812.sat
trunk/data/satdata/24819.sat
trunk/data/satdata/24834.sat
trunk/data/satdata/24836.sat
trunk/data/satdata/24837.sat
trunk/data/satdata/24839.sat
trunk/data/satdata/24840.sat
trunk/data/satdata/24841.sat
trunk/data/satdata/24842.sat
trunk/data/satdata/24846.sat
trunk/data/satdata/24869.sat
trunk/data/satdata/24870.sat
trunk/data/satdata/24871.sat
trunk/data/satdata/24872.sat
trunk/data/satdata/24873.sat
trunk/data/satdata/24876.sat
trunk/data/satdata/24880.sat
trunk/data/satdata/24883.sat
trunk/data/satdata/24901.sat
trunk/data/satdata/24903.sat
trunk/data/satdata/24904.sat
trunk/data/satdata/24905.sat
trunk/data/satdata/24906.sat
trunk/data/satdata/24907.sat
trunk/data/satdata/24916.sat
trunk/data/satdata/24925.sat
trunk/data/satdata/24926.sat
trunk/data/satdata/24931.sat
trunk/data/satdata/24932.sat
trunk/data/satdata/24936.sat
trunk/data/satdata/24944.sat
trunk/data/satdata/24945.sat
trunk/data/satdata/24946.sat
trunk/data/satdata/24948.sat
trunk/data/satdata/24949.sat
trunk/data/satdata/24950.sat
trunk/data/satdata/24953.sat
trunk/data/satdata/24954.sat
trunk/data/satdata/24957.sat
trunk/data/satdata/24960.sat
trunk/data/satdata/24965.sat
trunk/data/satdata/24966.sat
trunk/data/satdata/24967.sat
trunk/data/satdata/24968.sat
trunk/data/satdata/24969.sat
trunk/data/satdata/24971.sat
trunk/data/satdata/25004.sat
trunk/data/satdata/25010.sat
trunk/data/satdata/25023.sat
trunk/data/satdata/25024.sat
trunk/data/satdata/25025.sat
trunk/data/satdata/25030.sat
trunk/data/satdata/25039.sat
trunk/data/satdata/25040.sat
trunk/data/satdata/25041.sat
trunk/data/satdata/25042.sat
trunk/data/satdata/25043.sat
trunk/data/satdata/25050.sat
trunk/data/satdata/25063.sat
trunk/data/satdata/25064.sat
trunk/data/satdata/25071.sat
trunk/data/satdata/25077.sat
trunk/data/satdata/25078.sat
trunk/data/satdata/25086.sat
trunk/data/satdata/25104.sat
trunk/data/satdata/25105.sat
trunk/data/satdata/25106.sat
trunk/data/satdata/25108.sat
trunk/data/satdata/25112.sat
trunk/data/satdata/25113.sat
trunk/data/satdata/25114.sat
trunk/data/satdata/25115.sat
trunk/data/satdata/25116.sat
trunk/data/satdata/25117.sat
trunk/data/satdata/25118.sat
trunk/data/satdata/25119.sat
trunk/data/satdata/25126.sat
trunk/data/satdata/25152.sat
trunk/data/satdata/25153.sat
trunk/data/satdata/25158.sat
trunk/data/satdata/25159.sat
trunk/data/satdata/25160.sat
trunk/data/satdata/25162.sat
trunk/data/satdata/25163.sat
trunk/data/satdata/25164.sat
trunk/data/satdata/25165.sat
trunk/data/satdata/25169.sat
trunk/data/satdata/25170.sat
trunk/data/satdata/25171.sat
trunk/data/satdata/25172.sat
trunk/data/satdata/25173.sat
trunk/data/satdata/25237.sat
trunk/data/satdata/25239.sat
trunk/data/satdata/25260.sat
trunk/data/satdata/25262.sat
trunk/data/satdata/25263.sat
trunk/data/satdata/25272.sat
trunk/data/satdata/25273.sat
trunk/data/satdata/25274.sat
trunk/data/satdata/25275.sat
trunk/data/satdata/25276.sat
trunk/data/satdata/25280.sat
trunk/data/satdata/25285.sat
trunk/data/satdata/25286.sat
trunk/data/satdata/25287.sat
trunk/data/satdata/25288.sat
trunk/data/satdata/25289.sat
trunk/data/satdata/25290.sat
trunk/data/satdata/25291.sat
trunk/data/satdata/25306.sat
trunk/data/satdata/25307.sat
trunk/data/satdata/25308.sat
trunk/data/satdata/25309.sat
trunk/data/satdata/25311.sat
trunk/data/satdata/25315.sat
trunk/data/satdata/25319.sat
trunk/data/satdata/25320.sat
trunk/data/satdata/25331.sat
trunk/data/satdata/25338.sat
trunk/data/satdata/25342.sat
trunk/data/satdata/25343.sat
trunk/data/satdata/25344.sat
trunk/data/satdata/25345.sat
trunk/data/satdata/25346.sat
trunk/data/satdata/25354.sat
trunk/data/satdata/25358.sat
trunk/data/satdata/25371.sat
trunk/data/satdata/25379.sat
trunk/data/satdata/25395.sat
trunk/data/satdata/25396.sat
trunk/data/satdata/25397.sat
trunk/data/satdata/25398.sat
trunk/data/satdata/25399.sat
trunk/data/satdata/25400.sat
trunk/data/satdata/25404.sat
trunk/data/satdata/25407.sat
trunk/data/satdata/25413.sat
trunk/data/satdata/25414.sat
trunk/data/satdata/25415.sat
trunk/data/satdata/25416.sat
trunk/data/satdata/25417.sat
trunk/data/satdata/25418.sat
trunk/data/satdata/25419.sat
trunk/data/satdata/25420.sat
trunk/data/satdata/25431.sat
trunk/data/satdata/25432.sat
trunk/data/satdata/25460.sat
trunk/data/satdata/25462.sat
trunk/data/satdata/25467.sat
trunk/data/satdata/25468.sat
trunk/data/satdata/25469.sat
trunk/data/satdata/25471.sat
trunk/data/satdata/25473.sat
trunk/data/satdata/25475.sat
trunk/data/satdata/25476.sat
trunk/data/satdata/25477.sat
trunk/data/satdata/25478.sat
trunk/data/satdata/25479.sat
trunk/data/satdata/25480.sat
trunk/data/satdata/25481.sat
trunk/data/satdata/25482.sat
trunk/data/satdata/25485.sat
trunk/data/satdata/25491.sat
trunk/data/satdata/25492.sat
trunk/data/satdata/25495.sat
trunk/data/satdata/25509.sat
trunk/data/satdata/25515.sat
trunk/data/satdata/25516.sat
trunk/data/satdata/25520.sat
trunk/data/satdata/25522.sat
trunk/data/satdata/25527.sat
trunk/data/satdata/25528.sat
trunk/data/satdata/25530.sat
trunk/data/satdata/25531.sat
trunk/data/satdata/25544.sat
trunk/data/satdata/25546.sat
trunk/data/satdata/25558.sat
trunk/data/satdata/25560.sat
trunk/data/satdata/25568.sat
trunk/data/satdata/25577.sat
trunk/data/satdata/25578.sat
trunk/data/satdata/25590.sat
trunk/data/satdata/25621.sat
trunk/data/satdata/25622.sat
trunk/data/satdata/25623.sat
trunk/data/satdata/25624.sat
trunk/data/satdata/25626.sat
trunk/data/satdata/25630.sat
trunk/data/satdata/25634.sat
trunk/data/satdata/25635.sat
trunk/data/satdata/25636.sat
trunk/data/satdata/25638.sat
trunk/data/satdata/25639.sat
trunk/data/satdata/25642.sat
trunk/data/satdata/25646.sat
trunk/data/satdata/25649.sat
trunk/data/satdata/25650.sat
trunk/data/satdata/25651.sat
trunk/data/satdata/25652.sat
trunk/data/satdata/25657.sat
trunk/data/satdata/25666.sat
trunk/data/satdata/25673.sat
trunk/data/satdata/25676.sat
trunk/data/satdata/25677.sat
trunk/data/satdata/25678.sat
trunk/data/satdata/25679.sat
trunk/data/satdata/25682.sat
trunk/data/satdata/25693.sat
trunk/data/satdata/25721.sat
trunk/data/satdata/25723.sat
trunk/data/satdata/25732.sat
trunk/data/satdata/25735.sat
trunk/data/satdata/25736.sat
trunk/data/satdata/25740.sat
trunk/data/satdata/25756.sat
trunk/data/satdata/25757.sat
trunk/data/satdata/25758.sat
trunk/data/satdata/25770.sat
trunk/data/satdata/25771.sat
trunk/data/satdata/25772.sat
trunk/data/satdata/25773.sat
trunk/data/satdata/25777.sat
trunk/data/satdata/25778.sat
trunk/data/satdata/25785.sat
trunk/data/satdata/25789.sat
trunk/data/satdata/25791.sat
trunk/data/satdata/25847.sat
trunk/data/satdata/25851.sat
trunk/data/satdata/25852.sat
trunk/data/satdata/25853.sat
trunk/data/satdata/25854.sat
trunk/data/satdata/25860.sat
trunk/data/satdata/25861.sat
trunk/data/satdata/25867.sat
trunk/data/satdata/25872.sat
trunk/data/satdata/25873.sat
trunk/data/satdata/25874.sat
trunk/data/satdata/25875.sat
trunk/data/satdata/25880.sat
trunk/data/satdata/25883.sat
trunk/data/satdata/25884.sat
trunk/data/satdata/25885.sat
trunk/data/satdata/25886.sat
trunk/data/satdata/25894.sat
trunk/data/satdata/25897.sat
trunk/data/satdata/25907.sat
trunk/data/satdata/25908.sat
trunk/data/satdata/25909.sat
trunk/data/satdata/25910.sat
trunk/data/satdata/25913.sat
trunk/data/satdata/25919.sat
trunk/data/satdata/25922.sat
trunk/data/satdata/25924.sat
trunk/data/satdata/25933.sat
trunk/data/satdata/25937.sat
trunk/data/satdata/25940.sat
trunk/data/satdata/25943.sat
trunk/data/satdata/25944.sat
trunk/data/satdata/25945.sat
trunk/data/satdata/25946.sat
trunk/data/satdata/25949.sat
trunk/data/satdata/25954.sat
trunk/data/satdata/25961.sat
trunk/data/satdata/25962.sat
trunk/data/satdata/25963.sat
trunk/data/satdata/25964.sat
trunk/data/satdata/25977.sat
trunk/data/satdata/25978.sat
trunk/data/satdata/25980.sat
trunk/data/satdata/25981.sat
trunk/data/satdata/25982.sat
trunk/data/satdata/25983.sat
trunk/data/satdata/25984.sat
trunk/data/satdata/25985.sat
trunk/data/satdata/25986.sat
trunk/data/satdata/25989.sat
trunk/data/satdata/25994.sat
trunk/data/satdata/26032.sat
trunk/data/satdata/26033.sat
trunk/data/satdata/26034.sat
trunk/data/satdata/26038.sat
trunk/data/satdata/26058.sat
trunk/data/satdata/26063.sat
trunk/data/satdata/26064.sat
trunk/data/satdata/26071.sat
trunk/data/satdata/2608.sat
trunk/data/satdata/26080.sat
trunk/data/satdata/26081.sat
trunk/data/satdata/26082.sat
trunk/data/satdata/26083.sat
trunk/data/satdata/26084.sat
trunk/data/satdata/26089.sat
trunk/data/satdata/26091.sat
trunk/data/satdata/26092.sat
trunk/data/satdata/26093.sat
trunk/data/satdata/26094.sat
trunk/data/satdata/26095.sat
trunk/data/satdata/26098.sat
trunk/data/satdata/26102.sat
trunk/data/satdata/26107.sat
trunk/data/satdata/26108.sat
trunk/data/satdata/26113.sat
trunk/data/satdata/26243.sat
trunk/data/satdata/26298.sat
trunk/data/satdata/26352.sat
trunk/data/satdata/26360.sat
trunk/data/satdata/26369.sat
trunk/data/satdata/26372.sat
trunk/data/satdata/26378.sat
trunk/data/satdata/26382.sat
trunk/data/satdata/26386.sat
trunk/data/satdata/26388.sat
trunk/data/satdata/26390.sat
trunk/data/satdata/26394.sat
trunk/data/satdata/26402.sat
trunk/data/satdata/26405.sat
trunk/data/satdata/26407.sat
trunk/data/satdata/26410.sat
trunk/data/satdata/26411.sat
trunk/data/satdata/26451.sat
trunk/data/satdata/26463.sat
trunk/data/satdata/26464.sat
trunk/data/satdata/26469.sat
trunk/data/satdata/26470.sat
trunk/data/satdata/26477.sat
trunk/data/satdata/26483.sat
trunk/data/satdata/26487.sat
trunk/data/satdata/26494.sat
trunk/data/satdata/26495.sat
trunk/data/satdata/26536.sat
trunk/data/satdata/26545.sat
trunk/data/satdata/26546.sat
trunk/data/satdata/26547.sat
trunk/data/satdata/26548.sat
trunk/data/satdata/26549.sat
trunk/data/satdata/26554.sat
trunk/data/satdata/26559.sat
trunk/data/satdata/26561.sat
trunk/data/satdata/26580.sat
trunk/data/satdata/26590.sat
trunk/data/satdata/26599.sat
trunk/data/satdata/26605.sat
trunk/data/satdata/26608.sat
trunk/data/satdata/26609.sat
trunk/data/satdata/26610.sat
trunk/data/satdata/26619.sat
trunk/data/satdata/26620.sat
trunk/data/satdata/26621.sat
trunk/data/satdata/26624.sat
trunk/data/satdata/26626.sat
trunk/data/satdata/26631.sat
trunk/data/satdata/26638.sat
trunk/data/satdata/26639.sat
trunk/data/satdata/26643.sat
trunk/data/satdata/26666.sat
trunk/data/satdata/26690.sat
trunk/data/satdata/26694.sat
trunk/data/satdata/26695.sat
trunk/data/satdata/26702.sat
trunk/data/satdata/26719.sat
trunk/data/satdata/26720.sat
trunk/data/satdata/26724.sat
trunk/data/satdata/26761.sat
trunk/data/satdata/26766.sat
trunk/data/satdata/26818.sat
trunk/data/satdata/26824.sat
trunk/data/satdata/26853.sat
trunk/data/satdata/26863.sat
trunk/data/satdata/26867.sat
trunk/data/satdata/26871.sat
trunk/data/satdata/26874.sat
trunk/data/satdata/26892.sat
trunk/data/satdata/26900.sat
trunk/data/satdata/26927.sat
trunk/data/satdata/26930.sat
trunk/data/satdata/26931.sat
trunk/data/satdata/26932.sat
trunk/data/satdata/26953.sat
trunk/data/satdata/26957.sat
trunk/data/satdata/26958.sat
trunk/data/satdata/26985.sat
trunk/data/satdata/26997.sat
trunk/data/satdata/26998.sat
trunk/data/satdata/27001.sat
trunk/data/satdata/27003.sat
trunk/data/satdata/27004.sat
trunk/data/satdata/27298.sat
trunk/data/satdata/27370.sat
trunk/data/satdata/27372.sat
trunk/data/satdata/27373.sat
trunk/data/satdata/27374.sat
trunk/data/satdata/27375.sat
trunk/data/satdata/27376.sat
trunk/data/satdata/27378.sat
trunk/data/satdata/27380.sat
trunk/data/satdata/27386.sat
trunk/data/satdata/27389.sat
trunk/data/satdata/27391.sat
trunk/data/satdata/27392.sat
trunk/data/satdata/27399.sat
trunk/data/satdata/27400.sat
trunk/data/satdata/27403.sat
trunk/data/satdata/27414.sat
trunk/data/satdata/27421.sat
trunk/data/satdata/27422.sat
trunk/data/satdata/27424.sat
trunk/data/satdata/27426.sat
trunk/data/satdata/27430.sat
trunk/data/satdata/27431.sat
trunk/data/satdata/27432.sat
trunk/data/satdata/27434.sat
trunk/data/satdata/27436.sat
trunk/data/satdata/27438.sat
trunk/data/satdata/27441.sat
trunk/data/satdata/27445.sat
trunk/data/satdata/27450.sat
trunk/data/satdata/27451.sat
trunk/data/satdata/27453.sat
trunk/data/satdata/27460.sat
trunk/data/satdata/27461.sat
trunk/data/satdata/27499.sat
trunk/data/satdata/27501.sat
trunk/data/satdata/27508.sat
trunk/data/satdata/27509.sat
trunk/data/satdata/27513.sat
trunk/data/satdata/27516.sat
trunk/data/satdata/27525.sat
trunk/data/satdata/27528.sat
trunk/data/satdata/27540.sat
trunk/data/satdata/27550.sat
trunk/data/satdata/27554.sat
trunk/data/satdata/27559.sat
trunk/data/satdata/27560.sat
trunk/data/satdata/27561.sat
trunk/data/satdata/27566.sat
trunk/data/satdata/27597.sat
trunk/data/satdata/27598.sat
trunk/data/satdata/27599.sat
trunk/data/satdata/27600.sat
trunk/data/satdata/27601.sat
trunk/data/satdata/27603.sat
trunk/data/satdata/27605.sat
trunk/data/satdata/27607.sat
trunk/data/satdata/27608.sat
trunk/data/satdata/27632.sat
trunk/data/satdata/27640.sat
trunk/data/satdata/27642.sat
trunk/data/satdata/27643.sat
trunk/data/satdata/27651.sat
trunk/data/satdata/27663.sat
trunk/data/satdata/27683.sat
trunk/data/satdata/27700.sat
trunk/data/satdata/27704.sat
trunk/data/satdata/27707.sat
trunk/data/satdata/27714.sat
trunk/data/satdata/27715.sat
trunk/data/satdata/27718.sat
trunk/data/satdata/27775.sat
trunk/data/satdata/27783.sat
trunk/data/satdata/27807.sat
trunk/data/satdata/27811.sat
trunk/data/satdata/27813.sat
trunk/data/satdata/27818.sat
trunk/data/satdata/27820.sat
trunk/data/satdata/27825.sat
trunk/data/satdata/27830.sat
trunk/data/satdata/27831.sat
trunk/data/satdata/27834.sat
trunk/data/satdata/27838.sat
trunk/data/satdata/27842.sat
trunk/data/satdata/27843.sat
trunk/data/satdata/27844.sat
trunk/data/satdata/27845.sat
trunk/data/satdata/27846.sat
trunk/data/satdata/27847.sat
trunk/data/satdata/27848.sat
trunk/data/satdata/27852.sat
trunk/data/satdata/27854.sat
trunk/data/satdata/27858.sat
trunk/data/satdata/27939.sat
trunk/data/satdata/27941.sat
trunk/data/satdata/27942.sat
trunk/data/satdata/27943.sat
trunk/data/satdata/27945.sat
trunk/data/satdata/27948.sat
trunk/data/satdata/27951.sat
trunk/data/satdata/27954.sat
trunk/data/satdata/28051.sat
trunk/data/satdata/28057.sat
trunk/data/satdata/28059.sat
trunk/data/satdata/2807.sat
trunk/data/satdata/28082.sat
trunk/data/satdata/28089.sat
trunk/data/satdata/28094.sat
trunk/data/satdata/28112.sat
trunk/data/satdata/28114.sat
trunk/data/satdata/28129.sat
trunk/data/satdata/28132.sat
trunk/data/satdata/28134.sat
trunk/data/satdata/28137.sat
trunk/data/satdata/28154.sat
trunk/data/satdata/28163.sat
trunk/data/satdata/28184.sat
trunk/data/satdata/28187.sat
trunk/data/satdata/28190.sat
trunk/data/satdata/28194.sat
trunk/data/satdata/28220.sat
trunk/data/satdata/28221.sat
trunk/data/satdata/28222.sat
trunk/data/satdata/28230.sat
trunk/data/satdata/28238.sat
trunk/data/satdata/28252.sat
trunk/data/satdata/28254.sat
trunk/data/satdata/2826.sat
trunk/data/satdata/28353.sat
trunk/data/satdata/28358.sat
trunk/data/satdata/28361.sat
trunk/data/satdata/28364.sat
trunk/data/satdata/28366.sat
trunk/data/satdata/28368.sat
trunk/data/satdata/28369.sat
trunk/data/satdata/28370.sat
trunk/data/satdata/28371.sat
trunk/data/satdata/28372.sat
trunk/data/satdata/28373.sat
trunk/data/satdata/28375.sat
trunk/data/satdata/28376.sat
trunk/data/satdata/28378.sat
trunk/data/satdata/28380.sat
trunk/data/satdata/28382.sat
trunk/data/satdata/28393.sat
trunk/data/satdata/28417.sat
trunk/data/satdata/28446.sat
trunk/data/satdata/28451.sat
trunk/data/satdata/28463.sat
trunk/data/satdata/28471.sat
trunk/data/satdata/28472.sat
trunk/data/satdata/28474.sat
trunk/data/satdata/28480.sat
trunk/data/satdata/28485.sat
trunk/data/satdata/28492.sat
trunk/data/satdata/28493.sat
trunk/data/satdata/28494.sat
trunk/data/satdata/28495.sat
trunk/data/satdata/28496.sat
trunk/data/satdata/28497.sat
trunk/data/satdata/28498.sat
trunk/data/satdata/28499.sat
trunk/data/satdata/28509.sat
trunk/data/satdata/28521.sat
trunk/data/satdata/28526.sat
trunk/data/satdata/28542.sat
trunk/data/satdata/28622.sat
trunk/data/satdata/28626.sat
trunk/data/satdata/28628.sat
trunk/data/satdata/28629.sat
trunk/data/satdata/28638.sat
trunk/data/satdata/28644.sat
trunk/data/satdata/28649.sat
trunk/data/satdata/28650.sat
trunk/data/satdata/28654.sat
trunk/data/satdata/28659.sat
trunk/data/satdata/28702.sat
trunk/data/satdata/28707.sat
trunk/data/satdata/28738.sat
trunk/data/satdata/2874.sat
trunk/data/satdata/28773.sat
trunk/data/satdata/28786.sat
trunk/data/satdata/28790.sat
trunk/data/satdata/28868.sat
trunk/data/satdata/28874.sat
trunk/data/satdata/28884.sat
trunk/data/satdata/28885.sat
trunk/data/satdata/28890.sat
trunk/data/satdata/28891.sat
trunk/data/satdata/28892.sat
trunk/data/satdata/28893.sat
trunk/data/satdata/28894.sat
trunk/data/satdata/28895.sat
trunk/data/satdata/28897.sat
trunk/data/satdata/28899.sat
trunk/data/satdata/28902.sat
trunk/data/satdata/28903.sat
trunk/data/satdata/28911.sat
trunk/data/satdata/28912.sat
trunk/data/satdata/28915.sat
trunk/data/satdata/28916.sat
trunk/data/satdata/28922.sat
trunk/data/satdata/28924.sat
trunk/data/satdata/28931.sat
trunk/data/satdata/28932.sat
trunk/data/satdata/28935.sat
trunk/data/satdata/28937.sat
trunk/data/satdata/28939.sat
trunk/data/satdata/28941.sat
trunk/data/satdata/28942.sat
trunk/data/satdata/28945.sat
trunk/data/satdata/28946.sat
trunk/data/satdata/28980.sat
trunk/data/satdata/28981.sat
trunk/data/satdata/28982.sat
trunk/data/satdata/29045.sat
trunk/data/satdata/29047.sat
trunk/data/satdata/29048.sat
trunk/data/satdata/29049.sat
trunk/data/satdata/29050.sat
trunk/data/satdata/29051.sat
trunk/data/satdata/29052.sat
trunk/data/satdata/29055.sat
trunk/data/satdata/29079.sat
trunk/data/satdata/2909.sat
trunk/data/satdata/29092.sat
trunk/data/satdata/29107.sat
trunk/data/satdata/29108.sat
trunk/data/satdata/29155.sat
trunk/data/satdata/29162.sat
trunk/data/satdata/29163.sat
trunk/data/satdata/29228.sat
trunk/data/satdata/29230.sat
trunk/data/satdata/29236.sat
trunk/data/satdata/29247.sat
trunk/data/satdata/29252.sat
trunk/data/satdata/29268.sat
trunk/data/satdata/29270.sat
trunk/data/satdata/29272.sat
trunk/data/satdata/29273.sat
trunk/data/satdata/29349.sat
trunk/data/satdata/29394.sat
trunk/data/satdata/29398.sat
trunk/data/satdata/29479.sat
trunk/data/satdata/29480.sat
trunk/data/satdata/29486.sat
trunk/data/satdata/29494.sat
trunk/data/satdata/29495.sat
trunk/data/satdata/29499.sat
trunk/data/satdata/29505.sat
trunk/data/satdata/29506.sat
trunk/data/satdata/29507.sat
trunk/data/satdata/29520.sat
trunk/data/satdata/29526.sat
trunk/data/satdata/29601.sat
trunk/data/satdata/29640.sat
trunk/data/satdata/29643.sat
trunk/data/satdata/29644.sat
trunk/data/satdata/29648.sat
trunk/data/satdata/2965.sat
trunk/data/satdata/29655.sat
trunk/data/satdata/29656.sat
trunk/data/satdata/29658.sat
trunk/data/satdata/29659.sat
trunk/data/satdata/29670.sat
trunk/data/satdata/29671.sat
trunk/data/satdata/29672.sat
trunk/data/satdata/29678.sat
trunk/data/satdata/29709.sat
trunk/data/satdata/29710.sat
trunk/data/satdata/29712.sat
trunk/data/satdata/3029.sat
trunk/data/satdata/30323.sat
trunk/data/satdata/30580.sat
trunk/data/satdata/30581.sat
trunk/data/satdata/30582.sat
trunk/data/satdata/30773.sat
trunk/data/satdata/30776.sat
trunk/data/satdata/30777.sat
trunk/data/satdata/30778.sat
trunk/data/satdata/30793.sat
trunk/data/satdata/30794.sat
trunk/data/satdata/30797.sat
trunk/data/satdata/30798.sat
trunk/data/satdata/31102.sat
trunk/data/satdata/31113.sat
trunk/data/satdata/31114.sat
trunk/data/satdata/31118.sat
trunk/data/satdata/31119.sat
trunk/data/satdata/31121.sat
trunk/data/satdata/31122.sat
trunk/data/satdata/31124.sat
trunk/data/satdata/31125.sat
trunk/data/satdata/31126.sat
trunk/data/satdata/31127.sat
trunk/data/satdata/31128.sat
trunk/data/satdata/31129.sat
trunk/data/satdata/31130.sat
trunk/data/satdata/31132.sat
trunk/data/satdata/31140.sat
trunk/data/satdata/31304.sat
trunk/data/satdata/31306.sat
trunk/data/satdata/31307.sat
trunk/data/satdata/3133.sat
trunk/data/satdata/31395.sat
trunk/data/satdata/31571.sat
trunk/data/satdata/31573.sat
trunk/data/satdata/31574.sat
trunk/data/satdata/31576.sat
trunk/data/satdata/31577.sat
trunk/data/satdata/31598.sat
trunk/data/satdata/31601.sat
trunk/data/satdata/31698.sat
trunk/data/satdata/31789.sat
trunk/data/satdata/31792.sat
trunk/data/satdata/31793.sat
trunk/data/satdata/31797.sat
trunk/data/satdata/31800.sat
trunk/data/satdata/31862.sat
trunk/data/satdata/32018.sat
trunk/data/satdata/32019.sat
trunk/data/satdata/32050.sat
trunk/data/satdata/32052.sat
trunk/data/satdata/32060.sat
trunk/data/satdata/32062.sat
trunk/data/satdata/32252.sat
trunk/data/satdata/32253.sat
trunk/data/satdata/32260.sat
trunk/data/satdata/32263.sat
trunk/data/satdata/32264.sat
trunk/data/satdata/32265.sat
trunk/data/satdata/32266.sat
trunk/data/satdata/32275.sat
trunk/data/satdata/32276.sat
trunk/data/satdata/32277.sat
trunk/data/satdata/32283.sat
trunk/data/satdata/32293.sat
trunk/data/satdata/32294.sat
trunk/data/satdata/32299.sat
trunk/data/satdata/32373.sat
trunk/data/satdata/32376.sat
trunk/data/satdata/32382.sat
trunk/data/satdata/32384.sat
trunk/data/satdata/32387.sat
trunk/data/satdata/32388.sat
trunk/data/satdata/32393.sat
trunk/data/satdata/32394.sat
trunk/data/satdata/32395.sat
trunk/data/satdata/32404.sat
trunk/data/satdata/32478.sat
trunk/data/satdata/32487.sat
trunk/data/satdata/32500.sat
trunk/data/satdata/32708.sat
trunk/data/satdata/32711.sat
trunk/data/satdata/32729.sat
trunk/data/satdata/32750.sat
trunk/data/satdata/32763.sat
trunk/data/satdata/32765.sat
trunk/data/satdata/32767.sat
trunk/data/satdata/32768.sat
trunk/data/satdata/32779.sat
trunk/data/satdata/32781.sat
trunk/data/satdata/32783.sat
trunk/data/satdata/32784.sat
trunk/data/satdata/32785.sat
trunk/data/satdata/32786.sat
trunk/data/satdata/32787.sat
trunk/data/satdata/32788.sat
trunk/data/satdata/32789.sat
trunk/data/satdata/32790.sat
trunk/data/satdata/32791.sat
trunk/data/satdata/32794.sat
trunk/data/satdata/32951.sat
trunk/data/satdata/32958.sat
trunk/data/satdata/33051.sat
trunk/data/satdata/33053.sat
trunk/data/satdata/33055.sat
trunk/data/satdata/33056.sat
trunk/data/satdata/33060.sat
trunk/data/satdata/33061.sat
trunk/data/satdata/33062.sat
trunk/data/satdata/33063.sat
trunk/data/satdata/33064.sat
trunk/data/satdata/33065.sat
trunk/data/satdata/33105.sat
trunk/data/satdata/33108.sat
trunk/data/satdata/33153.sat
trunk/data/satdata/33154.sat
trunk/data/satdata/33207.sat
trunk/data/satdata/33244.sat
trunk/data/satdata/33274.sat
trunk/data/satdata/33275.sat
trunk/data/satdata/33278.sat
trunk/data/satdata/33312.sat
trunk/data/satdata/33313.sat
trunk/data/satdata/33314.sat
trunk/data/satdata/33315.sat
trunk/data/satdata/33316.sat
trunk/data/satdata/33320.sat
trunk/data/satdata/33321.sat
trunk/data/satdata/33331.sat
trunk/data/satdata/33373.sat
trunk/data/satdata/33376.sat
trunk/data/satdata/33378.sat
trunk/data/satdata/33379.sat
trunk/data/satdata/33380.sat
trunk/data/satdata/33396.sat
trunk/data/satdata/33412.sat
trunk/data/satdata/33414.sat
trunk/data/satdata/33436.sat
trunk/data/satdata/33446.sat
trunk/data/satdata/33453.sat
trunk/data/satdata/33456.sat
trunk/data/satdata/33459.sat
trunk/data/satdata/33460.sat
trunk/data/satdata/33463.sat
trunk/data/satdata/33466.sat
trunk/data/satdata/33467.sat
trunk/data/satdata/33468.sat
trunk/data/satdata/33493.sat
trunk/data/satdata/33498.sat
trunk/data/satdata/33499.sat
trunk/data/satdata/33504.sat
trunk/data/satdata/33591.sat
trunk/data/satdata/33595.sat
trunk/data/satdata/33596.sat
trunk/data/satdata/33749.sat
trunk/data/satdata/33750.sat
trunk/data/satdata/33751.sat
trunk/data/satdata/33752.sat
trunk/data/satdata/34111.sat
trunk/data/satdata/34264.sat
trunk/data/satdata/34661.sat
trunk/data/satdata/34710.sat
trunk/data/satdata/34779.sat
trunk/data/satdata/34810.sat
trunk/data/satdata/34941.sat
trunk/data/satdata/35001.sat
trunk/data/satdata/35003.sat
trunk/data/satdata/35004.sat
trunk/data/satdata/35005.sat
trunk/data/satdata/35491.sat
trunk/data/satdata/35578.sat
trunk/data/satdata/35636.sat
trunk/data/satdata/35681.sat
trunk/data/satdata/35683.sat
trunk/data/satdata/424.sat
trunk/data/satdata/4321.sat
trunk/data/satdata/4507.sat
trunk/data/satdata/4793.sat
trunk/data/satdata/5398.sat
trunk/data/satdata/6212.sat
trunk/data/satdata/6235.sat
trunk/data/satdata/6236.sat
trunk/data/satdata/6909.sat
trunk/data/satdata/6920.sat
trunk/data/satdata/7529.sat
trunk/data/satdata/7530.sat
trunk/data/satdata/7646.sat
trunk/data/satdata/8366.sat
trunk/data/satdata/8747.sat
trunk/data/satdata/8820.sat
trunk/data/satdata/900.sat
trunk/data/satdata/902.sat
trunk/data/satdata/9057.sat
trunk/data/satdata/9478.sat
Deleted: trunk/data/satdata/10061.sat
===================================================================
--- trunk/data/satdata/10061.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/10061.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,6 +0,0 @@
-[Satellite]
-VERSION=1.1
-NAME=GOES 2 [-]
-NICKNAME=GOES 2 [-]
-TLE1=1 10061U 77048A 09214.81136418 -.00000246 00000-0 10000-3 0 9360
-TLE2=2 10061 14.6577 355.9106 0016631 250.8553 109.0089 0.99396978 62267
Deleted: trunk/data/satdata/10114.sat
===================================================================
--- trunk/data/satdata/10114.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/10114.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 10114U 77057B 09214.77956404 .00000697 00000-0 48191-4 0 9024
-TLE2=2 10114 97.4937 110.9055 0016669 189.1819 170.9063 15.08773116748996
Deleted: trunk/data/satdata/10457.sat
===================================================================
--- trunk/data/satdata/10457.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/10457.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=TRANSAT
-NICKNAME=TRANSAT
-TLE1=1 10457U 77106A 09215.50617927 .00000072 00000-0 10000-3 0 8893
-TLE2=2 10457 89.6772 247.1919 0026154 129.1479 231.2003 13.48264317562342
Deleted: trunk/data/satdata/10637.sat
===================================================================
--- trunk/data/satdata/10637.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/10637.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=IUE
-NICKNAME=IUE
-TLE1=1 10637U 78012A 09212.02925901 -.00000101 00000-0 10000-3 0 5169
-TLE2=2 10637 43.0246 14.7498 1538974 153.9964 214.6835 1.00054671 67898
Deleted: trunk/data/satdata/10703.sat
===================================================================
--- trunk/data/satdata/10703.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/10703.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=OSCAR 8 (AO-8)
-NICKNAME=OSCAR 8 (AO-8)
-TLE1=1 10703U 78026B 09215.55193721 .00000209 00000-0 17443-3 0 5667
-TLE2=2 10703 98.8245 258.9952 0007446 45.2414 314.9362 13.98842473602645
Deleted: trunk/data/satdata/10861.sat
===================================================================
--- trunk/data/satdata/10861.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/10861.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 10861U 78045B 09214.58228861 .00001073 00000-0 27229-4 0 815
-TLE2=2 10861 81.2021 23.2889 0020630 179.7866 180.3459 15.38475719712458
Deleted: trunk/data/satdata/10953.sat
===================================================================
--- trunk/data/satdata/10953.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/10953.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=GOES 3 [P]
-NICKNAME=GOES 3 [P]
-TLE1=1 10953U 78062A 09214.42591501 -.00000120 00000-0 10000-3 0 5875
-TLE2=2 10953 14.3761 359.7151 0002700 16.1693 343.8823 1.00265690 67135
Deleted: trunk/data/satdata/10967.sat
===================================================================
--- trunk/data/satdata/10967.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/10967.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SEASAT 1
-NICKNAME=SEASAT 1
-TLE1=1 10967U 78064A 09215.63406431 -.00000088 00000-0 14799-4 0 8846
-TLE2=2 10967 108.0184 62.4871 0003155 260.9161 99.1629 14.42151764632017
Deleted: trunk/data/satdata/11060.sat
===================================================================
--- trunk/data/satdata/11060.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/11060.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=TIROS N [P]
-NICKNAME=TIROS N [P]
-TLE1=1 11060U 78096A 09215.91507331 -.00000014 00000-0 15547-4 0 2517
-TLE2=2 11060 98.9342 186.6679 0009841 240.2437 119.7760 14.17480134805717
Deleted: trunk/data/satdata/11267.sat
===================================================================
--- trunk/data/satdata/11267.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/11267.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 11267U 79011B 09215.59620957 .00000057 00000-0 35512-5 0 8638
-TLE2=2 11267 82.5214 58.9746 0019398 56.8737 303.4350 14.87011153648047
Deleted: trunk/data/satdata/11416.sat
===================================================================
--- trunk/data/satdata/11416.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/11416.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=NOAA 6 [P]
-NICKNAME=NOAA 6 [P]
-TLE1=1 11416U 79057A 09215.49438292 .00000020 00000-0 23307-4 0 9136
-TLE2=2 11416 98.4079 228.9641 0011045 118.3023 241.9295 14.31927102568486
Deleted: trunk/data/satdata/11574.sat
===================================================================
--- trunk/data/satdata/11574.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/11574.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 11574U 79089B 09215.24109294 .00000018 00000-0 14191-4 0 3419
-TLE2=2 11574 74.0690 120.8269 0015479 36.6345 323.5865 14.39604317563315
Deleted: trunk/data/satdata/11672.sat
===================================================================
--- trunk/data/satdata/11672.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/11672.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-14 R/B
-NICKNAME=SL-14 R/B
-TLE1=1 11672U 80005B 09215.17018668 .00000017 00000-0 -86534-6 0 4721
-TLE2=2 11672 82.5132 268.5976 0018666 123.1269 237.1749 14.86062076596186
Deleted: trunk/data/satdata/11849.sat
===================================================================
--- trunk/data/satdata/11849.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/11849.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 11849U 80051B 09214.51915894 .00000286 00000-0 14283-4 0 8958
-TLE2=2 11849 97.7056 347.4214 0012681 91.5511 268.7185 15.25590710594734
Deleted: trunk/data/satdata/11933.sat
===================================================================
--- trunk/data/satdata/11933.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/11933.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 11933U 80069B 09214.61626851 .00000498 00000-0 14012-4 0 7587
-TLE2=2 11933 81.2212 338.8765 0024472 50.5263 309.8120 15.34081765588289
Deleted: trunk/data/satdata/11964.sat
===================================================================
--- trunk/data/satdata/11964.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/11964.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=GOES 4 [-]
-NICKNAME=GOES 4 [-]
-TLE1=1 11964U 80074A 09203.06286847 .00000031 00000-0 10000-3 0 1423
-TLE2=2 11964 14.7312 3.4994 0034965 295.6727 64.0045 0.99229188 66374
Deleted: trunk/data/satdata/12054.sat
===================================================================
--- trunk/data/satdata/12054.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12054.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=COSMOS 1220
-NICKNAME=COSMOS 1220
-TLE1=1 12054U 80089A 09214.97321148 .00000752 00000-0 39902-4 0 507
-TLE2=2 12054 64.9766 149.7917 0044675 156.7501 203.5663 15.23150262475357
Deleted: trunk/data/satdata/12139.sat
===================================================================
--- trunk/data/satdata/12139.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12139.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 12139U 81003B 09214.99295715 .00000946 00000-0 54261-4 0 8306
-TLE2=2 12139 82.9550 23.5442 0594993 95.1174 271.8169 14.24320478433855
Deleted: trunk/data/satdata/12309.sat
===================================================================
--- trunk/data/satdata/12309.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12309.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=ESIAFI 1 (COMSTAR 4)
-NICKNAME=ESIAFI 1 (COMSTAR 4)
-TLE1=1 12309U 81018A 09211.96525765 -.00000102 00000-0 10000-3 0 2554
-TLE2=2 12309 13.9673 9.8436 0004142 281.5889 78.3984 1.00260164105632
Deleted: trunk/data/satdata/12389.sat
===================================================================
--- trunk/data/satdata/12389.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12389.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 12389U 81033B 09215.27470394 .00001970 00000-0 62143-4 0 4117
-TLE2=2 12389 82.9154 281.1509 0409987 37.2766 325.6141 14.77434449443952
Deleted: trunk/data/satdata/12458.sat
===================================================================
--- trunk/data/satdata/12458.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12458.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=NOVA I
-NICKNAME=NOVA I
-TLE1=1 12458U 81044A 09215.62746312 .00000050 00000-0 10000-3 0 8072
-TLE2=2 12458 90.0926 116.2708 0015598 19.3820 340.7870 13.22703967362116
Deleted: trunk/data/satdata/12465.sat
===================================================================
--- trunk/data/satdata/12465.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12465.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 12465U 81046B 09215.14552055 .00000490 00000-0 32822-4 0 8860
-TLE2=2 12465 81.2281 63.8625 0038674 137.2134 223.2118 15.04418248534010
Deleted: trunk/data/satdata/12472.sat
===================================================================
--- trunk/data/satdata/12472.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12472.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=GOES 5 [-]
-NICKNAME=GOES 5 [-]
-TLE1=1 12472U 81049A 09215.39964164 -.00000239 00000-0 10000-3 0 1763
-TLE2=2 12472 13.7292 13.8948 0001480 172.4987 187.5585 1.00220170 61184
Deleted: trunk/data/satdata/12553.sat
===================================================================
--- trunk/data/satdata/12553.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12553.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=NOAA 7 [-]
-NICKNAME=NOAA 7 [-]
-TLE1=1 12553U 81059A 09215.39573825 .00000012 00000-0 27143-4 0 319
-TLE2=2 12553 98.6571 167.8139 0011231 177.8704 182.2520 14.16766870452211
Deleted: trunk/data/satdata/12585.sat
===================================================================
--- trunk/data/satdata/12585.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12585.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=METEOR PRIRODA
-NICKNAME=METEOR PRIRODA
-TLE1=1 12585U 81065A 09215.68839823 -.00000349 00000-0 -19023-4 0 4357
-TLE2=2 12585 97.4044 260.0568 0018311 277.7654 82.1488 15.07272852527712
Deleted: trunk/data/satdata/12904.sat
===================================================================
--- trunk/data/satdata/12904.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/12904.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 12904U 81103B 09215.48383201 .00000352 00000-0 27236-4 0 9528
-TLE2=2 12904 81.1819 299.1904 0033882 109.7049 250.7776 14.98519721 61440
Deleted: trunk/data/satdata/1293.sat
===================================================================
--- trunk/data/satdata/1293.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/1293.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=OSCAR 3 (OSCAR III)
-NICKNAME=OSCAR 3 (OSCAR III)
-TLE1=1 01293U 65016F 09215.08169401 .00000149 00000-0 12652-3 0 5820
-TLE2=2 01293 70.0702 70.0707 0016693 110.1861 250.1049 14.04721679266395
Deleted: trunk/data/satdata/13068.sat
===================================================================
--- trunk/data/satdata/13068.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13068.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 13068U 82013B 09215.48514042 -.00000304 00000-0 -25954-4 0 9568
-TLE2=2 13068 81.2046 245.1292 0025986 37.0834 323.2156 15.00284631491625
Deleted: trunk/data/satdata/13154.sat
===================================================================
--- trunk/data/satdata/13154.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13154.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 13154U 82039B 09215.55416376 .00000144 00000-0 11777-4 0 7141
-TLE2=2 13154 81.1823 220.0012 0043249 245.1132 114.5585 14.92737786474172
Deleted: trunk/data/satdata/13367.sat
===================================================================
--- trunk/data/satdata/13367.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13367.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=LANDSAT 4
-NICKNAME=LANDSAT 4
-TLE1=1 13367U 82072A 09214.79902939 -.00000096 00000-0 -20685-5 0 1987
-TLE2=2 13367 98.1782 132.3209 0017229 180.0957 180.0270 15.02205663451512
Deleted: trunk/data/satdata/13402.sat
===================================================================
--- trunk/data/satdata/13402.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13402.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=COSMOS 1400
-NICKNAME=COSMOS 1400
-TLE1=1 13402U 82079A 09215.59006371 .00000863 00000-0 30192-4 0 8494
-TLE2=2 13402 81.1299 67.3457 0007026 326.6802 33.3994 15.28437027476519
Deleted: trunk/data/satdata/13403.sat
===================================================================
--- trunk/data/satdata/13403.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13403.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 13403U 82079B 09215.18348438 -.00000109 00000-0 -10635-4 0 759
-TLE2=2 13403 81.1750 300.7529 0039344 335.7917 24.1478 14.99131993465032
Deleted: trunk/data/satdata/1361.sat
===================================================================
--- trunk/data/satdata/1361.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/1361.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=LCS 1
-NICKNAME=LCS 1
-TLE1=1 01361U 65034C 09214.49159214 .00000009 00000-0 10000-3 0 1221
-TLE2=2 01361 32.1407 49.1047 0006447 159.3992 200.6770 9.89276586599942
Deleted: trunk/data/satdata/13631.sat
===================================================================
--- trunk/data/satdata/13631.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13631.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SATCOM C5
-NICKNAME=SATCOM C5
-TLE1=1 13631U 82105A 09214.51350650 -.00000115 00000-0 10000-3 0 6530
-TLE2=2 13631 12.6074 31.1199 0001801 249.1588 110.8857 1.00272444 64584
Deleted: trunk/data/satdata/13777.sat
===================================================================
--- trunk/data/satdata/13777.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13777.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=IRAS
-NICKNAME=IRAS
-TLE1=1 13777U 83004A 09215.16789812 .00000017 00000-0 41352-4 0 9288
-TLE2=2 13777 99.0644 47.9901 0017637 68.1913 292.1126 14.00069074 24179
Deleted: trunk/data/satdata/13819.sat
===================================================================
--- trunk/data/satdata/13819.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13819.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 13819U 83010B 09214.64184351 .00000263 00000-0 16560-4 0 5126
-TLE2=2 13819 81.1035 249.3744 0039309 99.7699 260.7981 15.05058144439965
Deleted: trunk/data/satdata/13923.sat
===================================================================
--- trunk/data/satdata/13923.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13923.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=NOAA 8 [-]
-NICKNAME=NOAA 8 [-]
-TLE1=1 13923U 83022A 09215.51792938 -.00000028 00000-0 62355-5 0 9261
-TLE2=2 13923 98.5575 244.4374 0015494 333.7855 26.2549 14.27708353371609
Deleted: trunk/data/satdata/13969.sat
===================================================================
--- trunk/data/satdata/13969.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/13969.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=TDRS 1
-NICKNAME=TDRS 1
-TLE1=1 13969U 83026B 09214.36882399 -.00000305 00000-0 10000-3 0 8971
-TLE2=2 13969 13.3748 8.9038 0024995 230.7309 155.4525 1.00272265 69464
Deleted: trunk/data/satdata/14050.sat
===================================================================
--- trunk/data/satdata/14050.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14050.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=GOES 6 [-]
-NICKNAME=GOES 6 [-]
-TLE1=1 14050U 83041A 09214.39816019 -.00000271 00000-0 10000-3 0 1828
-TLE2=2 14050 13.3948 18.9891 0001884 44.0088 316.0603 1.00262597154271
Deleted: trunk/data/satdata/14129.sat
===================================================================
--- trunk/data/satdata/14129.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14129.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=PHASE 3B (AO-10)
-NICKNAME=PHASE 3B (AO-10)
-TLE1=1 14129U 83058B 09212.86112528 -.00000349 00000-0 10000-3 0 6828
-TLE2=2 14129 25.8229 144.1105 6026521 243.9540 43.5159 2.05873552168573
Deleted: trunk/data/satdata/14207.sat
===================================================================
--- trunk/data/satdata/14207.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14207.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=COSMOS 1484
-NICKNAME=COSMOS 1484
-TLE1=1 14207U 83075A 09215.35391871 .00001409 00000-0 31648-4 0 3782
-TLE2=2 14207 97.5409 335.0437 0017266 53.9901 306.2971 15.45096559868654
Deleted: trunk/data/satdata/14208.sat
===================================================================
--- trunk/data/satdata/14208.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14208.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-3 R/B
-NICKNAME=SL-3 R/B
-TLE1=1 14208U 83075B 09214.73226424 -.00000421 00000-0 -26492-4 0 6863
-TLE2=2 14208 97.6778 268.4951 0044190 226.9258 132.8270 15.02206018414791
Deleted: trunk/data/satdata/14372.sat
===================================================================
--- trunk/data/satdata/14372.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14372.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=COSMOS 1500
-NICKNAME=COSMOS 1500
-TLE1=1 14372U 83099A 09215.65197110 .00000081 00000-0 37575-5 0 1930
-TLE2=2 14372 82.5327 267.3262 0012549 217.0331 143.0029 15.04137215404075
Deleted: trunk/data/satdata/14484.sat
===================================================================
--- trunk/data/satdata/14484.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14484.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=SL-8 R/B
-NICKNAME=SL-8 R/B
-TLE1=1 14484U 83111B 09215.14674548 .00001541 00000-0 48474-4 0 9577
-TLE2=2 14484 82.8504 150.1082 0433465 160.6690 201.1521 14.72690943307311
Deleted: trunk/data/satdata/14699.sat
===================================================================
--- trunk/data/satdata/14699.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14699.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=COSMOS 1536
-NICKNAME=COSMOS 1536
-TLE1=1 14699U 84013A 09215.09434861 .00000157 00000-0 10917-4 0 5280
-TLE2=2 14699 82.5258 215.8501 0016412 82.9277 277.3812 14.98073114381765
Deleted: trunk/data/satdata/14780.sat
===================================================================
--- trunk/data/satdata/14780.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14780.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=LANDSAT 5
-NICKNAME=LANDSAT 5
-TLE1=1 14780U 84021A 09215.78169736 -.00000006 00000-0 87314-5 0 9354
-TLE2=2 14780 98.2405 282.8382 0002502 345.4066 14.7060 14.57096856352313
Deleted: trunk/data/satdata/14781.sat
===================================================================
--- trunk/data/satdata/14781.sat 2009-08-07 23:13:43 UTC (rev 396)
+++ trunk/data/satdata/14781.sat 2009-08-07 23:38:30 UTC (rev 397)
@@ -1,5 +0,0 @@
-VERSION=1.1
-NAME=UOSAT 2 (UO-11)
-NICKNAME=UOSAT 2 (UO-11)
-TLE1=1 14781U 84021B 09215.14365637 -.00000278 00000-0 -29732-4 0 232
-TLE2=2 14781 98.1047 260.0586 0008918 178.8260 181.2989 14.79725818364774
Deleted: trunk/data/satd...
[truncated message content] |
|
From: <cs...@us...> - 2009-08-07 23:13:49
|
Revision: 396
http://gpredict.svn.sourceforge.net/gpredict/?rev=396&view=rev
Author: csete
Date: 2009-08-07 23:13:43 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Updated categories.
Modified Paths:
--------------
trunk/data/satdata/musson.cat
trunk/data/satdata/nnss.cat
trunk/data/satdata/noaa.cat
trunk/data/satdata/other-comm.cat
trunk/data/satdata/sbas.cat
trunk/data/satdata/science.cat
trunk/data/satdata/weather.cat
Added Paths:
-----------
trunk/data/satdata/tle-new.cat
Modified: trunk/data/satdata/musson.cat
===================================================================
--- trunk/data/satdata/musson.cat 2009-08-07 23:11:39 UTC (rev 395)
+++ trunk/data/satdata/musson.cat 2009-08-07 23:13:43 UTC (rev 396)
@@ -6,3 +6,4 @@
28380
28521
32052
+35635
Modified: trunk/data/satdata/nnss.cat
===================================================================
--- trunk/data/satdata/nnss.cat 2009-08-07 23:11:39 UTC (rev 395)
+++ trunk/data/satdata/nnss.cat 2009-08-07 23:13:43 UTC (rev 396)
@@ -1,4 +1,4 @@
-Navy Navigation Satellite System
+Navy Mav Sat System
2807
2965
3133
Modified: trunk/data/satdata/noaa.cat
===================================================================
--- trunk/data/satdata/noaa.cat 2009-08-07 23:11:39 UTC (rev 395)
+++ trunk/data/satdata/noaa.cat 2009-08-07 23:13:43 UTC (rev 396)
@@ -1,4 +1,4 @@
-NOAA Weather
+NOAA
11060
4793
6235
Modified: trunk/data/satdata/other-comm.cat
===================================================================
--- trunk/data/satdata/other-comm.cat 2009-08-07 23:11:39 UTC (rev 395)
+++ trunk/data/satdata/other-comm.cat 2009-08-07 23:13:43 UTC (rev 396)
@@ -1,4 +1,4 @@
-Other Communications
+Other Communication
26390
26483
26626
Modified: trunk/data/satdata/sbas.cat
===================================================================
--- trunk/data/satdata/sbas.cat 2009-08-07 23:11:39 UTC (rev 395)
+++ trunk/data/satdata/sbas.cat 2009-08-07 23:13:43 UTC (rev 396)
@@ -1,4 +1,4 @@
-Satellite-Based Augmentation System
+Satellite-based Augmentation System
24307
25153
26863
Modified: trunk/data/satdata/science.cat
===================================================================
--- trunk/data/satdata/science.cat 2009-08-07 23:11:39 UTC (rev 395)
+++ trunk/data/satdata/science.cat 2009-08-07 23:13:43 UTC (rev 396)
@@ -1,4 +1,5 @@
Space & Earth Science
+
424
10637
13777
Added: trunk/data/satdata/tle-new.cat
===================================================================
--- trunk/data/satdata/tle-new.cat (rev 0)
+++ trunk/data/satdata/tle-new.cat 2009-08-07 23:13:43 UTC (rev 396)
@@ -0,0 +1,22 @@
+Last 30 Days' Launches
+35578
+35579
+35635
+35636
+35637
+35641
+35681
+35682
+35683
+35684
+35685
+35686
+35687
+35688
+35689
+35690
+35691
+35692
+35693
+35694
+35695
Modified: trunk/data/satdata/weather.cat
===================================================================
--- trunk/data/satdata/weather.cat 2009-08-07 23:11:39 UTC (rev 395)
+++ trunk/data/satdata/weather.cat 2009-08-07 23:13:43 UTC (rev 396)
@@ -1,4 +1,4 @@
-Weather
+Weather Satellites
21140
22912
23522
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-07 23:11:47
|
Revision: 395
http://gpredict.svn.sourceforge.net/gpredict/?rev=395&view=rev
Author: csete
Date: 2009-08-07 23:11:39 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Trying sat data distribution as one data file. many small files made SVN commits impossible.
Added Paths:
-----------
trunk/data/satdata/satellites.dat
Added: trunk/data/satdata/satellites.dat
===================================================================
--- trunk/data/satdata/satellites.dat (rev 0)
+++ trunk/data/satdata/satellites.dat 2009-08-07 23:11:39 UTC (rev 395)
@@ -0,0 +1,8505 @@
+
+[25260]
+VERSION=1.1
+NAME=SPOT 4
+NICKNAME=SPOT 4
+TLE1=1 25260U 98017A 09219.21245068 .00000169 00000-0 10000-3 0 3577
+TLE2=2 25260 98.6953 291.1754 0001620 94.2235 358.3711 14.20040400589577
+
+[26390]
+VERSION=1.1
+NAME=SIRIUS-1
+NICKNAME=SIRIUS-1
+TLE1=1 26390U 00035A 09218.01560992 .00000073 00000-0 10000-3 0 5248
+TLE2=2 26390 61.4927 254.8292 2712001 270.4724 59.0253 1.00279604 33348
+
+[24971]
+VERSION=1.1
+NAME=IRS-1D
+NICKNAME=IRS-1D
+TLE1=1 24971U 97057A 09219.19134202 -.00000014 00000-0 93931-5 0 5446
+TLE2=2 24971 98.2342 252.8247 0054967 141.6583 218.8531 14.32956650620133
+
+[23598]
+VERSION=1.1
+NAME=DIRECTV 3 (DBS 3)
+NICKNAME=DIRECTV 3 (DBS 3)
+TLE1=1 23598U 95029A 09218.57231027 -.00000224 00000-0 10000-3 0 1231
+TLE2=2 23598 0.4087 83.9837 0003517 13.9665 47.8326 0.99004631 51796
+
+[25418]
+VERSION=1.1
+NAME=ORBCOMM FM15 [+]
+NICKNAME=ORBCOMM FM15 [+]
+TLE1=1 25418U 98046F 09218.88388133 -.00000125 00000-0 55438-5 0 1585
+TLE2=2 25418 45.0014 27.0752 0001117 299.9246 60.1501 14.27602307573932
+
+[25285]
+VERSION=1.1
+NAME=IRIDIUM 62 [+]
+NICKNAME=IRIDIUM 62 [+]
+TLE1=1 25285U 98021A 09218.47184104 .00000114 00000-0 33714-4 0 6367
+TLE2=2 25285 86.3980 344.1427 0002360 82.7939 277.3526 14.34213741593416
+
+[25354]
+VERSION=1.1
+NAME=CHINASTAR 1
+NICKNAME=CHINASTAR 1
+TLE1=1 25354U 98033A 09218.32223973 .00000000 00000-0 10000-3 0 5847
+TLE2=2 25354 0.0240 243.3002 0003058 223.1697 51.9202 1.00265038 45527
+
+[27811]
+VERSION=1.1
+NAME=HELLAS-SAT 2
+NICKNAME=HELLAS-SAT 2
+TLE1=1 27811U 03020A 09218.77157549 .00000000 00000-0 10000-3 0 9702
+TLE2=2 27811 0.0190 267.4664 0002989 234.4932 130.2414 1.00272543 22734
+
+[23571]
+VERSION=1.1
+NAME=INTELSAT 706 (IS-706)
+NICKNAME=INTELSAT 706 (IS-706)
+TLE1=1 23571U 95023A 09218.57126086 .00000085 00000-0 10000-3 0 9742
+TLE2=2 23571 0.0233 326.0480 0003112 168.0369 81.6260 1.00271937 52078
+
+[12389]
+VERSION=1.1
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 12389U 81033B 09218.59316623 .00002152 00000-0 68283-4 0 4146
+TLE2=2 12389 82.9166 278.2269 0409660 26.3345 335.8070 14.77450217444445
+
+[28485]
+VERSION=1.1
+NAME=SWIFT
+NICKNAME=SWIFT
+TLE1=1 28485U 04047A 09218.34865476 .00000570 00000-0 15642-4 0 3599
+TLE2=2 28485 20.5593 216.0740 0014256 315.5778 44.3541 14.92560888257171
+
+[29107]
+VERSION=1.1
+NAME=CLOUDSAT
+NICKNAME=CLOUDSAT
+TLE1=1 29107U 06016A 09218.19308204 .00000006 00000-0 11220-4 0 480
+TLE2=2 29107 98.1786 161.8074 0001531 97.2638 262.8739 14.57138415174156
+
+[25736]
+VERSION=1.1
+NAME=MUBLCOM
+NICKNAME=MUBLCOM
+TLE1=1 25736U 99026B 09218.87401934 .00000004 00000-0 12291-4 0 7996
+TLE2=2 25736 97.7647 145.7652 0004353 265.5798 94.4878 14.44569075538115
+
+[28496]
+VERSION=1.1
+NAME=ESSAIM-3
+NICKNAME=ESSAIM-3
+TLE1=1 28496U 04049E 09219.15783397 .00000065 00000-0 19338-4 0 2161
+TLE2=2 28496 98.2706 183.2545 0010184 85.4511 274.7867 14.70161369248754
+
+[902]
+VERSION=1.1
+NAME=CALSPHERE 2
+NICKNAME=CALSPHERE 2
+TLE1=1 00902U 64063E 09218.83787850 .00000075 00000-0 10000-3 0 1242
+TLE2=2 00902 90.1640 330.8990 0019731 98.3579 261.9808 13.52466473 24211
+
+[23711]
+VERSION=1.1
+NAME=SURFSAT
+NICKNAME=SURFSAT
+TLE1=1 23711U 95059B 09218.12118392 .00000054 00000-0 19271-3 0 2994
+TLE2=2 23711 100.3037 219.3652 0368334 4.7126 355.7405 13.12568218658987
+
+[24842]
+VERSION=1.1
+NAME=IRIDIUM 911 [-]
+NICKNAME=IRIDIUM 911 [-]
+TLE1=1 24842U 97030G 09218.21916012 .00000077 00000-0 16987-4 0 3680
+TLE2=2 24842 86.4471 113.3247 0012498 254.5839 105.3985 14.43179533638506
+
+[22220]
+VERSION=1.1
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 22220U 92076B 09218.89794456 -.00000304 00000-0 -12912-3 0 9597
+TLE2=2 22220 71.0002 341.6914 0013739 319.6665 40.3424 14.16143055864248
+
+[32388]
+VERSION=1.1
+NAME=HORIZONS 2
+NICKNAME=HORIZONS 2
+TLE1=1 32388U 07063B 09218.32734141 -.00000254 00000-0 10000-3 0 2523
+TLE2=2 32388 0.0113 310.8501 0002558 184.9219 223.0094 1.00273790 6110
+
+[25772]
+VERSION=1.1
+NAME=GLOBALSTAR M047
+NICKNAME=GLOBALSTAR M047
+TLE1=1 25772U 99031C 09218.11730346 -.00000086 00000-0 10000-3 0 428
+TLE2=2 25772 51.9946 227.6537 0001159 184.6478 175.4382 12.62266082468479
+
+[15427]
+VERSION=1.1
+NAME=NOAA 9 [P]
+NICKNAME=NOAA 9 [P]
+TLE1=1 15427U 84123A 09218.41176134 -.00000075 00000-0 -17479-4 0 7741
+TLE2=2 15427 98.4422 213.4729 0014008 275.4043 84.5554 14.15324684272062
+
+[28190]
+VERSION=1.1
+NAME=GPS BIIR-11 (PRN 19)
+NICKNAME=GPS BIIR-11 (PRN 19)
+TLE1=1 28190U 04009A 09217.77295033 -.00000002 00000-0 10000-3 0 2325
+TLE2=2 28190 54.8647 160.3585 0058249 340.3266 19.4156 2.00568291 39445
+
+[25288]
+VERSION=1.1
+NAME=IRIDIUM 65 [+]
+NICKNAME=IRIDIUM 65 [+]
+TLE1=1 25288U 98021D 09218.42110111 .00000101 00000-0 29037-4 0 6440
+TLE2=2 25288 86.3977 344.1378 0002327 74.7783 285.3667 14.34213625593406
+
+[25922]
+VERSION=1.1
+NAME=GALAXY 27 (G-27)
+NICKNAME=GALAXY 27 (G-27)
+TLE1=1 25922U 99052A 09216.55600830 .00000055 00000-0 10000-3 0 5259
+TLE2=2 25922 0.0133 76.3313 0002193 46.1670 261.8799 1.00271576 36113
+
+[26766]
+VERSION=1.1
+NAME=INTELSAT 10 (IS-10)
+NICKNAME=INTELSAT 10 (IS-10)
+TLE1=1 26766U 01019A 09217.62444905 .00000000 00000-0 10000-3 0 4271
+TLE2=2 26766 0.0129 277.2041 0002031 177.6497 152.7194 1.00270859 30151
+
+[24841]
+VERSION=1.1
+NAME=IRIDIUM 16 [-]
+NICKNAME=IRIDIUM 16 [-]
+TLE1=1 24841U 97030F 09218.22907930 .00000125 00000-0 36636-4 0 7095
+TLE2=2 24841 86.4051 111.1321 0002239 28.1371 331.9945 14.35293904635450
+
+[22970]
+VERSION=1.1
+NAME=TUBSAT B
+NICKNAME=TUBSAT B
+TLE1=1 22970U 94003B 09218.20212307 .00000051 00000-0 10000-3 0 1232
+TLE2=2 22970 82.5621 114.3639 0017033 119.8875 240.4012 13.16915040746567
+
+[25331]
+VERSION=1.1
+NAME=ECHOSTAR 4
+NICKNAME=ECHOSTAR 4
+TLE1=1 25331U 98028A 09218.33066257 -.00000244 00000-0 10000-3 0 337
+TLE2=2 25331 1.2156 50.9902 0005154 70.5324 235.2990 1.00268671 41312
+
+[24794]
+VERSION=1.1
+NAME=IRIDIUM 6 [+]
+NICKNAME=IRIDIUM 6 [+]
+TLE1=1 24794U 97020C 09218.13311721 .00000104 00000-0 30116-4 0 5067
+TLE2=2 24794 86.3937 79.1969 0002399 72.6979 287.4479 14.34220055641545
+
+[26464]
+VERSION=1.1
+NAME=CLUSTER II-FM8
+NICKNAME=CLUSTER II-FM8
+TLE1=1 26464U 00045B 09218.45833333 .00000347 00000-0 00000+0 0 3563
+TLE2=2 26464 109.3712 187.3308 8557009 31.5269 358.3203 0.42013901 4791
+
+[26626]
+VERSION=1.1
+NAME=SIRIUS-3
+NICKNAME=SIRIUS-3
+TLE1=1 26626U 00077A 09217.35031233 -.00000137 00000-0 10000-3 0 4615
+TLE2=2 26626 64.1096 14.5856 2674785 269.7432 59.9035 1.00282415 31807
+
+[28915]
+VERSION=1.1
+NAME=COSMOS 2419 (714)
+NICKNAME=COSMOS 2419 (714)
+TLE1=1 28915U 05050A 09218.19237948 .00000011 00000-0 10000-3 0 186
+TLE2=2 28915 64.8662 162.1422 0009309 326.2517 76.6245 2.13101827 28133
+
+[22826]
+VERSION=1.1
+NAME=ITAMSAT (IO-26)
+NICKNAME=ITAMSAT (IO-26)
+TLE1=1 22826U 93061D 09217.97130768 -.00000023 00000-0 75386-5 0 383
+TLE2=2 22826 98.4332 170.5626 0009834 110.7733 249.4507 14.29522652827123
+
+[23705]
+VERSION=1.1
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 23705U 95058B 09217.74669167 .00000026 00000-0 38202-4 0 9446
+TLE2=2 23705 71.0205 294.2437 0012093 347.5771 12.5073 14.14863007710879
+
+[3230]
+VERSION=1.1
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 03230U 68040B 09218.90780234 -.00000001 00000-0 43949-5 0 7173
+TLE2=2 03230 74.0345 200.0513 0034767 194.7743 165.2430 14.84219816208775
+
+[28187]
+VERSION=1.1
+NAME=EUTELSAT W3A
+NICKNAME=EUTELSAT W3A
+TLE1=1 28187U 04008A 09216.60081120 .00000044 00000-0 10000-3 0 8300
+TLE2=2 28187 0.0703 357.3303 0004156 122.0330 57.1913 1.00273384 19801
+
+[27426]
+VERSION=1.1
+NAME=DIRECTV 5 (TEMPO 1)
+NICKNAME=DIRECTV 5 (TEMPO 1)
+TLE1=1 27426U 02023A 09218.43238100 -.00000057 00000-0 10000-3 0 3608
+TLE2=2 27426 0.0187 95.3343 0003080 37.7207 227.5552 1.00272017 26582
+
+[28230]
+VERSION=1.1
+NAME=GP-B
+NICKNAME=GP-B
+TLE1=1 28230U 04014A 09218.34014324 .00000103 00000-0 12776-4 0 5723
+TLE2=2 28230 89.9452 157.6293 0002389 65.2338 294.9164 14.75982488285170
+
+[27378]
+VERSION=1.1
+NAME=ECHOSTAR 7
+NICKNAME=ECHOSTAR 7
+TLE1=1 27378U 02006A 09217.60632291 -.00000003 00000-0 10000-3 0 4042
+TLE2=2 27378 0.0574 278.2481 0001394 209.0557 286.3297 1.00271946 27301
+
+[29505]
+VERSION=1.1
+NAME=SJ-6C
+NICKNAME=SJ-6C
+TLE1=1 29505U 06046A 09219.19241053 .00000371 00000-0 43380-4 0 1369
+TLE2=2 29505 97.6880 224.6999 0001766 274.4143 85.6878 14.90666162151681
+
+[22245]
+VERSION=1.1
+NAME=GORIZONT 27
+NICKNAME=GORIZONT 27
+TLE1=1 22245U 92082A 09216.86347532 -.00000301 00000-0 10000-3 0 4727
+TLE2=2 22245 11.3668 44.3627 0013807 223.0772 136.9119 1.00207880 65434
+
+[22877]
+VERSION=1.1
+NAME=GPS BIIA-23 (PRN 04)
+NICKNAME=GPS BIIA-23 (PRN 04)
+TLE1=1 22877U 93068A 09218.01596993 .00000043 00000-0 10000-3 0 8433
+TLE2=2 22877 53.8743 216.3516 0086045 27.1764 333.2823 2.00551108115623
+
+[25043]
+VERSION=1.1
+NAME=IRIDIUM 38 [-]
+NICKNAME=IRIDIUM 38 [-]
+TLE1=1 25043U 97069E 09218.31365358 .00000072 00000-0 18487-4 0 6975
+TLE2=2 25043 86.4013 141.5549 0001954 57.0415 303.0968 14.34703556614792
+
+[23439]
+VERSION=1.1
+NAME=RADIO ROSTO (RS-15)
+NICKNAME=RADIO ROSTO (RS-15)
+TLE1=1 23439U 94085A 09218.35652099 -.00000039 00000-0 10000-3 0 2200
+TLE2=2 23439 64.8133 183.6865 0148958 42.0398 319.1845 11.27553426601774
+
+[26089]
+VERSION=1.1
+NAME=GARUDA 1
+NICKNAME=GARUDA 1
+TLE1=1 26089U 00011A 09218.83711767 -.00000359 00000-0 10000-3 0 4400
+TLE2=2 26089 1.2759 253.1503 0002542 248.0048 238.7305 1.00271029 34770
+
+[27941]
+VERSION=1.1
+NAME=NIGERIASAT 1
+NICKNAME=NIGERIASAT 1
+TLE1=1 27941U 03042C 09219.16683331 .00000020 00000-0 12811-4 0 6765
+TLE2=2 27941 97.9369 92.0046 0011134 343.3807 16.7019 14.63027026312996
+
+[28393]
+VERSION=1.1
+NAME=AMAZONAS
+NICKNAME=AMAZONAS
+TLE1=1 28393U 04031A 09216.27055630 -.00000287 00000-0 10000-3 0 6404
+TLE2=2 28393 0.0250 359.4076 0003188 116.1071 233.7761 1.00271214 18348
+
+[28916]
+VERSION=1.1
+NAME=COSMOS 2418 (713)
+NICKNAME=COSMOS 2418 (713)
+TLE1=1 28916U 05050B 09218.94375946 .00000020 00000-0 10000-3 0 80
+TLE2=2 28916 64.8845 162.1524 0020129 331.2765 241.8891 2.13104318 28146
+
+[32763]
+VERSION=1.1
+NAME=ICO G1
+NICKNAME=ICO G1
+TLE1=1 32763U 08016A 09219.02280061 -.00000169 00000-0 10000-3 0 2978
+TLE2=2 32763 5.4563 329.4818 0003313 158.5933 102.9441 1.00271366 4848
+
+[26892]
+VERSION=1.1
+NAME=COSMOS 2379
+NICKNAME=COSMOS 2379
+TLE1=1 26892U 01037A 09218.06054469 .00000083 00000-0 10000-3 0 3597
+TLE2=2 26892 4.9663 68.7067 0000394 178.5003 102.0874 1.00288458 29101
+
+[25276]
+VERSION=1.1
+NAME=IRIDIUM 60 [+]
+NICKNAME=IRIDIUM 60 [+]
+TLE1=1 25276U 98019E 09218.51026045 .00000034 00000-0 51489-5 0 6819
+TLE2=2 25276 86.3917 47.2860 0002375 79.3183 280.8280 14.34216392594464
+
+[26610]
+VERSION=1.1
+NAME=STRV 1C
+NICKNAME=STRV 1C
+TLE1=1 26610U 00072C 09213.19754679 -.00000244 00000-0 00000+0 0 9650
+TLE2=2 26610 6.6517 269.3422 7322399 95.9763 343.5011 2.03458741 64735
+
+[28935]
+VERSION=1.1
+NAME=ECHOSTAR 10
+NICKNAME=ECHOSTAR 10
+TLE1=1 28935U 06003A 09218.56262535 -.00000057 00000-0 10000-3 0 7287
+TLE2=2 28935 0.0277 307.4073 0001533 192.4936 267.6589 1.00272377 12763
+
+[25158]
+VERSION=1.1
+NAME=ORBCOMM FM03 [-]
+NICKNAME=ORBCOMM FM03 [-]
+TLE1=1 25158U 98007B 09218.19067792 .00000091 00000-0 92506-4 0 9464
+TLE2=2 25158 107.9731 216.0272 0052036 205.4517 154.4055 14.25442462596649
+
+[26483]
+VERSION=1.1
+NAME=SIRIUS-2
+NICKNAME=SIRIUS-2
+TLE1=1 26483U 00051A 09218.67756884 .00000000 00000-0 10000-3 0 2188
+TLE2=2 26483 63.7265 134.6547 2714461 268.7015 60.4881 1.00246444 32690
+
+[24901]
+VERSION=1.1
+NAME=AGILA 2
+NICKNAME=AGILA 2
+TLE1=1 24901U 97042A 09216.62045868 -.00000239 00000-0 10000-3 0 8959
+TLE2=2 24901 0.0274 257.0569 0005027 228.9677 196.6019 1.00270468 43793
+
+[23710]
+VERSION=1.1
+NAME=RADARSAT-1
+NICKNAME=RADARSAT-1
+TLE1=1 23710U 95059A 09219.22944641 .00000081 00000-0 48289-4 0 4678
+TLE2=2 23710 98.5778 225.2963 0001140 92.3827 327.2633 14.29982069718108
+
+[25770]
+VERSION=1.1
+NAME=GLOBALSTAR M025
+NICKNAME=GLOBALSTAR M025
+TLE1=1 25770U 99031A 09218.39449241 -.00000086 00000-0 10000-3 0 9673
+TLE2=2 25770 51.9951 227.2245 0000872 181.0317 179.0542 12.62259071468501
+
+[28463]
+VERSION=1.1
+NAME=EXPRESS-AM 1
+NICKNAME=EXPRESS-AM 1
+TLE1=1 28463U 04043A 09218.83833184 .00000150 00000-0 10000-3 0 5189
+TLE2=2 28463 0.0258 217.3722 0000620 203.3453 236.5756 1.00273725 17461
+
+[24906]
+VERSION=1.1
+NAME=IRIDIUM 23 [+]
+NICKNAME=IRIDIUM 23 [+]
+TLE1=1 24906U 97043D 09218.52584037 -.00000073 00000-0 -33112-4 0 7295
+TLE2=2 24906 86.3943 15.6029 0002356 77.5812 282.5646 14.34214097626232
+
+[27651]
+VERSION=1.1
+NAME=SORCE
+NICKNAME=SORCE
+TLE1=1 27651U 03004A 09218.87345446 .00000009 00000-0 16892-4 0 9695
+TLE2=2 27651 39.9975 33.9936 0027335 334.9366 25.0074 14.82195448353816
+
+[27431]
+VERSION=1.1
+NAME=FENGYUN 1D
+NICKNAME=FENGYUN 1D
+TLE1=1 27431U 02024B 09218.98038380 -.00000331 00000-0 -16571-3 0 6500
+TLE2=2 27431 98.6287 206.5920 0014399 272.2172 87.7333 14.09281917371961
+
+[25169]
+VERSION=1.1
+NAME=IRIDIUM 52 [+]
+NICKNAME=IRIDIUM 52 [+]
+TLE1=1 25169U 98010A 09218.39024369 .00000061 00000-0 14768-4 0 4214
+TLE2=2 25169 86.3960 110.6079 0002393 81.4039 278.7428 14.34218572600161
+
+[25634]
+VERSION=1.1
+NAME=ARGOS
+NICKNAME=ARGOS
+TLE1=1 25634U 99008A 09219.02120106 -.00000069 00000-0 -11198-4 0 7842
+TLE2=2 25634 99.0082 256.9208 0010253 158.0061 202.1575 14.18910434541258
+
+[15677]
+VERSION=1.1
+NAME=GSTAR 1
+NICKNAME=GSTAR 1
+TLE1=1 15677U 85035A 09216.56168526 -.00000102 00000-0 10000-3 0 1679
+TLE2=2 15677 10.7896 50.2710 0005567 265.9873 94.0454 1.00272515 63465
+
+[32266]
+VERSION=1.1
+NAME=GLOBALSTAR M068
+NICKNAME=GLOBALSTAR M068
+TLE1=1 32266U 07048D 09218.42171302 -.00000086 00000-0 10000-3 0 6488
+TLE2=2 32266 51.9875 317.7565 0000874 92.9571 267.1394 12.62260786 85951
+
+[26113]
+VERSION=1.1
+NAME=IMAGE
+NICKNAME=IMAGE
+TLE1=1 26113U 00017A 09215.94619152 .00000321 00000-0 00000-0 0 8552
+TLE2=2 26113 91.2661 212.9791 7370906 278.7485 11.6823 1.68638721 57638
+
+[21118]
+VERSION=1.1
+NAME=MOLNIYA 1-80
+NICKNAME=MOLNIYA 1-80
+TLE1=1 21118U 91012A 09218.32418207 .00001368 00000-0 10000-3 0 6701
+TLE2=2 21118 61.9702 260.9446 7265977 253.2605 21.6473 2.00487573135342
+
+[25884]
+VERSION=1.1
+NAME=GLOBALSTAR M027
+NICKNAME=GLOBALSTAR M027
+TLE1=1 25884U 99043B 09218.92632027 -.00000086 00000-0 10000-3 0 9565
+TLE2=2 25884 52.0091 2.9990 0001002 128.8015 231.2931 12.62265625460045
+
+[28899]
+VERSION=1.1
+NAME=INMARSAT 4-F2
+NICKNAME=INMARSAT 4-F2
+TLE1=1 28899U 05044A 09218.87308442 .00000139 00000-0 10000-3 0 7945
+TLE2=2 28899 2.2471 315.6568 0003114 182.8084 156.4401 1.00272845 13765
+
+[24948]
+VERSION=1.1
+NAME=IRIDIUM 28 [-]
+NICKNAME=IRIDIUM 28 [-]
+TLE1=1 24948U 97051E 09218.51660622 .00000256 00000-0 84430-4 0 5450
+TLE2=2 24948 86.3911 47.4612 0001831 72.2271 287.9155 14.34266370622794
+
+[4327]
+VERSION=1.1
+NAME=SERT 2
+NICKNAME=SERT 2
+TLE1=1 04327U 70009A 09217.72089640 .00000032 00000-0 10000-3 0 560
+TLE2=2 04327 99.2075 87.9698 0004336 183.1478 176.9634 13.58228203957523
+
+[33460]
+VERSION=1.1
+NAME=EUTELSAT W2M
+NICKNAME=EUTELSAT W2M
+TLE1=1 33460U 08065B 09215.97706016 .00000015 00000-0 10000-3 0 1248
+TLE2=2 33460 0.0572 294.3213 0002574 167.3126 205.8752 1.00272254 2329
+
+[25531]
+VERSION=1.1
+NAME=IRIDIUM 83 [+]
+NICKNAME=IRIDIUM 83 [+]
+TLE1=1 25531U 98066E 09218.22533892 .00000229 00000-0 74666-4 0 5924
+TLE2=2 25531 86.3965 110.5200 0002503 71.3222 288.8245 14.34218256562715
+
+[10953]
+VERSION=1.1
+NAME=GOES 3
+NICKNAME=GOES 3
+TLE1=1 10953U 78062A 09217.41789438 -.00000114 00000-0 10000-3 0 5902
+TLE2=2 10953 14.3771 359.6901 0002839 19.8091 340.2567 1.00265687 67168
+
+[27373]
+VERSION=1.1
+NAME=IRIDIUM 90 [S]
+NICKNAME=IRIDIUM 90 [S]
+TLE1=1 27373U 02005B 09218.41059850 .00000154 00000-0 40187-4 0 1548
+TLE2=2 27373 86.4494 110.2731 0004806 154.8423 205.3011 14.42959664397235
+
+[27561]
+VERSION=1.1
+NAME=RUBIN-3 & SL-8 R/B
+NICKNAME=RUBIN-3 & SL-8 R/B
+TLE1=1 27561U 02054C 09219.13542928 .00000006 00000-0 11596-4 0 7447
+TLE2=2 27561 97.9404 51.9553 0048705 83.0967 277.5774 14.53764562354915
+
+[7530]
+VERSION=1.1
+NAME=OSCAR 7 (AO-7)
+NICKNAME=OSCAR 7 (AO-7)
+TLE1=1 07530U 74089B 09218.52640616 -.00000027 00000-0 10000-3 0 5487
+TLE2=2 07530 101.4244 241.3519 0011745 168.9775 191.1560 12.53576053589023
+
+[25721]
+VERSION=1.1
+NAME=ABRIXAS
+NICKNAME=ABRIXAS
+TLE1=1 25721U 99022A 09218.75550938 -.00000769 00000-0 -20131-4 0 6285
+TLE2=2 25721 48.4430 64.0805 0020306 64.7927 295.5108 15.20235823568157
+
+[16908]
+VERSION=1.1
+NAME=EGP
+NICKNAME=EGP
+TLE1=1 16908U 86061A 09218.39803131 -.00000083 00000-0 10000-3 0 9775
+TLE2=2 16908 50.0109 4.6189 0010968 346.0353 14.0178 12.44462402713851
+
+[25395]
+VERSION=1.1
+NAME=FASAT B
+NICKNAME=FASAT B
+TLE1=1 25395U 98043B 09219.19326761 .00000030 00000-0 30767-4 0 5170
+TLE2=2 25395 98.3312 247.6866 0003798 63.4278 296.7292 14.24357425575706
+
+[33154]
+VERSION=1.1
+NAME=BADR-6
+NICKNAME=BADR-6
+TLE1=1 33154U 08034B 09217.75627156 .00000142 00000-0 10000-3 0 2027
+TLE2=2 33154 0.0487 328.1294 0001511 172.2628 112.2801 1.00274858 4006
+
+[25624]
+VERSION=1.1
+NAME=GLOBALSTAR M038
+NICKNAME=GLOBALSTAR M038
+TLE1=1 25624U 99004D 09218.90660537 -.00000086 00000-0 10000-3 0 177
+TLE2=2 25624 52.0037 2.3422 0001955 87.0513 273.0566 12.62260732484933
+
+[26900]
+VERSION=1.1
+NAME=INTELSAT 902 (IS-902)
+NICKNAME=INTELSAT 902 (IS-902)
+TLE1=1 26900U 01039A 09218.11614701 .00000000 00000-0 10000-3 0 4372
+TLE2=2 26900 0.0184 21.0205 0003873 131.2552 266.3222 1.00270998 29091
+
+[21111]
+VERSION=1.1
+NAME=COSMOS 2133
+NICKNAME=COSMOS 2133
+TLE1=1 21111U 91010A 09217.02332030 -.00000146 00000-0 10000-3 0 1773
+TLE2=2 21111 11.3583 41.3998 0003335 7.7976 352.3024 1.00280505 67679
+
+[23027]
+VERSION=1.1
+NAME=GPS BIIA-24 (PRN 06)
+NICKNAME=GPS BIIA-24 (PRN 06)
+TLE1=1 23027U 94016A 09217.22103167 -.00000013 00000-0 10000-3 0 8599
+TLE2=2 23027 53.5119 153.4449 0061448 285.0031 74.2931 2.00560098112912
+
+[27436]
+VERSION=1.1
+NAME=COSMOS 2389
+NICKNAME=COSMOS 2389
+TLE1=1 27436U 02026A 09218.99149165 .00000032 00000-0 17246-4 0 8297
+TLE2=2 27436 82.9460 45.0450 0046779 157.7937 202.5262 13.74734318360956
+
+[27844]
+VERSION=1.1
+NAME=CUTE-1 (CO-55)
+NICKNAME=CUTE-1 (CO-55)
+TLE1=1 27844U 03031E 09217.99761731 .00000024 00000-0 31243-4 0 6376
+TLE2=2 27844 98.7127 226.4591 0010424 5.1621 354.9675 14.20649539316334
+
+[25112]
+VERSION=1.1
+NAME=ORBCOMM FM08 [+]
+NICKNAME=ORBCOMM FM08 [+]
+TLE1=1 25112U 97084A 09218.20062065 -.00000123 00000-0 62898-5 0 2943
+TLE2=2 25112 45.0189 121.9543 0010661 346.4085 13.6473 14.34378458607430
+
+[23880]
+VERSION=1.1
+NAME=GORIZONT 32
+NICKNAME=GORIZONT 32
+TLE1=1 23880U 96034A 09218.05081535 -.00000123 00000-0 10000-3 0 2679
+TLE2=2 23880 9.5433 55.8948 0001246 53.4242 209.3100 1.00267497 48338
+
+[32395]
+VERSION=1.1
+NAME=COSMOS 2436 (723)
+NICKNAME=COSMOS 2436 (723)
+TLE1=1 32395U 07065C 09217.44745597 -.00000015 00000-0 10000-3 0 2965
+TLE2=2 32395 65.0470 41.7936 0017776 2.0114 358.0464 2.13103400 12470
+
+[26083]
+VERSION=1.1
+NAME=GLOBALSTAR M060
+NICKNAME=GLOBALSTAR M060
+TLE1=1 26083U 00008C 09218.28309460 -.00000086 00000-0 10000-3 0 90
+TLE2=2 26083 52.0045 139.5156 0000570 352.4360 7.6498 12.62266638445517
+
+[12458]
+VERSION=1.1
+NAME=NOVA I
+NICKNAME=NOVA I
+TLE1=1 12458U 81044A 09218.19943692 .00000050 00000-0 10000-3 0 8099
+TLE2=2 12458 90.0925 116.2945 0015478 12.3558 347.7964 13.22705205362451
+
+[25106]
+VERSION=1.1
+NAME=IRIDIUM 47 [+]
+NICKNAME=IRIDIUM 47 [+]
+TLE1=1 25106U 97082C 09218.48776956 .00000001 00000-0 -65875-5 0 6245
+TLE2=2 25106 86.3935 15.6486 0002354 80.5463 279.5998 14.34214957608766
+
+[23461]
+VERSION=1.1
+NAME=INTELSAT 704 (IS-704)
+NICKNAME=INTELSAT 704 (IS-704)
+TLE1=1 23461U 95001A 09218.74222184 -.00000296 00000-0 10000-3 0 9881
+TLE2=2 23461 0.2520 70.6729 0002000 59.4619 229.8694 0.99183607 53409
+
+[28378]
+VERSION=1.1
+NAME=ANIK F2
+NICKNAME=ANIK F2
+TLE1=1 28378U 04027A 09218.56262404 -.00000051 00000-0 10000-3 0 8305
+TLE2=2 28378 0.0190 37.7955 0001831 71.6052 297.2681 1.00273181 18603
+
+[22117]
+VERSION=1.1
+NAME=SATCOM C3
+NICKNAME=SATCOM C3
+TLE1=1 22117U 92060B 09218.47506127 -.00000237 00000-0 10000-3 0 1766
+TLE2=2 22117 4.5047 71.8457 0001454 60.8280 274.4309 1.00273067 61872
+
+[29230]
+VERSION=1.1
+NAME=KAZSAT 1
+NICKNAME=KAZSAT 1
+TLE1=1 29230U 06022A 09218.65265259 -.00000288 00000-0 10000-3 0 6356
+TLE2=2 29230 0.1980 85.8185 0002617 53.3982 149.3090 1.00237269 11500
+
+[27528]
+VERSION=1.1
+NAME=HISPASAT 1D
+NICKNAME=HISPASAT 1D
+TLE1=1 27528U 02044A 09218.95845612 -.00000217 00000-0 10000-3 0 619
+TLE2=2 27528 0.0503 312.5197 0001858 152.9405 165.1965 1.00270836 25232
+
+[23227]
+VERSION=1.1
+NAME=OPTUS B3
+NICKNAME=OPTUS B3
+TLE1=1 23227U 94055A 09218.52570229 -.00000076 00000-0 10000-3 0 3836
+TLE2=2 23227 1.5718 79.0319 0004899 36.7444 192.6548 1.00272875 54700
+
+[22827]
+VERSION=1.1
+NAME=HEALTHSAT 1
+NICKNAME=HEALTHSAT 1
+TLE1=1 22827U 93061E 09217.92464277 -.00000041 00000-0 31935-6 0 3223
+TLE2=2 22827 98.4267 171.7125 0009869 88.1545 272.0781 14.30166187827333
+
+[35637]
+VERSION=1.1
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 35637U 09039C 09218.98440496 .00000141 00000-0 10000-3 0 158
+TLE2=2 35637 82.9486 13.8036 0011228 216.1956 143.8450 13.90955452 2345
+
+[28892]
+VERSION=1.1
+NAME=UWE-1
+NICKNAME=UWE-1
+TLE1=1 28892U 05043C 09218.69164898 .00000127 00000-0 36096-4 0 3994
+TLE2=2 28892 98.0470 107.3206 0017292 186.1659 173.9332 14.59756969201210
+
+[27807]
+VERSION=1.1
+NAME=GSAT-2
+NICKNAME=GSAT-2
+TLE1=1 27807U 03018A 09218.13487074 .00000000 00000-0 10000-3 0 478
+TLE2=2 27807 0.0193 4.7424 0008950 170.1981 236.4123 1.00273486 22937
+
+[33105]
+VERSION=1.1
+NAME=JASON 2 (OSTM)
+NICKNAME=JASON 2 (OSTM)
+TLE1=1 33105U 08032A 09219.00133210 -.00000061 00000-0 00000+0 0 3874
+TLE2=2 33105 66.0451 325.3437 0007830 264.3734 95.6385 12.80930567 52857
+
+[29671]
+VERSION=1.1
+NAME=COSMOS 2426 (717)
+NICKNAME=COSMOS 2426 (717)
+TLE1=1 29671U 06062B 09218.04646657 -.00000015 00000-0 10000-3 0 7457
+TLE2=2 29671 65.4311 41.2947 0019159 163.2877 342.2361 2.13103604 20332
+
+[28874]
+VERSION=1.1
+NAME=GPS BIIRM-1 (PRN 17)
+NICKNAME=GPS BIIRM-1 (PRN 17)
+TLE1=1 28874U 05038A 09217.90858793 -.00000002 00000-0 10000-3 0 1981
+TLE2=2 28874 54.9982 157.1486 0046854 211.8442 147.8460 2.00558955 28312
+
+[27663]
+VERSION=1.1
+NAME=GPS BIIR-08 (PRN 16)
+NICKNAME=GPS BIIR-08 (PRN 16)
+TLE1=1 27663U 03005A 09218.13263878 -.00000001 00000-0 10000-3 0 7770
+TLE2=2 27663 55.5262 97.4131 0053918 340.5178 19.3566 2.00573444 47785
+
+[27600]
+VERSION=1.1
+NAME=MICRO LABSAT
+NICKNAME=MICRO LABSAT
+TLE1=1 27600U 02056D 09218.18974426 -.00000005 00000-0 14506-4 0 8297
+TLE2=2 27600 98.3891 273.1157 0011817 100.8435 259.4104 14.28863362346584
+
+[20442]
+VERSION=1.1
+NAME=LUSAT (LO-19)
+NICKNAME=LUSAT (LO-19)
+TLE1=1 20442U 90005G 09218.00820543 -.00000000 00000-0 15117-4 0 5860
+TLE2=2 20442 98.2452 191.2235 0012242 23.9984 336.1784 14.32065018 20445
+
+[26997]
+VERSION=1.1
+NAME=JASON 1
+NICKNAME=JASON 1
+TLE1=1 26997U 01055A 09217.87201700 -.00000038 00000-0 10000-3 0 636
+TLE2=2 26997 66.0454 327.2879 0007352 262.6293 97.3885 12.80931864358407
+
+[21426]
+VERSION=1.1
+NAME=MOLNIYA 1-81
+NICKNAME=MOLNIYA 1-81
+TLE1=1 21426U 91043A 09217.08395730 .00000102 00000-0 10000-3 0 1221
+TLE2=2 21426 62.0084 232.7843 7245344 266.2933 16.2616 2.00619423132887
+
+[27421]
+VERSION=1.1
+NAME=SPOT 5
+NICKNAME=SPOT 5
+TLE1=1 27421U 02021A 09219.17693285 -.00000009 00000-0 16506-4 0 2831
+TLE2=2 27421 98.7709 291.6703 0000801 106.5809 253.5472 14.20008613376407
+
+[24846]
+VERSION=1.1
+NAME=INTELSAT 802 (IS-802)
+NICKNAME=INTELSAT 802 (IS-802)
+TLE1=1 24846U 97031A 09217.71268544 .00000153 00000-0 00000-0 0 8673
+TLE2=2 24846 0.0175 9.1036 0002563 127.5420 107.2098 1.00274372 44411
+
+[33063]
+VERSION=1.1
+NAME=ORBCOMM FM39 [S]
+NICKNAME=ORBCOMM FM39 [S]
+TLE1=1 33063U 08031D 09219.19497089 -.00000070 00000-0 21418-4 0 3773
+TLE2=2 33063 48.4459 196.6513 0010069 257.5021 102.4763 14.68167090 60821
+
+[25944]
+VERSION=1.1
+NAME=GLOBALSTAR M059
+NICKNAME=GLOBALSTAR M059
+TLE1=1 25944U 99058B 09218.21138699 -.00000086 00000-0 10000-3 0 9421
+TLE2=2 25944 52.0041 138.6415 0000831 299.1739 60.9041 12.62262472452171
+
+[28446]
+VERSION=1.1
+NAME=AMC-15
+NICKNAME=AMC-15
+TLE1=1 28446U 04041A 09218.41775684 -.00000090 00000-0 00000+0 0 8779
+TLE2=2 28446 0.0425 242.7829 0002147 233.2216 244.3993 1.00272035 17657
+
+[25777]
+VERSION=1.1
+NAME=IRIDIUM 14 [S]
+NICKNAME=IRIDIUM 14 [S]
+TLE1=1 25777U 99032A 09218.44310935 .00000066 00000-0 10405-4 0 6915
+TLE2=2 25777 86.5165 344.1869 0002891 94.8967 265.2570 14.54938877539234
+
+[20776]
+VERSION=1.1
+NAME=SKYNET 4C
+NICKNAME=SKYNET 4C
+TLE1=1 20776U 90079A 09217.89316472 .00000029 00000-0 10000-3 0 9744
+TLE2=2 20776 9.9535 46.8310 0002838 75.1390 160.2965 1.00271584 69184
+
+[22041]
+VERSION=1.1
+NAME=GORIZONT 26
+NICKNAME=GORIZONT 26
+TLE1=1 22041U 92043A 09216.48386719 -.00000094 00000-0 10000-3 0 8639
+TLE2=2 22041 11.4565 43.2593 0029995 104.2766 256.1501 0.99240761 62353
+
+[30798]
+VERSION=1.1
+NAME=THEMIS E
+NICKNAME=THEMIS E
+TLE1=1 30798U 07004E 09219.45833333 -.00000303 00000-0 00000+0 0 6400
+TLE2=2 30798 4.5672 242.3787 7494028 122.4984 355.1444 1.00276270 8403
+
+[26064]
+VERSION=1.1
+NAME=FALCONSAT
+NICKNAME=FALCONSAT
+TLE1=1 26064U 00004D 09219.00696756 -.00000025 00000-0 11658-4 0 5508
+TLE2=2 26064 100.2167 12.8476 0038414 124.8912 235.5893 14.35421963499108
+
+[27516]
+VERSION=1.1
+NAME=KODAMA (DRTS)
+NICKNAME=KODAMA (DRTS)
+TLE1=1 27516U 02042B 09218.95621670 -.00000236 00000-0 10000-3 0 2242
+TLE2=2 27516 0.0851 267.1879 0003752 212.0717 271.3278 1.00270754 25355
+
+[25116]
+VERSION=1.1
+NAME=ORBCOMM FM09 [+]
+NICKNAME=ORBCOMM FM09 [+]
+TLE1=1 25116U 97084E 09219.12333684 -.00000125 00000-0 57976-5 0 1220
+TLE2=2 25116 45.0214 118.1655 0007161 315.0163 45.0104 14.34388924607568
+
+[25467]
+VERSION=1.1
+NAME=IRIDIUM 82 [+]
+NICKNAME=IRIDIUM 82 [+]
+TLE1=1 25467U 98051A 09218.29226592 .00000172 00000-0 54430-4 0 7677
+TLE2=2 25467 86.4029 142.2572 0002162 57.1825 302.9577 14.34220229574982
+
+[28129]
+VERSION=1.1
+NAME=GPS BIIR-10 (PRN 22)
+NICKNAME=GPS BIIR-10 (PRN 22)
+TLE1=1 28129U 03058A 09217.32705227 -.00000009 00000-0 10000-3 0 2914
+TLE2=2 28129 53.8033 278.0598 0054207 252.7038 106.7902 2.00565055 41266
+
+[31119]
+VERSION=1.1
+NAME=SAUDICOMSAT 7
+NICKNAME=SAUDICOMSAT 7
+TLE1=1 31119U 07012C 09219.03510021 .00000386 00000-0 88724-4 0 7031
+TLE2=2 31119 97.9918 279.4951 0063268 98.1677 262.6680 14.59449599122914
+
+[24315]
+VERSION=1.1
+NAME=AMC-1 (GE-1)
+NICKNAME=AMC-1 (GE-1)
+TLE1=1 24315U 96054A 09218.45495841 -.00000103 00000-0 10000-3 0 1822
+TLE2=2 24315 0.0425 251.1225 0003518 233.2685 251.4990 1.00272225 47284
+
+[27601]
+VERSION=1.1
+NAME=H-2A R/B
+NICKNAME=H-2A R/B
+TLE1=1 27601U 02056E 09217.82986722 -.00000004 00000-0 14396-4 0 6924
+TLE2=2 27601 98.5717 306.7930 0073600 135.5361 225.1762 14.30712968346967
+
+[25468]
+VERSION=1.1
+NAME=IRIDIUM 81 [+]
+NICKNAME=IRIDIUM 81 [+]
+TLE1=1 25468U 98051B 09218.49520538 .00000177 00000-0 56107-4 0 5998
+TLE2=2 25468 86.4013 142.0142 0002320 75.8150 284.3304 14.34219697571234
+
+[33108]
+VERSION=1.1
+NAME=COSMOS 2440
+NICKNAME=COSMOS 2440
+TLE1=1 33108U 08033A 09218.82643177 -.00000140 00000-0 10000-3 0 3317
+TLE2=2 33108 1.3648 289.5855 0001970 126.2512 277.3420 1.00274160 4063
+
+[27858]
+VERSION=1.1
+NAME=SCISAT 1
+NICKNAME=SCISAT 1
+TLE1=1 27858U 03036A 09218.29388951 .00000071 00000-0 15779-4 0 8076
+TLE2=2 27858 73.9336 83.2138 0008103 134.3239 225.8601 14.74810589322104
+
+[25163]
+VERSION=1.1
+NAME=GLOBALSTAR M004
+NICKNAME=GLOBALSTAR M004
+TLE1=1 25163U 98008B 09218.99822950 -.00000086 00000-0 10000-3 0 3810
+TLE2=2 25163 52.0009 83.6766 0004114 58.7788 301.3464 12.63153599529601
+
+[17589]
+VERSION=1.1
+NAME=COSMOS 1833
+NICKNAME=COSMOS 1833
+TLE1=1 17589U 87027A 09218.77195742 .00000287 00000-0 18038-3 0 3743
+TLE2=2 17589 70.9083 98.5612 0002345 305.2557 54.8341 14.12765027154753
+
+[25578]
+VERSION=1.1
+NAME=IRIDIUM 11 [S]
+NICKNAME=IRIDIUM 11 [S]
+TLE1=1 25578U 98074B 09218.51563365 -.00000045 00000-0 -15520-4 0 7276
+TLE2=2 25578 86.5132 15.8411 0002479 80.4132 279.7353 14.54937759564863
+
+[11849]
+VERSION=1.1
+NAME=SL-3 R/B
+NICKNAME=SL-3 R/B
+TLE1=1 11849U 80051B 09218.25779290 .00000366 00000-0 17450-4 0 8982
+TLE2=2 11849 97.7061 351.2716 0012567 79.8451 280.4177 15.25594232595304
+
+[27775]
+VERSION=1.1
+NAME=COSMOS 2397
+NICKNAME=COSMOS 2397
+TLE1=1 27775U 03015A 09217.74906520 .00000125 00000-0 10000-3 0 1094
+TLE2=2 27775 3.5160 71.4078 0044290 201.6507 158.3023 1.00471244 23057
+
+[14207]
+VERSION=1.1
+NAME=COSMOS 1484
+NICKNAME=COSMOS 1484
+TLE1=1 14207U 83075A 09218.85110146 .00001650 00000-0 36696-4 0 3814
+TLE2=2 14207 97.5422 338.6757 0017069 41.6846 318.5723 15.45109319869196
+
+[24674]
+VERSION=1.1
+NAME=INMARSAT 3-F3
+NICKNAME=INMARSAT 3-F3
+TLE1=1 24674U 96070A 09218.43576528 .00000038 00000-0 10000-3 0 9080
+TLE2=2 24674 0.1357 295.6900 0004432 200.3425 153.9880 1.00272685 46242
+
+[6236]
+VERSION=1.1
+NAME=OSCAR 6 (AO-6)
+NICKNAME=OSCAR 6 (AO-6)
+TLE1=1 06236U 72082B 09219.09288662 -.00000027 00000-0 10000-3 0 1859
+TLE2=2 06236 101.3928 230.4174 0003884 146.4545 213.6775 12.53078083683786
+
+[25546]
+VERSION=1.1
+NAME=BONUM 1
+NICKNAME=BONUM 1
+TLE1=1 25546U 98068A 09218.91864444 .00000078 00000-0 10000-3 0 3569
+TLE2=2 25546 0.0546 100.0767 0003036 350.4146 251.7160 1.00271309 39293
+
+[28474]
+VERSION=1.1
+NAME=GPS BIIR-13 (PRN 02)
+NICKNAME=GPS BIIR-13 (PRN 02)
+TLE1=1 28474U 04045A 09218.05440833 .00000043 00000-0 10000-3 0 9345
+TLE2=2 28474 53.9194 215.3047 0090089 166.1729 194.0826 2.00561957 34897
+
+[27939]
+VERSION=1.1
+NAME=MOZHAYETS 4 (RS-22)
+NICKNAME=MOZHAYETS 4 (RS-22)
+TLE1=1 27939U 03042A 09218.38823530 .00000022 00000-0 13177-4 0 8582
+TLE2=2 27939 97.9371 91.4129 0013160 338.8697 21.1965 14.63332813312913
+
+[31129]
+VERSION=1.1
+NAME=POLYSAT CP3
+NICKNAME=POLYSAT CP3
+TLE1=1 31129U 07012N 09219.16171431 .00000131 00000-0 40710-4 0 1129
+TLE2=2 31129 97.9868 269.7910 0103640 126.8398 234.2352 14.52153490122280
+
+[24960]
+VERSION=1.1
+NAME=MOLNIYA 1-90
+NICKNAME=MOLNIYA 1-90
+TLE1=1 24960U 97054A 09219.10711720 -.00000134 00000-0 10000-3 0 5186
+TLE2=2 24960 63.7878 79.9435 7291481 253.9523 349.2707 2.00603656 87005
+
+[20625]
+VERSION=1.1
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 20625U 90046B 09218.91879459 .00000171 00000-0 11391-3 0 3627
+TLE2=2 20625 70.9982 54.1211 0013778 154.6467 205.5320 14.14380611991820
+
+[25346]
+VERSION=1.1
+NAME=IRIDIUM 75 [+]
+NICKNAME=IRIDIUM 75 [+]
+TLE1=1 25346U 98032E 09218.38938126 .00000102 00000-0 29316-4 0 6740
+TLE2=2 25346 86.3987 344.2941 0002375 84.7813 275.3653 14.34213902588054
+
+[25639]
+VERSION=1.1
+NAME=SKYNET 4E
+NICKNAME=SKYNET 4E
+TLE1=1 25639U 99009B 09219.01729124 .00000149 00000-0 10000-3 0 6321
+TLE2=2 25639 5.5227 51.8329 0002674 68.6195 236.7846 1.00274044 38289
+
+[32052]
+VERSION=1.1
+NAME=COSMOS 2429
+NICKNAME=COSMOS 2429
+TLE1=1 32052U 07038A 09218.62799450 .00000089 00000-0 76682-4 0 6023
+TLE2=2 32052 82.9762 62.8110 0039316 145.3045 215.0679 13.74694469 95490
+
+[25652]
+VERSION=1.1
+NAME=GLOBALSTAR M037
+NICKNAME=GLOBALSTAR M037
+TLE1=1 25652U 99012D 09218.38195344 -.00000086 00000-0 10000-3 0 22
+TLE2=2 25652 52.0006 184.0059 0001466 186.0675 174.0172 12.62267268479635
+
+[28941]
+VERSION=1.1
+NAME=CUTE-1.7+APD (CO-56)
+NICKNAME=CUTE-1.7+APD (CO-56)
+TLE1=1 28941U 06005C 09219.01333650 .00063893 42017-5 16698-3 0 3239
+TLE2=2 28941 98.1340 43.2760 0068226 298.2383 61.2037 15.90998802195311
+
+[13631]
+VERSION=1.1
+NAME=SATCOM C5
+NICKNAME=SATCOM C5
+TLE1=1 13631U 82105A 09217.50528736 -.00000109 00000-0 10000-3 0 6548
+TLE2=2 13631 12.6123 31.0909 0001922 247.8022 112.2619 1.00272416 64614
+
+[22653]
+VERSION=1.1
+NAME=ASTRA 1C
+NICKNAME=ASTRA 1C
+TLE1=1 22653U 93031A 09216.02605167 .00000006 00000-0 10000-3 0 4455
+TLE2=2 22653 2.7026 77.0696 0004470 36.6875 210.3538 1.00273972 54532
+
+[25860]
+VERSION=1.1
+NAME=OKEAN O
+NICKNAME=OKEAN O
+TLE1=1 25860U 99039A 09218.96309868 .00000013 00000-0 93238-5 0 7509
+TLE2=2 25860 97.7899 198.1360 0001686 53.0527 307.0807 14.73582793540624
+
+[28082]
+VERSION=1.1
+NAME=ZHONGXING-20
+NICKNAME=ZHONGXING-20
+TLE1=1 28082U 03052A 09218.96783963 -.00000293 00000-0 10000-3 0 8078
+TLE2=2 28082 0.1404 270.3438 0000911 228.2916 263.5737 1.00271731 21030
+
+[2807]
+VERSION=1.1
+NAME=TRANSIT 16
+NICKNAME=TRANSIT 16
+TLE1=1 02807U 67048A 09218.91292314 .00000074 00000-0 10000-3 0 2722
+TLE2=2 02807 89.6516 201.8971 0022341 89.6881 270.6823 13.49716405 77466
+
+[25108]
+VERSION=1.1
+NAME=IRIDIUM 49 [+]
+NICKNAME=IRIDIUM 49 [+]
+TLE1=1 25108U 97082E 09218.50047134 -.00000014 00000-0 -12234-4 0 6389
+TLE2=2 25108 86.3944 15.6670 0002377 82.4240 277.7221 14.34214290608772
+
+[28894]
+VERSION=1.1
+NAME=SSETI EXPRESS (XO-53)
+NICKNAME=SSETI EXPRESS (XO-53)
+TLE1=1 28894U 05043E 09217.76537650 .00000007 00000-0 11042-4 0 5301
+TLE2=2 28894 98.0495 106.6565 0017072 191.9280 168.1522 14.59677986201082
+
+[26084]
+VERSION=1.1
+NAME=GLOBALSTAR M064
+NICKNAME=GLOBALSTAR M064
+TLE1=1 26084U 00008D 09219.02038943 -.00000086 00000-0 10000-3 0 2293
+TLE2=2 26084 52.0056 91.8863 0000265 23.5592 336.5417 12.62280424464356
+
+[21397]
+VERSION=1.1
+NAME=OKEAN 3
+NICKNAME=OKEAN 3
+TLE1=1 21397U 91039A 09218.38063273 .00000119 00000-0 10518-4 0 7253
+TLE2=2 21397 82.5251 332.6484 0021640 74.9930 285.3663 14.86838914982332
+
+[24873]
+VERSION=1.1
+NAME=IRIDIUM 921 [-]
+NICKNAME=IRIDIUM 921 [-]
+TLE1=1 24873U 97034E 09218.33548305 .00000446 00000-0 35860-4 0 6456
+TLE2=2 24873 86.3885 327.8480 0010427 19.9170 340.2467 14.97178419656719
+
+[23814]
+VERSION=1.1
+NAME=REX 2
+NICKNAME=REX 2
+TLE1=1 23814U 96014A 09217.70631664 .00000033 00000-0 93732-5 0 7454
+TLE2=2 23814 90.1590 273.1964 0022996 145.1089 215.1632 14.23869462696592
+
+[19120]
+VERSION=1.1
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 19120U 88039B 09217.71539838 .00000055 00000-0 49855-4 0 7571
+TLE2=2 19120 71.0124 272.2332 0024950 268.4696 91.3540 14.18585226 98924
+
+[26666]
+VERSION=1.1
+NAME=TURKSAT 2A
+NICKNAME=TURKSAT 2A
+TLE1=1 26666U 01002A 09217.77544663 .00000000 00000-0 10000-3 0 5002
+TLE2=2 26666 0.0097 241.1927 0003325 253.5857 140.8523 1.00273510 31396
+
+[15935]
+VERSION=1.1
+NAME=OSCAR 30
+NICKNAME=OSCAR 30
+TLE1=1 15935U 85066A 09218.56291824 .00000077 00000-0 12537-3 0 4322
+TLE2=2 15935 90.0493 23.0207 0170534 4.2051 356.0477 13.35261046167429
+
+[30773]
+VERSION=1.1
+NAME=MIDSTAR-1
+NICKNAME=MIDSTAR-1
+TLE1=1 30773U 07006B 09218.98019448 -.00000304 00000-0 00000+0 0 6877
+TLE2=2 30773 46.0327 87.0469 0008199 97.1964 262.9954 15.23796361134481
+
+[13403]
+VERSION=1.1
+NAME=SL-3 R/B
+NICKNAME=SL-3 R/B
+TLE1=1 13403U 82079B 09218.52073748 .00000624 00000-0 48832-4 0 782
+TLE2=2 13403 81.1754 296.9764 0038998 324.5524 35.3089 14.99138044465538
+
+[32478]
+VERSION=1.1
+NAME=EXPRESS-AM 33
+NICKNAME=EXPRESS-AM 33
+TLE1=1 32478U 08003A 09218.84042225 -.00000281 00000-0 10000-3 0 3947
+TLE2=2 32478 0.0054 182.7706 0001492 47.4404 124.3021 1.00269934 5883
+
+[25943]
+VERSION=1.1
+NAME=GLOBALSTAR M057
+NICKNAME=GLOBALSTAR M057
+TLE1=1 25943U 99058A 09217.86789025 -.00000086 00000-0 10000-3 0 4138
+TLE2=2 25943 52.0010 139.3873 0000395 128.6213 231.4683 12.62259555452108
+
+[28498]
+VERSION=1.1
+NAME=PARASOL
+NICKNAME=PARASOL
+TLE1=1 28498U 04049G 09218.40001846 .00000006 00000-0 11448-4 0 4804
+TLE2=2 28498 98.2727 160.9980 0001368 91.9628 268.1727 14.57113516246395
+
+[25417]
+VERSION=1.1
+NAME=ORBCOMM FM16 [+]
+NICKNAME=ORBCOMM FM16 [+]
+TLE1=1 25417U 98046E 09218.94378341 .00000048 00000-0 75140-4 0 1079
+TLE2=2 25417 45.0007 26.5760 0000660 15.6933 344.3978 14.27621148573944
+
+[28702]
+VERSION=1.1
+NAME=GALAXY 28 (G-28)
+NICKNAME=GALAXY 28 (G-28)
+TLE1=1 28702U 05022A 09218.34283089 -.00000187 00000-0 10000-3 0 6814
+TLE2=2 28702 0.0250 47.2794 0001605 31.2610 270.8556 1.00271314 15138
+
+[23125]
+VERSION=1.1
+NAME=STRV 1A
+NICKNAME=STRV 1A
+TLE1=1 23125U 94034B 09217.13111740 -.00000464 00000-0 -12607-3 0 4743
+TLE2=2 23125 7.3582 58.5788 6840211 345.8042 1.9793 2.85091279140848
+
+[32062]
+VERSION=1.1
+NAME=CBERS 2B
+NICKNAME=CBERS 2B
+TLE1=1 32062U 07042A 09219.20041239 -.00000014 00000-0 95517-5 0 1088
+TLE2=2 32062 98.4816 294.6654 0026782 195.0771 164.9634 14.38433767 98749
+
+[10703]
+VERSION=1.1
+NAME=OSCAR 8 (AO-8)
+NICKNAME=OSCAR 8 (AO-8)
+TLE1=1 10703U 78026B 09219.12827894 .00000357 00000-0 27728-3 0 5693
+TLE2=2 10703 98.8248 262.4388 0007492 34.7332 325.4322 13.98846330603149
+
+[8366]
+VERSION=1.1
+NAME=GOES 1 [-]
+NICKNAME=GOES 1 [-]
+TLE1=1 08366U 75100A 09218.31456634 -.00000246 00000-0 10000-3 0 8905
+TLE2=2 08366 14.3526 347.4229 0002787 260.0807 99.9463 1.00278454123450
+
+[27434]
+VERSION=1.1
+NAME=OFEQ 5
+NICKNAME=OFEQ 5
+TLE1=1 27434U 02025A 09219.22929398 .00000973 00000-0 34295-4 0 4579
+TLE2=2 27434 143.4625 233.5265 0024573 88.9459 120.1114 15.05672053400982
+
+[28163]
+VERSION=1.1
+NAME=MOLNIYA 1-93
+NICKNAME=MOLNIYA 1-93
+TLE1=1 28163U 04005A 09218.71538837 .00000050 00000-0 10000-3 0 9787
+TLE2=2 28163 64.8958 281.9138 7178367 275.5438 13.8914 2.00667822 40044
+
+[21089]
+VERSION=1.1
+NAME=COSMOS 2123 & RS-12/13
+NICKNAME=COSMOS 2123 & RS-12/13
+TLE1=1 21089U 91007A 09219.00056423 .00000039 00000-0 25255-4 0 2277
+TLE2=2 21089 82.9183 228.9154 0028698 184.9178 175.1696 13.74487807928176
+
+[3133]
+VERSION=1.1
+NAME=TRANSIT 18
+NICKNAME=TRANSIT 18
+TLE1=1 03133U 68012A 09218.23971619 .00000075 00000-0 10000-3 0 3388
+TLE2=2 03133 89.9798 286.6205 0075014 177.2549 182.9018 13.50529151 39310
+
+[14129]
+VERSION=1.1
+NAME=PHASE 3B (AO-10)
+NICKNAME=PHASE 3B (AO-10)
+TLE1=1 14129U 83058B 09215.77452686 -.00000418 00000-0 10000-3 0 6819
+TLE2=2 14129 25.8159 143.6292 6028435 244.7593 42.7609 2.05872213168630
+
+[22824]
+VERSION=1.1
+NAME=STELLA
+NICKNAME=STELLA
+TLE1=1 22824U 93061B 09219.20876589 .00000004 00000-0 18859-4 0 3402
+TLE2=2 22824 98.4781 165.9968 0006884 143.5220 216.6432 14.27284474826467
+
+[29670]
+VERSION=1.1
+NAME=COSMOS 2425 (716)
+NICKNAME=COSMOS 2425 (716)
+TLE1=1 29670U 06062A 09218.16367626 -.00000015 00000-0 10000-3 0 7365
+TLE2=2 29670 65.4147 41.2606 0022925 355.6204 13.5624 2.13103129 20338
+
+[26034]
+VERSION=1.1
+NAME=CELESTIS-03
+NICKNAME=CELESTIS-03
+TLE1=1 26034U 99070C 09218.22685081 .00000607 00000-0 87952-4 0 6054
+TLE2=2 26034 98.3706 231.9321 0018521 185.5725 174.5294 14.79859979517723
+
+[23522]
+VERSION=1.1
+NAME=HIMAWARI-5 (GMS-5)
+NICKNAME=HIMAWARI-5 (GMS-5)
+TLE1=1 23522U 95011B 09217.78862194 .00000000 00000-0 10000-3 0 3307
+TLE2=2 23522 7.6465 62.3128 0006648 340.5428 19.5560 0.99407180 52434
+
+[10061]
+VERSION=1.1
+NAME=GOES 2 [-]
+NICKNAME=GOES 2 [-]
+TLE1=1 10061U 77048A 09218.83555818 -.00000147 00000-0 10000-3 0 9400
+TLE2=2 10061 14.6581 355.8774 0016640 251.1094 108.7669 0.99395210 62309
+
+[34810]
+VERSION=1.1
+NAME=SICRAL 1B
+NICKNAME=SICRAL 1B
+TLE1=1 34810U 09020A 09218.90036740 .00000079 00000-0 10000-3 0 582
+TLE2=2 34810 0.0555 62.9644 0000159 14.2018 214.3006 1.00272489 1173
+
+[21820]
+VERSION=1.1
+NAME=SL-14 R/B
+NICKNAME=SL-14 R/B
+TLE1=1 21820U 91086B 09218.36134990 .00000119 00000-0 17059-4 0 7346
+TLE2=2 21820 82.5600 8.7441 1588919 141.0075 231.7115 11.90858802764648
+
+[24665]
+VERSION=1.1
+NAME=EUROBIRD 9
+NICKNAME=EUROBIRD 9
+TLE1=1 24665U 96067A 09218.02747546 .00000100 00000-0 10000-3 0 9205
+TLE2=2 24665 0.3910 82.2405 0006910 93.3465 196.8955 1.00455446 46939
+
+[33056]
+VERSION=1.1
+NAME=TURKSAT 3A
+NICKNAME=TURKSAT 3A
+TLE1=1 33056U 08030B 09219.03003096 .00000146 00000-0 10000-3 0 2088
+TLE2=2 33056 0.0166 104.1837 0005711 21.6876 242.5873 1.00273454 4337
+
+[24769]
+VERSION=1.1
+NAME=BSAT-1A
+NICKNAME=BSAT-1A
+TLE1=1 24769U 97016B 09218.52054245 .00000000 00000-0 10000-3 0 9431
+TLE2=2 24769 0.0663 257.7605 0002221 285.6859 68.7209 1.00265553 45106
+
+[33436]
+VERSION=1.1
+NAME=ASTRA 1M
+NICKNAME=ASTRA 1M
+TLE1=1 33436U 08057A 09218.37294969 .00000000 00000-0 10000-3 0 1196
+TLE2=2 33436 0.0176 140.7837 0004338 318.1146 9.5775 1.00270393 2771
+
+[32786]
+VERSION=1.1
+NAME=IMS-1
+NICKNAME=IMS-1
+TLE1=1 32786U 08021D 09218.74107270 .00000090 00000-0 18844-4 0 4471
+TLE2=2 32786 97.9454 281.4068 0011644 222.4017 137.6292 14.80054864 68867
+
+[24748]
+VERSION=1.1
+NAME=DIRECTV 6 (TEMPO 2)
+NICKNAME=DIRECTV 6 (TEMPO 2)
+TLE1=1 24748U 97011A 09217.10990265 .00000025 00000-0 10000-3 0 839
+TLE2=2 24748 3.3208 74.9820 0028364 150.9422 209.3158 0.99029127 45421
+
+[26720]
+VERSION=1.1
+NAME=BSAT-2A
+NICKNAME=BSAT-2A
+TLE1=1 26720U 01011B 09218.50066071 .00000000 00000-0 10000-3 0 3612
+TLE2=2 26720 0.0722 252.5891 0007687 341.5508 11.0579 1.00270278 30807
+
+[32387]
+VERSION=1.1
+NAME=RASCOM-QAF 1
+NICKNAME=RASCOM-QAF 1
+TLE1=1 32387U 07063A 09215.97181464 .00000014 00000-0 10000-3 0 2101
+TLE2=2 32387 0.0444 116.8798 0000720 329.5110 218.9889 1.00273551 6406
+
+[21088]
+VERSION=1.1
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 21088U 91006B 09217.97331331 .00000076 00000-0 61734-4 0 4762
+TLE2=2 21088 82.9419 354.7765 0024322 78.3281 282.0600 13.76747189930354
+
+[31698]
+VERSION=1.1
+NAME=TERRASAR-X
+NICKNAME=TERRASAR-X
+TLE1=1 31698U 07026A 09219.11661354 .00000058 00000-0 59491-5 0 3945
+TLE2=2 31698 97.4449 225.8061 0001528 83.8725 2.6825 15.19148520119009
+
+[27848]
+VERSION=1.1
+NAME=CUBESAT XI-IV (CO-57)
+NICKNAME=CUBESAT XI-IV (CO-57)
+TLE1=1 27848U 03031J 09219.03871329 .00000030 00000-0 34320-4 0 5872
+TLE2=2 27848 98.7163 226.5485 0010091 6.7117 353.4203 14.20450593316441
+
+[900]
+VERSION=1.1
+NAME=CALSPHERE 1
+NICKNAME=CALSPHERE 1
+TLE1=1 00900U 64063C 09218.38488128 .00000011 00000-0 17248-5 0 8538
+TLE2=2 00900 90.1633 327.9320 0030118 83.9251 276.5359 13.70478578226344
+
+[33331]
+VERSION=1.1
+NAME=GEOEYE 1
+NICKNAME=GEOEYE 1
+TLE1=1 33331U 08042A 09219.20948573 -.00000002 00000-0 85102-5 0 193
+TLE2=2 33331 98.0973 293.2013 0009334 279.7785 80.2371 14.64420688 48944
+
+[24795]
+VERSION=1.1
+NAME=IRIDIUM 5 [+]
+NICKNAME=IRIDIUM 5 [+]
+TLE1=1 24795U 97020D 09218.40584736 .00000116 00000-0 34331-4 0 8458
+TLE2=2 24795 86.3910 79.2385 0001152 57.8934 302.2383 14.34220194641669
+
+[25419]
+VERSION=1.1
+NAME=ORBCOMM FM14 [+]
+NICKNAME=ORBCOMM FM14 [+]
+TLE1=1 25419U 98046G 09218.89371571 -.00000110 00000-0 11702-4 0 1191
+TLE2=2 25419 45.0000 26.9724 0000530 123.7472 236.3407 14.27625527573939
+
+[25544]
+VERSION=1.1
+NAME=ISS (ZARYA)
+NICKNAME=ISS (ZARYA)
+TLE1=1 25544U 98067A 09219.04941150 .00004925 00000-0 38932-4 0 3673
+TLE2=2 25544 51.6404 45.7187 0007482 303.2425 201.5995 15.73518273613962
+
+[24273]
+VERSION=1.1
+NAME=MOLNIYA 1-89
+NICKNAME=MOLNIYA 1-89
+TLE1=1 24273U 96045A 09218.22627988 .00040705 -38098-6 64466-4 0 1102
+TLE2=2 24273 62.9051 311.7555 7135244 255.8337 21.9123 2.53846383 95687
+
+[28924]
+VERSION=1.1
+NAME=AMC-23
+NICKNAME=AMC-23
+TLE1=1 28924U 05052A 09218.59706086 -.00000007 00000-0 10000-3 0 6469
+TLE2=2 28924 0.0065 153.4675 0003245 338.3835 210.3376 1.00272655 13224
+
+[31601]
+VERSION=1.1
+NAME=OFEQ 7
+NICKNAME=OFEQ 7
+TLE1=1 31601U 07025A 09219.15821690 .00001381 00000-0 39812-4 0 4476
+TLE2=2 31601 141.7488 47.2021 0071255 216.2689 287.8958 15.19701030120182
+
+[21890]
+VERSION=1.1
+NAME=GPS BIIA-12 (PRN 25)
+NICKNAME=GPS BIIA-12 (PRN 25)
+TLE1=1 21890U 92009A 09217.65551623 -.00000057 00000-0 10000-3 0 3757
+TLE2=2 21890 55.6116 30.7451 0114549 290.4021 68.4006 2.00566992127865
+
+[25153]
+VERSION=1.1
+NAME=INMARSAT 3-F5
+NICKNAME=INMARSAT 3-F5
+TLE1=1 25153U 98006B 09218.03296521 .00000000 00000-0 10000-3 0 6819
+TLE2=2 25153 0.4816 348.3848 0003561 153.1654 209.7925 1.00273532 42176
+
+[32276]
+VERSION=1.1
+NAME=COSMOS 2432 (719)
+NICKNAME=COSMOS 2432 (719)
+TLE1=1 32276U 07052B 09218.96050025 .00000020 00000-0 10000-3 0 4723
+TLE2=2 32276 64.8916 161.8821 0015737 333.2769 75.1701 2.13102158 13861
+
+[28137]
+VERSION=1.1
+NAME=ESTRELA DO SUL
+NICKNAME=ESTRELA DO SUL
+TLE1=1 28137U 04001A 09216.33367627 -.00000284 00000-0 10000-3 0 7606
+TLE2=2 28137 0.0089 280.7768 0002314 210.0160 239.2885 1.00271569 20615
+
+[32790]
+VERSION=1.1
+NAME=CANX-2
+NICKNAME=CANX-2
+TLE1=1 32790U 08021H 09218.24298966 .00000169 00000-0 28298-4 0 4251
+TLE2=2 32790 97.9413 281.7529 0014607 227.0230 132.9758 14.81492507 68835
+
+[29051]
+VERSION=1.1
+NAME=FORMOSAT 3E
+NICKNAME=FORMOSAT 3E
+TLE1=1 29051U 06011E 09218.20627762 .00000372 00000-0 16522-3 0 685
+TLE2=2 29051 72.0069 253.1120 0071007 298.7358 60.6612 14.27124109175706
+
+[21576]
+VERSION=1.1
+NAME=ORBCOMM-X [-]
+NICKNAME=ORBCOMM-X [-]
+TLE1=1 21576U 91050C 09218.01207598 .00000017 00000-0 19275-4 0 838
+TLE2=2 21576 98.4689 169.7324 0002759 242.7630 117.3279 14.39957811947712
+
+[22671]
+VERSION=1.1
+NAME=MOLNIYA 1-86
+NICKNAME=MOLNIYA 1-86
+TLE1=1 22671U 93035A 09218.06111020 .00001000 00000-0 13508-3 0 1554
+TLE2=2 22671 62.0785 135.5960 7317087 270.0756 14.4124 2.03219439119029
+
+[22178]
+VERSION=1.1
+NAME=MOLNIYA 3-42
+NICKNAME=MOLNIYA 3-42
+TLE1=1 22178U 92067A 09217.95516778 .00000214 00000-0 -53247-2 0 7406
+TLE2=2 22178 61.9348 186.2087 7234221 264.4674 17.0365 2.00597651123170
+
+[25880]
+VERSION=1.1
+NAME=TELKOM 1
+NICKNAME=TELKOM 1
+TLE1=1 25880U 99042A 09216.83405495 -.00000348 00000-0 10000-3 0 7755
+TLE2=2 25880 0.0047 334.9221 0002284 179.7805 207.0213 1.00269607 36626
+
+[6235]
+VERSION=1.1
+NAME=NOAA 2 [-]
+NICKNAME=NOAA 2 [-]
+TLE1=1 06235U 72082A 09218.45643899 -.00000027 00000-0 10000-3 0 3171
+TLE2=2 06235 101.4022 234.3697 0003633 179.9173 180.1902 12.53003637683765
+
+[24954]
+VERSION=1.1
+NAME=FAISAT 2V
+NICKNAME=FAISAT 2V
+TLE1=1 24954U 97052B 09218.67885144 .00000038 00000-0 22145-4 0 5816
+TLE2=2 24954 82.9218 277.6064 0039849 351.0388 9.0052 13.79651899597633
+
+[32283]
+VERSION=1.1
+NAME=SAR-LUPE 3
+NICKNAME=SAR-LUPE 3
+TLE1=1 32283U 07053A 09219.17400757 .00000405 00000-0 18820-4 0 9829
+TLE2=2 32283 98.1167 94.6047 0011088 138.2195 336.9109 15.26438397 98432
+
+[1512]
+VERSION=1.1
+NAME=TEMPSAT 1
+NICKNAME=TEMPSAT 1
+TLE1=1 01512U 65065E 09218.29006557 .00000058 00000-0 10000-3 0 2052
+TLE2=2 01512 89.8124 299.4668 0067904 259.8349 99.5114 13.33258752139307
+
+[18153]
+VERSION=1.1
+NAME=SL-14 R/B
+NICKNAME=SL-14 R/B
+TLE1=1 18153U 87055B 09218.21356596 .00000057 00000-0 42530-5 0 8305
+TLE2=2 18153 82.4991 277.2747 0022306 168.0431 192.1331 14.81710080192894
+
+[25063]
+VERSION=1.1
+NAME=TRMM
+NICKNAME=TRMM
+TLE1=1 25063U 97074A 09218.80260429 .00002596 00000-0 36963-4 0 1304
+TLE2=2 25063 34.9667 3.7490 0001182 287.6283 72.4329 15.55907811667989
+
+[20663]
+VERSION=1.1
+NAME=COSMOS 2084
+NICKNAME=COSMOS 2084
+TLE1=1 20663U 90055A 09219.04403681 -.00000101 00000-0 96580-5 0 5928
+TLE2=2 20663 62.7926 38.7149 0101012 23.5089 337.0570 14.85322287 32513
+
+[34661]
+VERSION=1.1
+NAME=GPS BIIRM-7 (PRN 01)
+NICKNAME=GPS BIIRM-7 (PRN 01)
+TLE1=1 34661U 09014A 09218.00831845 -.00000003 00000-0 10000-3 0 879
+TLE2=2 34661 55.0885 95.7221 0034464 51.7554 308.6375 2.00557273 2765
+
+[1361]
+VERSION=1.1
+NAME=LCS 1
+NICKNAME=LCS 1
+TLE1=1 01361U 65034C 09218.63181808 .00000009 00000-0 10000-3 0 1236
+TLE2=2 01361 32.1410 39.2755 0006630 175.5501 184.5056 9.89276531600357
+
+[21922]
+VERSION=1.1
+NAME=GORIZONT 25
+NICKNAME=GORIZONT 25
+TLE1=1 21922U 92017A 09218.07371242 .00000000 00000-0 10000-3 0 2325
+TLE2=2 21922 11.5985 41.8564 0026493 301.7901 58.0544 0.99838831 63442
+
+[25771]
+VERSION=1.1
+NAME=GLOBALSTAR M049
+NICKNAME=GLOBALSTAR M049
+TLE1=1 25771U 99031B 09219.00800753 -.00000086 00000-0 10000-3 0 1731
+TLE2=2 25771 51.9936 224.9529 0001426 165.9840 194.1065 12.62264898468581
+
+[26058]
+VERSION=1.1
+NAME=ZHONGXING-22
+NICKNAME=ZHONGXING-22
+TLE1=1 26058U 00003A 09217.85315532 -.00000292 00000-0 10000-3 0 1793
+TLE2=2 26058 1.2182 78.2470 0002082 57.1507 224.0715 1.00268585 34959
+
+[27640]
+VERSION=1.1
+NAME=CORIOLIS
+NICKNAME=CORIOLIS
+TLE1=1 27640U 03001A 09219.01158770 -.00000061 00000-0 -80986-5 0 281
+TLE2=2 27640 98.7492 224.3873 0013383 270.9785 88.9896 14.18346530340869
+
+[26624]
+VERSION=1.1
+NAME=ANIK F1
+NICKNAME=ANIK F1
+TLE1=1 26624U 00076A 09218.51985498 -.00000076 00000-0 10000-3 0 5187
+TLE2=2 26624 0.0132 131.5342 0001792 334.2548 289.2383 1.00272572 31987
+
+[19883]
+VERSION=1.1
+NAME=TDRS 4
+NICKNAME=TDRS 4
+TLE1=1 19883U 89021B 09216.17935638 -.00000287 00000-0 10000-3 0 6291
+TLE2=2 19883 10.5999 51.2711 0001627 44.1595 236.0187 1.00279134247192
+
+[25126]
+VERSION=1.1
+NAME=HGS-1 (ASIASAT 3)
+NICKNAME=HGS-1 (ASIASAT 3)
+TLE1=1 25126U 97086A 09216.64828566 -.00000266 00000-0 10000-3 0 2687
+TLE2=2 25126 1.8287 118.8688 0044811 203.4658 155.8377 1.00187850 43373
+
+[5560]
+VERSION=1.1
+NAME=ASTEX 1
+NICKNAME=ASTEX 1
+TLE1=1 05560U 71089A 09218.41060654 .00000054 00000-0 15392-4 0 8742
+TLE2=2 05560 92.7131 359.6812 0015317 310.1689 49.8164 14.46206610985868
+
+[26871]
+VERSION=1.1
+NAME=GOES 12
+NICKNAME=GOES 12
+TLE1=1 26871U 01031A 09218.34710988 -.00000249 00000-0 10000-3 0 1711
+TLE2=2 26871 0.1440 89.1659 0004186 17.6465 257.8066 1.00260985 29513
+
+[14484]
+VERSION=1.1
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 14484U 83111B 09218.88388974 .00001478 00000-0 46189-4 0 9600
+TLE2=2 14484 82.8508 146.8064 0433766 148.4386 214.3676 14.72701359307868
+
+[26998]
+VERSION=1.1
+NAME=TIMED
+NICKNAME=TIMED
+TLE1=1 26998U 01055B 09218.35897108 .00000200 00000-0 28311-4 0 3586
+TLE2=2 26998 74.0725 250.7933 0001821 307.0683 53.0314 14.84086436414963
+
+[29499]
+VERSION=1.1
+NAME=METOP-A
+NICKNAME=METOP-A
+TLE1=1 29499U 06044A 09218.36754571 -.00000176 00000-0 -60585-4 0 8763
+TLE2=2 29499 98.6831 277.7294 0001048 91.6133 268.5187 14.21497524145145
+
+[32768]
+VERSION=1.1
+NAME=STAR ONE C2
+NICKNAME=STAR ONE C2
+TLE1=1 32768U 08018B 09218.39291941 -.00000267 00000-0 10000-3 0 1971
+TLE2=2 32768 0.0188 119.8191 0002342 13.1503 253.5437 1.00273033 4898
+
+[24957]
+VERSION=1.1
+NAME=NSS-5
+NICKNAME=NSS-5
+TLE1=1 24957U 97053A 09217.64654120 .00000000 00000-0 10000-3 0 8171
+TLE2=2 24957 0.0113 288.2102 0003741 257.1010 58.7556 1.00271440 43460
+
+[12465]
+VERSION=1.1
+NAME=SL-3 R/B
+NICKNAME=SL-3 R/B
+TLE1=1 12465U 81046B 09218.93668034 -.00000250 00000-0 -19379-4 0 8896
+TLE2=2 12465 81.2263 59.5622 0039152 125.2590 235.2287 15.04414739534587
+
+[25173]
+VERSION=1.1
+NAME=IRIDIUM 53 [+]
+NICKNAME=IRIDIUM 53 [+]
+TLE1=1 25173U 98010E 09218.46635844 -.00000093 00000-0 -40152-4 0 6544
+TLE2=2 25173 86.3974 110.5607 0002485 81.4345 278.7133 14.34217008600165
+
+[19257]
+VERSION=1.1
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 19257U 88053B 09218.18436910 .00000006 00000-0 11115-4 0 6536
+TLE2=2 19257 74.0488 91.7360 0020598 332.5524 27.4541 14.36387361106272
+
+[23528]
+VERSION=1.1
+NAME=INTELSAT 705 (IS-705)
+NICKNAME=INTELSAT 705 (IS-705)
+TLE1=1 23528U 95013A 09215.96045822 -.00000287 00000-0 10000-3 0 8880
+TLE2=2 23528 0.0560 263.6289 0003141 234.1728 110.6062 1.00271888 52553
+
+[21706]
+VERSION=1.1
+NAME=MOLNIYA 3-41
+NICKNAME=MOLNIYA 3-41
+TLE1=1 21706U 91065A 09218.58878330 .00001510 00000-0 11817-2 0 4025
+TLE2=2 21706 62.3218 53.5280 7487679 276.6238 11.3198 2.00548731131058
+
+[25469]
+VERSION=1.1
+NAME=IRIDIUM 80 [+]
+NICKNAME=IRIDIUM 80 [+]
+TLE1=1 25469U 98051C 09218.33667318 .00000076 00000-0 20240-4 0 5953
+TLE2=2 25469 86.4024 142.2095 0002482 77.5090 282.6378 14.34219599571218
+
+[19822]
+VERSION=1.1
+NAME=AKEBONO (EXOS-D)
+NICKNAME=AKEBONO (EXOS-D)
+TLE1=1 19822U 89016A 09218.68733911 .00003006 35376-6 10386-3 0 3000
+TLE2=2 19822 75.0954 238.2700 2695280 250.3300 78.9392 10.00442871600518
+
+[26093]
+VERSION=1.1
+NAME=PICOSAT 5
+NICKNAME=PICOSAT 5
+TLE1=1 26093U 00004L 09218.04939131 .00000116 00000-0 50425-4 0 4166
+TLE2=2 26093 100.2178 56.2801 0032921 14.4204 345.7898 14.44963352499259
+
+[25919]
+VERSION=1.1
+NAME=IKONOS 2
+NICKNAME=IKONOS 2
+TLE1=1 25919U 99051A 09219.17641457 .00000035 00000-0 15433-4 0 1615
+TLE2=2 25919 98.1082 293.6806 0000807 80.5986 279.5332 14.64448050527529
+
+[27441]
+VERSION=1.1
+NAME=EXPRESS 4A
+NICKNAME=EXPRESS 4A
+TLE1=1 27441U 02029A 09218.06274785 -.00000114 00000-0 10000-3 0 2871
+TLE2=2 27441 0.0790 91.3467 0001714 92.3503 139.5621 1.00270333 26218
+
+[26620]
+VERSION=1.1
+NAME=SAC C
+NICKNAME=SAC C
+TLE1=1 26620U 00075B 09218.54362098 .00000207 00000-0 55883-4 0 7838
+TLE2=2 26620 97.9072 248.7379 0001175 100.4684 259.6673 14.56579234463006
+
+[29268]
+VERSION=1.1
+NAME=ARIRANG 2 (KOMPSAT-2)
+NICKNAME=ARIRANG 2 (KOMPSAT-2)
+TLE1=1 29268U 06031A 09219.17421575 .00000026 00000-0 14490-4 0 3815
+TLE2=2 29268 98.0332 110.3870 0018104 350.9443 9.1432 14.61718960161534
+
+[25477]
+VERSION=1.1
+NAME=ORBCOMM FM23 [+]
+NICKNAME=ORBCOMM FM23 [+]
+TLE1=1 25477U 98053C 09218.17874115 .00000172 00000-0 12211-3 0 647
+TLE2=2 25477 45.0101 118.7719 0001715 279.1803 80.8853 14.28954159567127
+
+[24840]
+VERSION=1.1
+NAME=IRIDIUM 13 [+]
+NICKNAME=IRIDIUM 13 [+]
+TLE1=1 24840U 97030E 09218.21899596 .00000200 00000-0 64180-4 0 6853
+TLE2=2 24840 86.3980 110.5906 0002564 74.0207 286.1271 14.34218571635303
+
+[25693]
+VERSION=1.1
+NAME=UOSAT 12 (UO-36)
+NICKNAME=UOSAT 12 (UO-36)
+TLE1=1 25693U 99021A 09218.04709891 -.00000087 00000-0 70273-5 0 9826
+TLE2=2 25693 64.5597 322.6646 0002940 305.0204 55.0615 14.78755227555219
+
+[21575]
+VERSION=1.1
+NAME=UOSAT 5 (UO-22)
+NICKNAME=UOSAT 5 (UO-22)
+TLE1=1 21575U 91050B 09218.36267281 -.00000028 00000-0 49394-5 0 6127
+TLE2=2 21575 98.4471 166.5814 0006653 224.3232 135.7428 14.39680382947929
+
+[20437]
+VERSION=1.1
+NAME=UOSAT 3 (UO-14)
+NICKNAME=UOSAT 3 (UO-14)
+TLE1=1 20437U 90005B 09218.38234086 -.00000013 00000-0 10900-4 0 9881
+TLE2=2 20437 98.3448 174.6270 0011711 22.4781 337.6915 14.31548730 20233
+
+[28373]
+VERSION=1.1
+NAME=UNISAT 3
+NICKNAME=UNISAT 3
+TLE1=1 28373U 04025H 09219.02139111 .00000021 00000-0 18301-4 0 4381
+TLE2=2 28373 98.0362 233.2718 0070459 310.2364 49.2687 14.43332652269470
+
+[16969]
+VERSION=1.1
+NAME=NOAA 10 [-]
+NICKNAME=NOAA 10 [-]
+TLE1=1 16969U 86073A 09218.13685985 -.00000066 00000-0 -88871-5 0 7146
+TLE2=2 16969 98.6898 244.5089 0013182 52.9028 307.3347 14.27391373190630
+
+[34779]
+VERSION=1.1
+NAME=BEIDOU G2
+NICKNAME=BEIDOU G2
+TLE1=1 34779U 09018A 09218.94765793 -.00000149 00000-0 10000-3 0 853
+TLE2=2 34779 0.7134 270.7890 0001849 164.2564 303.3841 1.00255062 1341
+
+[27525]
+VERSION=1.1
+NAME=KALPANA-1 (METSAT 1)
+NICKNAME=KALPANA-1 (METSAT 1)
+TLE1=1 27525U 02043A 09218.08503847 .00000000 00000-0 10000-3 0 282
+TLE2=2 27525 0.0319 39.3437 0007996 62.6435 317.3353 1.00269584 25290
+
+[24880]
+VERSION=1.1
+NAME=SUPERBIRD C
+NICKNAME=SUPERBIRD C
+TLE1=1 24880U 97036A 09218.64183362 -.00000252 00000-0 10000-3 0 6351
+TLE2=2 24880 0.0295 255.9308 0000512 209.6538 224.7130 1.00272180 43987
+
+[25861]
+VERSION=1.1
+NAME=SL-16 R/B
+NICKNAME=SL-16 R/B
+TLE1=1 25861U 99039B 09218.50696532 -.00000009 00000-0 56187-5 0 1150
+TLE2=2 25861 97.7049 205.2267 0016699 5.9500 354.1897 14.76611648541768
+
+[27414]
+VERSION=1.1
+NAME=NSS-7
+NICKNAME=NSS-7
+TLE1=1 27414U 02019A 09217.93451191 .00000000 00000-0 10000-3 0 3800
+TLE2=2 27414 0.0098 255.9845 0005570 213.9885 159.0151 1.00267145 26824
+
+[17912]
+VERSION=1.1
+NAME=SL-14 R/B
+NICKNAME=SL-14 R/B
+TLE1=1 17912U 87038B 09218.51638663 .00000063 00000-0 50733-5 0 8254
+TLE2=2 17912 82.4980 221.2447 0019819 320.4261 39.5510 14.81482442202376
+
+[25622]
+VERSION=1.1
+NAME=GLOBALSTAR M040
+NICKNAME=GLOBALSTAR M040
+TLE1=1 25622U 99004B 09218.02746712 -.00000086 00000-0 10000-3 0 527
+TLE2=2 25622 51.9930 47.2807 0002171 54.2919 305.8147 12.62269715484066
+
+[21940]
+VERSION=1.1
+NAME=INMARSAT 2-F4
+NICKNAME=INMARSAT 2-F4
+TLE1=1 21940U 92021B 09217.96310690 .00000000 00000-0 10000-3 0 3520
+TLE2=2 21940 4.6432 50.1415 0002122 71.5509 288.6755 1.00268152 63350
+
+[25723]
+VERSION=1.1
+NAME=SL-8 R/B
+NICKNAME=SL-8 R/B
+TLE1=1 25723U 99022C 09218.81857938 -.00000679 00000-0 -18809-4 0 3583
+TLE2=2 25723 48.4459 154.6975 0022030 1.2477 358.8505 15.16091311566986
+
+[31127]
+VERSION=1.1
+NAME=SAUDICOMSAT 4
+NICKNAME=SAUDICOMSAT 4
+TLE1=1 31127U 07012L 09218.17510299 .00000381 00000-0 89803-4 0 7080
+TLE2=2 31127 97.9901 276.7191 0071468 106.9237 253.9786 14.57968981122663
+
+[23730]
+VERSION=1.1
+NAME=TELECOM 2C
+NICKNAME=TELECOM 2C
+TLE1=1 23730U 95067A 09216.04225260 .00000013 00000-0 00000+0 0 1390
+TLE2=2 23730 5.2948 70.1673 0003783 51.7343 209.3174 1.00272903 50143
+
+[8747]
+VERSION=1.1
+NAME=LES 9
+NICKNAME=LES 9
+TLE1=1 08747U 76023B 09216.83267493 -.00000071 00000-0 10000-3 0 3092
+TLE2=2 08747 10.9468 147.0477 0023955 326.1098 33.5872 1.00267971 67913
+
+[26545]
+VERSION=1.1
+NAME=SAUDISAT 1A (SO-41)
+NICKNAME=SAUDISAT 1A (SO-41)
+TLE1=1 26545U 00057A 09218.40392357 -.00000138 00000-0 18414-5 0 3188
+TLE2=2 26545 64.5599 322.8312 0057549 271.1241 88.3253 14.80597830478633
+
+[12585]
+VERSION=1.1
+NAME=METEOR PRIRODA
+NICKNAME=METEOR PRIRODA
+TLE1=1 12585U 81065A 09218.67581115 -.00000254 00000-0 -12779-4 0 4375
+TLE2=2 12585 97.4045 262.9326 0018327 267.3285 92.5847 15.07271657528164
+
+[11672]
+VERSION=1.1
+NAME=SL-14 R/B
+NICKNAME=SL-14 R/B
+TLE1=1 11672U 80005B 09218.67153596 .00000047 00000-0 25737-5 0 4751
+TLE2=2 11672 82.5135 265.3022 0018870 112.3090 248.0136 14.86062605596702
+
+[33312]
+VERSION=1.1
+NAME=RAPIDEYE 2
+NICKNAME=RAPIDEYE 2
+TLE1=1 33312U 08040A 09219.16687071 -.00000020 00000-0 44295-5 0 758
+TLE2=2 33312 97.9732 304.0353 0011336 312.5241 47.5016 14.79910206 50749
+
+[10114]
+VERSION=1.1
+NAME=SL-3 R/B
+NICKNAME=SL-3 R/B
+TLE1=1 10114U 77057B 09217.76401315 -.00000054 00000-0 55918-6 0 9072
+TLE2=2 10114 97.4935 113.8196 0016902 178.1047 182.0205 15.08771840749448
+
+[28376]
+VERSION=1.1
+NAME=AURA
+NICKNAME=AURA
+TLE1=1 28376U 04026A 09218.40392140 .00000036 00000-0 17913-4 0 5654
+TLE2=2 28376 98.1764 161.9471 0001325 57.9342 302.1976 14.57130006269128
+
+[35687]
+VERSION=1.1
+NAM...
[truncated message content] |
|
From: <cs...@us...> - 2009-08-07 23:10:44
|
Revision: 394
http://gpredict.svn.sourceforge.net/gpredict/?rev=394&view=rev
Author: csete
Date: 2009-08-07 23:10:32 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/data/satdata/convert.py
Modified: trunk/data/satdata/convert.py
===================================================================
--- trunk/data/satdata/convert.py 2009-08-06 23:55:45 UTC (rev 393)
+++ trunk/data/satdata/convert.py 2009-08-07 23:10:32 UTC (rev 394)
@@ -33,8 +33,8 @@
catfile.write(catnum+'\n')
# satellite file
- satfile = open('./out/'+catnum+'.sat','w')
- satfile.write('[Satellite]\n')
+ satfile = open('./tmp/'+catnum+'.sat','w')
+
satfile.write('VERSION=1.1\n')
satfile.write('NAME='+line1+'\n')
satfile.write('NICKNAME='+line1+'\n')
@@ -47,3 +47,22 @@
tlefile.close()
catfile.close()
+# now package the .sat files into one .dat file
+datfile = open('./out/satellites.dat', 'w')
+for file in os.listdir("./tmp/"):
+
+ # open .sat file
+ satfile = open("./tmp/"+file, "r")
+
+ # Create fake config group of catnum
+ catnum = file.partition(".")[0]
+ datfile.write("\n["+catnum+"]\n")
+
+ # read lines from satfile and write them to datfile
+ text = satfile.readlines()
+ datfile.writelines(text)
+
+ satfile.close();
+
+datfile.close()
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-06 23:55:55
|
Revision: 393
http://gpredict.svn.sourceforge.net/gpredict/?rev=393&view=rev
Author: csete
Date: 2009-08-06 23:55:45 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Added group.
Modified Paths:
--------------
trunk/data/satdata/10061.sat
Modified: trunk/data/satdata/10061.sat
===================================================================
--- trunk/data/satdata/10061.sat 2009-08-06 23:28:13 UTC (rev 392)
+++ trunk/data/satdata/10061.sat 2009-08-06 23:55:45 UTC (rev 393)
@@ -1,3 +1,4 @@
+[Satellite]
VERSION=1.1
NAME=GOES 2 [-]
NICKNAME=GOES 2 [-]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2009-08-06 23:28:21
|
Revision: 392
http://gpredict.svn.sourceforge.net/gpredict/?rev=392&view=rev
Author: csete
Date: 2009-08-06 23:28:13 +0000 (Thu, 06 Aug 2009)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/po/en_GB.po
trunk/po/en_US.po
trunk/po/fr.po
trunk/po/gpredict.pot
Modified: trunk/po/en_GB.po
===================================================================
--- trunk/po/en_GB.po 2009-08-06 23:25:43 UTC (rev 391)
+++ trunk/po/en_GB.po 2009-08-06 23:28:13 UTC (rev 392)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gpredict\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-05 01:49+0100\n"
+"POT-Creation-Date: 2009-08-07 01:26+0200\n"
"PO-Revision-Date: 2009-08-05 00:53+0100\n"
"Last-Translator: Michael Stephenson <mic...@go...>\n"
"Language-Team: British English\n"
@@ -68,8 +68,8 @@
#. window title
#. icon file name
#. create window title and file name for window icon
-#: ../src/about.c:90 ../src/main.c:177 ../src/sat-log.c:57
-#: ../src/sat-log-browser.c:457
+#: ../src/about.c:90 ../src/main.c:168 ../src/sat-log.c:58
+#: ../src/sat-log-browser.c:462
msgid "GPREDICT"
msgstr "GPREDICT"
@@ -87,32 +87,8 @@
msgid "translator-credits"
msgstr "Michael Stephenson"
-#: ../src/first-time.c:132 ../src/first-time.c:267 ../src/first-time.c:338
-#: ../src/first-time.c:492 ../src/first-time.c:538 ../src/first-time.c:583
+#: ../src/first-time.c:189 ../src/first-time.c:465 ../src/first-time.c:710
#, c-format
-msgid "%s: Check successful."
-msgstr "%s: Check successful."
-
-#: ../src/first-time.c:137 ../src/first-time.c:273 ../src/first-time.c:343
-#: ../src/first-time.c:497 ../src/first-time.c:543 ../src/first-time.c:588
-#, c-format
-msgid "%s: Check failed. Creating %s"
-msgstr "%s: Check failed. Creating %s"
-
-#: ../src/first-time.c:148 ../src/first-time.c:284 ../src/first-time.c:352
-#: ../src/first-time.c:506 ../src/first-time.c:552 ../src/first-time.c:597
-#, c-format
-msgid "%s: Failed to create %s"
-msgstr "%s: Failed to create %s"
-
-#: ../src/first-time.c:153 ../src/first-time.c:289 ../src/first-time.c:357
-#: ../src/first-time.c:511 ../src/first-time.c:557 ../src/first-time.c:602
-#, c-format
-msgid "%s: Created %s."
-msgstr "%s: Created %s."
-
-#: ../src/first-time.c:189 ../src/first-time.c:395 ../src/first-time.c:635
-#, c-format
msgid "%s: Could not open %s."
msgstr "%s: Could not open %s."
@@ -121,47 +97,71 @@
msgid "%s: Found at least one .qth file."
msgstr "%s: Found at least one .qth file."
-#: ../src/first-time.c:224
+#: ../src/first-time.c:255
#, c-format
msgid "%s: Failed to copy sample.qth"
msgstr "%s: Failed to copy sample.qth"
-#: ../src/first-time.c:231
+#: ../src/first-time.c:262
#, c-format
msgid "%s: Copied sample.qth to %s/"
msgstr "%s: Copied sample.qth to %s/"
-#: ../src/first-time.c:299
+#: ../src/first-time.c:303 ../src/first-time.c:408 ../src/first-time.c:532
+#: ../src/first-time.c:583 ../src/first-time.c:659
#, c-format
+msgid "%s: Check successful."
+msgstr "%s: Check successful."
+
+#: ../src/first-time.c:309 ../src/first-time.c:413 ../src/first-time.c:537
+#: ../src/first-time.c:589 ../src/first-time.c:664
+#, c-format
+msgid "%s: Check failed. Creating %s"
+msgstr "%s: Check failed. Creating %s"
+
+#: ../src/first-time.c:320 ../src/first-time.c:422 ../src/first-time.c:546
+#: ../src/first-time.c:600 ../src/first-time.c:673
+#, c-format
+msgid "%s: Failed to create %s"
+msgstr "%s: Failed to create %s"
+
+#: ../src/first-time.c:325 ../src/first-time.c:427 ../src/first-time.c:551
+#: ../src/first-time.c:605 ../src/first-time.c:678
+#, c-format
+msgid "%s: Created %s."
+msgstr "%s: Created %s."
+
+#: ../src/first-time.c:369
+#, c-format
msgid "%s: Failed to copy Amateur.mod"
msgstr "%s: Failed to copy Amateur.mod"
-#: ../src/first-time.c:306
+#: ../src/first-time.c:376
#, c-format
msgid "%s: Copied amateur.mod to %s/"
msgstr "%s: Copied amateur.mod to %s/"
-#: ../src/first-time.c:419
+#: ../src/first-time.c:486 ../src/first-time.c:742
#, c-format
-msgid "%s: Found at least one .tle file."
-msgstr "%s: Found at least one .tle file."
-
-#: ../src/first-time.c:447 ../src/first-time.c:665
-#, c-format
msgid "%s: Failed to copy %s"
msgstr "%s: Failed to copy %s"
-#: ../src/first-time.c:454
+#: ../src/first-time.c:491
#, c-format
msgid "%s: Successfully copied %s"
msgstr "%s: Successfully copied %s"
-#: ../src/first-time.c:658
+#: ../src/first-time.c:501
+#, fuzzy, c-format
+msgid "%s: Copied %d files to %s"
+msgstr "%s: Copied sample.qth to %s/"
+
+#: ../src/first-time.c:735
#, c-format
msgid "%s: %s does not appear to be in user conf dir; adding."
msgstr "%s: %s does not appear to be in user conf dir; adding."
-#: ../src/first-time.c:674
+#: ../src/first-time.c:751
#, c-format
msgid "%s: %s already in user conf dir."
msgstr "%s: %s already in user conf dir."
@@ -483,11 +483,11 @@
msgstr "Target"
#. Primary device
-#: ../src/gtk-rig-ctrl.c:655
+#: ../src/gtk-rig-ctrl.c:654
msgid "1. Device:"
msgstr "1. Device:"
-#: ../src/gtk-rig-ctrl.c:660
+#: ../src/gtk-rig-ctrl.c:659
msgid ""
"Select primary radio device.This device will be used for downlink and uplink "
"unless you select a secondary device for uplink"
@@ -495,21 +495,21 @@
"Select primary radio device.This device will be used for downlink and uplink "
"unless you select a secondary device for uplink"
-#: ../src/gtk-rig-ctrl.c:685 ../src/gtk-rig-ctrl.c:728
-#: ../src/gtk-rig-ctrl.c:2368 ../src/gtk-rot-ctrl.c:513
-#: ../src/gtk-rot-ctrl.c:1229 ../src/sat-pref-rig.c:304
-#: ../src/sat-pref-rot.c:270
+#: ../src/gtk-rig-ctrl.c:681 ../src/gtk-rig-ctrl.c:724
+#: ../src/gtk-rig-ctrl.c:2360 ../src/gtk-rot-ctrl.c:509
+#: ../src/gtk-rot-ctrl.c:1221 ../src/sat-pref-rig.c:300
+#: ../src/sat-pref-rot.c:266
#, c-format
msgid "%s:%d: Failed to open hwconf dir (%s)"
msgstr "%s:%d: Failed to open hwconf dir (%s)"
#. config will be force-loaded after LO spin is created
#. Secondary device
-#: ../src/gtk-rig-ctrl.c:698
+#: ../src/gtk-rig-ctrl.c:694
msgid "2. Device:"
msgstr "2. Device:"
-#: ../src/gtk-rig-ctrl.c:703
+#: ../src/gtk-rig-ctrl.c:699
msgid ""
"Select secondary radio device\n"
"This device will be used for uplink"
@@ -518,42 +518,42 @@
"This device will be used for uplink"
#. load config
-#: ../src/gtk-rig-ctrl.c:707 ../src/sat-pref-rig-editor.c:236
-#: ../src/sat-pref-rig.c:754 ../src/sat-pref-rig.c:763
+#: ../src/gtk-rig-ctrl.c:703 ../src/sat-pref-rig-editor.c:237
+#: ../src/sat-pref-rig.c:747 ../src/sat-pref-rig.c:756
msgid "None"
msgstr "None"
#. Engage button
-#: ../src/gtk-rig-ctrl.c:743 ../src/gtk-rot-ctrl.c:526
+#: ../src/gtk-rig-ctrl.c:739 ../src/gtk-rot-ctrl.c:522
msgid "Engage"
msgstr "Engage"
-#: ../src/gtk-rig-ctrl.c:744
+#: ../src/gtk-rig-ctrl.c:740
msgid "Engage the selected radio device"
msgstr "Engage the selected radio device"
#. Timeout
-#: ../src/gtk-rig-ctrl.c:752 ../src/gtk-rot-ctrl.c:532
+#: ../src/gtk-rig-ctrl.c:748 ../src/gtk-rot-ctrl.c:528
msgid "Cycle:"
msgstr "Cycle:"
-#: ../src/gtk-rig-ctrl.c:759
+#: ../src/gtk-rig-ctrl.c:755
msgid "This parameter controls the delay between commands sent to the rig."
msgstr "This parameter controls the delay between commands sent to the rig."
-#: ../src/gtk-rig-ctrl.c:766 ../src/gtk-rot-ctrl.c:546
+#: ../src/gtk-rig-ctrl.c:762 ../src/gtk-rot-ctrl.c:542
msgid "msec"
msgstr "msec"
-#: ../src/gtk-rig-ctrl.c:770 ../src/gtk-rot-ctrl.c:575
+#: ../src/gtk-rig-ctrl.c:766 ../src/gtk-rot-ctrl.c:571
msgid "Settings"
msgstr "Settings"
-#: ../src/gtk-rig-ctrl.c:787
+#: ../src/gtk-rig-ctrl.c:783
msgid "<span size='large'><b>ΔT: 00:00:00</b></span>"
msgstr "<span size='large'><b>ΔT: 00:00:00</b></span>"
-#: ../src/gtk-rig-ctrl.c:789
+#: ../src/gtk-rig-ctrl.c:785
msgid ""
"The time remaining until the next AOS or LOS event, depending on which one "
"comes first."
@@ -561,181 +561,181 @@
"The time remaining until the next AOS or LOS event, depending on which one "
"comes first."
-#: ../src/gtk-rig-ctrl.c:838 ../src/gtk-rot-ctrl.c:638
+#: ../src/gtk-rig-ctrl.c:834 ../src/gtk-rot-ctrl.c:634
#, c-format
msgid "%s:%s: Invalid satellite selection: %d"
msgstr "%s:%s: Invalid satellite selection: %d"
-#: ../src/gtk-rig-ctrl.c:875
+#: ../src/gtk-rig-ctrl.c:871
#, c-format
msgid "%s: Inconsistency detected in internal transponder data (%d,%d)"
msgstr "%s: Inconsistency detected in internal transponder data (%d,%d)"
-#: ../src/gtk-rig-ctrl.c:1007
+#: ../src/gtk-rig-ctrl.c:1003
#, c-format
msgid "%s:%s: Primary device selected: %d"
msgstr "%s:%s: Primary device selected: %d"
-#: ../src/gtk-rig-ctrl.c:1021 ../src/gtk-rig-ctrl.c:2456
+#: ../src/gtk-rig-ctrl.c:1017 ../src/gtk-rig-ctrl.c:2448
#, c-format
msgid "%s:%d: Failed to allocate memory for radio config"
msgstr "%s:%d: Failed to allocate memory for radio config"
-#: ../src/gtk-rig-ctrl.c:1030 ../src/gtk-rig-ctrl.c:1131
+#: ../src/gtk-rig-ctrl.c:1026 ../src/gtk-rig-ctrl.c:1127
#, c-format
msgid "%s:%s: Loaded new radio configuration %s"
msgstr "%s:%s: Loaded new radio configuration %s"
#. update LO widgets
-#: ../src/gtk-rig-ctrl.c:1033 ../src/gtk-rig-ctrl.c:1038
-#: ../src/gtk-rig-ctrl.c:1090 ../src/gtk-rig-ctrl.c:1106
-#: ../src/gtk-rig-ctrl.c:1134
+#: ../src/gtk-rig-ctrl.c:1029 ../src/gtk-rig-ctrl.c:1034
+#: ../src/gtk-rig-ctrl.c:1086 ../src/gtk-rig-ctrl.c:1102
+#: ../src/gtk-rig-ctrl.c:1130
#, c-format
msgid "%.0f MHz"
msgstr "%.0f MHz"
-#: ../src/gtk-rig-ctrl.c:1045 ../src/gtk-rig-ctrl.c:1140
+#: ../src/gtk-rig-ctrl.c:1041 ../src/gtk-rig-ctrl.c:1136
#, c-format
msgid "%s:%s: Failed to load radio configuration %s"
msgstr "%s:%s: Failed to load radio configuration %s"
-#: ../src/gtk-rig-ctrl.c:1074
+#: ../src/gtk-rig-ctrl.c:1070
#, c-format
msgid "%s:%s: Secondary device selected: %d"
msgstr "%s:%s: Secondary device selected: %d"
-#: ../src/gtk-rig-ctrl.c:1122
+#: ../src/gtk-rig-ctrl.c:1118
#, c-format
msgid "%s:%s: Failed to allocate memory for radio config"
msgstr "%s:%s: Failed to allocate memory for radio config"
-#: ../src/gtk-rig-ctrl.c:1178 ../src/gtk-rot-ctrl.c:780
+#: ../src/gtk-rig-ctrl.c:1174 ../src/gtk-rot-ctrl.c:776
#, c-format
msgid "%s: Controller does not have a valid configuration"
msgstr "%s: Controller does not have a valid configuration"
-#: ../src/gtk-rig-ctrl.c:1268 ../src/gtk-rot-ctrl.c:808
+#: ../src/gtk-rig-ctrl.c:1264 ../src/gtk-rot-ctrl.c:804
#, c-format
msgid "%s missed the deadline"
msgstr "%s missed the deadline"
-#: ../src/gtk-rig-ctrl.c:1300
+#: ../src/gtk-rig-ctrl.c:1296
#, c-format
msgid "%s: Invalid radio type %d. Setting type to RIG_TYPE_RX"
msgstr "%s: Invalid radio type %d. Setting type to RIG_TYPE_RX"
-#: ../src/gtk-rig-ctrl.c:1314 ../src/gtk-rot-ctrl.c:897
+#: ../src/gtk-rig-ctrl.c:1310 ../src/gtk-rot-ctrl.c:893
#, c-format
msgid "%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"
msgstr "%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"
-#: ../src/gtk-rig-ctrl.c:1832 ../src/gtk-rig-ctrl.c:2021
-#: ../src/gtk-rot-ctrl.c:965 ../src/gtk-rot-ctrl.c:1074
+#: ../src/gtk-rig-ctrl.c:1828 ../src/gtk-rig-ctrl.c:2017
+#: ../src/gtk-rot-ctrl.c:961 ../src/gtk-rot-ctrl.c:1070
#, c-format
msgid "%s:%d: Failed to create socket"
msgstr "%s:%d: Failed to create socket"
-#: ../src/gtk-rig-ctrl.c:1838 ../src/gtk-rig-ctrl.c:2027
-#: ../src/gtk-rot-ctrl.c:971 ../src/gtk-rot-ctrl.c:1080
+#: ../src/gtk-rig-ctrl.c:1834 ../src/gtk-rig-ctrl.c:2023
+#: ../src/gtk-rot-ctrl.c:967 ../src/gtk-rot-ctrl.c:1076
#, c-format
msgid "%s:%d Network socket created successfully"
msgstr "%s:%d Network socket created successfully"
-#: ../src/gtk-rig-ctrl.c:1852 ../src/gtk-rig-ctrl.c:2041
-#: ../src/gtk-rot-ctrl.c:985 ../src/gtk-rot-ctrl.c:1094
+#: ../src/gtk-rig-ctrl.c:1848 ../src/gtk-rig-ctrl.c:2037
+#: ../src/gtk-rot-ctrl.c:981 ../src/gtk-rot-ctrl.c:1090
#, c-format
msgid "%s:%d: Failed to connect to %s:%d"
msgstr "%s:%d: Failed to connect to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1858 ../src/gtk-rig-ctrl.c:2047
-#: ../src/gtk-rot-ctrl.c:991 ../src/gtk-rot-ctrl.c:1100
+#: ../src/gtk-rig-ctrl.c:1854 ../src/gtk-rig-ctrl.c:2043
+#: ../src/gtk-rot-ctrl.c:987 ../src/gtk-rot-ctrl.c:1096
#, c-format
msgid "%s:%d: Connection opened to %s:%d"
msgstr "%s:%d: Connection opened to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1876 ../src/gtk-rig-ctrl.c:2058
-#: ../src/gtk-rot-ctrl.c:1002 ../src/gtk-rot-ctrl.c:1113
+#: ../src/gtk-rig-ctrl.c:1872 ../src/gtk-rig-ctrl.c:2054
+#: ../src/gtk-rot-ctrl.c:998 ../src/gtk-rot-ctrl.c:1109
#, c-format
msgid "%s:%d: SIZE ERROR %d / %d"
msgstr "%s:%d: SIZE ERROR %d / %d"
-#: ../src/gtk-rig-ctrl.c:1886 ../src/gtk-rig-ctrl.c:2068
-#: ../src/gtk-rot-ctrl.c:1012
+#: ../src/gtk-rig-ctrl.c:1882 ../src/gtk-rig-ctrl.c:2064
+#: ../src/gtk-rot-ctrl.c:1008
#, c-format
msgid "%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"
msgstr "%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"
-#: ../src/gtk-rig-ctrl.c:1896 ../src/gtk-rig-ctrl.c:2078
+#: ../src/gtk-rig-ctrl.c:1892 ../src/gtk-rig-ctrl.c:2074
#, c-format
msgid "%s:%s: Got 0 bytes from rigctld"
msgstr "%s:%s: Got 0 bytes from rigctld"
-#: ../src/gtk-rig-ctrl.c:1901 ../src/gtk-rig-ctrl.c:2083
+#: ../src/gtk-rig-ctrl.c:1897 ../src/gtk-rig-ctrl.c:2079
#, c-format
msgid "%s:%s: Read %d bytes from rigctld"
msgstr "%s:%s: Read %d bytes from rigctld"
-#: ../src/gtk-rig-ctrl.c:1944 ../src/gtk-rig-ctrl.c:2121
+#: ../src/gtk-rig-ctrl.c:1940 ../src/gtk-rig-ctrl.c:2117
#, c-format
msgid "%s: Failed to create socket"
msgstr "%s: Failed to create socket"
-#: ../src/gtk-rig-ctrl.c:1950 ../src/gtk-rig-ctrl.c:2127
+#: ../src/gtk-rig-ctrl.c:1946 ../src/gtk-rig-ctrl.c:2123
#, c-format
msgid "%s: Network socket created successfully"
msgstr "%s: Network socket created successfully"
-#: ../src/gtk-rig-ctrl.c:1964 ../src/gtk-rig-ctrl.c:2141
+#: ../src/gtk-rig-ctrl.c:1960 ../src/gtk-rig-ctrl.c:2137
#, c-format
msgid "%s: Failed to connect to %s:%d"
msgstr "%s: Failed to connect to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1970 ../src/gtk-rig-ctrl.c:2147
+#: ../src/gtk-rig-ctrl.c:1966 ../src/gtk-rig-ctrl.c:2143
#, c-format
msgid "%s: Connection opened to %s:%d"
msgstr "%s: Connection opened to %s:%d"
-#: ../src/gtk-rig-ctrl.c:1981 ../src/gtk-rig-ctrl.c:2186
+#: ../src/gtk-rig-ctrl.c:1977 ../src/gtk-rig-ctrl.c:2182
#, c-format
msgid "%s: SIZE ERROR %d / %d"
msgstr "%s: SIZE ERROR %d / %d"
-#: ../src/gtk-rig-ctrl.c:2012 ../src/gtk-rot-ctrl.c:956
+#: ../src/gtk-rig-ctrl.c:2008 ../src/gtk-rot-ctrl.c:952
#, c-format
msgid "%s:%d: NULL storage."
msgstr "%s:%d: NULL storage."
-#: ../src/gtk-rig-ctrl.c:2175
+#: ../src/gtk-rig-ctrl.c:2171
#, c-format
msgid "%s: Invalid VFO argument. Using VFOA."
msgstr "%s: Invalid VFO argument. Using VFOA."
-#: ../src/gtk-rig-ctrl.c:2219
+#: ../src/gtk-rig-ctrl.c:2215
#, c-format
msgid "AOS in"
msgstr "AOS in"
-#: ../src/gtk-rig-ctrl.c:2223
+#: ../src/gtk-rig-ctrl.c:2219
#, c-format
msgid "LOS in"
msgstr "LOS in"
-#: ../src/gtk-rig-ctrl.c:2306
+#: ../src/gtk-rig-ctrl.c:2302
#, c-format
msgid "%s:%s: GtkSatModule has no target satellite."
msgstr "%s:%s: GtkSatModule has no target satellite."
-#: ../src/gtk-rig-ctrl.c:2318
+#: ../src/gtk-rig-ctrl.c:2314
#, c-format
msgid "%s:%s: Satellite %d has %d transponder modes."
msgstr "%s:%s: Satellite %d has %d transponder modes."
-#: ../src/gtk-rig-ctrl.c:2329
+#: ../src/gtk-rig-ctrl.c:2325
#, c-format
msgid "%s:&s: Read transponder '%s' for satellite %d"
msgstr "%s:&s: Read transponder '%s' for satellite %d"
-#: ../src/gtk-rig-ctrl.c:2468
+#: ../src/gtk-rig-ctrl.c:2460
#, c-format
msgid "%s:%d: Error reading radio configuration %s"
msgstr "%s:%d: Error reading radio configuration %s"
@@ -767,29 +767,29 @@
msgid "ΔT:"
msgstr "ΔT:"
-#: ../src/gtk-rot-ctrl.c:485
+#: ../src/gtk-rot-ctrl.c:484
msgid "Device:"
msgstr "Device:"
-#: ../src/gtk-rot-ctrl.c:490
+#: ../src/gtk-rot-ctrl.c:489
msgid "Select antenna rotator device"
msgstr "Select antenna rotator device"
-#: ../src/gtk-rot-ctrl.c:527
+#: ../src/gtk-rot-ctrl.c:523
msgid "Engage the selected rotor device"
msgstr "Engage the selected rotor device"
-#: ../src/gtk-rot-ctrl.c:539
+#: ../src/gtk-rot-ctrl.c:535
msgid "This parameter controls the delay between commands sent to the rotator."
msgstr ""
"This parameter controls the delay between commands sent to the rotator."
#. Tolerance
-#: ../src/gtk-rot-ctrl.c:551
+#: ../src/gtk-rot-ctrl.c:547
msgid "Tolerance:"
msgstr "Tolerance:"
-#: ../src/gtk-rot-ctrl.c:558
+#: ../src/gtk-rot-ctrl.c:554
msgid ""
"This parameter controls the tolerance between the target and rotator values "
"for the rotator.\n"
@@ -801,71 +801,66 @@
"If the difference between the target and rotator values is smaller than the "
"tolerance, no new commands are sent"
-#: ../src/gtk-rot-ctrl.c:568
+#: ../src/gtk-rot-ctrl.c:564
msgid "deg"
msgstr "deg"
-#: ../src/gtk-rot-ctrl.c:729
+#: ../src/gtk-rot-ctrl.c:725
#, c-format
msgid "%s:%d: Failed to allocate memory for rotator config"
msgstr "%s:%d: Failed to allocate memory for rotator config"
-#: ../src/gtk-rot-ctrl.c:738
+#: ../src/gtk-rot-ctrl.c:734
#, c-format
msgid "Loaded new rotator configuration %s"
msgstr "Loaded new rotator configuration %s"
-#: ../src/gtk-rot-ctrl.c:747
+#: ../src/gtk-rot-ctrl.c:743
#, c-format
msgid "%s:%d: Failed to load rotator configuration %s"
msgstr "%s:%d: Failed to load rotator configuration %s"
-#: ../src/gtk-rot-ctrl.c:868 ../src/gtk-rot-ctrl.c:869
-#: ../src/gtk-sat-module-popup.c:899 ../src/gtk-sat-module-popup.c:972
-#: ../src/sat-log-browser.c:71 ../src/sat-pref-rig.c:725
+#: ../src/gtk-rot-ctrl.c:864 ../src/gtk-rot-ctrl.c:865
+#: ../src/gtk-sat-module-popup.c:896 ../src/gtk-sat-module-popup.c:969
+#: ../src/sat-log-browser.c:72 ../src/sat-pref-rig.c:718
msgid "ERROR"
msgstr "ERROR"
-#: ../src/gtk-rot-ctrl.c:1022
+#: ../src/gtk-rot-ctrl.c:1018
#, c-format
msgid "%s:%s: Got 0 bytes from rotctld"
msgstr "%s:%s: Got 0 bytes from rotctld"
-#: ../src/gtk-rot-ctrl.c:1027
+#: ../src/gtk-rot-ctrl.c:1023
#, c-format
msgid "%s:%s: Read %d bytes from rotctld"
msgstr "%s:%s: Read %d bytes from rotctld"
-#: ../src/gtk-sat-data.c:72
-#, c-format
-msgid "%s: Can not find #%d in any .tle file."
-msgstr "%s: Can not find #%d in any .tle file."
+#: ../src/gtk-sat-data.c:73
+#, fuzzy, c-format
+msgid "%s: Failed to load data from %s (%s)"
+msgstr "%s: Failed to load %s (%s)"
-#: ../src/gtk-sat-data.c:106
-#, c-format
-msgid "%s: Found #%d in %s"
-msgstr "%s: Found #%d in %s"
+#: ../src/gtk-sat-data.c:85
+#, fuzzy, c-format
+msgid "%s: Error reading NAME from %s (%s)"
+msgstr "%s: Error reading %s (%s)"
-#: ../src/gtk-sat-data.c:116
-#, c-format
-msgid "%s: Invalid data for #%d"
-msgstr "%s: Invalid data for #%d"
+#: ../src/gtk-sat-data.c:93
+#, fuzzy, c-format
+msgid "%s: Satellite %d has no NICKNAME"
+msgstr "%s:%s: Satellite %d has %d transponder modes."
-#: ../src/gtk-sat-data.c:125
-#, c-format
-msgid "%s: Good data for #%d"
-msgstr "%s: Good data for #%d"
+#: ../src/gtk-sat-data.c:107
+#, fuzzy, c-format
+msgid "%s: TLE data for %d appears to be bad"
+msgstr "%s:%s: Original data for %d seems to be bad"
-#: ../src/gtk-sat-data.c:171 ../src/tle-update.c:903
-#, c-format
-msgid "%s: Failed to open %s"
-msgstr "%s: Failed to open %s"
-
-#: ../src/gtk-sat-list.c:53 ../src/gtk-sat-tree.c:212
+#: ../src/gtk-sat-list.c:53 ../src/gtk-sat-tree.c:213
msgid "Satellite"
msgstr "Satellite"
-#: ../src/gtk-sat-list.c:54 ../src/gtk-sat-tree.c:221
+#: ../src/gtk-sat-list.c:54 ../src/gtk-sat-tree.c:222
msgid "Catnum"
msgstr "Catnum"
@@ -908,12 +903,12 @@
msgstr "Next LOS"
#: ../src/gtk-sat-list.c:65 ../src/loc-tree.c:146
-#: ../src/sat-pass-dialogs.c:107 ../src/sat-pref-qth.c:195
+#: ../src/sat-pass-dialogs.c:107 ../src/sat-pref-qth.c:196
msgid "Lat"
msgstr "Lat"
#: ../src/gtk-sat-list.c:66 ../src/loc-tree.c:166
-#: ../src/sat-pass-dialogs.c:108 ../src/sat-pref-qth.c:208
+#: ../src/sat-pass-dialogs.c:108 ../src/sat-pref-qth.c:209
msgid "Lon"
msgstr "Lon"
@@ -1016,7 +1011,7 @@
#. altitude
#: ../src/gtk-sat-list.c:99 ../src/sat-pass-dialogs.c:135
#: ../src/sat-pref-qth-editor.c:318 ../src/gtk-single-sat.c:70
-#: ../src/qth-editor.c:333
+#: ../src/qth-editor.c:334
msgid "Altitude"
msgstr "Altitude"
@@ -1196,30 +1191,30 @@
msgid "%s:%d: Error loading map file (%s)"
msgstr "%s:%d: Error loading map file (%s)"
-#: ../src/gtk-sat-module.c:267
+#: ../src/gtk-sat-module.c:256
#, c-format
msgid "%s: Module %s is not valid."
msgstr "%s: Module %s is not valid."
-#: ../src/gtk-sat-module.c:310
+#: ../src/gtk-sat-module.c:299
msgid "Module options / shortcuts"
msgstr "Module options / shortcuts"
-#: ../src/gtk-sat-module.c:316
+#: ../src/gtk-sat-module.c:305
msgid "Close this module."
msgstr "Close this module."
-#: ../src/gtk-sat-module.c:450
+#: ../src/gtk-sat-module.c:439
#, c-format
msgid "%s:%d: Invalid module layout (%d)"
msgstr "%s:%d: Invalid module layout (%d)"
-#: ../src/gtk-sat-module.c:477
+#: ../src/gtk-sat-module.c:466
#, c-format
msgid "%s:%d: Invalid child number (%d)"
msgstr "%s:%d: Invalid child number (%d)"
-#: ../src/gtk-sat-module.c:514
+#: ../src/gtk-sat-module.c:503
#, c-format
msgid ""
"%s:%d: Invalid child type (%d)\n"
@@ -1228,73 +1223,73 @@
"%s:%d: Invalid child type (%d)\n"
"Using GtkSatList..."
-#: ../src/gtk-sat-module.c:553
+#: ../src/gtk-sat-module.c:543
#, c-format
msgid "%s: Could not load config data from %s (%s)."
msgstr "%s: Could not load config data from %s (%s)."
-#: ../src/gtk-sat-module.c:563
+#: ../src/gtk-sat-module.c:553
#, c-format
msgid "%s: Reading configuration from %s"
msgstr "%s: Reading configuration from %s"
-#: ../src/gtk-sat-module.c:607
+#: ../src/gtk-sat-module.c:595
#, c-format
msgid "%s: Can not load default QTH file %s; using built-in defaults"
msgstr "%s: Can not load default QTH file %s; using built-in defaults"
#. settings are really screwed up; we need some safe values here
-#: ../src/gtk-sat-module.c:611 ../src/gtk-sat-module.c:612
+#: ../src/gtk-sat-module.c:599 ../src/gtk-sat-module.c:600
msgid "Error"
msgstr "Error"
-#: ../src/gtk-sat-module.c:681 ../src/mod-cfg.c:578
+#: ../src/gtk-sat-module.c:670 ../src/mod-cfg.c:578
#, c-format
msgid "%s: Failed to get list of satellites (%s)"
msgstr "%s: Failed to get list of satellites (%s)"
-#: ../src/gtk-sat-module.c:703
+#: ../src/gtk-sat-module.c:692
#, c-format
msgid "%s: Error reading data for #%d"
msgstr "%s: Error reading data for #%d"
-#: ../src/gtk-sat-module.c:727
+#: ../src/gtk-sat-module.c:716
#, c-format
msgid "%s: Read data for #%d"
msgstr "%s: Read data for #%d"
-#: ../src/gtk-sat-module.c:734
+#: ../src/gtk-sat-module.c:723
#, c-format
msgid "%s: Sat #%d already in list"
msgstr "%s: Sat #%d already in list"
-#: ../src/gtk-sat-module.c:745
+#: ../src/gtk-sat-module.c:734
#, c-format
msgid "%s: Read %d out of %d satellites"
msgstr "%s: Read %d out of %d satellites"
-#: ../src/gtk-sat-module.c:783
+#: ../src/gtk-sat-module.c:772
#, c-format
msgid "%s: Previous cycle missed it's deadline."
msgstr "%s: Previous cycle missed it's deadline."
-#: ../src/gtk-sat-module.c:927 ../src/gtk-sat-module.c:1564
+#: ../src/gtk-sat-module.c:916 ../src/gtk-sat-module.c:1548
#, c-format
msgid "%f:%d: Unknown child type"
msgstr "%f:%d: Unknown child type"
-#: ../src/gtk-sat-module.c:1087
+#: ../src/gtk-sat-module.c:1076
#, c-format
msgid "%s: Module %s recevied CLOSE signal."
msgstr "%s: Module %s recevied CLOSE signal."
-#: ../src/gtk-sat-module.c:1097
+#: ../src/gtk-sat-module.c:1086
#, c-format
msgid "%s: Module %s is in DOCKED state."
msgstr "%s: Module %s is in DOCKED state."
-#: ../src/gtk-sat-module.c:1104 ../src/gtk-sat-module.c:1120
-#: ../src/gtk-sat-module.c:1148
+#: ../src/gtk-sat-module.c:1093 ../src/gtk-sat-module.c:1109
+#: ../src/gtk-sat-module.c:1137
#, c-format
msgid ""
"%s: Module %s was not found in mod-mgr (%d)\n"
@@ -1303,32 +1298,32 @@
"%s: Module %s was not found in mod-mgr (%d)\n"
"Internal state is corrupt?"
-#: ../src/gtk-sat-module.c:1113
+#: ../src/gtk-sat-module.c:1102
#, c-format
msgid "%s: Module %s is in WINDOW state."
msgstr "%s: Module %s is in WINDOW state."
-#: ../src/gtk-sat-module.c:1141
+#: ../src/gtk-sat-module.c:1130
#, c-format
msgid "%s: Module %s is in FULLSCREEN state."
msgstr "%s: Module %s is in FULLSCREEN state."
-#: ../src/gtk-sat-module.c:1170 ../src/gtk-sat-module.c:1342
+#: ../src/gtk-sat-module.c:1159 ../src/gtk-sat-module.c:1326
#, c-format
msgid "%s: Module %s has unknown state: %d"
msgstr "%s: Module %s has unknown state: %d"
-#: ../src/gtk-sat-module.c:1179
+#: ../src/gtk-sat-module.c:1168
#, c-format
msgid "%s: Module %s closed."
msgstr "%s: Module %s closed."
-#: ../src/gtk-sat-module.c:1220
+#: ../src/gtk-sat-module.c:1209
#, c-format
msgid "%s: Module %s recevied CONFIG signal."
msgstr "%s: Module %s recevied CONFIG signal."
-#: ../src/gtk-sat-module.c:1229
+#: ../src/gtk-sat-module.c:1218
#, c-format
msgid ""
"%s: Could not stop timeout callback\n"
@@ -1337,12 +1332,12 @@
"%s: Could not stop timeout callback\n"
"%s: Source ID %d seems invalid."
-#: ../src/gtk-sat-module.c:1247
+#: ../src/gtk-sat-module.c:1236
#, c-format
msgid "%s: Module configuration failed for some reason."
msgstr "%s: Module configuration failed for some reason."
-#: ../src/gtk-sat-module.c:1510
+#: ../src/gtk-sat-module.c:1494
#, c-format
msgid "%s: Reloading satellites for module %s"
msgstr "%s: Reloading satellites for module %s"
@@ -1400,7 +1395,7 @@
#. delete module
#: ../src/gtk-sat-module-popup.c:214 ../src/sat-pref-qth.c:490
-#: ../src/sat-pref-rig.c:342 ../src/sat-pref-rot.c:307
+#: ../src/sat-pref-rig.c:338 ../src/sat-pref-rot.c:303
msgid "Delete"
msgstr "Delete"
@@ -1462,37 +1457,37 @@
msgid "%s:%d: Cloning %s => %s"
msgstr "%s:%d: Cloning %s => %s"
-#: ../src/gtk-sat-module-popup.c:376
+#: ../src/gtk-sat-module-popup.c:373
#, c-format
msgid "%s:%d: Failed to clone %s."
msgstr "%s:%d: Failed to clone %s."
-#: ../src/gtk-sat-module-popup.c:381
+#: ../src/gtk-sat-module-popup.c:378
#, c-format
msgid "%s:%d: Successfully cloned %s."
msgstr "%s:%d: Successfully cloned %s."
-#: ../src/gtk-sat-module-popup.c:466
+#: ../src/gtk-sat-module-popup.c:463
#, c-format
msgid "%s:%d: Cloning cancelled by user."
msgstr "%s:%d: Cloning cancelled by user."
-#: ../src/gtk-sat-module-popup.c:472
+#: ../src/gtk-sat-module-popup.c:469
#, c-format
msgid "%s:%d: Cloning interrupted."
msgstr "%s:%d: Cloning interrupted."
-#: ../src/gtk-sat-module-popup.c:659 ../src/gtk-sat-module-popup.c:802
+#: ../src/gtk-sat-module-popup.c:656 ../src/gtk-sat-module-popup.c:799
#, c-format
msgid "%s:%d: Unknown module state: %d"
msgstr "%s:%d: Unknown module state: %d"
-#: ../src/gtk-sat-module-popup.c:828
+#: ../src/gtk-sat-module-popup.c:825
#, c-format
msgid "The sky at a glance (%s)"
msgstr "The sky at a glance (%s)"
-#: ../src/gtk-sat-module-popup.c:894
+#: ../src/gtk-sat-module-popup.c:891
msgid ""
"You have no radio configuration!\n"
"Please configure a radio first."
@@ -1500,12 +1495,12 @@
"You have no radio configuration!\n"
"Please configure a radio first."
-#: ../src/gtk-sat-module-popup.c:907
+#: ../src/gtk-sat-module-popup.c:904
#, c-format
msgid "Gpredict Radio Control: %s"
msgstr "Gpredict Radio Control: %s"
-#: ../src/gtk-sat-module-popup.c:967
+#: ../src/gtk-sat-module-popup.c:964
msgid ""
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
@@ -1513,12 +1508,12 @@
"You have no rotator configuration!\n"
"Please configure an antenna rotator first."
-#: ../src/gtk-sat-module-popup.c:980
+#: ../src/gtk-sat-module-popup.c:977
#, c-format
msgid "Gpredict Rotator Control: %s"
msgstr "Gpredict Rotator Control: %s"
-#: ../src/gtk-sat-module-popup.c:1066
+#: ../src/gtk-sat-module-popup.c:1062
#, c-format
msgid ""
"This operation will permanently delete\n"
@@ -1531,12 +1526,12 @@
"from the disk.\n"
"Do you you want to proceed?"
-#: ../src/gtk-sat-module-popup.c:1076
+#: ../src/gtk-sat-module-popup.c:1072
#, c-format
msgid "%s:%d: Failed to delete %s."
msgstr "%s:%d: Failed to delete %s."
-#: ../src/gtk-sat-module-popup.c:1081
+#: ../src/gtk-sat-module-popup.c:1077
#, c-format
msgid "%s:%d: %s deleted permanently."
msgstr "%s:%d: %s deleted permanently."
@@ -1646,84 +1641,84 @@
msgid "<b>Manual Control</b>"
msgstr "<b>Manual Control</b>"
-#: ../src/gtk-sat-tree.c:231
+#: ../src/gtk-sat-tree.c:232
msgid "Epoch"
msgstr "Epoch"
-#: ../src/gtk-sat-tree.c:244
+#: ../src/gtk-sat-tree.c:245
msgid "Selected"
msgstr "Selected"
#. expand and collabse buttons
-#: ../src/gtk-sat-tree.c:266
+#: ../src/gtk-sat-tree.c:267
msgid "Expand"
msgstr "Expand"
-#: ../src/gtk-sat-tree.c:269
+#: ../src/gtk-sat-tree.c:270
msgid "Expand all nodes in the tree to make it searchable"
msgstr "Expand all nodes in the tree to make it searchable"
-#: ../src/gtk-sat-tree.c:273
+#: ../src/gtk-sat-tree.c:274
msgid "Collapse"
msgstr "Collapse"
-#: ../src/gtk-sat-tree.c:276
+#: ../src/gtk-sat-tree.c:277
msgid "Collapse all nodes in the tree"
msgstr "Collapse all nodes in the tree"
-#: ../src/gtk-sat-tree.c:332
+#: ../src/gtk-sat-tree.c:333
#, c-format
msgid "%s:%d: Directory is: %s"
msgstr "%s:%d: Directory is: %s"
-#: ../src/gtk-sat-tree.c:340
+#: ../src/gtk-sat-tree.c:341
#, c-format
msgid "%s:%d: No .tle files found in %s."
msgstr "%s:%d: No .tle files found in %s."
-#: ../src/gtk-sat-tree.c:378
+#: ../src/gtk-sat-tree.c:379
#, c-format
msgid "%s:%d: Read %d sats from %s "
msgstr "%s:%d: Read %d sats from %s "
-#: ../src/gtk-sat-tree.c:420
+#: ../src/gtk-sat-tree.c:421
#, c-format
msgid "%s:%d: Failed to open %s (%s)"
msgstr "%s:%d: Failed to open %s (%s)"
-#: ../src/gtk-sat-tree.c:521 ../src/gtk-sat-tree.c:654
+#: ../src/gtk-sat-tree.c:522 ../src/gtk-sat-tree.c:655
#, c-format
msgid "%s:%d: Satellite %d selected."
msgstr "%s:%d: Satellite %d selected."
-#: ../src/gtk-sat-tree.c:537 ../src/gtk-sat-tree.c:659
+#: ../src/gtk-sat-tree.c:538 ../src/gtk-sat-tree.c:660
#, c-format
msgid "%s:%d: Satellite %d already selected; skip..."
msgstr "%s:%d: Satellite %d already selected; skip..."
-#: ../src/gtk-sat-tree.c:545
+#: ../src/gtk-sat-tree.c:546
#, c-format
msgid "%s:%d: Satellite %d de-selected."
msgstr "%s:%d: Satellite %d de-selected."
-#: ../src/gtk-sat-tree.c:581 ../src/gtk-sat-tree.c:734
+#: ../src/gtk-sat-tree.c:582 ../src/gtk-sat-tree.c:735
#, c-format
msgid "%s: Invalid GtkSatTree!"
msgstr "%s: Invalid GtkSatTree!"
-#: ../src/gtk-sat-tree.c:603
+#: ../src/gtk-sat-tree.c:604
#, c-format
msgid "%s: Satellite %d already selected; skip..."
msgstr "%s: Satellite %d already selected; skip..."
-#: ../src/gtk-sat-tree.c:745
+#: ../src/gtk-sat-tree.c:746
#, c-format
msgid "%s: There are no satellites selected => NULL."
msgstr "%s: There are no satellites selected => NULL."
#. location
-#: ../src/loc-tree.c:133 ../src/sat-pref-qth.c:188
-#: ../src/sat-pref-qth-editor.c:220 ../src/qth-editor.c:235
+#: ../src/loc-tree.c:133 ../src/sat-pref-qth.c:189
+#: ../src/sat-pref-qth-editor.c:220 ../src/qth-editor.c:236
msgid "Location"
msgstr "Location"
@@ -1785,37 +1780,32 @@
msgstr "just to have a pot"
#: ../src/main.c:113
-#, c-format
+#, fuzzy, c-format
msgid ""
"%s: User config check failed (code %d). This is fatal.\n"
-"A possible solution would be to remove the .gpredict2 data dir\n"
+"A possible solution would be to remove the .config/Gpredict data dir\n"
"in your home directory"
msgstr ""
"%s: User config check failed (code %d). This is fatal.\n"
"A possible solution would be to remove the .gpredict2 data dir\n"
"in your home directory"
-#: ../src/main.c:124
+#: ../src/main.c:418
#, c-format
-msgid "%s: TLE check failed! This is fatal."
-msgstr "%s: TLE check failed! This is fatal."
-
-#: ../src/main.c:427
-#, c-format
msgid "%s: Time threshold has been passed."
msgstr "%s: Time threshold has been passed."
-#: ../src/main.c:435
+#: ../src/main.c:426
#, c-format
msgid "%s: Starting new update thread."
msgstr "%s: Starting new update thread."
-#: ../src/main.c:445
+#: ../src/main.c:436
#, c-format
msgid "%s: Failed to create TLE update thread (%s)"
msgstr "%s: Failed to create TLE update thread (%s)"
-#: ../src/main.c:455
+#: ../src/main.c:446
msgid ""
"Your TLE files are getting out of date.\n"
"You can update them by selecting\n"
@@ -1827,7 +1817,7 @@
"<b>Edit -> Update TLE</b>\n"
"in the menubar."
-#: ../src/main.c:486
+#: ../src/main.c:477
#, c-format
msgid "%s: Could not find TLE monitoring task (ID = %d)"
msgstr "%s: Could not find TLE monitoring task (ID = %d)"
@@ -1987,12 +1977,12 @@
msgid "Failed to build menubar: %s"
msgstr "Failed to build menubar: %s"
-#: ../src/menubar.c:267
+#: ../src/menubar.c:268
#, c-format
msgid "%s: Starting new module configurator..."
msgstr "%s: Starting new module configurator..."
-#: ../src/menubar.c:274
+#: ../src/menubar.c:275
#, c-format
msgid "%s: New module name is %s."
msgstr "%s: New module name is %s."
@@ -2007,12 +1997,12 @@
msgid "%s: New module config cancelled."
msgstr "%s: New module config cancelled."
-#: ../src/menubar.c:335
+#: ../src/menubar.c:336
#, c-format
msgid "%s: Open existing module..."
msgstr "%s: Open existing module..."
-#: ../src/menubar.c:342
+#: ../src/menubar.c:343
#, c-format
msgid "%s: Open module %s."
msgstr "%s: Open module %s."
@@ -2074,17 +2064,17 @@
msgid "This function is still under development."
msgstr "This function is still under development."
-#: ../src/menubar.c:845
+#: ../src/menubar.c:842
#, c-format
msgid "%s:%s: Scanning directory %s for modules."
msgstr "%s:%s: Scanning directory %s for modules."
-#: ../src/menubar.c:868
+#: ../src/menubar.c:865
#, c-format
msgid "%s:%d: Failed to open module dir %s (%s)"
msgstr "%s:%d: Failed to open module dir %s (%s)"
-#: ../src/menubar.c:883
+#: ../src/menubar.c:880
msgid ""
"You do not have any modules set up yet. Please use File->New in order to "
"create a module."
@@ -2092,21 +2082,21 @@
"You do not have any modules set up yet. Please use File->New in order to "
"create a module."
-#: ../src/menubar.c:901
+#: ../src/menubar.c:898
msgid "Module"
msgstr "Module"
#. create dialog
-#: ../src/menubar.c:909
+#: ../src/menubar.c:906
msgid "Select a module"
msgstr "Select a module"
-#: ../src/menubar.c:936
+#: ../src/menubar.c:933
#, c-format
msgid "%s:%s: Selected module is: %s"
msgstr "%s:%s: Selected module is: %s"
-#: ../src/menubar.c:941
+#: ../src/menubar.c:938
#, c-format
msgid "%s:%s: No selection is list of modules."
msgstr "%s:%s: No selection is list of modules."
@@ -2139,17 +2129,17 @@
msgid "Please select at least one satellite from the list."
msgstr "Please select at least one satellite from the list."
-#: ../src/mod-cfg.c:344
+#: ../src/mod-cfg.c:345
#, c-format
msgid "%s: Attempt to save data to empty file name."
msgstr "%s: Attempt to save data to empty file name."
-#: ../src/mod-cfg.c:351
+#: ../src/mod-cfg.c:352
#, c-format
msgid "%s: Attempt to save NULL data."
msgstr "%s: Attempt to save NULL data."
-#: ../src/mod-cfg.c:362 ../src/sat-cfg.c:305
+#: ../src/mod-cfg.c:363 ../src/sat-cfg.c:307
#, c-format
msgid "%s: Could not create config data (%s)."
msgstr "%s: Could not create config data (%s)."
@@ -2211,22 +2201,22 @@
#. is buff == "** DEFAULT **" clear the configuration key
#. otherwise store the filename
#.
-#: ../src/mod-cfg.c:701 ../src/mod-cfg.c:743 ../src/mod-cfg.c:791
+#: ../src/mod-cfg.c:701 ../src/mod-cfg.c:742 ../src/mod-cfg.c:790
msgid "** DEFAULT **"
msgstr "** DEFAULT **"
-#: ../src/mod-cfg.c:734
+#: ../src/mod-cfg.c:733
#, c-format
msgid "%s:%d: Failed to open user cfg dir %s (%s)"
msgstr "%s:%d: Failed to open user cfg dir %s (%s)"
-#: ../src/mod-cfg.c:832
+#: ../src/mod-cfg.c:831
#, c-format
msgid "%s: Applied changes to %s."
msgstr "%s: Applied changes to %s."
#. window icon file name
-#: ../src/mod-cfg.c:854
+#: ../src/mod-cfg.c:853
msgid "Module Properties"
msgstr "Module Properties"
@@ -2473,74 +2463,74 @@
"Observer: %s, %s\n"
"LAT:%.2f LON:%.2f\n"
-#: ../src/radio-conf.c:68 ../src/radio-conf.c:225 ../src/rotor-conf.c:65
+#: ../src/radio-conf.c:68 ../src/radio-conf.c:224 ../src/rotor-conf.c:65
#, c-format
msgid "%s: NULL configuration name!"
msgstr "%s: NULL configuration name!"
-#: ../src/radio-conf.c:85 ../src/rotor-conf.c:82
+#: ../src/radio-conf.c:84 ../src/rotor-conf.c:81
#, c-format
msgid "%s: Could not load file %s\n"
msgstr "%s: Could not load file %s\n"
-#: ../src/radio-conf.c:98 ../src/radio-conf.c:108 ../src/radio-conf.c:120
-#: ../src/radio-conf.c:136 ../src/radio-conf.c:151 ../src/radio-conf.c:162
-#: ../src/radio-conf.c:177 ../src/radio-conf.c:189
+#: ../src/radio-conf.c:97 ../src/radio-conf.c:107 ../src/radio-conf.c:119
+#: ../src/radio-conf.c:135 ../src/radio-conf.c:150 ../src/radio-conf.c:161
+#: ../src/radio-conf.c:176 ../src/radio-conf.c:188
#, c-format
msgid "%s: Error reading radio conf from %s (%s)."
msgstr "%s: Error reading radio conf from %s (%s)."
-#: ../src/radio-conf.c:201
+#: ../src/radio-conf.c:200
#, c-format
msgid "%s: Read radio configuration %s"
msgstr "%s: Read radio configuration %s"
-#: ../src/radio-conf.c:261
+#: ../src/radio-conf.c:259
#, c-format
msgid "%s: Saved radio configuration %s"
msgstr "%s: Saved radio configuration %s"
-#: ../src/rotor-conf.c:95 ../src/rotor-conf.c:105
+#: ../src/rotor-conf.c:94 ../src/rotor-conf.c:104
#, c-format
msgid "%s: Error reading rotor conf from %s (%s)."
msgstr "%s: Error reading rotor conf from %s (%s)."
-#: ../src/rotor-conf.c:115
+#: ../src/rotor-conf.c:114
#, c-format
msgid "%s: Az type not defined for %s. Assuming 0..360°"
msgstr "%s: Az type not defined for %s. Assuming 0..360°"
-#: ../src/rotor-conf.c:125
+#: ../src/rotor-conf.c:124
#, c-format
msgid "%s: MinAz not defined for %s. Assuming 0°."
msgstr "%s: MinAz not defined for %s. Assuming 0°."
-#: ../src/rotor-conf.c:134
+#: ../src/rotor-conf.c:133
#, c-format
msgid "%s: MaxAz not defined for %s. Assuming 360°."
msgstr "%s: MaxAz not defined for %s. Assuming 360°."
-#: ../src/rotor-conf.c:143
+#: ../src/rotor-conf.c:142
#, c-format
msgid "%s: MinEl not defined for %s. Assuming 0°."
msgstr "%s: MinEl not defined for %s. Assuming 0°."
-#: ../src/rotor-conf.c:152
+#: ../src/rotor-conf.c:151
#, c-format
msgid "%s: MaxEl not defined for %s. Assuming 90°."
msgstr "%s: MaxEl not defined for %s. Assuming 90°."
-#: ../src/sat-cfg.c:263
+#: ../src/sat-cfg.c:264
#, c-format
msgid "%s: Error reading config file (%s)"
msgstr "%s: Error reading config file (%s)"
-#: ../src/sat-cfg.c:267
+#: ../src/sat-cfg.c:268
#, c-format
msgid "%s: Using built-in defaults"
msgstr "%s: Using built-in defaults"
-#: ../src/sat-cfg.c:276
+#: ../src/sat-cfg.c:277
#, c-format
msgid "%s: Everything OK."
msgstr "%s: Everything OK."
@@ -2736,21 +2726,21 @@
msgstr "Mode: %s"
#. * WARNING: Used directly in sat-log-browser
-#: ../src/sat-log.c:57 ../src/sat-log-browser.c:69
+#: ../src/sat-log.c:58 ../src/sat-log-browser.c:70
msgid "NONE"
msgstr "NONE"
-#: ../src/sat-log.c:57
+#: ../src/sat-log.c:58
msgid "HAMLIB"
msgstr "HAMLIB"
#. print an error message
-#: ../src/sat-log.c:101
+#: ../src/sat-log.c:102
#, c-format
msgid "ERROR: Could not create %s\n"
msgstr "ERROR: Could not create %s\n"
-#: ../src/sat-log.c:125
+#: ../src/sat-log.c:126
#, c-format
msgid ""
"\n"
@@ -2765,112 +2755,112 @@
"%s\n"
"\n"
-#: ../src/sat-log.c:138
+#: ../src/sat-log.c:139
#, c-format
msgid "%s: Session started"
msgstr "%s: Session started"
-#: ../src/sat-log.c:150
+#: ../src/sat-log.c:151
#, c-format
msgid "%s: Session ended"
msgstr "%s: Session ended"
-#: ../src/sat-log-browser.c:56 ../src/sat-pass-dialogs.c:100
+#: ../src/sat-log-browser.c:57 ../src/sat-pass-dialogs.c:100
#: ../src/sat-pass-dialogs.c:124
msgid "Time"
msgstr "Time"
-#: ../src/sat-log-browser.c:57
+#: ../src/sat-log-browser.c:58
msgid "Source"
msgstr "Source"
-#: ../src/sat-log-browser.c:58
+#: ../src/sat-log-browser.c:59
msgid "Level"
msgstr "Level"
-#: ../src/sat-log-browser.c:59
+#: ../src/sat-log-browser.c:60
msgid "Message"
msgstr "Message"
-#: ../src/sat-log-browser.c:70
+#: ../src/sat-log-browser.c:71
msgid "BUG"
msgstr "BUG"
-#: ../src/sat-log-browser.c:72
+#: ../src/sat-log-browser.c:73
msgid "WARNING"
msgstr "WARNING"
-#: ../src/sat-log-browser.c:73
+#: ../src/sat-log-browser.c:74
msgid "DEBUG"
msgstr "DEBUG"
-#: ../src/sat-log-browser.c:74
+#: ../src/sat-log-browser.c:75
msgid "TRACE"
msgstr "TRACE"
#. create dialog window; we use "fake" stock responses to catch user
#. button clicks (save_as and pause)
#.
-#: ../src/sat-log-browser.c:152
+#: ../src/sat-log-browser.c:154
msgid "Log Browser"
msgstr "Log Browser"
#. create file chooser dialog
-#: ../src/sat-log-browser.c:371
+#: ../src/sat-log-browser.c:375
msgid "Select Log File"
msgstr "Select Log File"
-#: ../src/sat-log-browser.c:447
+#: ../src/sat-log-browser.c:452
msgid "SYS"
msgstr "SYS"
-#: ../src/sat-log-browser.c:458
+#: ../src/sat-log-browser.c:463
msgid "Log file seems corrupt"
msgstr "Log file seems corrupt"
-#: ../src/sat-log-browser.c:480
+#: ../src/sat-log-browser.c:485
#, c-format
msgid "%s:%d: Error open debug log (%s)"
msgstr "%s:%d: Error open debug log (%s)"
-#: ../src/sat-log-browser.c:654
+#: ../src/sat-log-browser.c:659
msgid "Hamlib"
msgstr "Hamlib"
-#: ../src/sat-log-browser.c:660
+#: ../src/sat-log-browser.c:665
msgid "Gpredict"
msgstr "Gpredict"
-#: ../src/sat-log-browser.c:666
+#: ../src/sat-log-browser.c:671
msgid "Other"
msgstr "Other"
-#: ../src/sat-log-browser.c:676
+#: ../src/sat-log-browser.c:681
msgid "Bugs"
msgstr "Bugs"
-#: ../src/sat-log-browser.c:682
+#: ../src/sat-log-browser.c:687
msgid "Errors"
msgstr "Errors"
-#: ../src/sat-log-browser.c:688
+#: ../src/sat-log-browser.c:693
msgid "Warnings"
msgstr "Warnings"
-#: ../src/sat-log-browser.c:694
+#: ../src/sat-log-browser.c:699
msgid "Messages"
msgstr "Messages"
-#: ../src/sat-log-browser.c:700
+#: ../src/sat-log-browser.c:705
msgid "Debug"
msgstr "Debug"
-#: ../src/sat-log-browser.c:713
+#: ../src/sat-log-browser.c:718
msgid "<b>Total</b>"
msgstr "<b>Total</b>"
#. frame around the table
-#: ../src/sat-log-browser.c:738
+#: ../src/sat-log-browser.c:743
msgid " Summary "
msgstr " Summary "
@@ -3109,8 +3099,8 @@
#. Config name
#. QTH name
#: ../src/sat-pref-rig-editor.c:157 ../src/sat-pref-rot-editor.c:154
-#: ../src/sat-pref-qth.c:181 ../src/sat-pref-qth-editor.c:184
-#: ../src/qth-editor.c:199
+#: ../src/sat-pref-qth.c:182 ../src/sat-pref-qth-editor.c:184
+#: ../src/qth-editor.c:200
msgid "Name"
msgstr "Name"
@@ -3128,7 +3118,7 @@
msgid "Host"
msgstr "Host"
-#: ../src/sat-pref-rig-editor.c:181
+#: ../src/sat-pref-rig-editor.c:182
msgid ""
"Enter the host where rigctld is running. You can use both host name and IP "
"address, e.g. 192.168.1.100\n"
@@ -3141,37 +3131,37 @@
"If gpredict and rigctld are running on the same computer use localhost"
#. port
-#: ../src/sat-pref-rig-editor.c:189 ../src/sat-pref-rot-editor.c:183
+#: ../src/sat-pref-rig-editor.c:190 ../src/sat-pref-rot-editor.c:187
#: ../src/sat-pref-rig.c:149 ../src/sat-pref-rot.c:132
msgid "Port"
msgstr "Port"
-#: ../src/sat-pref-rig-editor.c:197
+#: ../src/sat-pref-rig-editor.c:198
msgid "Enter the port number where rigctld is listening"
msgstr "Enter the port number where rigctld is listening"
#. radio type
-#: ../src/sat-pref-rig-editor.c:201
+#: ../src/sat-pref-rig-editor.c:202
msgid "Radio type"
msgstr "Radio type"
-#: ../src/sat-pref-rig-editor.c:206 ../src/sat-pref-rig.c:709
+#: ../src/sat-pref-rig-editor.c:207 ../src/sat-pref-rig.c:702
msgid "RX only"
msgstr "RX only"
-#: ../src/sat-pref-rig-editor.c:207 ../src/sat-pref-rig.c:713
+#: ../src/sat-pref-rig-editor.c:208 ../src/sat-pref-rig.c:706
msgid "TX only"
msgstr "TX only"
-#: ../src/sat-pref-rig-editor.c:208
+#: ../src/sat-pref-rig-editor.c:209
msgid "Simplex TRX"
msgstr "Simplex TRX"
-#: ../src/sat-pref-rig-editor.c:209
+#: ../src/sat-pref-rig-editor.c:210
msgid "Duplex TRX"
msgstr "Duplex TRX"
-#: ../src/sat-pref-rig-editor.c:213
+#: ../src/sat-pref-rig-editor.c:214
msgid ""
"<b>RX only:</b> The radio shall only be used as receiver. If <i>Monitor PTT "
"status</i> is checked the doppler tuning will be suspended while PTT is ON "
@@ -3202,19 +3192,19 @@
"and not care about PTT setting."
#. ptt
-#: ../src/sat-pref-rig-editor.c:231
+#: ../src/sat-pref-rig-editor.c:232
msgid "PTT status"
msgstr "PTT status"
-#: ../src/sat-pref-rig-editor.c:237
+#: ../src/sat-pref-rig-editor.c:238
msgid "Read PTT"
msgstr "Read PTT"
-#: ../src/sat-pref-rig-editor.c:238
+#: ../src/sat-pref-rig-editor.c:239
msgid "Read DCD"
msgstr "Read DCD"
-#: ../src/sat-pref-rig-editor.c:242
+#: ../src/sat-pref-rig-editor.c:243
msgid ""
"Select PTT type.\n"
"\n"
@@ -3245,31 +3235,31 @@
"can read squelch status and send it via CTS."
#. VFO Up/Down
-#: ../src/sat-pref-rig-editor.c:253
+#: ../src/sat-pref-rig-editor.c:254
msgid "VFO Up/Down"
msgstr "VFO Up/Down"
-#: ../src/sat-pref-rig-editor.c:258
+#: ../src/sat-pref-rig-editor.c:259
msgid "Not applicable"
msgstr "Not applicable"
-#: ../src/sat-pref-rig-editor.c:259
+#: ../src/sat-pref-rig-editor.c:260
msgid "MAIN ↑ / SUB ↓"
msgstr "MAIN ↑ / SUB ↓"
-#: ../src/sat-pref-rig-editor.c:260
+#: ../src/sat-pref-rig-editor.c:261
msgid "SUB ↑ / MAIN ↓"
msgstr "SUB ↑ / MAIN ↓"
-#: ../src/sat-pref-rig-editor.c:261
+#: ../src/sat-pref-rig-editor.c:262
msgid "A ↑ / B ↓"
msgstr "A ↑ / B ↓"
-#: ../src/sat-pref-rig-editor.c:262
+#: ../src/sat-pref-rig-editor.c:263
msgid "B ↑ / A ↓"
msgstr "B ↑ / A ↓"
-#: ../src/sat-pref-rig-editor.c:266
+#: ../src/sat-pref-rig-editor.c:267
msgid ""
"Select which VFO to use for uplink and downlink. This setting is used for "
"full-duplex radios only, such as the IC-910H, FT-847 and the TS-2000.\n"
@@ -3286,26 +3276,26 @@
"<b>TS-2000:</b> B↑ / A↓"
#. Downconverter LO frequency
-#: ../src/sat-pref-rig-editor.c:275
+#: ../src/sat-pref-rig-editor.c:276
msgid "LO Down:"
msgstr "LO Down:"
-#: ../src/sat-pref-rig-editor.c:283
+#: ../src/sat-pref-rig-editor.c:284
msgid ""
"Enter the frequency of the local oscillator of the downconverter, if any."
msgstr ""
"Enter the frequency of the local oscillator of the downconverter, if any."
-#: ../src/sat-pref-rig-editor.c:287 ../src/sat-pref-rig-editor.c:304
+#: ../src/sat-pref-rig-editor.c:288 ../src/sat-pref-rig-editor.c:305
msgid "MHz"
msgstr "MHz"
#. Upconverter LO frequency
-#: ../src/sat-pref-rig-editor.c:292
+#: ../src/sat-pref-rig-editor.c:293
msgid "LO Up:"
msgstr "LO Up:"
-#: ../src/sat-pref-rig-editor.c:300
+#: ../src/sat-pref-rig-editor.c:301
msgid "Enter the frequency of the local oscillator of the upconverter, if any."
msgstr ""
"Enter the frequency of the local oscillator of the upconverter, if any."
@@ -3323,24 +3313,29 @@
"Enter a short name for this configuration, e.g. ROTOR-1.\n"
"Allowed characters: 0..9, a..z, A..Z, - and _"
-#: ../src/sat-pref-rot-editor.c:178
+#: ../src/sat-pref-rot-editor.c:179
+#, fuzzy
msgid ""
-"Enter the host where rogctld is running. You can use both host name and IP "
-"address, e.g. 192.168.1.100"
+"Enter the host where rigctld is running. You can use both host name and IP "
+"address, e.g. 192.168.1.100\n"
+"\n"
+"If gpredict and rotctld are running on the same computer, use localhost"
msgstr ""
-"Enter the host where rogctld is running. You can use both host name and IP "
-"address, e.g. 192.168.1.100"
+"Enter the host where rigctld is running. You can use both host name and IP "
+"address, e.g. 192.168.1.100\n"
+"\n"
+"If gpredict and rigctld are running on the same computer use localhost"
-#: ../src/sat-pref-rot-editor.c:191
+#: ../src/sat-pref-rot-editor.c:195
msgid "Enter the port number where rotctld is listening. Default is 4533."
msgstr "Enter the port number where rotctld is listening. Default is 4533."
#. Az-type
-#: ../src/sat-pref-rot-editor.c:197
+#: ../src/sat-pref-rot-editor.c:201
msgid "Az type"
msgstr "Az type"
-#: ../src/sat-pref-rot-editor.c:208
+#: ../src/sat-pref-rot-editor.c:212
msgid ""
"Select your azimuth range here. Note that gpredict assumes that 0° is at "
"North and + direction is clockwise for both types"
@@ -3349,23 +3344,23 @@
"North and + direction is clockwise for both types"
#. Az and El limits
-#: ../src/sat-pref-rot-editor.c:215
+#: ../src/sat-pref-rot-editor.c:219
msgid " Min Az"
msgstr " Min Az"
-#: ../src/sat-pref-rot-editor.c:224
+#: ../src/sat-pref-rot-editor.c:228
msgid " Max Az"
msgstr " Max Az"
-#: ../src/sat-pref-rot-editor.c:233
+#: ../src/sat-pref-rot-editor.c:237
msgid " Min El"
msgstr " Min El"
-#: ../src/sat-pref-rot-editor.c:242
+#: ../src/sat-pref-rot-editor.c:246
msgid " Max El"
msgstr " Max El"
-#: ../src/sat-pref-rot-editor.c:427
+#: ../src/sat-pref-rot-editor.c:431
#, c-format
msgid "%s:%s: Invalid AZ rotator type."
msgstr "%s:%s: Invalid AZ rotator type."
@@ -3380,35 +3375,35 @@
msgid "Reset module settings to the global values."
msgstr "Reset module settings to the global values."
-#: ../src/sat-pref-debug.c:78
+#: ../src/sat-pref-debug.c:80
msgid "Debug level:"
msgstr "Debug level:"
-#: ../src/sat-pref-debug.c:82
+#: ../src/sat-pref-debug.c:84
msgid "Level 0: None"
msgstr "Level 0: None"
-#: ../src/sat-pref-debug.c:83
+#: ../src/sat-pref-debug.c:85
msgid "Level 1: Bug"
msgstr "Level 1: Bug"
-#: ../src/sat-pref-debug.c:84
+#: ../src/sat-pref-debug.c:86
msgid "Level 2: Error"
msgstr "Level 2: Error"
-#: ../src/sat-pref-debug.c:85
+#: ../src/sat-pref-debug.c:87
msgid "Level 3: Warning"
msgstr "Level 3: Warning"
-#: ../src/sat-pref-debug.c:86
+#: ../src/sat-pref-debug.c:88
msgid "Level 4: Info"
msgstr "Level 4: Info"
-#: ../src/sat-pref-debug.c:87
+#: ../src/sat-pref-debug.c:89
msgid "Level 5: Trace"
msgstr "Level 5: Trace"
-#: ../src/sat-pref-debug.c:92
+#: ../src/sat-pref-debug.c:94
msgid ""
"Select the debug level. The higher the level, the more messages will be "
"logged (so be careful with eLevel 5)."
@@ -3416,39 +3411,37 @@
"Select the debug level. The higher the level, the more messages will be "
"logged (so be careful with eLevel 5)."
-#: ../src/sat-pref-debug.c:103
+#: ../src/sat-pref-debug.c:105
msgid "Delete log files older than:"
msgstr "Delete log files older than:"
-#: ../src/sat-pref-debug.c:107
+#: ../src/sat-pref-debug.c:109
msgid "Always delete"
msgstr "Always delete"
-#: ../src/sat-pref-debug.c:108
+#: ../src/sat-pref-debug.c:110
msgid "1 day"
msgstr "1 day"
-#: ../src/sat-pref-debug.c:109
+#: ../src/sat-pref-debug.c:111
msgid "1 week"
msgstr "1 week"
-#: ../src/sat-pref-debug.c:110
+#: ../src/sat-pref-debug.c:112
msgid "1 month"
msgstr "1 month"
-#: ../src/sat-pref-debug.c:114
+#: ../src/sat-pref-debug.c:116
msgid "Select how often gpredict should delete old log files."
msgstr "Select how often gpredict should delete old log files."
-#. info label
-#: ../src/sat-pref-debug.c:124
-#, c-format
+#: ../src/sat-pref-debug.c:127
+#, fuzzy, c-format
msgid ""
-"Gpredict stores all run-time messages in the %s%s.gpredict2%slogs%s folder. "
-"The current log file is called gpredict.log and the file is always kept "
-"until the next execution so that you can examine it in case of a failure. If "
-"old log files are kept, they are called gpredict-XYZ.log where XYZ is a "
-"uniques timestamp."
+"Gpredict stores all run-time messages in the %s%slogs%s folder. The current "
+"log file is called gpredict.log and the file is always kept until the next "
+"execution so that you can examine it in case of a failure. If old log files "
+"are kept, they are called gpredict-XYZ.log where XYZ is a uniques timestamp."
msgstr ""
"Gpredict stores all run-time messages in the %s%s.gpredict2%slogs%s folder. "
"The current log file is called gpredict.log and the file is always kept "
@@ -3907,19 +3900,19 @@
msgid "Sky at a Glance"
msgstr "Sky at a Glance"
-#: ../src/sat-pref-qth.c:222 ../src/sat-pref-qth.c:992
+#: ../src/sat-pref-qth.c:223 ../src/sat-pref-qth.c:987
msgid "Alt (ft)"
msgstr "Alt (ft)"
-#: ../src/sat-pref-qth.c:228 ../src/sat-pref-qth.c:997
+#: ../src/sat-pref-qth.c:229 ../src/sat-pref-qth.c:992
msgid "Alt (m)"
msgstr "Alt (m)"
-#: ../src/sat-pref-qth.c:237
+#: ../src/sat-pref-qth.c:238
msgid "QRA"
msgstr "QRA"
-#: ../src/sat-pref-qth.c:256
+#: ../src/sat-pref-qth.c:257
msgid "Default"
msgstr "Default"
@@ -3933,7 +3926,7 @@
msgid "%s:%d: Error reading %s (see prev msg)"
msgstr "%s:%d: Error reading %s (see prev msg)"
-#: ../src/sat-pref-qth.c:335 ../src/sat-pref-qth.c:935
+#: ../src/sat-pref-qth.c:335 ../src/sat-pref-qth.c:930
#, c-format
msgid "%s:%d: Failed to open user cfg dir (%s)"
msgstr "%s:%d: Failed to open user cfg dir (%s)"
@@ -3958,8 +3951,8 @@
msgid "%s:%d: This appears to be the default QTH."
msgstr "%s:%d: This appears to be the default QTH."
-#: ../src/sat-pref-qth.c:478 ../src/sat-pref-rig.c:330
-#: ../src/sat-pref-rot.c:295
+#: ../src/sat-pref-qth.c:478 ../src/sat-pref-rig.c:326
+#: ../src/sat-pref-rot.c:291
msgid "Add New"
msgstr "Add New"
@@ -3967,8 +3960,8 @@
msgid "Add a new ground station to the list"
msgstr "Add a new ground station to the list"
-#: ../src/sat-pref-qth.c:484 ../src/sat-pref-rig.c:336
-#: ../src/sat-pref-rot.c:301
+#: ../src/sat-pref-qth.c:484 ../src/sat-pref-rig.c:332
+#: ../src/sat-pref-rot.c:297
msgid "Edit"
msgstr "Edit"
@@ -4016,27 +4009,27 @@
msgid "%s:%d: Clearing default flag for %s."
msgstr "%s:%d: Clearing default flag for %s."
-#: ../src/sat-pref-qth.c:864
+#: ../src/sat-pref-qth.c:860
#, c-format
msgid "%s:%d: %s appears to be default QTH"
msgstr "%s:%d: %s appears to be default QTH"
-#: ../src/sat-pref-qth.c:920
+#: ../src/sat-pref-qth.c:915
#, c-format
msgid "%s:%d: Failed top remove %s"
msgstr "%s:%d: Failed top remove %s"
-#: ../src/sat-pref-qth.c:925
+#: ../src/sat-pref-qth.c:920
#, c-format
msgid "%s:%d: Removed %s"
msgstr "%s:%d: Removed %s"
#. crate dialog and add contents
-#: ../src/sat-pref-qth-editor.c:112 ../src/qth-editor.c:109
+#: ../src/sat-pref-qth-editor.c:112 ../src/qth-editor.c:110
msgid "Edit ground station data"
msgstr "Edit ground station data"
-#: ../src/sat-pref-qth-editor.c:192 ../src/qth-editor.c:207
+#: ../src/sat-pref-qth-editor.c:192 ../src/qth-editor.c:208
msgid ""
"Enter a short name for this ground station, e.g. callsign.\n"
"Allowed characters: 0..9, a..z, A..Z, - and _"
@@ -4044,7 +4037,7 @@
"Enter a short name for this ground station, e.g. callsign.\n"
"Allowed characters: 0..9, a..z, A..Z, - and _"
-#: ../src/sat-pref-qth-editor.c:194 ../src/qth-editor.c:209
+#: ../src/sat-pref-qth-editor.c:194 ../src/qth-editor.c:210
msgid ""
"The name will be used to identify the ground station when it is presented to "
"the user. Maximum allowed length is 25 characters."
@@ -4053,11 +4046,11 @@
"the user. Maximum allowed length is 25 characters."
#. QTH description
-#: ../src/sat-pref-qth-editor.c:205 ../src/qth-editor.c:220
+#: ../src/sat-pref-qth-editor.c:205 ../src/qth-editor.c:221
msgid "Description"
msgstr "Description"
-#: ../src/sat-pref-qth-editor.c:213 ../src/qth-editor.c:228
+#: ../src/sat-pref-qth-editor.c:213 ../src/qth-editor.c:229
msgid "Enter an optional description for this ground station."
msgstr "Enter an optional description for this ground station."
@@ -4071,63 +4064,63 @@
"when generating reports. The maximum length for the description is 256 "
"characters."
-#: ../src/sat-pref-qth-editor.c:228 ../src/qth-editor.c:243
+#: ../src/sat-pref-qth-editor.c:228 ../src/qth-editor.c:244
msgid "Optional location of the ground station, fx. Copenhagen, Denmark."
msgstr "Optional location of the ground station, fx. Copenhagen, Denmark."
#: ../src/sat-pref-qth-editor.c:232 ../src/sat-pref-qth-editor.c:353
-#: ../src/qth-editor.c:247 ../src/qth-editor.c:368
+#: ../src/qth-editor.c:248 ../src/qth-editor.c:369
msgid "Select"
msgstr "Select"
-#: ../src/sat-pref-qth-editor.c:233 ../src/qth-editor.c:248
+#: ../src/sat-pref-qth-editor.c:233 ../src/qth-editor.c:249
msgid "Select a predefined location from a list."
msgstr "Select a predefined location from a list."
#. latitude
-#: ../src/sat-pref-qth-editor.c:241 ../src/qth-editor.c:256
+#: ../src/sat-pref-qth-editor.c:241 ../src/qth-editor.c:257
msgid "Latitude (°)"
msgstr "Latitude (°)"
-#: ../src/sat-pref-qth-editor.c:251 ../src/qth-editor.c:266
+#: ../src/sat-pref-qth-editor.c:251 ../src/qth-editor.c:267
msgid "Select the latitude of the ground station in decimal degrees."
msgstr "Select the latitude of the ground station in decimal degrees."
-#: ../src/sat-pref-qth-editor.c:256 ../src/qth-editor.c:271
+#: ../src/sat-pref-qth-editor.c:256 ../src/qth-editor.c:272
msgid "North"
msgstr "North"
-#: ../src/sat-pref-qth-editor.c:257 ../src/qth-editor.c:272
+#: ../src/sat-pref-qth-editor.c:257 ../src/qth-editor.c:273
msgid "South"
msgstr "South"
#. longitude
-#: ../src/sat-pref-qth-editor.c:263 ../src/qth-editor.c:278
+#: ../src/sat-pref-qth-editor.c:263 ../src/qth-editor.c:279
msgid "Longitude (°)"
msgstr "Longitude (°)"
-#: ../src/sat-pref-qth-editor.c:272 ../src/qth-editor.c:287
+#: ../src/sat-pref-qth-editor.c:272 ../src/qth-editor.c:288
msgid "Select the longitude of the ground station in decimal degrees."
msgstr "Select the longitude of the ground station in decimal degrees."
-#: ../src/sat-pref-qth-editor.c:277 ../src/qth-editor.c:292
+#: ../src/sat-pref-qth-editor.c:277 ../src/qth-editor.c:293
msgid "East"
msgstr "East"
-#: ../src/sat-pref-qth-editor.c:278 ../src/qth-editor.c:293
+#: ../src/sat-pref-qth-editor.c:278 ../src/qth-editor.c:294
msgid "West"
msgstr "West"
#. QRA locator
-#: ../src/sat-pref-qth-editor.c:302 ../src/qth-editor.c:317
+#: ../src/sat-pref-qth-editor.c:302 ../src/qth-editor.c:318
msgid "Locator"
msgstr "Locator"
-#: ../src/sat-pref-qth-editor.c:310 ../src/qth-editor.c:325
+#: ../src/sat-pref-qth-editor.c:310 ../src/qth-editor.c:326
msgid "Maidenhead locator grid."
msgstr "Maidenhead locator grid."
-#: ../src/sat-pref-qth-editor.c:326 ../src/qth-editor.c:341
+#: ../src/sat-pref-qth-editor.c:326 ../src/qth-editor.c:342
msgid ""
"Select the altitude of the ground station in meters or feet depending on "
"your settings"
@@ -4135,24 +4128,24 @@
"Select the altitude of the ground station in meters or feet depending on "
"your settings"
-#: ../src/sat-pref-qth-editor.c:332 ../src/qth-editor.c:347
+#: ../src/sat-pref-qth-editor.c:332 ../src/qth-editor.c:348
msgid "ft asl"
msgstr "ft asl"
-#: ../src/sat-pref-qth-editor.c:335 ../src/qth-editor.c:350
+#: ../src/sat-pref-qth-editor.c:335 ../src/qth-editor.c:351
msgid "m asl"
msgstr "m asl"
#. weather station
-#: ../src/sat-pref-qth-editor.c:341 ../src/qth-editor.c:356
+#: ../src/sat-pref-qth-editor.c:341 ../src/qth-editor.c:357
msgid "Weather St"
msgstr "Weather St"
-#: ../src/sat-pref-qth-editor.c:349 ../src/qth-editor.c:364
+#: ../src/sat-pref-qth-editor.c:349 ../src/qth-editor.c:365
msgid "Four letter code for weather station"
msgstr "Four letter code for weather station"
-#: ../src/sat-pref-qth-editor.c:354 ../src/qth-editor.c:369
+#: ../src/sat-pref-qth-editor.c:354 ../src/qth-editor.c:370
msgid "Select a predefined weather station from a list."
msgstr "Select a predefined weather station from a list."
@@ -4179,22 +4172,22 @@
"%s:%d: Oooops, gpredict encountered an internal error (no selection in qth "
"list)"
-#: ../src/sat-pref-qth-editor.c:744 ../src/qth-editor.c:726
+#: ../src/sat-pref-qth-editor.c:744 ../src/qth-editor.c:724
#, c-format
msgid "%s:%s: %.2f %.2f => %s"
msgstr "%s:%s: %.2f %.2f => %s"
-#: ../src/sat-pref-qth-editor.c:759 ../src/qth-editor.c:741
+#: ../src/sat-pref-qth-editor.c:759 ../src/qth-editor.c:739
#, c-format
msgid "%s:%d: Error converting lon/lat to locator"
msgstr "%s:%d: Error converting lon/lat to locator"
-#: ../src/sat-pref-qth-editor.c:787 ../src/qth-editor.c:769
+#: ../src/sat-...
[truncated message content] |
