gpredict-svn Mailing List for Gpredict (Page 33)
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...> - 2008-10-26 17:24:30
|
Revision: 166
http://gpredict.svn.sourceforge.net/gpredict/?rev=166&view=rev
Author: csete
Date: 2008-10-26 17:24:21 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Added files.
Added Paths:
-----------
trunk/src/sat-info.c
trunk/src/sat-info.h
Added: trunk/src/sat-info.c
===================================================================
--- trunk/src/sat-info.c (rev 0)
+++ trunk/src/sat-info.c 2008-10-26 17:24:21 UTC (rev 166)
@@ -0,0 +1,407 @@
+/* -*- 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/
+*/
+/** \brief Satellite info
+ */
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include "sgpsdp/sgp4sdp4.h"
+#include "sat-log.h"
+#include "config-keys.h"
+#include "sat-cfg.h"
+#ifdef HAVE_CONFIG_H
+# include <build-config.h>
+#endif
+#include "orbit-tools.h"
+#include "predict-tools.h"
+#include "sat-pass-dialogs.h"
+#include "sat-info.h"
+
+
+
+
+
+
+static gchar *epoch_to_str (sat_t *sat);
+
+
+/** \brief Show satellite info in a dialog
+ * \param menuitem The menuitem from where the function is invoked.
+ * \param data Pointer to parent window or NULL.
+ *
+ * FIXME: see nice drawing at http://www.amsat.org/amsat-new/tools/keps_tutorial.php
+ *
+*/
+void
+show_sat_info (GtkWidget *menuitem, gpointer data)
+{
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWindow *toplevel = NULL;
+ sat_t *sat;
+ gchar *str;
+
+
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+
+ if (data != NULL)
+ toplevel = GTK_WINDOW (data);
+
+ /* create table */
+ table = gtk_table_new (20, 4, FALSE);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 10);
+
+ /* create table contents and add them to table */
+
+ /* satellite name */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), _("<b>Satellite name:</b>"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+
+ label = gtk_label_new (NULL);
+ str = g_strdup_printf (_("<b>%s</b>"), sat->tle.sat_name);
+ gtk_label_set_markup (GTK_LABEL (label), str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1);
+ g_free (str);
+
+ /* operational status */
+ label = gtk_label_new (_("Operational Status:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+
+ switch (sat->tle.status) {
+
+ case OP_STAT_OPERATIONAL:
+ label = gtk_label_new (_("Operational"));
+ break;
+
+ case OP_STAT_NONOP:
+ label = gtk_label_new (_("Non-operational"));
+ break;
+
+ case OP_STAT_PARTIAL:
+ label = gtk_label_new (_("Partially operational"));
+ break;
+
+ case OP_STAT_STDBY:
+ label = gtk_label_new (_("Backup/Standby"));
+ break;
+
+ case OP_STAT_SPARE:
+ label = gtk_label_new (_("Spare"));
+ break;
+
+ case OP_STAT_EXTENDED:
+ label = gtk_label_new (_("Extended Mission"));
+ break;
+
+ default:
+ label = gtk_label_new (_("Unknown"));
+ break;
+
+ }
+
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 1, 2);
+
+ /* Catnum */
+ label = gtk_label_new (_("Catalogue number:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+
+ str = g_strdup_printf ("%d", sat->tle.catnr);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 2, 3);
+ g_free (str);
+
+ /* international designator */
+ label = gtk_label_new (_("Internation designator:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+
+ label = gtk_label_new (sat->tle.idesg);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 3, 4);
+
+ /* elset number */
+ label = gtk_label_new (_("Element set number:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
+
+ str = g_strdup_printf ("%d", sat->tle.elset);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 4, 5);
+ g_free (str);
+
+ /* elset epoch */
+ label = gtk_label_new (_("Epoch time:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6);
+
+ str = epoch_to_str (sat);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 5, 6);
+ g_free (str);
+
+ /* Revolution Number @ Epoch */
+ label = gtk_label_new (_("Orbit number @ epoch:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 6, 7);
+
+ str = g_strdup_printf ("%d", sat->tle.revnum);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 6, 7);
+ g_free (str);
+
+ /* ephermis type left out, since it is always 0 */
+
+ /* separator */
+ gtk_table_attach_defaults (GTK_TABLE (table),
+ gtk_hseparator_new (),
+ 0, 4, 7, 8);
+
+ /* Orbit inclination */
+ label = gtk_label_new (_("Inclination:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 8, 9);
+
+ str = g_strdup_printf ("%.4f\302\260", sat->tle.xincl/de2ra);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 8, 9);
+ g_free (str);
+
+ /* RAAN */
+ label = gtk_label_new (_("RAAN:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 9, 10);
+
+ str = g_strdup_printf ("%.4f\302\260", sat->tle.xnodeo/de2ra);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 9, 10);
+ g_free (str);
+
+ /* Eccentricity */
+ label = gtk_label_new (_("Eccentricity:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 10, 11);
+
+ str = g_strdup_printf ("%.7f", sat->tle.eo);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 10, 11);
+ g_free (str);
+
+ /* Argument of perigee */
+ label = gtk_label_new (_("Arg. of perigee:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 11, 12);
+
+ str = g_strdup_printf ("%.4f\302\260", sat->tle.omegao/de2ra);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 11, 12);
+ g_free (str);
+
+ /* Mean Anomaly */
+ label = gtk_label_new (_("Mean anomaly:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 12, 13);
+
+ str = g_strdup_printf ("%.4f\302\260", sat->tle.xmo/de2ra);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 12, 13);
+ g_free (str);
+
+ /* Mean Motion */
+ label = gtk_label_new (_("Mean motion:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 13, 14);
+
+ //str = g_strdup_printf ("%.4f [rev/day]", sat->tle.xno/(xmnpda*(twopi/xmnpda/xmnpda)));
+ str = g_strdup_printf ("%.8f [rev/day]", sat->meanmo);
+ label = gtk_label_new (str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 13, 14);
+ g_free (str);
+
+ /* one half of the first time derivative of mean motion */
+ label = gtk_label_new (_("\302\275 d/dt (mean motion):"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 14, 15);
+
+ str = g_strdup_printf ("%.5e [rev/day<sup>2</sup>]",
+ sat->tle.xndt2o/(twopi/xmnpda/xmnpda));
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 14, 15);
+ g_free (str);
+
+ /* one sixth of the second time derivative of mean motion */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label),
+ _("1/6 d<sup>2</sup>/dt<sup>2</sup> (mean motion):"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 15, 16);
+
+ str = g_strdup_printf ("%.5e [rev/day<sup>3</sup>]",
+ sat->tle.xndd6o*xmnpda/(twopi/xmnpda/xmnpda));
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 15, 16);
+ g_free (str);
+
+ /* B* drag term */
+ label = gtk_label_new (_("B* drag term:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 16, 17);
+
+ str = g_strdup_printf ("%.5e [R<sub>E</sub><sup>-1</sup>]", sat->tle.bstar*ae);
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), str);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 16, 17);
+ g_free (str);
+
+ /* Orbit type */
+
+ /* Next Event */
+
+
+
+ gtk_widget_show_all (table);
+
+ /* create dialog window with NULL parent */
+ dialog = gtk_dialog_new_with_buttons (_("Satellite Info"),
+ toplevel,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ /* allow interaction with other windows */
+ gtk_window_set_modal (GTK_WINDOW (dialog), FALSE);
+
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), NULL);
+ g_signal_connect (dialog, "destroy",
+ G_CALLBACK (gtk_widget_destroyed), &dialog);
+
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table);
+
+ gtk_widget_show_all (dialog);
+
+
+}
+
+
+
+/* BBBBB.BBBBBBBB] - Epoch Time -- 2-digit year, followed by 3-digit sequential
+ day of the year, followed by the time represented as the
+ fractional portion of one day, but...
+
+ we now have the converted fields, tle->epoch_year, tle->epoch_day and tle->epoch_fod
+
+*/
+static gchar *
+epoch_to_str (sat_t *sat)
+{
+ GDate *epd;
+ guint h,m,s,sec;
+ gchar *buff;
+ gchar *fmt;
+ struct tm tms;
+ time_t t;
+ guint size;
+
+ /* http://celestrak.com/columns/v04n03/#FAQ02
+ ... While talking about the epoch, this is perhaps a good place to answer
+ the other time-related questions. First, how is the epoch time format
+ interpreted? This question is best answered by using an example. An epoch
+ of 98001.00000000 corresponds to 0000 UT on 1998 January 01st in other
+ words, midnight between 1997 December 31 and 1998 January 01. An epoch of
+ 98000.00000000 would actually correspond to the beginning of 1997 December
+ 31st strange as that might seem. Note that the epoch day starts at UT
+ midnight (not noon) and that all times are measured mean solar rather than
+ sidereal time units (the answer to our third question).
+ */
+ epd = g_date_new_dmy (1, 1, sat->tle.epoch_year);
+ g_date_add_days (epd, sat->tle.epoch_day-1);
+
+ /* convert date to struct tm */
+ g_date_to_struct_tm (epd, &tms);
+
+ /* add HMS */
+ sec = (guint) floor (sat->tle.epoch_fod * 86400); /* fraction of day in seconds */
+
+ /* hour */
+ h = (guint) floor (sec / 3600);
+ tms.tm_hour = h;
+
+ /* minutes */
+ m = (guint) floor ((sec - (h*3600)) / 60);
+ tms.tm_min = m;
+
+ s = (guint) floor (sec - (h*3600) - (m*60));
+ tms.tm_sec = s;
+
+ /* get format string */
+ fmt = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
+
+ /* format either local time or UTC depending on check box */
+ t = mktime (&tms);
+ buff = g_try_malloc (51);
+
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
+ size = strftime (buff, 50, fmt, localtime (&t));
+ else
+ size = strftime (buff, 50, fmt, gmtime (&t));
+
+ if (size < 50)
+ buff[size]='\0';
+ else
+ buff[50]='\0';
+
+ g_date_free (epd);
+ g_free (fmt);
+
+ return buff;
+}
+
Added: trunk/src/sat-info.h
===================================================================
--- trunk/src/sat-info.h (rev 0)
+++ trunk/src/sat-info.h 2008-10-26 17:24:21 UTC (rev 166)
@@ -0,0 +1,38 @@
+/* -*- 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 SAT_INFO_H
+#define SAT_INFO_H 1
+
+#include <gtk/gtk.h>
+#include "sgpsdp/sgp4sdp4.h"
+#include "gtk-sat-data.h"
+
+
+void show_sat_info (GtkWidget *menuitem, gpointer data);
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-26 17:19:15
|
Revision: 165
http://gpredict.svn.sourceforge.net/gpredict/?rev=165&view=rev
Author: csete
Date: 2008-10-26 17:19:12 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Added new files.
Modified Paths:
--------------
trunk/src/Makefile.am
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-10-26 17:17:47 UTC (rev 164)
+++ trunk/src/Makefile.am 2008-10-26 17:19:12 UTC (rev 165)
@@ -45,6 +45,7 @@
gtk-sat-data.c gtk-sat-data.h \
gtk-sat-list.c gtk-sat-list.h \
gtk-sat-list-col-sel.c gtk-sat-list-col-sel.h \
+ gtk-sat-list-popup.c gtk-sat-list-poup.h \
gtk-sat-map.c gtk-sat-map.h \
gtk-sat-map-popup.c gtk-sat-map-popup.h \
gtk-sat-map-ground-track.c gtk-sat-map-ground-track.h \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-26 17:17:54
|
Revision: 164
http://gpredict.svn.sourceforge.net/gpredict/?rev=164&view=rev
Author: csete
Date: 2008-10-26 17:17:47 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Use new gtk-sat-list-popup.
Modified Paths:
--------------
trunk/src/gtk-sat-list.c
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2008-10-26 17:17:07 UTC (rev 163)
+++ trunk/src/gtk-sat-list.c 2008-10-26 17:17:47 UTC (rev 164)
@@ -37,7 +37,7 @@
#include "config-keys.h"
#include "sat-cfg.h"
#include "mod-cfg-get-param.h"
-#include "sat-popup-menu.h"
+#include "gtk-sat-list-popup.h"
#include "gtk-sat-data.h"
#include "gpredict-utils.h"
#include "locator.h"
@@ -1230,8 +1230,8 @@
}
else {
- sat_popup_menu_exec (sat, GTK_SAT_LIST (list)->qth, event,
- gtk_widget_get_toplevel (treeview));
+ gtk_sat_list_popup_exec (sat, GTK_SAT_LIST (list)->qth, event,
+ GTK_SAT_LIST (list));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-26 17:17:11
|
Revision: 163
http://gpredict.svn.sourceforge.net/gpredict/?rev=163&view=rev
Author: csete
Date: 2008-10-26 17:17:07 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Fixed compilation errors.
Modified Paths:
--------------
trunk/src/gtk-sat-list-popup.c
Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c 2008-10-26 17:12:13 UTC (rev 162)
+++ trunk/src/gtk-sat-list-popup.c 2008-10-26 17:17:07 UTC (rev 163)
@@ -56,7 +56,7 @@
* \param toplevel The top level window.
*/
void
-sat_popup_menu_exec (sat_t *sat, qth_t *qth, GdkEventButton *event, GtkSatList *list)
+gtk_sat_list_popup_exec (sat_t *sat, qth_t *qth, GdkEventButton *event, GtkSatList *list)
{
GtkWidget *menu;
GtkWidget *menuitem;
@@ -85,7 +85,7 @@
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
g_signal_connect (menuitem, "activate",
G_CALLBACK (show_sat_info),
- gtk_widgeT_get_toplevel (GTK_WIDGET (list)));
+ gtk_widget_get_toplevel (GTK_WIDGET (list)));
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
@@ -142,7 +142,7 @@
qth_t *qth;
pass_t *pass;
GtkWidget *dialog;
- GtkWindow *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (data));
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
GtkSatList *list = GTK_SAT_LIST (data);
@@ -207,7 +207,7 @@
show_future_passes_cb (GtkWidget *menuitem, gpointer data)
{
GtkWidget *dialog;
- GtkWindow *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (data));
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
GtkSatList *list = GTK_SAT_LIST (data);
GSList *passes = NULL;
sat_t *sat;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-26 17:12:20
|
Revision: 162
http://gpredict.svn.sourceforge.net/gpredict/?rev=162&view=rev
Author: csete
Date: 2008-10-26 17:12:13 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Added files.
Added Paths:
-----------
trunk/src/gtk-sat-list-popup.c
trunk/src/gtk-sat-list-popup.h
Added: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c (rev 0)
+++ trunk/src/gtk-sat-list-popup.c 2008-10-26 17:12:13 UTC (rev 162)
@@ -0,0 +1,275 @@
+/* -*- 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/
+*/
+/** \brief Pop-up menu used by GtkSatList.
+ */
+#include <gtk/gtk.h>
+#include <glib/gi18n.h>
+#include "sgpsdp/sgp4sdp4.h"
+#include "sat-log.h"
+#include "config-keys.h"
+#include "sat-cfg.h"
+#ifdef HAVE_CONFIG_H
+# include <build-config.h>
+#endif
+#include "orbit-tools.h"
+#include "predict-tools.h"
+#include "sat-pass-dialogs.h"
+#include "gtk-sat-list-popup.h"
+#include "sat-popup-menu.h"
+
+
+
+
+void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
+void show_future_passes_cb (GtkWidget *menuitem, gpointer data);
+
+
+/** \brief Show satellite popup menu.
+ * \param sat Pointer to the satellite data.
+ * \param qth The current location.
+ * \param event The mouse-click related event info.
+ * \param toplevel The top level window.
+ */
+void
+sat_popup_menu_exec (sat_t *sat, qth_t *qth, GdkEventButton *event, GtkSatList *list)
+{
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ GtkWidget *label;
+ GtkWidget *image;
+ gchar *buff;
+
+
+
+ menu = gtk_menu_new ();
+
+ /* first menu item is the satellite name, centered */
+ menuitem = gtk_image_menu_item_new ();
+ label = gtk_label_new (NULL);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5);
+ buff = g_strdup_printf ("<b>%s</b>", sat->tle.sat_name);
+ gtk_label_set_markup (GTK_LABEL (label), buff);
+ g_free (buff);
+ gtk_container_add (GTK_CONTAINER (menuitem), label);
+ image = gtk_image_new_from_stock (GTK_STOCK_INFO,
+ GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
+
+ /* attach data to menuitem and connect callback */
+ g_object_set_data (G_OBJECT (menuitem), "sat", sat);
+ g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (show_sat_info),
+ gtk_widgeT_get_toplevel (GTK_WIDGET (list)));
+
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+
+ /* separator */
+ menuitem = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+
+ /* next pass and predict passes */
+ menuitem = gtk_image_menu_item_new_with_label (_("Show next pass"));
+ image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL,
+ GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
+ g_object_set_data (G_OBJECT (menuitem), "sat", sat);
+ g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (show_next_pass_cb),
+ list);
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+
+ menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
+ image = gtk_image_new_from_stock (GTK_STOCK_INDEX,
+ GTK_ICON_SIZE_MENU);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
+ g_object_set_data (G_OBJECT (menuitem), "sat", sat);
+ g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (show_future_passes_cb),
+ list);
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+
+
+ gtk_widget_show_all (menu);
+
+ /* Note: event can be NULL here when called from view_onPopupMenu;
+ * gdk_event_get_time() accepts a NULL argument */
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+ (event != NULL) ? event->button : 0,
+ gdk_event_get_time ((GdkEvent*) event));
+
+
+}
+
+
+
+
+
+/** \brief Show details of the next pass.
+ *
+ */
+void
+show_next_pass_cb (GtkWidget *menuitem, gpointer data)
+{
+ sat_t *sat;
+ qth_t *qth;
+ pass_t *pass;
+ GtkWidget *dialog;
+ GtkWindow *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (data));
+ GtkSatList *list = GTK_SAT_LIST (data);
+
+
+ /* get next pass */
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+
+ /* check wheather sat actially has AOS */
+ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
+ has_aos (sat, qth)) {
+
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ pass = get_next_pass (sat, qth,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+ }
+ else {
+ pass = get_pass (sat, qth, list->tstamp,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+ }
+
+ if (pass != NULL) {
+ show_pass (sat->tle.sat_name, qth, pass, GTK_WIDGET (toplevel));
+ }
+ else {
+ /* show dialog that there are no passes within time frame */
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes\n"\
+ "within the next %d days"),
+ sat->tle.sat_name,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+ }
+ else {
+ /* show dialog telling that this sat never reaches AOS*/
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes for\n"\
+ "the current ground station!\n\n"\
+ "This can be because the satellite\n"\
+ "is geostationary, decayed or simply\n"\
+ "never comes above the horizon"),
+ sat->tle.sat_name);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+}
+
+
+void
+show_future_passes_cb (GtkWidget *menuitem, gpointer data)
+{
+ GtkWidget *dialog;
+ GtkWindow *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (data));
+ GtkSatList *list = GTK_SAT_LIST (data);
+ GSList *passes = NULL;
+ sat_t *sat;
+ qth_t *qth;
+
+
+
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+
+ /* check wheather sat actially has AOS */
+ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
+ has_aos (sat, qth)) {
+
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ passes = get_next_passes (sat, qth,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
+ }
+ else {
+ passes = get_passes (sat, qth, list->tstamp,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
+ }
+
+ if (passes != NULL) {
+ show_passes (sat->tle.sat_name, qth, passes, GTK_WIDGET (toplevel));
+ }
+ else {
+ /* show dialog that there are no passes within time frame */
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes\n"\
+ "within the next %d days"),
+ sat->tle.sat_name,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+ }
+ else {
+ /* show dialog */
+ GtkWidget *dialog;
+
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes for\n"\
+ "the current ground station!"),
+ sat->tle.sat_name);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+}
+
+
+
Added: trunk/src/gtk-sat-list-popup.h
===================================================================
--- trunk/src/gtk-sat-list-popup.h (rev 0)
+++ trunk/src/gtk-sat-list-popup.h 2008-10-26 17:12:13 UTC (rev 162)
@@ -0,0 +1,42 @@
+/* -*- 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 GTK_SAT_LIST_POPUP_H
+#define GTK_SAT_LIST_POPUP_H 1
+
+#include <gtk/gtk.h>
+#include "sgpsdp/sgp4sdp4.h"
+#include "gtk-sat-data.h"
+#include "gtk-sat-list.h"
+
+
+void gtk_sat_list_popup_exec (sat_t *sat, qth_t *qth,
+ GdkEventButton *event,
+ GtkSatList *list);
+
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-25 22:30:50
|
Revision: 161
http://gpredict.svn.sourceforge.net/gpredict/?rev=161&view=rev
Author: csete
Date: 2008-10-25 22:30:41 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Uodated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/sat-pref-conditions.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-25 22:07:53 UTC (rev 160)
+++ trunk/ChangeLog 2008-10-25 22:30:41 UTC (rev 161)
@@ -1,3 +1,20 @@
+2008-10-25; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-sky-glance.[ch]:
+ Added start time as parameter.
+
+ * src/gtk-sat-module-popup.c:
+ Use real time or simulated time for sky at glance start depending
+ on user settings.
+
+ * src/gtk-single-sat.[ch]:
+ * src/gtk-sat-module.c:
+ * src/gtk-polar-view-popup.c:
+ * src/gtk-sat-map-popup.c:
+ Use real or simulated time for pass predictions. Enabled tooltips for
+ labels in GtkSingleSat.
+
+
2008-10-24; Alexandru Csete <oz...@gm...>
* src/sat-cfg.[ch]:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-10-25 22:07:53 UTC (rev 160)
+++ trunk/NEWS 2008-10-25 22:30:41 UTC (rev 161)
@@ -1,10 +1,11 @@
+Changes in version 1.0 (beta):
-Changes in version 1.0 (TBD):
-
- Radio doppler tuning via hamlibs rigctld.
- Antenna rotator control via hamlibs rotctld.
- User defined twilight threshold for predicting satellite visibility.
- Feature request 1705375: Restore main window position and size.
+* Feature request 2192404: Starting time for pass predictions.
+* Feature request 2194621: Data recorder.
- Fixed bug 1752908: New satellites in TLE files.
- Fixed bug 1818144: No log file created at first execution.
- Fixed bug 1839140: Sky at a glance axis incorrectly labelled.
Modified: trunk/src/sat-pref-conditions.c
===================================================================
--- trunk/src/sat-pref-conditions.c 2008-10-25 22:07:53 UTC (rev 160)
+++ trunk/src/sat-pref-conditions.c 2008-10-25 22:30:41 UTC (rev 161)
@@ -339,7 +339,7 @@
G_CALLBACK (spin_changed_cb), NULL);
gtk_table_attach (GTK_TABLE (table), tzero, 0, 3, 13, 14,
- GTK_FILL, GTK_SHRINK,
+ GTK_FILL | GTK_EXPAND, GTK_SHRINK,
0, 0);
/* create vertical box */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-25 22:22:11
|
Revision: 158
http://gpredict.svn.sourceforge.net/gpredict/?rev=158&view=rev
Author: csete
Date: 2008-10-25 21:44:36 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Use real or simulated time for pass predictions.
Modified Paths:
--------------
trunk/src/gtk-sat-module.c
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2008-10-25 21:20:54 UTC (rev 157)
+++ trunk/src/gtk-sat-module.c 2008-10-25 21:44:36 UTC (rev 158)
@@ -506,8 +506,9 @@
module->satellites,
module->qth,
0);
- break;
+ break;
+
default:
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s:%d: Invalid child type (%d)\nUsing GtkSatList..."),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-25 22:07:56
|
Revision: 160
http://gpredict.svn.sourceforge.net/gpredict/?rev=160&view=rev
Author: csete
Date: 2008-10-25 22:07:53 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Use real or simulated time for pass predictions.
Modified Paths:
--------------
trunk/src/gtk-sat-map-popup.c
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2008-10-25 21:55:36 UTC (rev 159)
+++ trunk/src/gtk-sat-map-popup.c 2008-10-25 22:07:53 UTC (rev 160)
@@ -51,6 +51,8 @@
static void coverage_toggled (GtkCheckMenuItem *item, gpointer data);
static void track_toggled (GtkCheckMenuItem *item, gpointer data);
/* static void target_toggled (GtkCheckMenuItem *item, gpointer data); */
+static void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
+static void show_next_passes_cb (GtkWidget *menuitem, gpointer data);
/** \brief Show satellite popup menu.
@@ -106,7 +108,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass), toplevel);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), satmap);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
@@ -114,7 +116,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes), toplevel);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_passes_cb), satmap);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
/* separator */
@@ -265,6 +267,143 @@
}
+static void show_next_pass_cb (GtkWidget *menuitem, gpointer data)
+{
+ GtkSatMap *satmap = GTK_SAT_MAP (data);
+ sat_t *sat;
+ qth_t *qth;
+ pass_t *pass;
+ GtkWidget *dialog;
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
+
+
+ /* get next pass */
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+
+ /* check wheather sat actially has AOS */
+ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
+ has_aos (sat, qth)) {
+ if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ pass = get_next_pass (sat, qth,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+ }
+ else {
+ pass = get_pass (sat, qth, satmap->tstamp,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+ }
+
+ if (pass != NULL) {
+ show_pass (sat->tle.sat_name, qth, pass, GTK_WIDGET (toplevel));
+ }
+ else {
+ /* show dialog that there are no passes within time frame */
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes\n"\
+ "within the next %d days"),
+ sat->tle.sat_name,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+ }
+ else {
+ /* show dialog telling that this sat never reaches AOS*/
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes for\n"\
+ "the current ground station!\n\n"\
+ "This can be because the satellite\n"\
+ "is geostationary, decayed or simply\n"\
+ "never comes above the horizon"),
+ sat->tle.sat_name);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+}
+
+
+static void show_next_passes_cb (GtkWidget *menuitem, gpointer data)
+{
+ GtkSatMap *satmap = GTK_SAT_MAP (data);
+ GtkWidget *dialog;
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
+ GSList *passes = NULL;
+ sat_t *sat;
+ qth_t *qth;
+
+
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+
+ /* check wheather sat actially has AOS */
+ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
+ has_aos (sat, qth)) {
+
+ if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ passes = get_next_passes (sat, qth,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
+ }
+ else {
+ passes = get_passes (sat, qth, satmap->tstamp,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
+
+ }
+
+
+ if (passes != NULL) {
+ show_passes (sat->tle.sat_name, qth, passes, GTK_WIDGET (toplevel));
+ }
+ else {
+ /* show dialog that there are no passes within time frame */
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes\n"\
+ "within the next %d days"),
+ sat->tle.sat_name,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+ }
+ else {
+ /* show dialog */
+ GtkWidget *dialog;
+
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes for\n"\
+ "the current ground station!"),
+ sat->tle.sat_name);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+}
+
+
+
#if 0
/** \brief Manage toggling of Set Target.
* \param item The menu item that was toggled.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-25 21:55:45
|
Revision: 159
http://gpredict.svn.sourceforge.net/gpredict/?rev=159&view=rev
Author: csete
Date: 2008-10-25 21:55:36 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Use real or simulated time for pass predictions.
Modified Paths:
--------------
trunk/src/gtk-polar-view-popup.c
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2008-10-25 21:44:36 UTC (rev 158)
+++ trunk/src/gtk-polar-view-popup.c 2008-10-25 21:55:36 UTC (rev 159)
@@ -50,7 +50,10 @@
static void track_toggled (GtkCheckMenuItem *item, gpointer data);
/* static void target_toggled (GtkCheckMenuItem *item, gpointer data); */
static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y);
+static void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
+static void show_next_passes_cb (GtkWidget *menuitem, gpointer data);
+
/** \brief Show satellite popup menu.
* \param sat Pointer to the satellite data.
* \param qth The current location.
@@ -106,7 +109,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass), toplevel);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), pview);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
@@ -114,7 +117,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes), toplevel);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_passes_cb), pview);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
/* separator */
@@ -358,3 +361,141 @@
return item;
}
+
+
+
+static void
+show_next_pass_cb (GtkWidget *menuitem, gpointer data)
+{
+ GtkPolarView *pv = GTK_POLAR_VIEW (data);
+ sat_t *sat;
+ qth_t *qth;
+ pass_t *pass;
+ GtkWidget *dialog;
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
+
+
+ /* get next pass */
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+
+ /* check wheather sat actially has AOS */
+ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
+ has_aos (sat, qth)) {
+ if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ pass = get_next_pass (sat, qth,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+ }
+ else {
+ pass = get_pass (sat, qth, pv->tstamp,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+ }
+
+ if (pass != NULL) {
+ show_pass (sat->tle.sat_name, qth, pass, GTK_WIDGET (toplevel));
+ }
+ else {
+ /* show dialog that there are no passes within time frame */
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes\n"\
+ "within the next %d days"),
+ sat->tle.sat_name,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+ }
+ else {
+ /* show dialog telling that this sat never reaches AOS*/
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes for\n"\
+ "the current ground station!\n\n"\
+ "This can be because the satellite\n"\
+ "is geostationary, decayed or simply\n"\
+ "never comes above the horizon"),
+ sat->tle.sat_name);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+}
+
+
+static void show_next_passes_cb (GtkWidget *menuitem, gpointer data)
+{
+ GtkPolarView *pv = GTK_POLAR_VIEW (data);
+ GtkWidget *dialog;
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
+ GSList *passes = NULL;
+ sat_t *sat;
+ qth_t *qth;
+
+
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+
+ /* check wheather sat actially has AOS */
+ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
+ has_aos (sat, qth)) {
+
+ if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ passes = get_next_passes (sat, qth,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
+ }
+ else {
+ passes = get_passes (sat, qth, pv->tstamp,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
+
+ }
+
+
+ if (passes != NULL) {
+ show_passes (sat->tle.sat_name, qth, passes, GTK_WIDGET (toplevel));
+ }
+ else {
+ /* show dialog that there are no passes within time frame */
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes\n"\
+ "within the next %d days"),
+ sat->tle.sat_name,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+ }
+ else {
+ /* show dialog */
+ GtkWidget *dialog;
+
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes for\n"\
+ "the current ground station!"),
+ sat->tle.sat_name);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-25 21:21:01
|
Revision: 157
http://gpredict.svn.sourceforge.net/gpredict/?rev=157&view=rev
Author: csete
Date: 2008-10-25 21:20:54 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Use real or simulated time for pass predictions. Enabled tooltips for labels.
Modified Paths:
--------------
trunk/src/gtk-single-sat.c
trunk/src/gtk-single-sat.h
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2008-10-25 17:55:36 UTC (rev 156)
+++ trunk/src/gtk-single-sat.c 2008-10-25 21:20:54 UTC (rev 157)
@@ -45,6 +45,9 @@
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
+#include "orbit-tools.h"
+#include "predict-tools.h"
+#include "sat-pass-dialogs.h"
@@ -95,7 +98,7 @@
N_("Altitude"),
N_("Velocity"),
N_("Doppler Shift @ 100MHz"),
- N_("Signal Loss @ 100MHz"),
+ N_("Signal loss @ 100MHz"),
N_("Signal Delay"),
N_("Mean Anomaly"),
N_("Orbit Phase"),
@@ -113,9 +116,10 @@
static void Calculate_RADec (sat_t *sat, qth_t *qth, obs_astro_t *obs_set);
static void gtk_single_sat_popup_cb (GtkWidget *button, gpointer data);
static void select_satellite (GtkWidget *menuitem, gpointer data);
+static void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
+static void show_next_passes_cb (GtkWidget *menuitem, gpointer data);
-
static GtkVBoxClass *parent_class = NULL;
@@ -223,7 +227,7 @@
GTK_SINGLE_SAT (widget)->selected = 0;
GTK_SINGLE_SAT (widget)->qth = qth;
GTK_SINGLE_SAT (widget)->cfgdata = cfgdata;
-
+
/* initialise column flags */
if (fields > 0)
GTK_SINGLE_SAT (widget)->flags = fields;
@@ -281,17 +285,18 @@
gtk_table_attach (GTK_TABLE (GTK_SINGLE_SAT (widget)->table), label1,
0, 1, i, i+1,
GTK_FILL, GTK_SHRINK, 0, 0);
- /* FIXME: does not work
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, label1, SINGLE_SAT_FIELD_HINT[i], NULL);
- */
+
label2 = gtk_label_new ("-");
gtk_misc_set_alignment (GTK_MISC (label2), 0.0, 0.5);
gtk_table_attach (GTK_TABLE (GTK_SINGLE_SAT (widget)->table), label2,
1, 2, i, i+1,
GTK_FILL, GTK_SHRINK, 0, 0);
+ /* add tooltips */
+ gtk_widget_set_tooltip_text (label1, SINGLE_SAT_FIELD_HINT[i]);
+ gtk_widget_set_tooltip_text (label2, SINGLE_SAT_FIELD_HINT[i]);
+
/* store reference */
GTK_SINGLE_SAT (widget)->labels[i] = label2;
}
@@ -341,6 +346,7 @@
ssat->counter++;
}
else {
+
/* we calculate here to avoid double calc */
if ((ssat->flags & SINGLE_SAT_FLAG_RA) ||
@@ -832,10 +838,13 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", single_sat->qth);
- g_signal_connect (menuitem, "activate",
+/* g_signal_connect (menuitem, "activate",
G_CALLBACK (show_next_pass),
- gtk_widget_get_toplevel (button));
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+ gtk_widget_get_toplevel (button));*/
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (show_next_pass_cb), data);
+
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
image = gtk_image_new_from_stock (GTK_STOCK_INDEX,
@@ -843,24 +852,26 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", single_sat->qth);
- g_signal_connect (menuitem, "activate",
+/* g_signal_connect (menuitem, "activate",
G_CALLBACK (show_future_passes),
- gtk_widget_get_toplevel (button));
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+ gtk_widget_get_toplevel (button));*/
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (show_next_passes_cb), data);
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
/* separator */
- menuitem = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+// menuitem = gtk_separator_menu_item_new ();
+// gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
/* Alarm */
- menuitem = gtk_check_menu_item_new_with_label (_("Alarm"));
- gtk_widget_set_sensitive (menuitem, FALSE);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+// menuitem = gtk_check_menu_item_new_with_label (_("Alarm"));
+// gtk_widget_set_sensitive (menuitem, FALSE);
+// gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
/* Announce */
- menuitem = gtk_check_menu_item_new_with_label (_("Announce"));
- gtk_widget_set_sensitive (menuitem, FALSE);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+// menuitem = gtk_check_menu_item_new_with_label (_("Announce"));
+// gtk_widget_set_sensitive (menuitem, FALSE);
+// gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
/* separator */
menuitem = gtk_separator_menu_item_new ();
@@ -891,7 +902,7 @@
}
- /* seelct sat */
+ /* select sat */
menuitem = gtk_menu_item_new_with_label (_("Select satellite"));
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), select_menu);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
@@ -999,3 +1010,141 @@
GTK_SINGLE_SAT (widget)->counter = 1;
}
+
+
+static void
+show_next_pass_cb (GtkWidget *menuitem, gpointer data)
+{
+ GtkSingleSat *ssat = GTK_SINGLE_SAT (data);
+ sat_t *sat;
+ qth_t *qth;
+ pass_t *pass;
+ GtkWidget *dialog;
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
+
+
+ /* get next pass */
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+
+ /* check wheather sat actially has AOS */
+ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
+ has_aos (sat, qth)) {
+ if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ pass = get_next_pass (sat, qth,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+ }
+ else {
+ pass = get_pass (sat, qth, ssat->tstamp,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+ }
+
+ if (pass != NULL) {
+ show_pass (sat->tle.sat_name, qth, pass, GTK_WIDGET (toplevel));
+ }
+ else {
+ /* show dialog that there are no passes within time frame */
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes\n"\
+ "within the next %d days"),
+ sat->tle.sat_name,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+ }
+ else {
+ /* show dialog telling that this sat never reaches AOS*/
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes for\n"\
+ "the current ground station!\n\n"\
+ "This can be because the satellite\n"\
+ "is geostationary, decayed or simply\n"\
+ "never comes above the horizon"),
+ sat->tle.sat_name);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+}
+
+
+static void
+show_next_passes_cb (GtkWidget *menuitem, gpointer data)
+{
+ GtkSingleSat *ssat = GTK_SINGLE_SAT (data);
+ GtkWidget *dialog;
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
+ GSList *passes = NULL;
+ sat_t *sat;
+ qth_t *qth;
+
+
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+
+ /* check wheather sat actially has AOS */
+ if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
+ has_aos (sat, qth)) {
+
+ if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ passes = get_next_passes (sat, qth,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
+ }
+ else {
+ passes = get_passes (sat, qth, ssat->tstamp,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
+ sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
+
+ }
+
+
+ if (passes != NULL) {
+ show_passes (sat->tle.sat_name, qth, passes, GTK_WIDGET (toplevel));
+ }
+ else {
+ /* show dialog that there are no passes within time frame */
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes\n"\
+ "within the next %d days"),
+ sat->tle.sat_name,
+ sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+ }
+ else {
+ /* show dialog */
+ GtkWidget *dialog;
+
+ dialog = gtk_message_dialog_new (toplevel,
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Satellite %s has no passes for\n"\
+ "the current ground station!"),
+ sat->tle.sat_name);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ }
+
+}
Modified: trunk/src/gtk-single-sat.h
===================================================================
--- trunk/src/gtk-single-sat.h 2008-10-25 17:55:36 UTC (rev 156)
+++ trunk/src/gtk-single-sat.h 2008-10-25 21:20:54 UTC (rev 157)
@@ -31,6 +31,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
+#include "gtk-sat-module.h"
#include "gtk-sat-data.h"
@@ -117,6 +118,7 @@
struct _gtk_single_sat
{
GtkVBox vbox;
+
GtkWidget *header; /*!< Header label, ie. satellite name. */
@@ -126,10 +128,12 @@
GtkWidget *table; /*!< table. */
GtkWidget *popup_button; /*!< Popup button. */
+
GKeyFile *cfgdata; /*!< Configuration data. */
GSList *sats; /*!< Satellites. */
qth_t *qth; /*!< Pointer to current location. */
+
guint32 flags; /*!< Flags indicating which columns are visible. */
guint refresh; /*!< Refresh rate. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-25 17:55:43
|
Revision: 156
http://gpredict.svn.sourceforge.net/gpredict/?rev=156&view=rev
Author: csete
Date: 2008-10-25 17:55:36 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Use real time or simulated time for sky at glance start depending on user settings.
Modified Paths:
--------------
trunk/src/gtk-sat-module-popup.c
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2008-10-25 17:55:05 UTC (rev 155)
+++ trunk/src/gtk-sat-module-popup.c 2008-10-25 17:55:36 UTC (rev 156)
@@ -841,7 +841,14 @@
/* create sky at a glance widget */
module->busy = TRUE;
- skg = gtk_sky_glance_new (module->satellites, module->qth);
+
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
+ skg = gtk_sky_glance_new (module->satellites, module->qth, 0.0);
+ }
+ else {
+ skg = gtk_sky_glance_new (module->satellites, module->qth, module->tmgCdnum);
+ }
+
module->busy = FALSE;
gtk_container_set_border_width (GTK_CONTAINER (window), 10);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-25 17:55:09
|
Revision: 155
http://gpredict.svn.sourceforge.net/gpredict/?rev=155&view=rev
Author: csete
Date: 2008-10-25 17:55:05 +0000 (Sat, 25 Oct 2008)
Log Message:
-----------
Added start time as parameter.
Modified Paths:
--------------
trunk/src/gtk-sky-glance.c
trunk/src/gtk-sky-glance.h
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2008-10-24 22:24:30 UTC (rev 154)
+++ trunk/src/gtk-sky-glance.c 2008-10-25 17:55:05 UTC (rev 155)
@@ -224,7 +224,7 @@
* \param qth Pointer to the ground station data.
*/
GtkWidget*
-gtk_sky_glance_new (GHashTable *sats, qth_t *qth)
+gtk_sky_glance_new (GHashTable *sats, qth_t *qth, gdouble ts)
{
GtkWidget *skg;
GooCanvasItemModel *root;
@@ -239,7 +239,15 @@
/* get settings */
GTK_SKY_GLANCE (skg)->numsat = g_hash_table_size (sats);
- GTK_SKY_GLANCE (skg)->ts = get_current_daynum ();
+
+ /* if ts = 0 use current time */
+ if (ts > 0.0) {
+ GTK_SKY_GLANCE (skg)->ts = ts;
+ }
+ else {
+ GTK_SKY_GLANCE (skg)->ts = get_current_daynum ();
+ }
+
GTK_SKY_GLANCE (skg)->te = GTK_SKY_GLANCE (skg)->ts +
sat_cfg_get_int (SAT_CFG_INT_SKYATGL_TIME)*(1.0/24.0);
Modified: trunk/src/gtk-sky-glance.h
===================================================================
--- trunk/src/gtk-sky-glance.h 2008-10-24 22:24:30 UTC (rev 154)
+++ trunk/src/gtk-sky-glance.h 2008-10-25 17:55:05 UTC (rev 155)
@@ -115,7 +115,7 @@
GtkType gtk_sky_glance_get_type (void);
-GtkWidget* gtk_sky_glance_new (GHashTable *sats, qth_t *qth);
+GtkWidget* gtk_sky_glance_new (GHashTable *sats, qth_t *qth, gdouble ts);
/*
void gtk_sky_glance_reconf (GtkWidget *skg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-24 22:24:34
|
Revision: 154
http://gpredict.svn.sourceforge.net/gpredict/?rev=154&view=rev
Author: csete
Date: 2008-10-24 22:24:30 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-24 21:45:29 UTC (rev 153)
+++ trunk/ChangeLog 2008-10-24 22:24:30 UTC (rev 154)
@@ -1,3 +1,12 @@
+2008-10-24; Alexandru Csete <oz...@gm...>
+
+ * src/sat-cfg.[ch]:
+ Added parameter for pass prediction T0.
+
+ * src/sat-pref-conditions.c:
+ Added widgets to configure pass prediction T0.
+
+
2008-10-11; Alexandru Csete <oz...@gm...>
* src/sat-pref-rig-editor.c:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-24 21:47:43
|
Revision: 153
http://gpredict.svn.sourceforge.net/gpredict/?rev=153&view=rev
Author: csete
Date: 2008-10-24 21:45:29 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Added widgets to configure pass prediction T0.
Modified Paths:
--------------
trunk/src/sat-pref-conditions.c
Modified: trunk/src/sat-pref-conditions.c
===================================================================
--- trunk/src/sat-pref-conditions.c 2008-10-24 18:10:19 UTC (rev 152)
+++ trunk/src/sat-pref-conditions.c 2008-10-24 21:45:29 UTC (rev 153)
@@ -35,6 +35,7 @@
+static GtkWidget *tzero;
static GtkWidget *minel;
static GtkWidget *numpass;
static GtkWidget *lookahead;
@@ -67,7 +68,7 @@
dirty = FALSE;
reset = FALSE;
- table = gtk_table_new (12, 3, FALSE);
+ table = gtk_table_new (14, 3, FALSE);
gtk_table_set_row_spacings (GTK_TABLE (table), 10);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
@@ -314,7 +315,32 @@
GTK_FILL | GTK_EXPAND,
GTK_SHRINK,
0, 0);
+
+ /* separator */
+ gtk_table_attach (GTK_TABLE (table),
+ gtk_hseparator_new (),
+ 0, 3, 12, 13,
+ GTK_FILL | GTK_EXPAND,
+ GTK_SHRINK,
+ 0, 0);
+ /* T0 for predictions */
+ tzero = gtk_check_button_new_with_label (_("Always use real time for pass predictions"));
+ gtk_widget_set_tooltip_text (tzero,
+ _("Check this box if you want Gpredict to always use "\
+ "the current (real) time as starting time when predicting "\
+ "future satellite passes.\n\n"\
+ "If you leave the box unchecked and the time controller is "\
+ "active, Gpredict will use the time from the time controller "\
+ "as starting time for predicting satellite passes."));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tzero),
+ sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0));
+ g_signal_connect (G_OBJECT (tzero), "toggled",
+ G_CALLBACK (spin_changed_cb), NULL);
+
+ gtk_table_attach (GTK_TABLE (table), tzero, 0, 3, 13, 14,
+ GTK_FILL, GTK_SHRINK,
+ 0, 0);
/* create vertical box */
vbox = gtk_vbox_new (FALSE, 0);
@@ -357,6 +383,8 @@
gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (nument)));
sat_cfg_set_int (SAT_CFG_INT_PRED_TWILIGHT_THLD,
gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (twspin)));
+ sat_cfg_set_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0,
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tzero)));
dirty = FALSE;
}
@@ -367,6 +395,7 @@
sat_cfg_reset_int (SAT_CFG_INT_PRED_RESOLUTION);
sat_cfg_reset_int (SAT_CFG_INT_PRED_NUM_ENTRIES);
sat_cfg_reset_int (SAT_CFG_INT_PRED_TWILIGHT_THLD);
+ sat_cfg_reset_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0);
reset = FALSE;
}
@@ -439,8 +468,9 @@
sat_cfg_get_int_def (SAT_CFG_INT_PRED_NUM_ENTRIES));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (twspin),
sat_cfg_get_int_def (SAT_CFG_INT_PRED_TWILIGHT_THLD));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tzero),
+ sat_cfg_get_bool_def (SAT_CFG_BOOL_PRED_USE_REAL_T0));
-
/* reset flags */
reset = TRUE;
dirty = FALSE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-24 18:10:24
|
Revision: 152
http://gpredict.svn.sourceforge.net/gpredict/?rev=152&view=rev
Author: csete
Date: 2008-10-24 18:10:19 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Added parameter for pass prediction T0.
Modified Paths:
--------------
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
Modified: trunk/src/sat-cfg.c
===================================================================
--- trunk/src/sat-cfg.c 2008-10-24 17:56:20 UTC (rev 151)
+++ trunk/src/sat-cfg.c 2008-10-24 18:10:19 UTC (rev 152)
@@ -132,7 +132,8 @@
{ "TLE", "SERVER_AUTH", FALSE},
{ "TLE", "PROXY_AUTH", FALSE},
{ "TLE", "ADD_NEW_SATS", TRUE},
- { "LOG", "KEEP_LOG_FILES", FALSE}
+ { "LOG", "KEEP_LOG_FILES", FALSE},
+ { "PREDICT", "USE_REAL_T0", FALSE}
};
Modified: trunk/src/sat-cfg.h
===================================================================
--- trunk/src/sat-cfg.h 2008-10-24 17:56:20 UTC (rev 151)
+++ trunk/src/sat-cfg.h 2008-10-24 18:10:19 UTC (rev 152)
@@ -54,7 +54,8 @@
SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */
SAT_CFG_BOOL_TLE_PROXY_AUTH, /*!< Proxy requires authentication. */
SAT_CFG_BOOL_TLE_ADD_NEW, /*!< Add new satellites to database. */
- SAT_CFG_BOOL_KEEP_LOG_FILES, /*!< Whether to keep old log files */
+ SAT_CFG_BOOL_KEEP_LOG_FILES, /*!< Whether to keep old log files */
+ SAT_CFG_BOOL_PRED_USE_REAL_T0, /*!< Whether to use current time as T0 fro predictions */
SAT_CFG_BOOL_NUM /*!< Number of boolean parameters */
} sat_cfg_bool_e;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-24 17:56:22
|
Revision: 151
http://gpredict.svn.sourceforge.net/gpredict/?rev=151&view=rev
Author: csete
Date: 2008-10-24 17:56:20 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Updated version number.
Modified Paths:
--------------
trunk/configure.ac
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-10-11 22:12:45 UTC (rev 150)
+++ trunk/configure.ac 2008-10-24 17:56:20 UTC (rev 151)
@@ -2,7 +2,7 @@
AM_CONFIG_HEADER(build-config.h)
-AM_INIT_AUTOMAKE(gpredict, 1.0b1)
+AM_INIT_AUTOMAKE(gpredict, 1.1_beta)
AM_MAINTAINER_MODE
AC_PROG_INTLTOOL([0.21])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-11 22:12:52
|
Revision: 150
http://gpredict.svn.sourceforge.net/gpredict/?rev=150&view=rev
Author: csete
Date: 2008-10-11 22:12:45 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-11 21:46:06 UTC (rev 149)
+++ trunk/ChangeLog 2008-10-11 22:12:45 UTC (rev 150)
@@ -1,3 +1,15 @@
+2008-10-11; Alexandru Csete <oz...@gm...>
+
+ * src/sat-pref-rig-editor.c:
+ * src/sat-pref-rot-editor.c:
+ Fixed incorrect tooltip.
+
+ * src/gtk-sat-module-popup.c:
+ * src/gtk-rot-ctrl.c:
+ * src/gtk-rig-ctrl.c:
+ Fixed bug 2130912: Crash when no rig or no rotator are defined.
+
+
2008-09-20; Alexandru Csete <oz...@gm...>
* src/tle-update.c:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-10-11 21:46:06 UTC (rev 149)
+++ trunk/NEWS 2008-10-11 22:12:45 UTC (rev 150)
@@ -12,6 +12,8 @@
- Fixed bug 1704133: Blank lines in config file.
- Fixed bug 1954664: Wrong overpass prediction.
- Fixed bug 1880815: Null pointer dereference causes crash on startup.
+- Fixed bug 2139102: rigctld port.
+- Fixed bug 2130912: Crash when no rig or no rotator are defined.
x Windows: New installer instead of ZIP distribution.
- Updated PDF user manual.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-11 21:46:14
|
Revision: 149
http://gpredict.svn.sourceforge.net/gpredict/?rev=149&view=rev
Author: csete
Date: 2008-10-11 21:46:06 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
Fixed bug 2130912: Crash when no rig or no rotator are defined.
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-sat-module-popup.c
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2008-10-11 21:05:07 UTC (rev 148)
+++ trunk/src/gtk-rig-ctrl.c 2008-10-11 21:46:06 UTC (rev 149)
@@ -85,6 +85,7 @@
static gboolean get_freq (GtkRigCtrl *ctrl, gdouble *freq);
static void update_count_down (GtkRigCtrl *ctrl, gdouble t);
+static gboolean have_conf (void);
static GtkVBoxClass *parent_class = NULL;
@@ -191,6 +192,11 @@
{
GtkWidget *widget;
GtkWidget *table;
+
+ /* check that we have rot conf */
+ if (!have_conf()) {
+ return NULL;
+ }
widget = g_object_new (GTK_TYPE_RIG_CTRL, NULL);
@@ -1084,3 +1090,44 @@
g_free (cs);
}
+
+
+/** \brief Check that we have at least one .rig file */
+static gboolean have_conf ()
+{
+ GDir *dir = NULL; /* directory handle */
+ GError *error = NULL; /* error flag and info */
+ gchar *cfgdir;
+ gchar *dirname; /* directory name */
+ const gchar *filename; /* file name */
+ gint i = 0;
+
+
+ /* open configuration directory */
+ cfgdir = get_conf_dir ();
+ dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S,
+ "hwconf", NULL);
+ g_free (cfgdir);
+
+ dir = g_dir_open (dirname, 0, &error);
+ if (dir) {
+ /* read each .rig file */
+ while ((filename = g_dir_read_name (dir))) {
+
+ if (g_strrstr (filename, ".rig")) {
+ i++;
+ }
+ }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to open hwconf dir (%s)"),
+ __FILE__, __LINE__, error->message);
+ g_clear_error (&error);
+ }
+
+ g_free (dirname);
+ g_dir_close (dir);
+
+ return (i > 0) ? TRUE : FALSE;
+}
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-10-11 21:05:07 UTC (rev 148)
+++ trunk/src/gtk-rot-ctrl.c 2008-10-11 21:46:06 UTC (rev 149)
@@ -85,6 +85,8 @@
static gboolean get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el);
static gboolean set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el);
+static gboolean have_conf (void);
+
static GtkVBoxClass *parent_class = NULL;
static GdkColor ColBlack = { 0, 0, 0, 0};
@@ -194,6 +196,11 @@
GtkWidget *widget;
GtkWidget *table;
+ /* check that we have rot conf */
+ if (!have_conf()) {
+ return NULL;
+ }
+
widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
/* store satellites */
@@ -490,7 +497,7 @@
dir = g_dir_open (dirname, 0, &error);
if (dir) {
- /* read each .rig file */
+ /* read each .rot file */
while ((filename = g_dir_read_name (dir))) {
if (g_strrstr (filename, ".rot")) {
@@ -1188,3 +1195,44 @@
g_free (cs);
}
+
+
+/** \brief Check that we have at least one .rot file */
+static gboolean have_conf ()
+{
+ GDir *dir = NULL; /* directory handle */
+ GError *error = NULL; /* error flag and info */
+ gchar *cfgdir;
+ gchar *dirname; /* directory name */
+ const gchar *filename; /* file name */
+ gint i = 0;
+
+
+ /* open configuration directory */
+ cfgdir = get_conf_dir ();
+ dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S,
+ "hwconf", NULL);
+ g_free (cfgdir);
+
+ dir = g_dir_open (dirname, 0, &error);
+ if (dir) {
+ /* read each .rot file */
+ while ((filename = g_dir_read_name (dir))) {
+
+ if (g_strrstr (filename, ".rot")) {
+ i++;
+ }
+ }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to open hwconf dir (%s)"),
+ __FILE__, __LINE__, error->message);
+ g_clear_error (&error);
+ }
+
+ g_free (dirname);
+ g_dir_close (dir);
+
+ return (i > 0) ? TRUE : FALSE;
+}
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2008-10-11 21:05:07 UTC (rev 148)
+++ trunk/src/gtk-sat-module-popup.c 2008-10-11 21:46:06 UTC (rev 149)
@@ -878,6 +878,23 @@
module->rigctrl = gtk_rig_ctrl_new (module);
+ if (module->rigctrl == NULL) {
+ /* gtk_rot_ctrl_new returned NULL becasue no rotators are configured */
+ GtkWidget *dialog;
+ dialog = gtk_message_dialog_new (GTK_WINDOW (app),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ _("You have no radio configuration!\n"\
+ "Please configure a radio first.")
+ );
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
+ gtk_window_set_title (GTK_WINDOW (dialog), _("ERROR"));
+ gtk_widget_show_all (dialog);
+
+ return;
+ }
+
/* create a window */
module->rigctrlwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
buff = g_strdup_printf (_("Gpredict Radio Control: %s"), module->name);
@@ -934,6 +951,23 @@
module->rotctrl = gtk_rot_ctrl_new (module);
+ if (module->rotctrl == NULL) {
+ /* gtk_rot_ctrl_new returned NULL becasue no rotators are configured */
+ GtkWidget *dialog;
+ dialog = gtk_message_dialog_new (GTK_WINDOW (app),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+ _("You have no rotator configuration!\n"\
+ "Please configure an antenna rotator first.")
+ );
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
+ gtk_window_set_title (GTK_WINDOW (dialog), _("ERROR"));
+ gtk_widget_show_all (dialog);
+
+ return;
+ }
+
/* create a window */
module->rotctrlwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
buff = g_strdup_printf (_("Gpredict Rotator Control: %s"), module->name);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-11 21:05:15
|
Revision: 148
http://gpredict.svn.sourceforge.net/gpredict/?rev=148&view=rev
Author: csete
Date: 2008-10-11 21:05:07 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
Fixed bug 2139102 - rigctld port (minor)
Modified Paths:
--------------
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rot-editor.c
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-09-21 00:28:06 UTC (rev 147)
+++ trunk/src/sat-pref-rig-editor.c 2008-10-11 21:05:07 UTC (rev 148)
@@ -171,7 +171,8 @@
host = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (host), 50);
gtk_widget_set_tooltip_text (host,
- _("Enter the host and port where rigctld is running, e.g. 192.168.1.100:15123"));
+ _("Enter the host where rogctld is running. You can use both host name "\
+ " and IP address, e.g. 192.168.1.100"));
gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
/* port */
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2008-09-21 00:28:06 UTC (rev 147)
+++ trunk/src/sat-pref-rot-editor.c 2008-10-11 21:05:07 UTC (rev 148)
@@ -176,7 +176,7 @@
gtk_entry_set_max_length (GTK_ENTRY (host), 50);
gtk_widget_set_tooltip_text (host,
_("Enter the host where rogctld is running. You can use both host name "\
- " and IP address."));
+ " and IP address, e.g. 192.168.1.100"));
gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
/* port */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-21 00:28:09
|
Revision: 147
http://gpredict.svn.sourceforge.net/gpredict/?rev=147&view=rev
Author: csete
Date: 2008-09-21 00:28:06 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Tagging release 1.0 beta 1
Added Paths:
-----------
tags/release-1.0b1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-21 00:10:46
|
Revision: 146
http://gpredict.svn.sourceforge.net/gpredict/?rev=146&view=rev
Author: csete
Date: 2008-09-21 00:10:38 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Fixed typo.
Modified Paths:
--------------
trunk/src/Makefile.am
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-09-21 00:02:57 UTC (rev 145)
+++ trunk/src/Makefile.am 2008-09-21 00:10:38 UTC (rev 146)
@@ -39,7 +39,7 @@
gtk-polar-plot.c gtk-polar-plot.h \
gtk-polar-view.c gtk-polar-view.h \
gtk-polar-view-popup.c gtk-polar-view-popup.h \
- gtk-rig-ctrl.c gtk.rig-ctrl.h \
+ gtk-rig-ctrl.c gtk-rig-ctrl.h \
gtk-rot-ctrl.c gtk-rot-ctrl.h \
gtk-rot-knob.c gtk-rot-knob.h \
gtk-sat-data.c gtk-sat-data.h \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-21 00:03:05
|
Revision: 145
http://gpredict.svn.sourceforge.net/gpredict/?rev=145&view=rev
Author: csete
Date: 2008-09-21 00:02:57 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-09-20 23:56:54 UTC (rev 144)
+++ trunk/NEWS 2008-09-21 00:02:57 UTC (rev 145)
@@ -13,7 +13,7 @@
- Fixed bug 1954664: Wrong overpass prediction.
- Fixed bug 1880815: Null pointer dereference causes crash on startup.
x Windows: New installer instead of ZIP distribution.
-- Updated PDF user manual as PDF.
+- Updated PDF user manual.
Changes in version 0.9.0 (2007-09-29):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-20 23:56:59
|
Revision: 144
http://gpredict.svn.sourceforge.net/gpredict/?rev=144&view=rev
Author: csete
Date: 2008-09-20 23:56:54 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
Updated
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/amateur.tle
trunk/data/cubesat.tle
trunk/data/galileo.tle
trunk/data/geo.tle
trunk/data/gps-ops.tle
trunk/data/iridium.tle
trunk/data/military.tle
trunk/data/radar.tle
trunk/data/science.tle
trunk/data/weather.tle
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-20 23:54:02 UTC (rev 143)
+++ trunk/ChangeLog 2008-09-20 23:56:54 UTC (rev 144)
@@ -3,6 +3,14 @@
* src/tle-update.c:
Changed connection timeout from system default to 10 seconds.
+ * src/sat-pref-rot-editor.c:
+ Added default value to az-type selector.
+
+ * src/sar-pref-rig.c:
+ * src/sat-pref-rig-editor.c:
+ Fixed bug that caused local oscillator frequency to be 0 when trying to
+ edit a radio configuration.
+
2008-09-18; Alexandru Csete <oz...@gm...>
Modified: trunk/data/amateur.tle
===================================================================
--- trunk/data/amateur.tle 2008-09-20 23:54:02 UTC (rev 143)
+++ trunk/data/amateur.tle 2008-09-20 23:56:54 UTC (rev 144)
@@ -1,174 +1,174 @@
OSCAR III [-]
-1 01293U 65016F 08260.99766534 -.00000058 00000-0 -26336-5 0 3408
-2 01293 70.0720 41.8001 0018132 180.9416 179.1662 14.04658852221449
+1 01293U 65016F 08263.49003345 -.00000059 00000-0 -30944-5 0 3423
+2 01293 70.0721 36.4145 0017996 177.8363 182.2829 14.04658782221792
AO-5 [-]
-1 04321U 70008B 08261.04495502 -.00000031 00000-0 10000-3 0 542
-2 04321 102.1304 260.9931 0027730 136.5005 223.8260 12.52154398766576
+1 04321U 70008B 08263.20214693 -.00000031 00000-0 10000-3 0 553
+2 04321 102.1307 263.1913 0027781 132.5083 227.8339 12.52154419766847
AO-6 [-]
-1 06236U 72082B 08259.91187074 -.00000027 00000-0 10000-3 0 475
-2 06236 101.4145 278.2333 0004224 66.6725 293.4792 12.53074975643054
+1 06236U 72082B 08264.06346058 -.00000027 00000-0 10000-3 0 465
+2 06236 101.4144 282.2233 0004217 56.9818 303.1659 12.53075070643579
AO-7 [P]
-1 07530U 74089B 08260.51241670 -.00000027 00000-0 10000-3 0 2790
-2 07530 101.4605 288.9346 0012209 83.7193 276.5272 12.53574121548424
+1 07530U 74089B 08263.86428670 -.00000027 00000-0 10000-3 0 2822
+2 07530 101.4600 292.1725 0012181 76.7071 283.5358 12.53574178548844
AO-8 [-]
-1 10703U 78026B 08261.18017256 -.00000302 00000-0 -18007-3 0 2686
-2 10703 98.8750 309.8434 0006245 204.0771 156.0100 13.98819039557853
+1 10703U 78026B 08264.18435865 -.00000265 00000-0 -15419-3 0 2715
+2 10703 98.8744 312.7509 0006464 194.4158 165.6822 13.98817941558270
AO-10 [-]
-1 14129U 83058B 08259.99927279 -.00000079 00000-0 10000-3 0 5604
-2 14129 26.0334 195.4003 5964421 157.3627 246.9367 2.05869022162001
+1 14129U 83058B 08263.39625297 -.00000175 00000-0 10000-3 0 5638
+2 14129 26.0337 194.8578 5963879 158.2838 244.5155 2.05869842162070
UO-11 [P]
-1 14781U 84021B 08261.15450383 .00000341 00000-0 52618-4 0 7691
-2 14781 98.1473 296.5289 0009894 132.8717 227.3310 14.79665128317452
+1 14781U 84021B 08263.85946129 -.00000257 00000-0 -26945-4 0 7713
+2 14781 98.1470 299.2711 0009988 124.6915 235.5257 14.79662370317853
FO-12 [-]
-1 16909U 86061B 08260.22329166 -.00000083 00000-0 10000-3 0 4422
-2 16909 50.0167 284.1238 0011119 227.3316 132.6583 12.44451922 4861
+1 16909U 86061B 08262.23106662 -.00000083 00000-0 10000-3 0 4430
+2 16909 50.0164 277.9509 0011085 232.3731 127.6100 12.44452006 5110
UO-14 [-]
-1 20437U 90005B 08261.04701773 -.00000006 00000-0 13176-4 0 7353
-2 20437 98.2979 224.5018 0009817 262.4727 97.5337 14.31523904973970
+1 20437U 90005B 08263.91275030 -.00000006 00000-0 13440-4 0 7379
+2 20437 98.2985 227.2424 0009760 253.0527 106.9584 14.31524117974381
UO-15 [-]
-1 20438U 90005C 08261.05341439 -.00000009 00000-0 12561-4 0 2247
-2 20438 98.3570 216.2072 0009212 289.7803 70.2387 14.30430430973426
+1 20438U 90005C 08263.50163685 -.00000020 00000-0 82526-5 0 2268
+2 20438 98.3573 218.5609 0009065 281.0583 78.9579 14.30430421973772
AO-16 [P]
-1 20439U 90005D 08261.03622344 .00000006 00000-0 17679-4 0 4190
-2 20439 98.2410 236.4503 0009946 264.5172 95.4874 14.31802837974062
+1 20439U 90005D 08263.90140127 -.00000017 00000-0 88988-5 0 4210
+2 20439 98.2414 239.1727 0009955 255.4595 104.5492 14.31802824974471
DO-17 [-]
-1 20440U 90005E 08261.02481697 .00000014 00000-0 20468-4 0 1225
-2 20440 98.2197 241.7804 0009988 260.2462 99.7598 14.32105559974192
+1 20440U 90005E 08263.47018451 .00000003 00000-0 16314-4 0 1245
+2 20440 98.2201 244.0992 0010004 253.1568 106.8519 14.32105694974543
WO-18 [-]
-1 20441U 90005F 08261.05314010 .00000013 00000-0 19951-4 0 6312
-2 20441 98.2251 240.3550 0010617 263.9056 96.0915 14.31871520974131
+1 20441U 90005F 08263.70854385 .00000003 00000-0 16432-4 0 6332
+2 20441 98.2250 242.8733 0010592 255.6121 104.3885 14.31871696974518
LO-19 [P]
-1 20442U 90005G 08261.06831315 .00000044 00000-0 31605-4 0 3429
-2 20442 98.2092 244.7332 0010936 260.5952 99.4028 14.32040758974227
+1 20442U 90005G 08263.51379061 -.00000073 00000-0 -12010-4 0 3441
+2 20442 98.2101 247.0494 0010973 251.4587 108.5387 14.32040462974577
FO-20 [-]
-1 20480U 90013C 08260.86106956 -.00000006 00000-0 52416-4 0 9386
-2 20480 99.0379 226.5846 0540826 69.2360 296.5835 12.83359092871845
+1 20480U 90013C 08263.12182147 -.00000002 00000-0 60402-4 0 9407
+2 20480 99.0380 228.4186 0540818 64.1205 301.4611 12.83359202872132
AO-21 [-]
-1 21087U 91006A 08260.49782683 .00000041 00000-0 27677-4 0 693
-2 21087 82.9375 248.7308 0034638 330.5725 29.3480 13.75036458884801
+1 21087U 91006A 08264.06336679 .00000016 00000-0 13322-5 0 729
+2 21087 82.9378 246.0883 0034445 320.4935 39.3709 13.75036369885290
RS-12 & RS-13 [-]
-1 21089U 91007A 08259.67748191 .00000029 00000-0 14692-4 0 9496
-2 21089 82.9195 110.3877 0030048 16.8964 343.3198 13.74481935883489
+1 21089U 91007A 08263.60843373 .00000044 00000-0 30271-4 0 9524
+2 21089 82.9185 107.4691 0029756 6.2365 353.9148 13.74482299884028
UO-22 [-]
-1 21575U 91050B 08260.90603962 -.00000040 00000-0 91192-6 0 3757
-2 21575 98.4043 208.2168 0008223 115.8124 244.3916 14.39648729901387
+1 21575U 91050B 08263.47759980 .00000044 00000-0 27816-4 0 3779
+2 21575 98.4060 210.7408 0008227 107.9222 252.2860 14.39649301901750
KO-23 [-]
-1 22077U 92052B 08260.49133233 -.00000037 00000-0 10000-3 0 5362
-2 22077 66.0844 179.8682 0003569 345.5419 14.5496 12.86445577756313
+1 22077U 92052B 08263.29002211 -.00000037 00000-0 10000-3 0 5386
+2 22077 66.0847 174.0077 0003782 345.6045 14.4857 12.86445543756676
AO-24 [-]
-1 22654U 93031B 08259.52379467 -.00000097 00000-0 10000-3 0 1782
-2 22654 5.2882 342.5105 2892469 144.8942 238.0872 1.42205750 75219
+1 22654U 93031B 08262.33603758 -.00000100 00000-0 10000-3 0 1794
+2 22654 5.2859 342.4601 2892171 145.0614 237.7558 1.42205757 75250
AO-27 [+]
-1 22825U 93061C 08260.98017841 .00000022 00000-0 25043-4 0 636
-2 22825 98.3951 217.6043 0008389 356.5982 3.5163 14.29246884780882
+1 22825U 93061C 08263.50043022 -.00000066 00000-0 -93667-5 0 657
+2 22825 98.3962 220.0334 0008363 349.0012 11.0986 14.29246659781246
IO-26 [P]
-1 22826U 93061D 08260.52827630 .00000000 00000-0 16517-4 0 7743
-2 22826 98.3873 218.0370 0008973 353.8260 6.2810 14.29496363780914
+1 22826U 93061D 08262.97809407 -.00000003 00000-0 15323-4 0 7766
+2 22826 98.3875 220.3968 0008947 346.6395 13.4548 14.29496534781262
KO-25 [-]
-1 22828U 93061F 08261.04004493 .00000025 00000-0 25868-4 0 9981
-2 22828 98.3819 218.4986 0009375 325.7658 34.2920 14.29799335749259
+1 22828U 93061F 08263.48934478 .00000011 00000-0 20635-4 0 02
+2 22828 98.3827 220.8573 0009255 318.1298 41.9182 14.29799456749608
PO-28 [+]
-1 22829U 93061G 08261.09971727 .00000012 00000-0 20918-4 0 382
-2 22829 98.3771 219.6761 0009178 322.4893 37.5648 14.30196971781266
+1 22829U 93061G 08263.89814005 -.00000060 00000-0 -68972-5 0 408
+2 22829 98.3784 222.3713 0009096 313.7726 46.2692 14.30196662781662
RS-15 [P]
-1 23439U 94085A 08260.18883265 -.00000039 00000-0 10000-3 0 1454
-2 23439 64.8189 347.8919 0146342 105.2697 256.4456 11.27552848565225
+1 23439U 94085A 08261.69659202 -.00000039 00000-0 10000-3 0 1868
+2 23439 64.8186 345.4540 0146265 104.9475 256.7691 11.27552769565394
FO-29 [P]
-1 24278U 96046B 08260.23106202 -.00000032 00000-0 56243-5 0 8585
-2 24278 98.5778 164.5772 0350463 340.0321 18.7384 13.52940002596709
+1 24278U 96046B 08263.85461100 -.00000061 00000-0 -23143-4 0 8616
+2 24278 98.5775 167.7236 0350550 330.6539 27.5310 13.52939737597193
MO-30 [-]
-1 24305U 96052B 08259.91801416 .00000026 00000-0 11977-4 0 9122
-2 24305 82.9373 196.8698 0028844 299.9805 59.8497 13.73561997603027
+1 24305U 96052B 08263.85160699 .00000000 00000-0 -15460-4 0 9158
+2 24305 82.9383 193.9627 0028718 288.6544 71.1494 13.73561784603560
TO-31 [-]
-1 25396U 98043C 08260.62422065 .00000084 00000-0 54669-4 0 2069
-2 25396 98.3677 296.3734 0002272 334.9292 25.1769 14.23762834529372
+1 25396U 98043C 08263.22445419 -.00000044 00000-0 -13896-5 0 2084
+2 25396 98.3666 298.8483 0002030 324.3291 35.7781 14.23762227529740
GO-32 [P]
-1 25397U 98043D 08260.57991644 -.00000178 00000-0 -60890-4 0 6982
-2 25397 98.3578 291.1991 0001261 18.5302 341.5939 14.23147354529216
+1 25397U 98043D 08262.90004182 .00000094 00000-0 59571-4 0 7006
+2 25397 98.3573 293.4028 0001197 11.4864 348.6333 14.23148862529547
SO-33 [P]
-1 25509U 98061B 08260.12874437 -.00000007 00000-0 -12410-4 0 2812
-2 25509 31.4288 162.1400 0354510 102.3815 261.6714 14.28224411516627
+1 25509U 98061B 08263.06432210 .00000053 00000-0 -13258-5 0 2831
+2 25509 31.4287 145.5448 0354460 128.0687 235.2465 14.28224504517049
PO-34 [-]
-1 25520U 98064B 08260.43199379 .00000288 00000-0 44172-5 0 815
-2 25520 28.4605 287.8843 0005643 199.3838 160.6541 15.17227918547035
+1 25520U 98064B 08263.39201403 .00000370 00000-0 84117-5 0 832
+2 25520 28.4605 268.0684 0005531 230.1199 129.8911 15.17229244547480
ARISS [+]
-1 25544U 98067A 08260.52254209 .00005033 00000-0 42102-4 0 2622
-2 25544 51.6420 267.9221 0006994 117.9417 30.5893 15.72081521562909
+1 25544U 98067A 08263.50002433 .00008988 00000-0 71331-4 0 2845
+2 25544 51.6417 252.6754 0006843 128.1839 323.1095 15.72144976563373
SO-35 [-]
-1 25636U 99008C 08260.58499448 -.00000004 00000-0 70012-5 0 1100
-2 25636 96.4718 144.3648 0148660 8.8939 351.4836 14.43441833503633
+1 25636U 99008C 08263.49642744 .00000018 00000-0 12897-4 0 1124
+2 25636 96.4712 146.5816 0148501 359.7027 0.4051 14.43442309504054
UO-36 [-]
-1 25693U 99021A 08261.11967964 -.00000131 00000-0 18901-5 0 7275
-2 25693 64.5561 234.7415 0034474 225.1049 134.7209 14.78721207507462
+1 25693U 99021A 08263.89249414 -.00000145 00000-0 44321-8 0 7290
+2 25693 64.5562 226.2228 0034223 224.8008 135.0356 14.78721535507870
OO-38 [-]
-1 26063U 00004C 08261.20406819 -.00000039 00000-0 71228-5 0 3114
-2 26063 100.1888 352.3948 0036661 310.8009 48.9996 14.35843451452770
+1 26063U 00004C 08263.43393319 -.00000043 00000-0 54707-5 0 3131
+2 26063 100.1892 355.0264 0036623 304.4469 55.3260 14.35843475453091
SO-41 [-]
-1 26545U 00057A 08260.92919391 -.00000018 00000-0 16733-4 0 684
-2 26545 64.5564 239.5363 0039401 321.4615 38.3693 14.80528489430743
+1 26545U 00057A 08263.02315106 -.00000109 00000-0 51245-5 0 704
+2 26545 64.5574 233.0846 0039590 321.1726 38.6499 14.80528431431057
MO-46 [-]
-1 26548U 00057D 08260.79313920 -.00000003 00000-0 17925-4 0 2004
-2 26548 64.5561 206.8064 0038241 310.9544 48.8255 14.83295115431407
+1 26548U 00057D 08262.00671811 -.00000115 00000-0 44689-5 0 2019
+2 26548 64.5570 203.0513 0038305 310.8316 48.9440 14.83294789431584
SO-42 [-]
-1 26549U 00057E 08261.15364265 -.00000061 00000-0 11320-4 0 1426
-2 26549 64.5560 253.9815 0040919 328.0136 31.8446 14.79385541430474
+1 26549U 00057E 08263.51961484 -.00000049 00000-0 12949-4 0 1440
+2 26549 64.5561 246.7040 0041197 327.5261 32.3323 14.79386060430823
AO-40 [-]
-1 26609U 00072B 08258.76573546 -.00000396 00000-0 10000-3 0 1195
-2 26609 7.7949 60.7969 7934888 122.9745 337.5321 1.25586678 36163
+1 26609U 00072B 08261.15347167 -.00000356 00000-0 10000-3 0 1219
+2 26609 7.8057 60.3522 7935485 123.8033 337.0196 1.25586612 36195
NO-44 [P]
-1 26931U 01043C 08260.51868395 -.00000261 00000-0 -69594-4 0 9785
-2 26931 67.0524 49.3712 0007258 263.0620 96.9636 14.29531717363465
+1 26931U 01043C 08262.96741496 .00000273 00000-0 13884-3 0 9802
+2 26931 67.0533 43.0629 0007264 264.5758 95.4515 14.29534559363814
NO-45 [-]
-1 26932U 01043D 08260.98247143 -.00000038 00000-0 17584-4 0 9805
-2 26932 67.0548 48.0575 0008175 275.8243 84.1925 14.29592131363575
+1 26932U 01043D 08263.50106281 -.00000044 00000-0 15084-4 0 9825
+2 26932 67.0544 41.5701 0008187 274.6128 85.4035 14.29592295363939
BO-47 & BO-48 [-]
-1 27422U 02021B 08260.85722716 .00000016 00000-0 23723-4 0 8511
-2 27422 98.5483 340.1089 0011673 308.4799 51.5336 14.28459730330382
+1 27422U 02021B 08264.14935907 .00000009 00000-0 20757-4 0 8544
+2 27422 98.5473 343.3340 0011707 298.2973 61.7028 14.28460337330852
AO-49 [-]
-1 27605U 02058A 08261.09779708 .00000023 00000-0 25198-4 0 7283
-2 27605 64.5576 122.8750 0085378 262.2373 96.9036 14.72363774308734
+1 27605U 02058A 08263.67881735 -.00000065 00000-0 12213-4 0 7307
+2 27605 64.5567 115.0238 0085317 261.7403 97.3989 14.72363845309114
SO-50 [+]
-1 27607U 02058C 08261.10226902 -.00000036 00000-0 16750-4 0 7009
-2 27607 64.5583 134.4924 0086219 261.4648 97.6713 14.71379763308494
+1 27607U 02058C 08263.88891572 -.00000101 00000-0 67537-5 0 7022
+2 27607 64.5578 126.0267 0086114 261.0481 98.0837 14.71379842308906
DTUSAT [-]
-1 27842U 03031C 08259.91344591 .00000019 00000-0 28906-4 0 3779
-2 27842 98.7123 267.9253 0008862 191.2910 168.8081 14.20945799270399
+1 27842U 03031C 08263.92712453 .00000026 00000-0 32018-4 0 3790
+2 27842 98.7121 271.8843 0008987 179.5271 180.5920 14.20946450270964
CO-55 [+]
-1 27844U 03031E 08260.57700588 .00000020 00000-0 29576-4 0 3964
-2 27844 98.7181 267.5843 0009161 208.9877 151.0797 14.20596148270418
+1 27844U 03031E 08263.04215010 .00000056 00000-0 46580-4 0 3985
+2 27844 98.7182 270.0160 0009239 201.4016 158.6766 14.20597009270763
AAU CUBESAT [-]
-1 27846U 03031G 08260.47647348 .00000019 00000-0 28983-4 0 3171
-2 27846 98.7128 268.4756 0009089 189.1621 170.9404 14.20946900270476
+1 27846U 03031G 08263.01142723 .00000007 00000-0 23411-4 0 3191
+2 27846 98.7118 270.9759 0009033 181.9752 178.1395 14.20947103270835
CANX-1 [-]
-1 27847U 03031H 08260.48191998 .00000017 00000-0 27894-4 0 3312
-2 27847 98.7132 268.4763 0009027 189.2852 170.8181 14.20932204270427
+1 27847U 03031H 08263.01689955 .00000009 00000-0 24151-4 0 3335
+2 27847 98.7125 270.9769 0009101 181.7893 178.3248 14.20932396270786
CO-57 [+]
-1 27848U 03031J 08260.58740604 .00000022 00000-0 30493-4 0 3470
-2 27848 98.7189 266.6750 0009091 214.1519 145.9078 14.20404329270380
+1 27848U 03031J 08263.05288386 .00000044 00000-0 41153-4 0 3490
+2 27848 98.7191 269.1064 0009133 206.5450 153.5267 14.20404959270738
RS-22 [+]
-1 27939U 03042A 08260.81503224 .00000045 00000-0 17743-4 0 5968
-2 27939 97.9802 139.0129 0012599 276.4395 83.5382 14.63257088265594
+1 27939U 03042A 08263.89220384 .00000051 00000-0 18877-4 0 5991
+2 27939 97.9792 141.9910 0012588 265.5339 94.4435 14.63257737266049
AO-51 [+]
-1 28375U 04025K 08260.24357242 -.00000003 00000-0 11898-4 0 1998
-2 28375 98.0679 279.6794 0082887 236.8095 122.5124 14.40618079221514
+1 28375U 04025K 08263.02179951 -.00000002 00000-0 12267-4 0 2010
+2 28375 98.0677 282.3003 0082872 228.2411 131.1676 14.40618346221916
VO-52 [+]
-1 28650U 05017B 08260.78933598 -.00000188 00000-0 -17128-4 0 322
-2 28650 97.7819 324.8459 0026701 199.8251 160.1910 14.81497356182164
+1 28650U 05017B 08263.35588355 .00000430 00000-0 61140-4 0 348
+2 28650 97.7810 327.3393 0026895 191.2779 168.7875 14.81500767182542
UWE-1 [-]
-1 28892U 05043C 08257.99387692 -.00000042 00000-0 86982-6 0 1433
-2 28892 98.0824 149.4552 0018330 129.3872 230.8990 14.59658296153554
+1 28892U 05043C 08263.20367471 .00000090 00000-0 28524-4 0 1468
+2 28892 98.0831 154.5338 0018581 114.0980 246.2159 14.59660287154316
XO-53 [-]
-1 28894U 05043E 08260.62036392 .00000019 00000-0 13548-4 0 2639
-2 28894 98.0834 152.2693 0018257 123.0030 237.2928 14.59633335153942
+1 28894U 05043E 08263.49951416 .00000023 00000-0 14341-4 0 2659
+2 28894 98.0831 155.0752 0018430 114.5817 245.7305 14.59633733154369
CO-58 [+]
-1 28895U 05043F 08260.70142639 .00000163 00000-0 43748-4 0 1219
-2 28895 98.0853 152.4938 0018999 121.6669 238.6400 14.59696701153837
+1 28895U 05043F 08262.96351883 .00000085 00000-0 27409-4 0 1233
+2 28895 98.0853 154.6995 0019014 114.8520 245.4688 14.59696917154163
NCUBE-2 [-]
-1 28897U 05043H 08261.13497747 .00000066 00000-0 23282-4 0 6524
-2 28897 98.0836 152.8415 0018019 120.7854 239.5130 14.59868830146187
+1 28897U 05043H 08264.15074295 .00000091 00000-0 28620-4 0 6549
+2 28897 98.0825 155.7815 0018182 111.9584 248.3584 14.59869926146621
CO-56 [P]
-1 28941U 06005C 08261.11557879 .00032347 27003-5 21545-3 0 3838
-2 28941 98.1179 24.7270 0152900 66.3288 295.3747 15.61321053144365
+1 28941U 06005C 08264.06355230 .00022006 25590-5 14809-3 0 3916
+2 28941 98.1163 28.1003 0152097 55.5237 305.9981 15.61464224144828
PEHUENSAT 1 [+]
-1 29712U 07001D 08261.22561522 .00000377 00000-0 56262-4 0 8015
-2 29712 97.8677 317.6488 0015427 82.6711 277.6255 14.80265875 91086
+1 29712U 07001D 08264.19986301 .00000447 00000-0 65358-4 0 8104
+2 29712 97.8667 320.5639 0015399 73.4960 286.7962 14.80269132 91523
Modified: trunk/data/cubesat.tle
===================================================================
--- trunk/data/cubesat.tle 2008-09-20 23:54:02 UTC (rev 143)
+++ trunk/data/cubesat.tle 2008-09-20 23:56:54 UTC (rev 144)
@@ -1,75 +1,75 @@
DTUSAT
-1 27842U 03031C 08259.91344591 .00000019 00000-0 28906-4 0 3779
-2 27842 98.7123 267.9253 0008862 191.2910 168.8081 14.20945799270399
+1 27842U 03031C 08263.92712453 .00000026 00000-0 32018-4 0 3790
+2 27842 98.7121 271.8843 0008987 179.5271 180.5920 14.20946450270964
CUTE-1 (CO-55)
-1 27844U 03031E 08260.57700588 .00000020 00000-0 29576-4 0 3964
-2 27844 98.7181 267.5843 0009161 208.9877 151.0797 14.20596148270418
+1 27844U 03031E 08263.04215010 .00000056 00000-0 46580-4 0 3985
+2 27844 98.7182 270.0160 0009239 201.4016 158.6766 14.20597009270763
QUAKESAT
-1 27845U 03031F 08260.52524410 .00000047 00000-0 42642-4 0 3764
-2 27845 98.7239 266.9121 0008275 227.7245 132.3232 14.20217250270328
+1 27845U 03031F 08263.06149727 .00000066 00000-0 51389-4 0 3781
+2 27845 98.7234 269.4135 0008275 220.4773 139.5799 14.20217972270689
AAU CUBESAT
-1 27846U 03031G 08260.47647348 .00000019 00000-0 28983-4 0 3171
-2 27846 98.7128 268.4756 0009089 189.1621 170.9404 14.20946900270476
+1 27846U 03031G 08263.01142723 .00000007 00000-0 23411-4 0 3191
+2 27846 98.7118 270.9759 0009033 181.9752 178.1395 14.20947103270835
CANX-1
-1 27847U 03031H 08260.48191998 .00000017 00000-0 27894-4 0 3312
-2 27847 98.7132 268.4763 0009027 189.2852 170.8181 14.20932204270427
+1 27847U 03031H 08263.01689955 .00000009 00000-0 24151-4 0 3335
+2 27847 98.7125 270.9769 0009101 181.7893 178.3248 14.20932396270786
CUBESAT XI-IV (CO-57)
-1 27848U 03031J 08260.58740604 .00000022 00000-0 30493-4 0 3470
-2 27848 98.7189 266.6750 0009091 214.1519 145.9078 14.20404329270380
+1 27848U 03031J 08263.05288386 .00000044 00000-0 41153-4 0 3490
+2 27848 98.7191 269.1064 0009133 206.5450 153.5267 14.20404959270738
UWE-1
-1 28892U 05043C 08257.99387692 -.00000042 00000-0 86982-6 0 1433
-2 28892 98.0824 149.4552 0018330 129.3872 230.8990 14.59658296153554
+1 28892U 05043C 08263.20367471 .00000090 00000-0 28524-4 0 1468
+2 28892 98.0831 154.5338 0018581 114.0980 246.2159 14.59660287154316
CUBESAT XI-V (CO-58)
-1 28895U 05043F 08260.70142639 .00000163 00000-0 43748-4 0 1219
-2 28895 98.0853 152.4938 0018999 121.6669 238.6400 14.59696701153837
+1 28895U 05043F 08262.96351883 .00000085 00000-0 27409-4 0 1233
+2 28895 98.0853 154.6995 0019014 114.8520 245.4688 14.59696917154163
NCUBE-2
-1 28897U 05043H 08261.13497747 .00000066 00000-0 23282-4 0 6524
-2 28897 98.0836 152.8415 0018019 120.7854 239.5130 14.59868830146187
+1 28897U 05043H 08264.15074295 .00000091 00000-0 28620-4 0 6549
+2 28897 98.0825 155.7815 0018182 111.9584 248.3584 14.59869926146621
CUTE-1.7+APD (CO-56)
-1 28941U 06005C 08261.11557879 .00032347 27003-5 21545-3 0 3838
-2 28941 98.1179 24.7270 0152900 66.3288 295.3747 15.61321053144365
+1 28941U 06005C 08264.06355230 .00022006 25590-5 14809-3 0 3916
+2 28941 98.1163 28.1003 0152097 55.5237 305.9981 15.61464224144828
GENESAT-1
-1 29655U 06058C 08260.93338227 .00006186 00000-0 77925-4 0 5125
-2 29655 40.0258 88.0156 0003958 36.3502 323.7584 15.59902851 99713
+1 29655U 06058C 08263.81409394 .00008759 00000-0 10863-3 0 5157
+2 29655 40.0257 70.1200 0002714 71.0928 289.0181 15.59962563100166
CSTB1
-1 31122U 07012F 08261.16645728 .00000552 00000-0 13192-3 0 4384
-2 31122 98.0353 323.3108 0086288 43.7946 317.0044 14.55158746 75450
+1 31122U 07012F 08264.05443318 .00000552 00000-0 13192-3 0 4409
+2 31122 98.0358 326.0886 0086298 34.8074 325.8715 14.55160080 75874
MAST
-1 31126U 07012K 08261.14710518 .00000050 00000-0 21920-4 0 4209
-2 31126 98.0316 321.8652 0095552 47.4340 313.4919 14.53444988 75379
+1 31126U 07012K 08262.38626663 -.00000077 00000-0 -68352-5 0 4216
+2 31126 98.0316 323.0535 0095351 43.6899 317.1841 14.53444478 75556
LIBERTAD-1
-1 31128U 07012M 08260.64501595 -.00000046 00000-0 00000+0 0 4339
-2 31128 98.0312 320.1764 0103886 52.5256 308.5335 14.51974523 75206
+1 31128U 07012M 08263.12584445 -.00000047 00000-0 00000+0 0 4353
+2 31128 98.0299 322.5497 0103743 44.8847 316.0706 14.51975214 75564
POLYSAT CP3
-1 31129U 07012N 08261.09602379 .00000044 00000-0 20785-4 0 2996
-2 31129 98.0320 320.6669 0103596 51.0434 309.9946 14.52063908 75250
+1 31129U 07012N 08264.12796047 .00000069 00000-0 26740-4 0 3095
+2 31129 98.0307 323.5671 0103457 41.7472 319.1578 14.52064852 75695
CAPE1
-1 31130U 07012P 08260.43204553 .00000175 00000-0 50987-4 0 4058
-2 31130 98.0335 319.9833 0103779 53.3250 307.7430 14.51991310 74963
+1 31130U 07012P 08263.80869089 -.00000035 00000-0 26949-5 0 4084
+2 31130 98.0325 323.2124 0103586 42.9265 317.9938 14.51991575 75453
POLYSAT CP4
-1 31132U 07012Q 08261.16557110 .00000417 00000-0 10225-3 0 4140
-2 31132 98.0352 323.2847 0086360 43.7719 317.0282 14.55143378 75323
+1 31132U 07012Q 08264.19110086 .00000093 00000-0 30786-4 0 4160
+2 31132 98.0342 326.1932 0086324 34.3526 326.3202 14.55143431 75764
NTS (CANX-6)
-1 32784U 08021B 08260.21125203 .00000251 00000-0 39284-4 0 1571
-2 32784 97.9868 319.8080 0015561 190.9787 169.1087 14.80967775 20874
+1 32784U 08021B 08263.85974280 -.00000123 00000-0 -89607-5 0 1600
+2 32784 97.9860 323.4406 0015830 178.9293 181.1953 14.80967210 21417
CUTE-1.7+APD II
-1 32785U 08021C 08260.44123313 .00000111 00000-0 21042-4 0 1597
-2 32785 97.9855 320.0984 0014408 196.0722 164.0033 14.81392073 20917
+1 32785U 08021C 08263.81849650 .00000340 00000-0 50311-4 0 1629
+2 32785 97.9840 323.4635 0014668 184.5066 175.6015 14.81393663 21412
COMPASS-1
-1 32787U 08021E 08261.17878230 .00000110 00000-0 20849-4 0 1497
-2 32787 97.9817 320.7685 0015515 195.0252 165.0502 14.81459968 21021
+1 32787U 08021E 08264.21817780 .00000285 00000-0 43220-4 0 1523
+2 32787 97.9790 323.7953 0015714 185.0547 175.0498 14.81462571 21477
AAUSAT-II
-1 32788U 08021F 08261.16833290 .00000221 00000-0 34908-4 0 1500
-2 32788 97.9807 320.7760 0015116 195.2135 164.8625 14.81571825 21024
+1 32788U 08021F 08263.86981679 .00000221 00000-0 34926-4 0 1526
+2 32788 97.9804 323.4669 0015418 186.7985 173.3012 14.81572517 21420
DELFI-C3
-1 32789U 08021G 08260.23399854 .00000300 00000-0 45125-4 0 1580
-2 32789 97.9838 319.8785 0015435 197.4841 162.5840 14.81471690 20883
+1 32789U 08021G 08263.81370227 .00000566 00000-0 78964-4 0 1615
+2 32789 97.9835 323.4457 0015679 185.6971 174.4056 14.81475513 21419
CANX-2
-1 32790U 08021H 08261.18460925 -.00000052 00000-0 22791-6 0 1452
-2 32790 97.9855 320.8329 0015042 193.3783 166.7032 14.81381172 21003
+1 32790U 08021H 08263.81889169 .00000208 00000-0 33514-4 0 1476
+2 32790 97.9851 323.4579 0015296 184.9419 175.1645 14.81383157 21399
SEEDS II
-1 32791U 08021J 08260.71952068 -.00000062 00000-0 -96575-6 0 1458
-2 32791 97.9832 320.3299 0015656 194.5758 165.4999 14.81312966 20929
+1 32791U 08021J 08263.21882575 .00000432 00000-0 62182-4 0 1477
+2 32791 97.9816 322.8179 0015771 186.7560 173.3449 14.81316254 21290
PSLV DEB
-1 32797U 08021L 08259.11819499 .00001613 00000-0 20936-3 0 765
-2 32797 97.9886 318.9194 0016663 202.4292 157.6051 14.82055141 19405
+1 32797U 08021L 08263.97926600 .00001409 00000-0 18365-3 0 796
+2 32797 97.9907 323.7741 0017199 187.2908 172.8373 14.82069291 20128
Modified: trunk/data/galileo.tle
===================================================================
--- trunk/data/galileo.tle 2008-09-20 23:54:02 UTC (rev 143)
+++ trunk/data/galileo.tle 2008-09-20 23:56:54 UTC (rev 144)
@@ -1,6 +1,6 @@
GIOVE-A
-1 28922U 05051A 08259.14832539 .00000016 00000-0 10000-3 0 3932
-2 28922 56.0556 164.6164 0007879 331.7703 28.2358 1.70194761 16882
+1 28922U 05051A 08262.08608970 .00000025 00000-0 10000-3 0 3940
+2 28922 56.0551 164.5394 0007820 331.2528 28.7718 1.70194777 16935
GIOVE-B
-1 32781U 08020A 08259.62465398 .00000013 00000-0 10000-3 0 683
-2 32781 55.9761 199.6087 0018608 214.7162 145.1291 1.70951143 2435
+1 32781U 08020A 08261.96447862 .00000020 00000-0 10000-3 0 698
+2 32781 55.9756 199.5464 0018750 214.5218 145.3435 1.70950975 2473
Modified: trunk/data/geo.tle
===================================================================
--- trunk/data/geo.tle 2008-09-20 23:54:02 UTC (rev 143)
+++ trunk/data/geo.tle 2008-09-20 23:56:54 UTC (rev 144)
@@ -1,438 +1,438 @@
LES 9
-1 08747U 76023B 08259.43832664 -.00000079 00000-0 10000-3 0 1245
-2 08747 10.6707 156.3591 0023538 313.7627 300.0208 1.00272734 64660
+1 08747U 76023B 08263.55108807 -.00000084 00000-0 10000-3 0 1277
+2 08747 10.6734 156.2416 0022282 313.4518 345.0865 1.00271896 64707
MARISAT 2
-1 09478U 76101A 08259.19172221 -.00000249 00000-0 10000-3 0 320
-2 09478 13.5890 358.2100 0002937 120.8401 270.6873 1.00275721 60196
+1 09478U 76101A 08263.23755813 -.00000254 00000-0 10000-3 0 342
+2 09478 13.5888 358.1737 0001627 252.8487 159.1745 1.00273288 60233
GOES 3
-1 10953U 78062A 08259.30616631 -.00000124 00000-0 10000-3 0 2390
-2 10953 14.2616 2.2707 0001272 257.6244 102.4005 1.00278049 63912
+1 10953U 78062A 08263.29489535 -.00000130 00000-0 10000-3 0 2425
+2 10953 14.2635 2.2373 0001438 247.2444 112.7649 1.00277963 63959
ESIAFI 1 (COMSTAR 4)
-1 12309U 81018A 08258.83127835 -.00000141 00000-0 10000-3 0 1547
-2 12309 13.7046 12.4036 0006245 236.8702 123.1144 1.00282643102431
+1 12309U 81018A 08260.82554162 -.00000143 00000-0 10000-3 0 1559
+2 12309 13.7064 12.3878 0006132 236.2997 123.6728 1.00282489102452
SATCOM C5
-1 13631U 82105A 08258.40502759 -.00000096 00000-0 10000-3 0 5340
-2 13631 12.0668 34.0473 0005751 202.8894 157.1619 1.00273181 61359
+1 13631U 82105A 08261.39664973 -.00000097 00000-0 10000-3 0 5351
+2 13631 12.0716 34.0214 0005909 202.9059 157.1177 1.00273308 61388
TDRS 1
-1 13969U 83026B 08260.02942828 -.00000293 00000-0 10000-3 0 7120
-2 13969 13.1304 11.3502 0024183 222.6782 82.7353 1.00271977 66241
+1 13969U 83026B 08262.38159751 -.00000296 00000-0 10000-3 0 7141
+2 13969 13.1293 11.3126 0024388 222.2543 212.2861 1.00271100 66273
GSTAR 1
-1 15677U 85035A 08259.45710166 -.00000088 00000-0 10000-3 0 555
-2 15677 10.0731 53.8733 0006333 234.1161 125.9497 1.00272555 60226
+1 15677U 85035A 08261.45150010 -.00000089 00000-0 10000-3 0 566
+2 15677 10.0775 53.8527 0006718 231.0989 128.9358 1.00272562 60245
INTELSAT 511
-1 15873U 85055A 08259.40116051 -.00000115 00000-0 10000-3 0 3018
-2 15873 11.4803 41.8416 0010694 263.3682 96.5891 1.00080499 59639
+1 15873U 85055A 08262.39855639 -.00000106 00000-0 10000-3 0 3023
+2 15873 11.4864 41.8123 0010623 262.0153 97.9193 1.00080255 59665
GOES 7
-1 17561U 87022A 08260.44531600 .00000073 00000-0 10000-3 0 6056
-2 17561 11.5963 39.8791 0003495 170.5076 130.5061 1.00281416 62165
+1 17561U 87022A 08263.61467664 .00000066 00000-0 10000-3 0 6115
+2 17561 11.6018 39.8492 0004354 175.1557 190.0741 1.00282003 62209
GSTAR 3
-1 19483U 88081A 08259.37298382 -.00000100 00000-0 10000-3 0 1231
-2 19483 13.9592 23.5005 0002566 320.8814 39.1521 1.00272531 69609
+1 19483U 88081A 08261.36741145 -.00000102 00000-0 10000-3 0 1268
+2 19483 13.9620 23.4826 0002480 324.4398 35.5771 1.00272615 69625
TDRS 3
-1 19548U 88091B 08260.62199586 -.00000187 00000-0 10000-3 0 1202
-2 19548 11.3062 42.5987 0015371 304.4956 317.7228 1.00273963 60394
+1 19548U 88091B 08263.70500850 -.00000194 00000-0 10000-3 0 1224
+2 19548 11.3125 42.5714 0015346 303.9786 351.2052 1.00273397 60422
ASTRA 1A
-1 19688U 88109B 08258.89320655 -.00000090 00000-0 10000-3 0 4774
-2 19688 6.9306 67.5961 0011254 303.2624 56.8591 0.98337162 52342
+1 19688U 88109B 08261.94368409 -.00000009 00000-0 10000-3 0 4807
+2 19688 6.9382 67.5592 0011536 303.7558 56.3204 0.98335781 52374
TDRS 4
-1 19883U 89021B 08260.88077882 -.00000274 00000-0 10000-3 0 4244
-2 19883 9.8925 54.8886 0002931 108.6307 103.9915 1.00272369243976
+1 19883U 89021B 08263.35372753 -.00000280 00000-0 10000-3 0 4263
+2 19883 9.8976 54.8642 0002954 113.2379 272.1100 1.00271601244006
INTELSAT 602 (IS-602)
-1 20315U 89087A 08260.43817925 -.00000058 00000-0 10000-3 0 7534
-2 20315 6.2315 69.5979 0001708 110.7206 137.3982 1.00325690 66975
+1 20315U 89087A 08263.62004447 -.00000059 00000-0 10000-3 0 7558
+2 20315 6.2392 69.5576 0001696 111.0887 206.2947 1.00325801 67004
LEASAT 5
-1 20410U 90002B 08259.58887110 -.00000308 00000-0 10000-3 0 9761
-2 20410 7.8273 36.7338 0000642 245.2906 24.9511 1.00272133 53689
+1 20410U 90002B 08263.88401933 -.00000314 00000-0 10000-3 0 9794
+2 20410 7.8348 36.7125 0000166 169.7112 211.0169 1.00269703 53739
INTELSAT 603 (IS-603)
-1 20523U 90021A 08260.94778440 -.00000151 00000-0 10000-3 0 3472
-2 20523 5.7063 71.1584 0001493 106.5437 139.8519 1.00272737 60735
+1 20523U 90021A 08262.79817449 -.00000154 00000-0 10000-3 0 3495
+2 20523 5.7110 71.1358 0001308 122.8490 71.5262 1.00272052 60751
ASIASAT 1
-1 20558U 90030A 08258.82506860 -.00000290 00000-0 10000-3 0 6049
-2 20558 8.3876 63.6089 0004210 170.3859 189.8091 0.99245600 67347
+1 20558U 90030A 08262.85512318 -.00000230 00000-0 10000-3 0 6057
+2 20558 8.3971 63.5586 0004087 172.0304 188.1038 0.99243616 67382
INSAT-1D
-1 20643U 90051A 08258.98816869 -.00000034 00000-0 10000-3 0 9811
-2 20643 9.1558 59.5236 0015685 39.5752 320.6955 1.00264015 53738
+1 20643U 90051A 08261.98000333 -.00000035 00000-0 10000-3 0 9839
+2 20643 9.1627 59.4879 0015682 39.7272 320.5042 1.00264341 53764
COSMOS 2085
-1 20693U 90061A 08258.90926882 -.00000113 00000-0 10000-3 0 8565
-2 20693 11.6367 38.3343 0002516 205.2819 154.7880 1.00283290 66483
+1 20693U 90061A 08263.89482211 -.00000123 00000-0 10000-3 0 8574
+2 20693 11.6458 38.2877 0002752 205.3083 154.7176 1.00283164 66535
SKYNET 4C
-1 20776U 90079A 08260.64542844 .00000038 00000-0 10000-3 0 8321
-2 20776 9.2613 49.9848 0002185 130.9650 53.4024 1.00274927 65941
+1 20776U 90079A 08261.11674286 .00000037 00000-0 10000-3 0 8341
+2 20776 9.2622 49.9809 0002259 128.0763 226.4359 1.00274987 65942
EUTELSAT 2-F1
-1 20777U 90079B 08260.31898233 -.00000241 00000-0 10000-3 0 7924
-2 20777 8.5881 62.6337 0006489 125.7307 234.4946 0.99347881 46364
+1 20777U 90079B 08262.33190487 -.00000226 00000-0 10000-3 0 7938
+2 20777 8.5929 62.6088 0006553 126.8192 233.3703 0.99347166 46383
SBS-6
-1 20872U 90091A 08261.10224266 -.00000224 00000-0 10000-3 0 9430
-2 20872 1.1047 82.7357 0002158 91.8768 137.7229 1.00272837 54056
+1 20872U 90091A 08264.10761613 -.00000230 00000-0 10000-3 0 9454
+2 20872 1.1121 82.6669 0002110 90.1038 144.4620 1.00271703 54088
GALAXY 6
-1 20873U 90091B 08260.00092618 .00000003 00000-0 10000-3 0 1844
-2 20873 5.4905 72.0615 0003511 81.5976 278.7319 0.99754657 60119
+1 20873U 90091B 08262.00561755 .00000031 00000-0 10000-3 0 1862
+2 20873 5.4953 72.0335 0003579 81.3545 278.9335 0.99754635 60133
INMARSAT 2-F1
-1 20918U 90093A 08257.98984230 -.00000255 00000-0 10000-3 0 433
-2 20918 5.9718 57.4935 0002756 110.5808 325.1340 1.00272633 61906
+1 20918U 90093A 08261.29858965 -.00000254 00000-0 10000-3 0 470
+2 20918 5.9778 57.4076 0003138 117.9946 72.2166 1.00271485 61930
GSTAR 4
-1 20946U 90100B 08258.67585675 -.00000046 00000-0 10000-3 0 1945
-2 20946 5.6767 71.8953 0005557 145.7275 214.6015 0.99144604 60002
+1 20946U 90100B 08261.70143301 -.00000127 00000-0 10000-3 0 1950
+2 20946 5.6841 71.8564 0005611 146.0549 214.2299 0.99145697 60038
COSMOS 2133
-1 21111U 91010A 08258.94621204 -.00000041 00000-0 10000-3 0 629
-2 21111 10.7105 44.5588 0002001 310.6387 49.4445 1.00269326 64422
+1 21111U 91010A 08261.93792967 -.00000043 00000-0 10000-3 0 641
+2 21111 10.7165 44.5296 0001975 310.2352 49.8168 1.00269667 64458
INMARSAT 2-F2
-1 21149U 91018A 08260.45692399 -.00000134 00000-0 10000-3 0 1747
-2 21149 5.2924 57.4037 0003855 110.1355 254.7773 1.00272432 64224
+1 21149U 91018A 08263.51313971 -.00000139 00000-0 10000-3 0 1793
+2 21149 5.2992 57.3824 0003869 129.9261 258.2576 1.00272438 64250
TDRS 5
-1 21639U 91054B 08260.61373433 .00000100 00000-0 10000-3 0 2972
-2 21639 9.2197 58.8112 0003398 111.8536 235.1125 1.00280239 62714
+1 21639U 91054B 08263.62440520 .00000094 00000-0 10000-3 0 2992
+2 21639 9.2267 58.7732 0003436 116.4214 237.4767 1.00280975 62743
INTELSAT 605 (IS-605)
-1 21653U 91055A 08260.28904425 .00000013 00000-0 10000-3 0 6701
-2 21653 3.7405 76.0051 0001111 92.6442 105.0228 1.00273520 62565
+1 21653U 91055A 08263.62098863 .00000008 00000-0 10000-3 0 6728
+2 21653 3.7483 75.9542 0001336 100.3221 220.1961 1.00273996 62598
ANIK E1
-1 21726U 91067A 08259.24602825 -.00000197 00000-0 10000-3 0 559
-2 21726 5.0696 74.1329 0005411 157.1243 203.2236 0.99172789 52979
+1 21726U 91067A 08260.25429528 -.00000211 00000-0 10000-3 0 567
+2 21726 5.0720 74.1180 0005534 157.6975 202.6446 0.99172785 52988
INTELSAT 601 (IS-601)
-1 21765U 91075A 08259.92492116 .00000128 00000-0 10000-3 0 6397
-2 21765 3.7920 75.7550 0000280 325.5424 334.4428 1.00274857 61669
+1 21765U 91075A 08262.81567104 .00000126 00000-0 10000-3 0 6410
+2 21765 3.7990 75.7114 0000055 110.9234 152.6075 1.00273432 61696
EUTELSAT 2-F3
-1 21803U 91083A 08260.29231377 -.00000140 00000-0 10000-3 0 5766
-2 21803 7.7488 65.7726 0003766 140.7112 182.0763 0.99295906 57289
+1 21803U 91083A 08263.44420970 -.00000088 00000-0 10000-3 0 5788
+2 21803 7.7561 65.7332 0004404 153.8344 215.6842 0.99294720 57325
GALAXY 5
-1 21906U 92013A 08258.67749282 .00000006 00000-0 10000-3 0 8091
-2 21906 3.5337 77.0394 0012207 270.0163 90.3122 0.99289993 52026
+1 21906U 92013A 08261.69861203 -.00000062 00000-0 10000-3 0 8100
+2 21906 3.5413 76.9994 0012071 270.7841 89.4938 0.99291190 52053
INMARSAT 2-F4
-1 21940U 92021B 08259.88346334 -.00000348 00000-0 10000-3 0 8767
-2 21940 3.9494 50.0606 0002065 124.2557 247.9716 1.00274816 60105
+1 21940U 92021B 08263.92295373 -.00000354 00000-0 10000-3 0 8805
+2 21940 3.9580 50.0669 0002135 128.9568 261.4825 1.00272415 60140
EUTELSAT 2-F4
-1 22028U 92041B 08259.49515132 .00000034 00000-0 10000-3 0 794
-2 22028 6.9349 69.0897 0007507 104.2250 256.0918 0.99076611 51993
+1 22028U 92041B 08263.53199475 .00000070 00000-0 10000-3 0 815
+2 22028 6.9450 69.0354 0007167 104.2888 255.9470 0.99076897 52036
SATCOM C3
-1 22117U 92060B 08260.43375122 -.00000231 00000-0 10000-3 0 9859
-2 22117 3.6969 75.9109 0002255 146.4985 210.4765 1.00271513 58626
+1 22117U 92060B 08263.49448159 -.00000236 00000-0 10000-3 0 9876
+2 22117 3.7040 75.8659 0001920 147.5133 234.3853 1.00271375 58664
HELLAS SAT 1 (DFS 3)
-1 22175U 92066A 08259.13230129 .00000090 00000-0 10000-3 0 2766
-2 22175 6.2260 69.8858 0001236 263.9066 96.3567 0.99731046 55930
+1 22175U 92066A 08263.14258812 .00000043 00000-0 10000-3 0 2792
+2 22175 6.2366 69.8392 0000581 239.6323 120.5642 0.99733248 55972
GORIZONT 27
-1 22245U 92082A 08259.57499161 .00000127 00000-0 10000-3 0 3732
-2 22245 10.6931 47.7300 0015061 208.9893 151.0316 1.00177379 62190
+1 22245U 92082A 08262.56941520 .00000123 00000-0 10000-3 0 3743
+2 22245 10.6993 47.6986 0015224 208.6682 151.3160 1.00178738 62225
SUPERBIRD A1
-1 22253U 92084A 08260.44180439 -.00000126 00000-0 10000-3 0 7213
-2 22253 2.8039 77.7229 0004292 82.3137 152.7544 1.00272040 57548
+1 22253U 92084A 08263.62591022 -.00000131 00000-0 10000-3 0 7249
+2 22253 2.8118 77.6737 0004260 83.1792 221.3613 1.00272077 57573
COSMOS 2224
-1 22269U 92088A 08259.12739448 .00000059 00000-0 10000-3 0 5129
-2 22269 9.8172 50.4474 0003891 114.3315 245.8329 1.00227665 57153
+1 22269U 92088A 08262.12032500 .00000053 00000-0 10000-3 0 5144
+2 22269 9.8238 50.4162 0004087 118.4454 241.6820 1.00228624 57186
TDRS 6
-1 22314U 93003B 08260.41903837 .00000088 00000-0 10000-3 0 3453
-2 22314 8.5564 61.9721 0003232 83.8757 187.0328 1.00266987 57433
+1 22314U 93003B 08263.32143389 .00000082 00000-0 10000-3 0 3470
+2 22314 8.5633 61.9363 0003198 92.4027 146.2123 1.00267869 57462
ASTRA 1C
-1 22653U 93031A 08257.55795380 .00000034 00000-0 10000-3 0 3061
-2 22653 1.8888 81.7230 0003465 90.6332 26.6819 1.00270313 51280
+1 22653U 93031A 08263.84902876 .00000033 00000-0 10000-3 0 3081
+2 22653 1.9001 81.5352 0004010 101.4286 127.0956 1.00273649 51347
INSAT-2B
-1 22724U 93048B 08258.05148126 .00000116 00000-0 10000-3 0 1311
-2 22724 7.2475 66.9437 0015042 44.1805 316.1592 0.99960950 55759
+1 22724U 93048B 08263.05293126 .00000134 00000-0 10000-3 0 1341
+2 22724 7.2597 66.8807 0014960 45.1036 315.1688 0.99962835 55804
ACTS
-1 22796U 93058B 08259.47806511 -.00000084 00000-0 10000-3 0 5596
-2 22796 8.7801 61.0811 0001232 67.3034 292.8722 1.00271630 61896
+1 22796U 93058B 08263.46689351 -.00000090 00000-0 10000-3 0 5611
+2 22796 8.7894 61.0335 0000971 113.6236 246.4900 1.00271562 61939
INTELSAT 701 (IS-701)
-1 22871U 93066A 08260.41934850 .00000054 00000-0 10000-3 0 2642
-2 22871 0.0348 147.4903 0002901 23.8534 155.3685 1.00273415 54456
+1 22871U 93066A 08263.56741097 .00000051 00000-0 10000-3 0 2658
+2 22871 0.0138 179.3779 0002873 355.7803 207.9694 1.00273853 54496
GORIZONT 28
-1 22880U 93069A 08260.35594862 -.00000359 00000-0 10000-3 0 9706
-2 22880 10.1985 51.0892 0000667 252.5721 297.1806 1.00276175 54522
+1 22880U 93069A 08263.04361116 -.00000364 00000-0 10000-3 0 9727
+2 22880 10.2036 51.0654 0000838 244.8807 195.1278 1.00274590 54557
GORIZONT 29
-1 22907U 93072A 08259.41668198 -.00000140 00000-0 10000-3 0 5781
-2 22907 10.1690 51.2253 0014951 194.0716 166.0034 1.00115944 54278
+1 22907U 93072A 08263.41175744 -.00000133 00000-0 10000-3 0 5801
+2 22907 10.1782 51.1826 0014600 190.9174 169.1129 1.00115291 54318
SOLIDARIDAD 1
-1 22911U 93073A 08258.49671785 -.00000086 00000-0 10000-3 0 975
-2 22911 7.2320 66.9360 0004692 111.8377 248.4326 1.00279733 52895
+1 22911U 93073A 08261.48809031 -.00000086 00000-0 10000-3 0 1022
+2 22911 7.2390 66.8993 0004956 115.2533 244.9811 1.00279766 52928
METEOSAT-6 (MOP-3)
-1 22912U 93073B 08259.73905332 -.00000013 00000-0 10000-3 0 6912
-2 22912 7.7164 63.0794 0000587 177.0624 88.3976 1.00269750 52715
+1 22912U 93073B 08263.77313171 -.00000020 00000-0 10000-3 0 6979
+2 22912 7.7261 63.0312 0000725 184.3070 97.4084 1.00270113 52759
NATO 4B
-1 22921U 93076A 08260.06911185 .00000153 00000-0 10000-3 0 677
-2 22921 7.1582 55.0660 0003357 132.7406 227.4595 1.00272499 54146
+1 22921U 93076A 08262.06351390 .00000152 00000-0 10000-3 0 696
+2 22921 7.1629 55.0498 0003333 135.0407 225.1284 1.00273309 54161
DIRECTV 1 (DBS 1)
-1 22930U 93078A 08259.27812102 -.00000173 00000-0 10000-3 0 4766
-2 22930 0.0601 58.1834 0001399 115.9945 189.3597 1.00270093 61865
+1 22930U 93078A 08262.21047662 -.00000173 00000-0 10000-3 0 4776
+2 22930 0.0468 67.2403 0000829 97.1095 177.7577 1.00271397 61882
THAICOM 1
-1 22931U 93078B 08259.81035860 -.00000361 00000-0 10000-3 0 2267
-2 22931 0.0752 35.5681 0001467 197.2725 174.0891 1.00273645 53570
+1 22931U 93078B 08262.87419051 -.00000363 00000-0 10000-3 0 2290
+2 22931 0.0798 37.6613 0001642 194.4678 200.8043 1.00271635 53607
GOES 8
-1 23051U 94022A 08259.55751629 .00000064 00000-0 10000-3 0 4801
-2 23051 5.0483 77.5837 0008013 149.6336 210.7506 0.98903677 60000
+1 23051U 94022A 08262.59038838 .00000055 00000-0 10000-3 0 4865
+2 23051 5.0561 77.5350 0008402 151.1639 209.1546 0.98904420 60039
INTELSAT 702 (IS-702)
-1 23124U 94034A 08255.79424336 .00000082 00000-0 10000-3 0 861
-2 23124 0.0117 265.6156 0002632 255.5989 170.7506 1.00273379 66325
+1 23124U 94034A 08259.78833892 .00000086 00000-0 10000-3 0 869
+2 23124 0.0062 25.3167 0002484 140.9066 167.5622 1.00272487 66361
INTELSAT 2 (IS-2)
-1 23175U 94040A 08260.43209218 -.00000029 00000-0 10000-3 0 2810
-2 23175 0.0112 204.6165 0002117 318.9063 156.8173 1.00273671 51283
+1 23175U 94040A 08263.56846296 -.00000033 00000-0 10000-3 0 2826
+2 23175 0.0227 230.3728 0002253 315.9735 186.1551 1.00271406 51320
BS-3N
-1 23176U 94040B 08259.80823368 -.00000350 00000-0 10000-3 0 9182
-2 23176 0.0838 277.5738 0001943 244.0522 234.4203 1.00270813 51786
+1 23176U 94040B 08263.93896399 -.00000354 00000-0 10000-3 0 9213
+2 23176 0.0715 278.0144 0001661 248.2338 280.8936 1.00268425 51824
APSTAR 1
-1 23185U 94043A 08260.33431771 -.00000263 00000-0 10000-3 0 36
-2 23185 3.7483 75.8523 0000771 111.9519 70.2393 1.00270695 51839
+1 23185U 94043A 08263.15353924 -.00000267 00000-0 10000-3 0 58
+2 23185 3.7549 75.8038 0000932 122.7028 357.2104 1.00269467 51863
DIRECTV 2 (DBS 2)
-1 23192U 94047A 08260.49171486 .00000016 00000-0 10000-3 0 3408
-2 23192 1.6851 81.0761 0013103 159.8908 155.8978 0.98634677 61720
+1 23192U 94047A 08262.43847463 -.00000025 00000-0 10000-3 0 3422
+2 23192 1.6902 81.0553 0013514 161.2931 125.7928 0.98635383 61743
BRASILSAT B1
-1 23199U 94049A 08259.45690978 -.00000269 00000-0 10000-3 0 1435
-2 23199 1.4604 82.2432 0006424 347.9512 20.9520 1.00269166 62523
+1 23199U 94049A 08263.15254188 -.00000272 00000-0 10000-3 0 1452
+2 23199 1.4709 82.3030 0001689 99.8095 163.2168 1.00276554 62552
OPTUS B3
-1 23227U 94055A 08259.64429284 -.00000073 00000-0 10000-3 0 2158
-2 23227 0.7518 83.4562 0006032 105.1750 202.2981 1.00273105 51455
+1 23227U 94055A 08262.56441703 -.00000074 00000-0 10000-3 0 2176
+2 23227 0.7589 83.3835 0005296 101.0581 180.6145 1.00272769 51482
NSS-703
-1 23305U 94064A 08260.70111815 .00000072 00000-0 10000-3 0 8235
-2 23305 0.0170 182.4229 0002908 348.9150 134.0986 1.00273722 51180
+1 23305U 94064A 08263.93353331 .00000067 00000-0 10000-3 0 8250
+2 23305 0.0174 190.0227 0002958 341.6670 220.5886 1.00271857 51221
SOLIDARIDAD 2
-1 23313U 94065A 08259.40530911 -.00000025 00000-0 10000-3 0 1885
-2 23313 0.5394 84.0996 0002309 78.3378 223.3321 1.00273541 51040
+1 23313U 94065A 08262.56411309 -.00000026 00000-0 10000-3 0 1910
+2 23313 0.5472 83.9899 0002267 83.9623 278.1106 1.00273672 51072
THAICOM 2
-1 23314U 94065B 08260.60291556 -.00000120 00000-0 10000-3 0 1144
-2 23314 0.0798 36.7264 0004516 195.9850 58.7634 1.00271723 51024
+1 23314U 94065B 08263.74307473 -.00000125 00000-0 10000-3 0 1176
+2 23314 0.0782 32.2307 0004566 201.0743 111.7157 1.00271410 51057
EXPRESS 1
-1 23319U 94067A 08260.41054417 -.00000186 00000-0 10000-3 0 5969
-2 23319 7.4366 66.2159 0005039 90.8413 269.4175 0.99821971 50888
+1 23319U 94067A 08263.41558017 -.00000166 00000-0 10000-3 0 5976
+2 23319 7.4440 66.1767 0005034 92.9192 267.2800 0.99821141 50911
ASTRA 1D
-1 23331U 94070A 08260.02195259 .00000156 00000-0 00000+0 0 7912
-2 23331 0.9578 80.7100 0002691 82.2008 231.6329 1.00270168 51295
+1 23331U 94070A 08264.01386900 .00000150 00000-0 00000+0 0 7947
+2 23331 0.9677 80.6353 0002772 90.6923 224.2244 1.00271835 51334
RADUGA 32
-1 23448U 94087A 08258.97470200 -.00000043 00000-0 10000-3 0 578
-2 23448 9.6077 55.4503 0006219 123.9304 236.2660 1.00267522 67928
+1 23448U 94087A 08261.96644065 -.00000044 00000-0 10000-3 0 596
+2 23448 9.6141 55.4159 0006127 124.8565 235.3030 1.00267822 67951
INTELSAT 704 (IS-704)
-1 23461U 95001A 08259.91351580 -.00000002 00000-0 10000-3 0 8016
-2 23461 0.0175 226.0163 0003792 283.7632 240.3407 1.00273409 50150
+1 23461U 95001A 08263.77925245 -.00000006 00000-0 10000-3 0 8047
+2 23461 0.0313 240.2797 0003545 266.1782 199.1543 1.00273564 50189
INTELSAT 705 (IS-705)
-1 23528U 95013A 08258.99967436 -.00000283 00000-0 10000-3 0 7697
-2 23528 0.0087 122.6682 0003758 45.8590 135.6950 1.00270696 49315
+1 23528U 95013A 08261.93241641 -.00000281 00000-0 10000-3 0 7708
+2 23528 0.0180 241.2483 0003159 310.1108 91.5490 1.00272027 49346
BRASILSAT B2
-1 23536U 95016A 08259.45789964 -.00000168 00000-0 00000-0 0 8856
-2 23536 0.6407 87.6814 0003807 68.5101 271.4422 1.00272792 49398
+1 23536U 95016A 08263.50859285 -.00000171 00000-0 00000+0 0 8876
+2 23536 0.6507 87.5723 0003548 86.2846 276.0239 1.00272305 49434
AMSC 1
1 23553U 95019A 08261.14872411 -.00000110 00000-0 10000-3 0 399
2 23553 3.8246 75.9177 0002557 116.1728 116.6236 1.00272260 49215
INTELSAT 706 (IS-706)
-1 23571U 95023A 08260.68955530 .00000114 00000-0 10000-3 0 8027
-2 23571 0.0328 131.8611 0003094 47.3713 115.2749 1.00274129 48822
+1 23571U 95023A 08263.93380709 .00000109 00000-0 10000-3 0 8044
+2 23571 0.0250 264.2126 0003240 284.6965 196.7310 1.00273583 48861
DIRECTV 3 (DBS 3)
-1 23598U 95029A 08259.31640029 -.00000220 00000-0 10000-3 0 9349
-2 23598 0.0094 313.7608 0001565 235.3975 197.3833 1.00271681 48542
+1 23598U 95029A 08262.19711703 -.00000220 00000-0 10000-3 0 9358
+2 23598 0.0263 128.7835 0002949 37.6831 179.9932 1.00271041 48565
TDRS 7
-1 23613U 95035B 08260.25210392 .00000127 00000-0 10000-3 0 3771
-2 23613 10.4411 51.1620 0002779 130.2888 114.5397 1.00283823 48243
+1 23613U 95035B 08260.88376770 .00000126 00000-0 10000-3 0 3783
+2 23613 10.4420 51.1555 0002760 132.5946 340.2885 1.00284120 48252
INTELSAT 4 (IS-4)
-1 23636U 95040A 08260.71596964 -.00000057 00000-0 10000-3 0 8504
-2 23636 0.0058 202.5870 0003088 323.6529 159.5572 1.00272988 48023
+1 23636U 95040A 08261.94470749 -.00000058 00000-0 10000-3 0 8514
+2 23636 0.0024 189.1113 0003092 337.4464 242.8003 1.00273019 48045
COSMOS 2319
-1 23653U 95045A 08259.61166125 .00000131 00000-0 10000-3 0 9296
-2 23653 9.2195 57.7639 0005127 83.7600 276.4430 1.00202326 47770
+1 23653U 95045A 08262.60530798 .00000126 00000-0 10000-3 0 9306
+2 23653 9.2264 57.7264 0005174 83.7008 276.4612 1.00203667 47800
TELSTAR 4 (TELSTAR 402R)
-1 23670U 95049A 08258.47010840 -.00000183 00000-0 10000-3 0 8370
-2 23670 4.6582 73.4550 0004758 147.6933 212.6870 1.00277146 47528
+1 23670U 95049A 08261.46155755 -.00000183 00000-0 10000-3 0 8378
+2 23670 4.6657 73.4163 0005137 149.8070 210.5297 1.00276483 47555
LUCH 1
-1 23680U 95054A 08258.99660590 -.00000076 00000-0 10000-3 0 6691
-2 23680 8.3040 66.9854 0004429 311.3190 48.8331 1.00277590 47381
+1 23680U 95054A 08261.98802429 -.00000078 00000-0 10000-3 0 6718
+2 23680 8.3110 66.9455 0004308 309.2678 50.8427 1.00277653 47412
ASTRA 1E
-1 23686U 95055A 08259.70410637 .00000138 00000-0 00000+0 0 9071
-2 23686 0.0636 190.0197 0004662 323.0046 118.9846 1.00273487 47353
+1 23686U 95055A 08261.95674347 .00000138 00000-0 00000+0 0 9082
+2 23686 0.0643 186.1162 0004789 327.8229 211.2555 1.00274465 47388
ASIASAT 2
-1 23723U 95064A 08259.55216542 -.00000308 00000-0 10000-3 0 7506
-2 23723 0.0478 302.6490 0002474 222.4106 129.1247 1.00273631 46881
+1 23723U 95064A 08263.92704926 -.00000311 00000-0 10000-3 0 7537
+2 23723 0.0401 305.8083 0002466 226.8857 260.7707 1.00271689 46932
TELECOM 2C
-1 23730U 95067A 08259.83490127 .00000022 00000-0 10000-3 0 56
-2 23730 4.4866 74.2371 0004225 100.9212 123.6208 1.00272414 46910
+1 23730U 95067A 08262.19481242 .00000021 00000-0 10000-3 0 67
+2 23730 4.4927 74.1969 0004475 106.3504 250.1244 1.00272690 46935
ECHOSTAR 1
-1 23754U 95073A 08259.50027778 .00000130 00000-0 10000-3 0 9768
-2 23754 0.0277 266.8222 0002526 250.9278 229.1295 1.00275299 46437
+1 23754U 95073A 08263.60547896 .00000127 00000-0 10000-3 0 9791
+2 23754 0.0118 238.2424 0002480 310.6570 239.8698 1.00271531 46470
INTELSAT 3R (IS-3R)
-1 23764U 96002A 08260.20832189 -.00000268 00000-0 10000-3 0 5524
-2 23764 0.0129 207.7709 0002532 351.5034 188.2546 1.00271173 46445
+1 23764U 96002A 08261.92263959 -.00000268 00000-0 10000-3 0 5538
+2 23764 0.0047 205.0431 0002780 350.5506 90.7589 1.00268733 46458
AFRICASAT-1 (MEASAT-1)
-1 23765U 96002B 08258.67274744 .00000132 00000-0 10000-3 0 7026
-2 23765 0.9159 82.6550 0000533 27.9212 171.6671 1.00275989 46403
+1 23765U 96002B 08261.92973130 .00000134 00000-0 10000-3 0 7036
+2 23765 0.9230 82.6206 0000350 25.3041 269.9982 1.00272491 46445
KOREASAT 2
-1 23768U 96003A 08257.78775251 -.00000363 00000-0 10000-3 0 6284
-2 23768 1.6599 80.9593 0004248 24.5931 287.7523 1.00274548 46379
+1 23768U 96003A 08263.92324933 -.00000366 00000-0 10000-3 0 6322
+2 23768 1.6763 80.8512 0001206 145.0937 222.1500 1.00270740 46444
HGS-3
-1 23779U 96006A 08260.05344853 .00000154 00000-0 10000-3 0 756
-2 23779 0.0304 228.5001 0002527 293.3769 250.7806 1.00275784 46181
+1 23779U 96006A 08262.77085796 .00000153 00000-0 10000-3 0 776
+2 23779 0.0176 206.7553 0002785 336.7687 130.0745 1.00270733 46209
INTELSAT 707 (IS-707)
-1 23816U 96015A 08259.30917112 -.00000285 00000-0 10000-3 0 7571
-2 23816 0.0031 167.8842 0003269 22.0530 223.0120 1.00271518 45828
+1 23816U 96015A 08262.22955046 -.00000284 00000-0 10000-3 0 7584
+2 23816 0.0039 167.8450 0003269 22.1521 197.1784 1.00271859 45850
INMARSAT 3-F1
-1 23839U 96020A 08258.59829400 .00000010 00000-0 10000-3 0 3777
-2 23839 0.1316 297.4043 0004797 227.6735 108.7641 1.00274032 45607
+1 23839U 96020A 08263.93588622 .00000007 00000-0 10000-3 0 3810
+2 23839 0.1225 303.8770 0005371 240.2339 216.5497 1.00274025 45660
ASTRA 1F
1 23842U 96021A 08255.90665278 .00000117 00000-0 00000+0 0 9280
2 23842 0.0319 178.3836 0001829 259.3368 259.1900 1.00275698 45481
MSAT M1
-1 23846U 96022A 08260.49394751 -.00000078 00000-0 10000-3 0 3129
-2 23846 1.1653 81.5393 0005242 85.3052 260.2924 1.00272115 45447
+1 23846U 96022A 08263.26767272 -.00000081 00000-0 10000-3 0 3145
+2 23846 1.1730 81.6495 0005399 86.7504 180.0202 1.00272371 45472
PALAPA C2
1 23864U 96030A 08260.60119760 -.00000357 00000-0 10000-3 0 7478
2 23864 0.0127 302.6051 0001407 254.0111 128.7184 1.00273311 45174
AMOS
-1 23865U 96030B 08258.82659323 -.00000034 00000-0 00000+0 0 9776
-2 23865 0.0504 155.4785 0000848 74.9877 57.2955 1.00273650 45154
+1 23865U 96030B 08261.31079328 -.00000033 00000-0 00000+0 0 9785
+2 23865 0.0687 261.2461 0001543 289.8417 273.4350 1.00272248 45189
GALAXY 9 (G-9)
-1 23877U 96033A 08259.45688012 -.00000225 00000-0 10000-3 0 9608
-2 23877 0.0739 79.4941 0002099 93.6963 265.1002 1.00272420 45113
+1 23877U 96033A 08261.17889476 -.00000224 00000-0 10000-3 0 9617
+2 23877 0.0777 78.5052 0001991 91.6418 169.7650 1.00271721 45123
GORIZONT 32
-1 23880U 96034A 08260.90401714 -.00000114 00000-0 10000-3 0 346
-2 23880 8.7905 59.6393 0002178 146.9784 100.5640 1.00275186 45098
+1 23880U 96034A 08263.85852736 -.00000121 00000-0 10000-3 0 378
+2 23880 8.7970 59.6038 0002548 157.3023 76.8339 1.00274642 45129
INTELSAT 709 (IS-709)
-1 23915U 96035A 08258.92313337 -.00000186 00000-0 10000-3 0 8109
-2 23915 0.0060 138.1516 0002935 38.8382 234.7699 1.00272532 44903
+1 23915U 96035A 08263.97546139 -.00000189 00000-0 10000-3 0 8145
+2 23915 0.0160 124.7352 0003063 47.7682 263.0738 1.00271225 44950
APSTAR 1A
-1 23943U 96039A 08259.72166789 -.00000335 00000-0 10000-3 0 8476
-2 23943 3.0427 77.3587 0001204 78.7144 228.7432 1.00267519 44719
+1 23943U 96039A 08263.67341247 -.00000339 00000-0 10000-3 0 8484
+2 23943 3.0523 77.3034 0000897 82.8818 211.1663 1.00276303 44751
TURKSAT 1C
-1 23949U 96040B 08260.02195259 .00000155 00000-0 10000-3 0 8742
-2 23949 0.4696 80.3973 0003493 103.0472 210.7699 1.00271988 44659
+1 23949U 96040B 08263.75555395 .00000151 00000-0 10000-3 0 8764
+2 23949 0.4788 80.3113 0003225 100.4905 121.2024 1.00273563 44684
TELECOM 2D
-1 24209U 96044B 08260.13327358 -.00000062 00000-0 10000-3 0 7843
-2 24209 2.2087 79.2898 0005047 90.5287 225.7607 1.00272278 44464
+1 24209U 96044B 08261.93051891 -.00000063 00000-0 10000-3 0 7850
+2 24209 2.2130 79.2720 0005130 92.1096 152.9820 1.00272401 44484
INMARSAT 3-F2
-1 24307U 96053A 08260.15821345 -.00000122 00000-0 10000-3 0 4809
-2 24307 0.1359 293.4130 0005577 227.3787 236.1678 1.00272480 44047
+1 24307U 96053A 08264.02856870 -.00000127 00000-0 10000-3 0 4849
+2 24307 0.1267 294.2328 0005583 227.5404 192.3348 1.00272156 44078
ECHOSTAR 2
-1 24313U 96055A 08259.50210867 .00000119 00000-0 10000-3 0 8232
-2 24313 0.1812 82.4295 0002948 98.4494 210.7827 1.00303790 44062
+1 24313U 96055A 08263.47720287 .00000115 00000-0 10000-3 0 8275
+2 24313 0.1909 82.1309 0002761 103.0601 201.8879 1.00305330 44103
AMC-1 (GE-1)
-1 24315U 96054A 08259.37957618 -.00000102 00000-0 10000-3 0 145
-2 24315 0.0240 244.2712 0003610 283.3118 220.7751 1.00271947 44026
+1 24315U 96054A 08263.30826146 -.00000104 00000-0 10000-3 0 168
+2 24315 0.0181 239.6488 0003617 289.8680 197.0516 1.00272019 44060
ARABSAT-2B
-1 24652U 96063A 08260.02047255 .00000155 00000-0 00000+0 0 8522
-2 24652 0.0387 187.8754 0003067 358.3704 206.9638 1.00275107 43863
+1 24652U 96063A 08262.70934005 .00000153 00000-0 00000+0 0 8547
+2 24652 0.0357 187.2980 0003585 7.0618 89.4694 1.00271400 43882
MEASAT-2
-1 24653U 96063B 08260.61012858 -.00000216 00000-0 10000-3 0 8129
-2 24653 0.8883 82.8550 0001496 85.3343 195.3902 1.00272563 43432
+1 24653U 96063B 08263.61161383 -.00000220 00000-0 10000-3 0 8158
+2 24653 0.8956 82.7967 0001499 81.5809 202.6972 1.00271666 43467
EUROBIRD 9
-1 24665U 96067A 08259.83114748 .00000063 00000-0 10000-3 0 7543
-2 24665 0.0420 93.1453 0002817 94.9425 115.2799 1.00273232 43671
+1 24665U 96067A 08264.01076772 .00000058 00000-0 10000-3 0 7569
+2 24665 0.0529 90.8525 0003590 78.3051 203.0164 1.00273972 43724
INMARSAT 3-F3
-1 24674U 96070A 08259.63165361 .00000041 00000-0 10000-3 0 4488
-2 24674 0.1312 298.9574 0006720 243.2018 218.3211 1.00274553 42990
+1 24674U 96070A 08263.44854293 .00000037 00000-0 10000-3 0 4521
+2 24674 0.1241 303.2161 0005482 243.8908 151.1726 1.00270805 43027
AMC-2 (GE-2)
1 24713U 97002A 08260.49028065 -.00000114 00000-0 00000+0 0 7832
2 24713 0.0066 248.5419 0002718 308.4238 234.3502 1.00272326 42604
NAHUEL 1A
-1 24714U 97002B 08258.58802404 -.00000260 00000-0 10000-3 0 7632
-2 24714 1.0632 82.4260 0003937 84.6549 326.7469 1.00270676 42587
+1 24714U 97002B 08264.08771706 -.00000264 00000-0 10000-3 0 7661
+2 24714 1.0755 82.4253 0004181 92.5206 144.1...
[truncated message content] |
|
From: <cs...@us...> - 2008-09-20 23:54:08
|
Revision: 143
http://gpredict.svn.sourceforge.net/gpredict/?rev=143&view=rev
Author: csete
Date: 2008-09-20 23:54:02 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
Fixed bug that caused local oscillator frequency to be 0 when trying to edit a radio configuration.
Modified Paths:
--------------
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig.c
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-09-20 23:38:50 UTC (rev 142)
+++ trunk/src/sat-pref-rig-editor.c 2008-09-20 23:54:02 UTC (rev 143)
@@ -231,7 +231,7 @@
gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4532); /* hamlib default? */
/* lo in MHz */
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), conf->lo / 1000000);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), conf->lo / 1000000.0);
}
@@ -277,7 +277,7 @@
conf->port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));
/* lo freq */
- conf->lo = 1000000*gtk_spin_button_get_value (GTK_SPIN_BUTTON (lo));
+ conf->lo = 1000000.0*gtk_spin_button_get_value (GTK_SPIN_BUTTON (lo));
return TRUE;
}
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2008-09-20 23:38:50 UTC (rev 142)
+++ trunk/src/sat-pref-rig.c 2008-09-20 23:54:02 UTC (rev 143)
@@ -450,7 +450,7 @@
RIG_LIST_COL_NAME, &conf.name,
RIG_LIST_COL_HOST, &conf.host,
RIG_LIST_COL_PORT, &conf.port,
- RIG_LIST_COL_PORT, &conf.lo,
+ RIG_LIST_COL_LO, &conf.lo,
-1);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-20 23:38:52
|
Revision: 142
http://gpredict.svn.sourceforge.net/gpredict/?rev=142&view=rev
Author: csete
Date: 2008-09-20 23:38:50 +0000 (Sat, 20 Sep 2008)
Log Message:
-----------
Added default value to az-type selector.
Modified Paths:
--------------
trunk/src/sat-pref-rot-editor.c
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2008-09-20 23:36:06 UTC (rev 141)
+++ trunk/src/sat-pref-rot-editor.c 2008-09-20 23:38:50 UTC (rev 142)
@@ -203,6 +203,7 @@
"0\302\260 \342\206\222 180\302\260 \342\206\222 360\302\260");
gtk_combo_box_append_text (GTK_COMBO_BOX (aztype),
"-180\302\260 \342\206\222 0\302\260 \342\206\222 +180\302\260");
+ gtk_combo_box_set_active (GTK_COMBO_BOX (aztype), 0);
gtk_widget_set_tooltip_text (aztype,
_("Select your azimuth range here. Note that gpredict assumes "
"that 0\302\260 is at North and + direction is clockwise for "\
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
