gpredict-svn Mailing List for Gpredict (Page 32)
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-12-28 16:04:00
|
Revision: 191
http://gpredict.svn.sourceforge.net/gpredict/?rev=191&view=rev
Author: csete
Date: 2008-12-28 16:03:51 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Update canvas bounds when resizing the canvas.
Modified Paths:
--------------
trunk/src/gtk-azel-plot.c
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2008-12-28 16:01:24 UTC (rev 190)
+++ trunk/src/gtk-azel-plot.c 2008-12-28 16:03:51 UTC (rev 191)
@@ -466,6 +466,9 @@
polv->width = allocation->width;
polv->height = allocation->height;
+ goo_canvas_set_bounds (GOO_CANVAS (GTK_AZEL_PLOT (polv)->canvas), 0, 0,
+ polv->width, polv->height);
+
/* update coordinate system */
polv->x0 = POLV_X_MARGIN;
polv->xmax = polv->width - POLV_X_MARGIN;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 16:01:25
|
Revision: 190
http://gpredict.svn.sourceforge.net/gpredict/?rev=190&view=rev
Author: csete
Date: 2008-12-28 16:01:24 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Update canvas bounds when resizing the canvas.
Modified Paths:
--------------
trunk/src/gtk-polar-plot.c
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2008-12-28 15:46:34 UTC (rev 189)
+++ trunk/src/gtk-polar-plot.c 2008-12-28 16:01:24 UTC (rev 190)
@@ -781,6 +781,10 @@
polv->cx = allocation->width / 2;
polv->cy = allocation->height / 2;
+ goo_canvas_set_bounds (GOO_CANVAS (GTK_POLAR_PLOT (polv)->canvas), 0, 0,
+ allocation->width, allocation->height);
+
+
/* update coordinate system */
g_object_set (polv->C00,
"center-x", (gdouble) polv->cx,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 15:46:36
|
Revision: 189
http://gpredict.svn.sourceforge.net/gpredict/?rev=189&view=rev
Author: csete
Date: 2008-12-28 15:46:34 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Update canvas bounds when resizing the canvas.
Modified Paths:
--------------
trunk/src/gtk-sky-glance.c
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2008-12-28 14:53:15 UTC (rev 188)
+++ trunk/src/gtk-sky-glance.c 2008-12-28 15:46:34 UTC (rev 189)
@@ -436,7 +436,10 @@
skg->pps = (skg->h - SKG_MARGIN) / skg->numsat - SKG_MARGIN;
+ goo_canvas_set_bounds (GOO_CANVAS (GTK_SKY_GLANCE (skg)->canvas), 0, 0,
+ allocation->width, allocation->height);
+
/* update cursor tracking line */
pts = goo_canvas_points_new (2);
pts->coords[0] = skg->x0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 14:53:23
|
Revision: 188
http://gpredict.svn.sourceforge.net/gpredict/?rev=188&view=rev
Author: csete
Date: 2008-12-28 14:53:15 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Update canvas bounds when resizing the canvas.
Modified Paths:
--------------
trunk/src/gtk-polar-view.c
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2008-12-28 14:46:41 UTC (rev 187)
+++ trunk/src/gtk-polar-view.c 2008-12-28 14:53:15 UTC (rev 188)
@@ -232,12 +232,10 @@
gtk_widget_modify_base (GTK_POLAR_VIEW (polv)->canvas, GTK_STATE_NORMAL, &bg_color);
gtk_widget_set_size_request (GTK_POLAR_VIEW (polv)->canvas,
POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE);
- /* if we set canvas bounds resize will cut the image to this size
- discovered with GooCanvas 0.12
goo_canvas_set_bounds (GOO_CANVAS (GTK_POLAR_VIEW (polv)->canvas), 0, 0,
POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE);
- */
+
/* connect size-request signal */
g_signal_connect (GTK_POLAR_VIEW (polv)->canvas, "size-allocate",
G_CALLBACK (size_allocate_cb), polv);
@@ -521,6 +519,11 @@
polv->cx = allocation->width / 2;
polv->cy = allocation->height / 2;
+ /* update canvas bounds to match new size */
+ goo_canvas_set_bounds (GOO_CANVAS (GTK_POLAR_VIEW (polv)->canvas), 0, 0,
+ allocation->width, allocation->height);
+
+
/* update coordinate system */
g_object_set (polv->C00,
"center-x", (gdouble) polv->cx,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 14:46:44
|
Revision: 187
http://gpredict.svn.sourceforge.net/gpredict/?rev=187&view=rev
Author: csete
Date: 2008-12-28 14:46:41 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Don't set canvas bounds when creating canvas because that will limit the visible area to the bound size, i.e. we cannot make the canvas larger.
Modified Paths:
--------------
trunk/src/gtk-sat-map.c
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2008-12-28 14:39:16 UTC (rev 186)
+++ trunk/src/gtk-sat-map.c 2008-12-28 14:46:41 UTC (rev 187)
@@ -267,7 +267,8 @@
goo_canvas_set_bounds (GOO_CANVAS (GTK_SAT_MAP (satmap)->canvas), 0, 0,
gdk_pixbuf_get_width (GTK_SAT_MAP (satmap)->origmap),
gdk_pixbuf_get_height (GTK_SAT_MAP (satmap)->origmap));
-
+
+
/* connect size-request signal */
g_signal_connect (GTK_SAT_MAP (satmap)->canvas, "size-allocate",
G_CALLBACK (size_allocate_cb), satmap);
@@ -512,6 +513,11 @@
GDK_INTERP_BILINEAR);
}
+ /* set canvas bounds to match new size */
+ goo_canvas_set_bounds (GOO_CANVAS (GTK_SAT_MAP (satmap)->canvas), 0, 0,
+ satmap->width, satmap->height);
+
+
/* redraw static elements */
g_object_set (satmap->map,
"pixbuf", pbuf,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 14:39:25
|
Revision: 186
http://gpredict.svn.sourceforge.net/gpredict/?rev=186&view=rev
Author: csete
Date: 2008-12-28 14:39:16 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Don't set canvas bounds when creating canvas because that will limit the visible area to the bound size, i.e. we cannot make the canvas larger.
Modified Paths:
--------------
trunk/src/gtk-polar-view.c
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2008-12-28 14:32:06 UTC (rev 185)
+++ trunk/src/gtk-polar-view.c 2008-12-28 14:39:16 UTC (rev 186)
@@ -232,8 +232,11 @@
gtk_widget_modify_base (GTK_POLAR_VIEW (polv)->canvas, GTK_STATE_NORMAL, &bg_color);
gtk_widget_set_size_request (GTK_POLAR_VIEW (polv)->canvas,
POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE);
+ /* if we set canvas bounds resize will cut the image to this size
+ discovered with GooCanvas 0.12
goo_canvas_set_bounds (GOO_CANVAS (GTK_POLAR_VIEW (polv)->canvas), 0, 0,
POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE);
+ */
/* connect size-request signal */
g_signal_connect (GTK_POLAR_VIEW (polv)->canvas, "size-allocate",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 14:32:12
|
Revision: 185
http://gpredict.svn.sourceforge.net/gpredict/?rev=185&view=rev
Author: csete
Date: 2008-12-28 14:32:06 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-28 14:29:59 UTC (rev 184)
+++ trunk/ChangeLog 2008-12-28 14:32:06 UTC (rev 185)
@@ -1,3 +1,15 @@
+2008-12-28; Alexandru Csete <oz...@gm...>
+
+ * src/sat-pref-rig-editor.c:
+ Added widgets for editing radio type and ptt.
+
+ * src/sat-pref-rig-data.h:
+ Updated column definitions to include rig type and ptt.
+
+ * src/sat-pref-rig.c:
+ Include rig type and ptt fields.
+
+
2008-12-27; Alexandru Csete <oz...@gm...>
* autogen.sh:
@@ -6,6 +18,12 @@
* src/Makefile.am:
Use sytem wide GooCanvas library instead of built-in copy. Build now
requires GooCanvas 0.10 to be installed.
+
+ * goocan8:
+ Deleted.
+
+ * src/radio-conf.[ch]:
+ Added management of radio type.
2008-10-26; Alexandru Csete <oz...@gm...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 14:30:02
|
Revision: 184
http://gpredict.svn.sourceforge.net/gpredict/?rev=184&view=rev
Author: csete
Date: 2008-12-28 14:29:59 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Include rig type and ptt fields.
Modified Paths:
--------------
trunk/src/sat-pref-rig.c
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2008-12-28 13:14:46 UTC (rev 183)
+++ trunk/src/sat-pref-rig.c 2008-12-28 14:29:59 UTC (rev 184)
@@ -58,6 +58,16 @@
GtkTreeModel *model,
GtkTreeIter *iter,
gpointer column);
+static void render_type (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column);
+static void render_ptt (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column);
static void render_lo (GtkTreeViewColumn *col,
GtkCellRenderer *renderer,
GtkTreeModel *model,
@@ -135,6 +145,28 @@
"text", RIG_LIST_COL_PORT,
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+
+ /* rig type */
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Rig Type"), renderer,
+ "text", RIG_LIST_COL_TYPE,
+ NULL);
+ gtk_tree_view_column_set_cell_data_func (column, renderer,
+ render_type,
+ GUINT_TO_POINTER(RIG_LIST_COL_TYPE),
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+
+ /* PTT */
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("PTT Status"), renderer,
+ "text", RIG_LIST_COL_PTT,
+ NULL);
+ gtk_tree_view_column_set_cell_data_func (column, renderer,
+ render_ptt,
+ GUINT_TO_POINTER(RIG_LIST_COL_PTT),
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
/* lo */
renderer = gtk_cell_renderer_text_new ();
@@ -168,6 +200,8 @@
G_TYPE_STRING, // name
G_TYPE_STRING, // host
G_TYPE_INT, // port
+ G_TYPE_INT, // type
+ G_TYPE_BOOLEAN, // PTT
G_TYPE_DOUBLE // LO
);
@@ -194,6 +228,8 @@
RIG_LIST_COL_NAME, conf.name,
RIG_LIST_COL_HOST, conf.host,
RIG_LIST_COL_PORT, conf.port,
+ RIG_LIST_COL_TYPE, conf.type,
+ RIG_LIST_COL_PTT, conf.ptt,
RIG_LIST_COL_LO, conf.lo,
-1);
@@ -303,6 +339,8 @@
.name = NULL,
.host = NULL,
.port = 4532,
+ .type = RIG_TYPE_RX,
+ .ptt = FALSE,
.lo = 0.0,
};
@@ -343,6 +381,8 @@
RIG_LIST_COL_NAME, &conf.name,
RIG_LIST_COL_HOST, &conf.host,
RIG_LIST_COL_PORT, &conf.port,
+ RIG_LIST_COL_TYPE, &conf.type,
+ RIG_LIST_COL_PTT, &conf.ptt,
RIG_LIST_COL_LO, &conf.lo,
-1);
radio_conf_save (&conf);
@@ -381,6 +421,8 @@
.name = NULL,
.host = NULL,
.port = 4532,
+ .type = RIG_TYPE_RX,
+ .ptt = FALSE,
.lo = 0.0,
};
@@ -395,6 +437,8 @@
RIG_LIST_COL_NAME, conf.name,
RIG_LIST_COL_HOST, conf.host,
RIG_LIST_COL_PORT, conf.port,
+ RIG_LIST_COL_TYPE, conf.type,
+ RIG_LIST_COL_PTT, conf.ptt,
RIG_LIST_COL_LO, conf.lo,
-1);
@@ -425,6 +469,8 @@
.name = NULL,
.host = NULL,
.port = 4532,
+ .type = RIG_TYPE_RX,
+ .ptt = FALSE,
.lo = 0.0,
};
@@ -450,6 +496,8 @@
RIG_LIST_COL_NAME, &conf.name,
RIG_LIST_COL_HOST, &conf.host,
RIG_LIST_COL_PORT, &conf.port,
+ RIG_LIST_COL_TYPE, &conf.type,
+ RIG_LIST_COL_PTT, &conf.ptt,
RIG_LIST_COL_LO, &conf.lo,
-1);
@@ -478,6 +526,8 @@
RIG_LIST_COL_NAME, conf.name,
RIG_LIST_COL_HOST, conf.host,
RIG_LIST_COL_PORT, conf.port,
+ RIG_LIST_COL_TYPE, conf.type,
+ RIG_LIST_COL_PTT, conf.ptt,
RIG_LIST_COL_LO, conf.lo,
-1);
@@ -569,6 +619,79 @@
}
+/** \brief Render radio type.
+ * \param col Pointer to the tree view column.
+ * \param renderer Pointer to the renderer.
+ * \param model Pointer to the tree model.
+ * \param iter Pointer to the tree iterator.
+ * \param column The column number in the model.
+ *
+ * This function renders the radio type onto the riglist.
+*/
+static void render_type (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
+{
+ guint type;
+ guint coli = GPOINTER_TO_UINT (column);
+
+ gtk_tree_model_get (model, iter, coli, &type, -1);
+
+ switch (type) {
+ case RIG_TYPE_RX:
+ g_object_set (renderer, "text", _("RX only"), NULL);
+ break;
+
+ case RIG_TYPE_TX:
+ g_object_set (renderer, "text", _("TX only"), NULL);
+ break;
+
+ case RIG_TYPE_TRX:
+ g_object_set (renderer, "text", _("RX + TX"), NULL);
+ break;
+
+ case RIG_TYPE_DUPLEX:
+ g_object_set (renderer, "text", _("Duplex"), NULL);
+ break;
+
+ default:
+ g_object_set (renderer, "text", _("ERROR"), NULL);
+ break;
+ }
+
+}
+
+
+/** \brief Render PTT status usage.
+ * \param col Pointer to the tree view column.
+ * \param renderer Pointer to the renderer.
+ * \param model Pointer to the tree model.
+ * \param iter Pointer to the tree iterator.
+ * \param column The column number in the model.
+ *
+ * This function renders the PTT status usage onto the riglist.
+*/
+static void render_ptt (GtkTreeViewColumn *col,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer column)
+{
+ gboolean ptt;
+ guint coli = GPOINTER_TO_UINT (column);
+
+ gtk_tree_model_get (model, iter, coli, &ptt, -1);
+
+ if (ptt)
+ g_object_set (renderer, "text", _("Monitor"), NULL);
+ else
+ g_object_set (renderer, "text", _("Ignore"), NULL);
+
+}
+
+
/** \brief Render Local Oscillator frequency.
* \param col Pointer to the tree view column.
* \param renderer Pointer to the renderer.
@@ -602,3 +725,4 @@
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 13:14:50
|
Revision: 183
http://gpredict.svn.sourceforge.net/gpredict/?rev=183&view=rev
Author: csete
Date: 2008-12-28 13:14:46 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Force PTT to FALSE for full duplex rigs.
Modified Paths:
--------------
trunk/src/sat-pref-rig-editor.c
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-12-28 11:08:48 UTC (rev 182)
+++ trunk/src/sat-pref-rig-editor.c 2008-12-28 13:14:46 UTC (rev 183)
@@ -454,6 +454,7 @@
break;
case RIG_TYPE_DUPLEX:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ptt), FALSE);
gtk_widget_set_sensitive (ptt, FALSE);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 11:08:51
|
Revision: 182
http://gpredict.svn.sourceforge.net/gpredict/?rev=182&view=rev
Author: csete
Date: 2008-12-28 11:08:48 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Updated column defs to include rig type and ptt.
Modified Paths:
--------------
trunk/src/sat-pref-rig-data.h
Modified: trunk/src/sat-pref-rig-data.h
===================================================================
--- trunk/src/sat-pref-rig-data.h 2008-12-28 11:06:54 UTC (rev 181)
+++ trunk/src/sat-pref-rig-data.h 2008-12-28 11:08:48 UTC (rev 182)
@@ -33,6 +33,8 @@
RIG_LIST_COL_NAME = 0, /*!< File name. */
RIG_LIST_COL_HOST, /*!< Hostname, e.g. localhost */
RIG_LIST_COL_PORT, /*!< Port number */
+ RIG_LIST_COL_TYPE, /*!< Radio type */
+ RIG_LIST_COL_PTT, /*!< PTT */
RIG_LIST_COL_LO, /*!< Local oscillator freq */
RIG_LIST_COL_NUM /*!< The number of fields in the list. */
} rig_list_col_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-28 11:06:57
|
Revision: 181
http://gpredict.svn.sourceforge.net/gpredict/?rev=181&view=rev
Author: csete
Date: 2008-12-28 11:06:54 +0000 (Sun, 28 Dec 2008)
Log Message:
-----------
Added widget for editing radio type and ptt.
Modified Paths:
--------------
trunk/src/sat-pref-rig-editor.c
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-12-27 23:57:42 UTC (rev 180)
+++ trunk/src/sat-pref-rig-editor.c 2008-12-28 11:06:54 UTC (rev 181)
@@ -54,6 +54,8 @@
static GtkWidget *name; /* config name */
static GtkWidget *host; /* host */
static GtkWidget *port; /* port number */
+static GtkWidget *type; /* rig type */
+static GtkWidget *ptt; /* PTT */
static GtkWidget *lo; /* local oscillator */
@@ -62,6 +64,7 @@
static void clear_widgets (void);
static gboolean apply_changes (radio_conf_t *conf);
static void name_changed (GtkWidget *widget, gpointer data);
+static void type_changed (GtkWidget *widget, gpointer data);
/** \brief Add or edit a radio configuration.
@@ -141,7 +144,7 @@
- table = gtk_table_new (4, 4, FALSE);
+ table = gtk_table_new (6, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
@@ -188,21 +191,62 @@
_("Enter the port number where rigctld is listening"));
gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 3, 2, 3);
+ /* radio type */
+ label = gtk_label_new (_("Type"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+
+ type = gtk_combo_box_new_text ();
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("RX only"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("TX only"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("RX/TX"));
+ gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Duplex"));
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), RIG_TYPE_RX);
+ g_signal_connect (type, "changed", G_CALLBACK (type_changed), NULL);
+ gtk_widget_set_tooltip_markup (type,
+ _("<b>RX only:</b> The radio shall only be used as receiver. "\
+ "If <i>Monitor PTT status</i> is checked the doppler tuning "\
+ "will be suspended while PTT is ON (manual TX). "\
+ "If not, the controller will always perform doppler tuning and "\
+ "you cannot use the same RIG for uplink.\n"\
+ "<b>TX only:</b> The radio shall only be used for uplink. "\
+ "If <i>Monitor PTT status</i> is checked the doppler tuning "\
+ "will be suspended while PTT is OFF (manual RX).\n"\
+ "<b>RX/TX:</b> The radio should be used for both up- and downlink "\
+ "but in simplex mode only. This option requires that the PTT status "\
+ "is monitored (otherwise gpredict cannot know whether to tune the "\
+ "RX or the TX).\n"\
+ "<b>Duplex:</b> The radio is a full duplex radio, such as the IC910H. "\
+ "Gpredict will be continuously tuning both uplink and downlink "\
+ "simultaneously and not care about PTT setting."));
+ gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 3, 3, 4);
+
+ /* ptt */
+ ptt = gtk_check_button_new_with_label (_("Monitor PTT status"));
+ gtk_widget_set_tooltip_text (ptt,
+ _("If checked, the radio controller will monitor the status of"\
+ " the PTT and act accordingly. For example, the doppler tuning "\
+ "on an RX only radio will be suspended while PTT is active. This"\
+ " functionality is also required for radios that are used as both"\
+ " TX and RX (simplex)"));
+ gtk_table_attach_defaults (GTK_TABLE (table), ptt, 1, 4, 4, 5);
+
+
/* LO frequency */
label = gtk_label_new (_("LO"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 5, 6);
lo = gtk_spin_button_new_with_range (-10000, 10000, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), 0);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (lo), 0);
gtk_widget_set_tooltip_text (lo,
_("Enter the frequency of the local oscillator, if any."));
- gtk_table_attach_defaults (GTK_TABLE (table), lo, 1, 3, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), lo, 1, 3, 5, 6);
label = gtk_label_new (_("MHz"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 5, 6);
if (conf->name != NULL)
update_widgets (conf);
@@ -232,6 +276,40 @@
else
gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4532); /* hamlib default? */
+ /* ptt */
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ptt), conf->ptt);
+
+ /* rig type */
+ switch (conf->type) {
+ case RIG_TYPE_RX:
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), conf->type);
+ gtk_widget_set_sensitive (ptt, TRUE);
+ break;
+
+ case RIG_TYPE_TX:
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), conf->type);
+ gtk_widget_set_sensitive (ptt, TRUE);
+ break;
+
+ case RIG_TYPE_TRX:
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), conf->type);
+ /* force ptt to TRUE */
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ptt), TRUE);
+ gtk_widget_set_sensitive (ptt, FALSE);
+ break;
+
+ case RIG_TYPE_DUPLEX:
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), conf->type);
+ gtk_widget_set_sensitive (ptt, FALSE);
+ break;
+
+ default:
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), RIG_TYPE_RX);
+ gtk_widget_set_sensitive (ptt, TRUE);
+ break;
+ }
+
+
/* lo in MHz */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), conf->lo / 1000000.0);
}
@@ -244,12 +322,14 @@
*
*/
static void
-clear_widgets ()
+clear_widgets ()
{
gtk_entry_set_text (GTK_ENTRY (name), "");
gtk_entry_set_text (GTK_ENTRY (host), "");
gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4532); /* hamlib default? */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), 0);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (type), RIG_TYPE_RX);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ptt), FALSE);
}
@@ -281,6 +361,12 @@
/* lo freq */
conf->lo = 1000000.0*gtk_spin_button_get_value (GTK_SPIN_BUTTON (lo));
+ /* rig type */
+ conf->type = gtk_combo_box_get_active (GTK_COMBO_BOX (type));
+
+ /* ptt */
+ conf->ptt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ptt));
+
return TRUE;
}
@@ -344,3 +430,36 @@
}
+/** \brief Manage type changed signals.
+ * \param widget The GtkComboBox that received the signal.
+ * \param data User data (always NULL).
+ *
+ * This function is called when the user selects a new radio type.
+ */
+static void
+type_changed (GtkWidget *widget, gpointer data)
+{
+ switch (gtk_combo_box_get_active (GTK_COMBO_BOX (widget))) {
+ case RIG_TYPE_RX:
+ gtk_widget_set_sensitive (ptt, TRUE);
+ break;
+
+ case RIG_TYPE_TX:
+ gtk_widget_set_sensitive (ptt, TRUE);
+ break;
+
+ case RIG_TYPE_TRX:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ptt), TRUE);
+ gtk_widget_set_sensitive (ptt, FALSE);
+ break;
+
+ case RIG_TYPE_DUPLEX:
+ gtk_widget_set_sensitive (ptt, FALSE);
+ break;
+
+ default:
+ gtk_widget_set_sensitive (ptt, TRUE);
+ break;
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-27 23:57:52
|
Revision: 180
http://gpredict.svn.sourceforge.net/gpredict/?rev=180&view=rev
Author: csete
Date: 2008-12-27 23:57:42 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Added parameters for rig type and PTT.
Modified Paths:
--------------
trunk/src/radio-conf.c
trunk/src/radio-conf.h
Modified: trunk/src/radio-conf.c
===================================================================
--- trunk/src/radio-conf.c 2008-12-27 21:43:37 UTC (rev 179)
+++ trunk/src/radio-conf.c 2008-12-27 23:57:42 UTC (rev 180)
@@ -38,6 +38,8 @@
#define KEY_HOST "Host"
#define KEY_PORT "Port"
#define KEY_LO "LO"
+#define KEY_TYPE "Type"
+#define KEY_PTT "READ_PTT"
/** \brief Read radio configuration.
@@ -117,6 +119,26 @@
return FALSE;
}
+ conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading radio conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
+ conf->ptt = g_key_file_get_boolean (cfg, GROUP, KEY_PTT, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading radio conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
g_key_file_free (cfg);
sat_log_log (SAT_LOG_LEVEL_MSG,
@@ -155,6 +177,8 @@
g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host);
g_key_file_set_integer (cfg, GROUP, KEY_PORT, conf->port);
g_key_file_set_double (cfg, GROUP, KEY_LO, conf->lo);
+ g_key_file_set_integer (cfg, GROUP, KEY_TYPE, conf->type);
+ g_key_file_set_boolean (cfg, GROUP, KEY_PTT, conf->ptt);
/* convert to text sdata */
data = g_key_file_to_data (cfg, &len, NULL);
Modified: trunk/src/radio-conf.h
===================================================================
--- trunk/src/radio-conf.h 2008-12-27 21:43:37 UTC (rev 179)
+++ trunk/src/radio-conf.h 2008-12-27 23:57:42 UTC (rev 180)
@@ -33,7 +33,15 @@
#include <glib.h>
+/** \brief Radio types. */
+typedef enum {
+ RIG_TYPE_RX = 0, /*!< Rig can only be used as receiver */
+ RIG_TYPE_TX, /*!< Rig can only be used as transmitter */
+ RIG_TYPE_TRX, /*!< Rig can be used as RX/TX (simplex only) */
+ RIG_TYPE_DUPLEX /*!< Rig is a full duplex radio, e.g. IC910 */
+} rig_type_t;
+
/** \brief Radio configuration. */
typedef struct {
gchar *name; /*!< Configuration file name, without .rig. */
@@ -41,6 +49,8 @@
gint port; /*!< port number */
gdouble lo; /*!< local oscillator freq in Hz (using double for
compatibility with rest of code) */
+ rig_type_t type; /*!< Radio type */
+ gboolean ptt; /*!< Flag indicating that we should read PTT status (needed for RX, TX, and TRX) */
} radio_conf_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-27 22:06:26
|
Revision: 179
http://gpredict.svn.sourceforge.net/gpredict/?rev=179&view=rev
Author: csete
Date: 2008-12-27 21:43:37 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Fixed small typo.
Modified Paths:
--------------
trunk/src/sat-pref-rig-editor.c
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-12-27 19:56:34 UTC (rev 178)
+++ trunk/src/sat-pref-rig-editor.c 2008-12-27 21:43:37 UTC (rev 179)
@@ -171,8 +171,9 @@
host = gtk_entry_new ();
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, e.g. 192.168.1.100"));
+ _("Enter the host where rigctld is running. "\
+ "You can use both host name and IP address, "\
+ "e.g. 192.168.1.100"));
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-12-27 19:56:37
|
Revision: 178
http://gpredict.svn.sourceforge.net/gpredict/?rev=178&view=rev
Author: csete
Date: 2008-12-27 19:56:34 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-12-27 19:55:29 UTC (rev 177)
+++ trunk/NEWS 2008-12-27 19:56:34 UTC (rev 178)
@@ -6,6 +6,7 @@
- Feature request 1705375: Restore main window position and size.
- Feature request 2192404: Starting time for pass predictions.
* Feature request 2194621: Data recorder.
+- Feature request 2347471: Use system goocanvas.
- 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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-27 19:55:33
|
Revision: 177
http://gpredict.svn.sourceforge.net/gpredict/?rev=177&view=rev
Author: csete
Date: 2008-12-27 19:55:29 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-27 19:55:07 UTC (rev 176)
+++ trunk/ChangeLog 2008-12-27 19:55:29 UTC (rev 177)
@@ -1,3 +1,13 @@
+2008-12-27; Alexandru Csete <oz...@gm...>
+
+ * autogen.sh:
+ * configure.ac:
+ * Makefile.am:
+ * src/Makefile.am:
+ Use sytem wide GooCanvas library instead of built-in copy. Build now
+ requires GooCanvas 0.10 to be installed.
+
+
2008-10-26; Alexandru Csete <oz...@gm...>
* src/gtk-sat-list-popup.[ch]:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-27 19:55:17
|
Revision: 176
http://gpredict.svn.sourceforge.net/gpredict/?rev=176&view=rev
Author: csete
Date: 2008-12-27 19:55:07 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Deleted buil-in copy of goocanvas.
Removed Paths:
-------------
trunk/goocanv8/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-27 19:54:29
|
Revision: 175
http://gpredict.svn.sourceforge.net/gpredict/?rev=175&view=rev
Author: csete
Date: 2008-12-27 19:54:20 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Use sytem wide GooCanvas library instead of built-in copy. Build now requires GooCanvas 0.10 to be installed.
Modified Paths:
--------------
trunk/Makefile.am
trunk/autogen.sh
trunk/configure.ac
trunk/src/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-12-27 14:06:23 UTC (rev 174)
+++ trunk/Makefile.am 2008-12-27 19:54:20 UTC (rev 175)
@@ -1,4 +1,4 @@
-SUBDIRS = goocanv8 src doc pixmaps data po
+SUBDIRS = src doc pixmaps data po
install-data-local:
@$(NORMAL_INSTALL)
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2008-12-27 14:06:23 UTC (rev 174)
+++ trunk/autogen.sh 2008-12-27 19:54:20 UTC (rev 175)
@@ -37,12 +37,6 @@
# This might not be necessary with newer autotools:
rm -f config.cache
-echo "****** autogen GooCanvas" && \
- cd goocanv8 && \
- ./autogen.sh && \
- cd .. && \
-echo "****** finished GooCanvas" && \
-
# We use glib-gettextize, which apparently does not add the intl directory
# (containing a local copy of libintl code), and therefore has a slightly different Makefile.
echo "- glib-gettextize." && \
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-12-27 14:06:23 UTC (rev 174)
+++ trunk/configure.ac 2008-12-27 19:54:20 UTC (rev 175)
@@ -20,8 +20,8 @@
CFLAGS="${CFLAGS} -Wall"
fi
-dnl chack for glib and gtk libraries
-pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0"
+dnl check for glib, gtk, and goocanvas libraries
+pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.14.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.10"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -31,10 +31,10 @@
PKG_CHECK_MODULES(LIBCURL, libcurl, [
CFLAGS="$CFLAGS $LIBCURL_CFLAGS";
LIBS="$LIBS $LIBCURL_LIBS";
- havecurl=true;
+ havecurl=true;
AC_DEFINE(HAVE_LIBCURL, 1, [Define if libcurl is available])
], [
- havecurl=false;
+ havecurl=false;
AC_DEFINE(HAVE_LIBCURL, 0, [Define if libcurl is unvailable])
])
@@ -76,6 +76,7 @@
GTHR_V=`pkg-config --modversion gthread-2.0`
GDK_V=`pkg-config --modversion gdk-2.0`
GTK_V=`pkg-config --modversion gtk+-2.0`
+GOOC_V=`pkg-config --modversion goocanvas`
dnl SQL_V=`pkg-config --modversion sqlite3`
if test "$havecurl" = true ; then
CURL_V=`pkg-config --modversion libcurl`
@@ -88,7 +89,6 @@
AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS)
-AC_CONFIG_SUBDIRS(goocanv8)
AC_OUTPUT([
Makefile
@@ -113,6 +113,7 @@
echo Gthread version.... : $GTHR_V
echo Gdk version........ : $GDK_V
echo Gtk+ version....... : $GTK_V
+echo GooCanvas version.. : $GOOC_V
dnl echo SQLite version..... : $SQL_V
if test "$havecurl" = true ; then
echo Curl version....... : $CURL_V
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-12-27 14:06:23 UTC (rev 174)
+++ trunk/src/Makefile.am 2008-12-27 19:54:20 UTC (rev 175)
@@ -3,7 +3,7 @@
SUBDIRS = sgpsdp
INCLUDES = \
- @PACKAGE_CFLAGS@ -I.. -I$(top_srcdir)/goocanv8/src \
+ @PACKAGE_CFLAGS@ -I.. \
-DDATADIR=\""$(datadir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)/gpredict"\" \
-DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/gpredict"\" \
@@ -113,7 +113,7 @@
##gpredict_LDADD = ./sgpsdp/libsgp4sdp4.a @PACKAGE_LIBS@
-gpredict_LDADD = @PACKAGE_LIBS@ ../goocanv8/src/.libs/libgoocanvas.a
+gpredict_LDADD = @PACKAGE_LIBS@
## $(INTLLIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-12-27 14:06:35
|
Revision: 174
http://gpredict.svn.sourceforge.net/gpredict/?rev=174&view=rev
Author: csete
Date: 2008-12-27 14:06:23 +0000 (Sat, 27 Dec 2008)
Log Message:
-----------
Updated script and TLE data.
Modified Paths:
--------------
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/update-tle.sh
trunk/data/weather.tle
Modified: trunk/data/amateur.tle
===================================================================
--- trunk/data/amateur.tle 2008-10-26 21:34:20 UTC (rev 173)
+++ trunk/data/amateur.tle 2008-12-27 14:06:23 UTC (rev 174)
@@ -1,174 +1,177 @@
OSCAR III [-]
-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
+1 01293U 65016F 08362.11586417 -.00000099 00000-0 -28362-4 0 4197
+2 01293 70.0702 183.2826 0016376 33.7096 326.5052 14.04678137235648
AO-5 [-]
-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
+1 04321U 70008B 08360.99455234 -.00000031 00000-0 10000-3 0 982
+2 04321 102.1292 2.8286 0027611 307.7944 52.0626 12.52155360779088
AO-6 [-]
-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
+1 06236U 72082B 08360.10887740 -.00000027 00000-0 10000-3 0 881
+2 06236 101.4033 14.4720 0003716 230.0553 130.0193 12.53076013655601
AO-7 [P]
-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
+1 07530U 74089B 08361.46749842 -.00000027 00000-0 10000-3 0 3623
+2 07530 101.4466 26.3746 0011810 246.0210 113.9628 12.53574861561074
AO-8 [-]
-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
+1 10703U 78026B 08361.89142462 -.00000276 00000-0 -16228-3 0 3621
+2 10703 98.8591 47.2100 0006343 288.4730 71.5745 13.98826503571934
AO-10 [-]
-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
+1 14129U 83058B 08360.44051195 -.00000012 00000-0 10000-3 0 6015
+2 14129 26.0284 179.5072 5960537 184.4027 166.1156 2.05868360164075
UO-11 [P]
-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
+1 14781U 84021B 08361.30466834 .00000141 00000-0 25978-4 0 8459
+2 14781 98.1330 37.9698 0009310 168.4088 191.7315 14.79685781332266
FO-12 [-]
-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
+1 16909U 86061B 08361.17434896 -.00000083 00000-0 10000-3 0 4896
+2 16909 50.0180 333.7719 0011467 126.1599 234.0298 12.44452239 17435
UO-14 [-]
-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
+1 20437U 90005B 08361.97638086 .00000001 00000-0 16049-4 0 8113
+2 20437 98.3155 321.1133 0010673 325.3652 34.6837 14.31532851988410
UO-15 [-]
-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
+1 20438U 90005C 08361.43034774 -.00000005 00000-0 14009-4 0 3056
+2 20438 98.3756 312.8011 0010139 354.3496 5.7571 14.30436489987776
AO-16 [P]
-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
+1 20439U 90005D 08361.94603762 .00000030 00000-0 26584-4 0 4961
+2 20439 98.2553 332.4071 0010510 328.0390 32.0152 14.31812175988500
DO-17 [-]
-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
+1 20440U 90005E 08361.63387606 .00000023 00000-0 23759-4 0 2056
+2 20440 98.2315 337.2342 0010550 324.6199 35.4282 14.32115056988590
WO-18 [-]
-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
+1 20441U 90005F 08361.04974247 .00000028 00000-0 25655-4 0 7119
+2 20441 98.2387 335.2668 0011315 329.9500 30.1035 14.31880174988444
LO-19 [P]
-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
+1 20442U 90005G 08361.96145277 .00000023 00000-0 23665-4 0 4205
+2 20442 98.2208 340.3275 0011400 324.4304 35.6123 14.32049239988667
FO-20 [-]
-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
+1 20480U 90013C 08361.89383708 -.00000036 00000-0 -64467-5 0 210
+2 20480 99.0566 308.6523 0540066 200.2831 157.6055 12.83359328884806
AO-21 [-]
-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
+1 21087U 91006A 08361.86136936 .00000052 00000-0 38373-4 0 1531
+2 21087 82.9404 173.6628 0036471 46.4316 313.9860 13.75039147898730
RS-12 & RS-13 [-]
-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
+1 21089U 91007A 08361.66417545 -.00000004 00000-0 -20432-4 0 333
+2 21089 82.9213 34.6839 0030902 89.7533 270.7173 13.74483828897491
UO-22 [-]
-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
+1 21575U 91050B 08361.89146604 .00000027 00000-0 22578-4 0 4454
+2 21575 98.4240 307.4309 0007495 169.2961 190.8399 14.39659986915918
KO-23 [-]
-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
+1 22077U 92052B 08362.09926653 -.00000037 00000-0 10000-3 0 6245
+2 22077 66.0873 327.0670 0009344 320.4967 39.5365 12.86446441769380
AO-24 [-]
-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
+1 22654U 93031B 08360.06727683 -.00000119 00000-0 10000-3 0 2192
+2 22654 5.2113 340.7059 2882725 150.5942 229.3837 1.42205280 76642
AO-27 [+]
-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
+1 22825U 93061C 08361.86008356 -.00000078 00000-0 -14227-4 0 1384
+2 22825 98.4122 314.9312 0009218 55.3134 304.8911 14.29254767795296
IO-26 [P]
-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
+1 22826U 93061D 08361.18058500 .00000019 00000-0 23891-4 0 8552
+2 22826 98.4066 315.1001 0009752 54.1789 306.0304 14.29505488795297
KO-25 [-]
-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
+1 22828U 93061F 08361.95101114 -.00000003 00000-0 15170-4 0 747
+2 22828 98.3997 315.7883 0010294 27.7953 332.3770 14.29807313763675
PO-28 [+]
-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
+1 22829U 93061G 08360.93325031 .00000011 00000-0 20373-4 0 1112
+2 22829 98.3959 315.9303 0010102 27.8612 332.3111 14.30205229795533
RS-15 [P]
-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
+1 23439U 94085A 08359.08001997 -.00000039 00000-0 10000-3 0 1681
+2 23439 64.8128 187.9769 0145902 85.8529 275.9055 11.27553426576374
FO-29 [P]
-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
+1 24278U 96046B 08361.54695846 .00000040 00000-0 73917-4 0 9358
+2 24278 98.5776 252.5509 0351300 77.6171 286.4046 13.52941068610406
MO-30 [-]
-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
+1 24305U 96052B 08361.75443527 .00000028 00000-0 14150-4 0 9963
+2 24305 82.9353 121.5803 0030613 17.1144 343.1039 13.73565518617008
TO-31 [-]
-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
+1 25396U 98043C 08361.61144190 .00000069 00000-0 48117-4 0 2907
+2 25396 98.3537 32.3932 0002991 36.0188 324.1192 14.23769413543746
GO-32 [P]
-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
+1 25397U 98043D 08361.18892246 .00000065 00000-0 47063-4 0 7812
+2 25397 98.3451 26.6574 0001989 58.5758 301.5622 14.23153045543529
SO-33 [P]
-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
+1 25509U 98061B 08361.96828443 -.00000041 00000-0 -22433-4 0 3547
+2 25509 31.4357 306.3036 0355143 272.6983 83.3062 14.28233798531193
PO-34 [-]
-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
+1 25520U 98064B 08361.20280632 .00000424 00000-0 11047-4 0 1508
+2 25520 28.4609 333.1758 0005503 216.9645 143.0571 15.17275846562359
ARISS [+]
-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
+1 25544U 98067A 08361.52062318 .00011219 00000-0 89152-4 0 9369
+2 25544 51.6417 110.7667 0007680 130.3323 334.0421 15.71790900578792
SO-35 [-]
-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
+1 25636U 99008C 08361.65504669 .00000025 00000-0 14153-4 0 1927
+2 25636 96.4590 221.2480 0149399 48.6050 312.7898 14.43451075518213
UO-36 [-]
-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
+1 25693U 99021A 08361.34635567 -.00000146 00000-0 -44203-6 0 8039
+2 25693 64.5581 286.8330 0024498 212.9969 146.9626 14.78732698522289
OO-38 [-]
-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
+1 26063U 00004C 08361.19960998 -.00000025 00000-0 11605-4 0 3933
+2 26063 100.1895 110.4038 0037097 28.9612 331.3616 14.35852044467123
SO-41 [-]
-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
+1 26545U 00057A 08361.91118035 -.00000062 00000-0 11320-4 0 1453
+2 26545 64.5597 288.4043 0048286 305.0659 54.5946 14.80552657445699
MO-46 [-]
-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
+1 26548U 00057D 08361.92360001 -.00000084 00000-0 83681-5 0 2803
+2 26548 64.5594 253.8589 0045947 297.3405 62.3010 14.83327134446405
SO-42 [-]
-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
+1 26549U 00057E 08361.06446086 -.00000065 00000-0 11053-4 0 2203
+2 26549 64.5594 306.7007 0050763 310.4693 49.2009 14.79409198445257
AO-40 [-]
-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
+1 26609U 00072B 08357.37598698 -.00000023 00000-0 10000-3 0 1701
+2 26609 8.3411 42.1271 7939549 157.7677 278.7401 1.25584862 37409
NO-44 [P]
-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
+1 26931U 01043C 08361.61599318 -.00000077 00000-0 21329-5 0 593
+2 26931 67.0499 148.9270 0005969 258.5675 101.4719 14.29542988377918
NO-45 [-]
-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
+1 26932U 01043D 08361.86581924 -.00000061 00000-0 84699-5 0 609
+2 26932 67.0536 148.1907 0008089 254.2554 105.7655 14.29599140377991
BO-47 & BO-48 [-]
-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
+1 27422U 02021B 08362.21248291 -.00000015 00000-0 11096-4 0 9336
+2 27422 98.5379 79.3400 0012697 12.1725 347.9761 14.28474297344855
AO-49 [-]
-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
+1 27605U 02058A 08361.48540940 .00000020 00000-0 24820-4 0 8033
+2 27605 64.5570 177.5079 0081776 242.7789 116.4986 14.72379578323515
SO-50 [+]
-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
+1 27607U 02058C 08361.01297002 .00000048 00000-0 29530-4 0 7742
+2 27607 64.5553 191.0458 0082486 242.0927 117.1824 14.71403859323198
DTUSAT [-]
-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
+1 27842U 03031C 08361.87436362 .00000020 00000-0 29550-4 0 4517
+2 27842 98.7085 8.4560 0008803 262.6453 97.3720 14.20960409284874
CO-55 [+]
-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
+1 27844U 03031E 08361.50639644 .00000026 00000-0 32673-4 0 4737
+2 27844 98.7157 7.1015 0009101 283.6790 76.3378 14.20613972284748
AAU CUBESAT [-]
-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
+1 27846U 03031G 08360.95861735 .00000025 00000-0 31888-4 0 3897
+2 27846 98.7081 7.5474 0008844 264.5051 95.5115 14.20960998284745
CANX-1 [-]
-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
+1 27847U 03031H 08360.54265265 .00000031 00000-0 34593-4 0 4028
+2 27847 98.7086 7.1314 0008702 265.4670 94.5523 14.20945127284637
CO-57 [+]
-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
+1 27848U 03031J 08361.95315242 .00000036 00000-0 37187-4 0 4225
+2 27848 98.7163 6.6092 0009249 287.1132 72.9029 14.20419878284777
RS-22 [+]
-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
+1 27939U 03042A 08361.54029891 .00000008 00000-0 10431-4 0 6768
+2 27939 97.9684 236.4251 0013169 321.6046 38.4224 14.63282914280328
AO-51 [+]
-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
+1 28375U 04025K 08361.92570859 .00000005 00000-0 14350-4 0 2769
+2 28375 98.0575 15.5276 0083553 288.7832 70.4304 14.40628718236155
VO-52 [+]
-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
+1 28650U 05017B 08361.96374925 .00000405 00000-0 57996-4 0 1145
+2 28650 97.7679 63.0374 0026279 230.6096 129.2772 14.81538111197148
UWE-1 [-]
-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
+1 28892U 05043C 08360.95471021 .00000212 00000-0 53911-4 0 2246
+2 28892 98.0766 249.7607 0017602 166.4442 193.7255 14.59692426168572
XO-53 [-]
-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
+1 28894U 05043E 08361.66418709 .00000012 00000-0 12138-4 0 3471
+2 28894 98.0770 250.7046 0017678 166.5732 193.5943 14.59648330168683
CO-58 [+]
-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
+1 28895U 05043F 08357.69608648 .00000096 00000-0 29631-4 0 1952
+2 28895 98.0826 247.0326 0018215 176.7596 183.3728 14.59726383167980
NCUBE-2 [-]
-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
+1 28897U 05043H 08361.68210475 .00000116 00000-0 33622-4 0 7331
+2 28897 98.0770 250.8333 0017263 165.7114 194.4566 14.59902801160859
CO-56 [P]
-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
+1 28941U 06005C 08362.04508670 .00025005 26621-5 14111-3 0 6727
+2 28941 98.1232 140.9131 0130705 55.4465 305.8846 15.68311654160141
PEHUENSAT 1 [+]
-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
+1 29712U 07001D 08362.14335373 .00000612 00000-0 86809-4 0 936
+2 29712 97.8540 56.4786 0015227 113.3642 246.9184 14.80389766106013
+DO-64 [+]
+1 32789U 08021G 08362.21833081 .00000689 00000-0 94511-4 0 2490
+2 32789 97.9709 61.4076 0015059 227.9273 132.0655 14.81572680 35987
Modified: trunk/data/cubesat.tle
===================================================================
--- trunk/data/cubesat.tle 2008-10-26 21:34:20 UTC (rev 173)
+++ trunk/data/cubesat.tle 2008-12-27 14:06:23 UTC (rev 174)
@@ -1,75 +1,75 @@
DTUSAT
-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
+1 27842U 03031C 08361.87436362 .00000020 00000-0 29550-4 0 4517
+2 27842 98.7085 8.4560 0008803 262.6453 97.3720 14.20960409284874
CUTE-1 (CO-55)
-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
+1 27844U 03031E 08361.50639644 .00000026 00000-0 32673-4 0 4737
+2 27844 98.7157 7.1015 0009101 283.6790 76.3378 14.20613972284748
QUAKESAT
-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
+1 27845U 03031F 08361.97453628 .00000075 00000-0 55797-4 0 4517
+2 27845 98.7210 6.9486 0008635 301.8934 58.1402 14.20239902284723
AAU CUBESAT
-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
+1 27846U 03031G 08360.95861735 .00000025 00000-0 31888-4 0 3897
+2 27846 98.7081 7.5474 0008844 264.5051 95.5115 14.20960998284745
CANX-1
-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
+1 27847U 03031H 08360.54265265 .00000031 00000-0 34593-4 0 4028
+2 27847 98.7086 7.1314 0008702 265.4670 94.5523 14.20945127284637
CUBESAT XI-IV (CO-57)
-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
+1 27848U 03031J 08361.95315242 .00000036 00000-0 37187-4 0 4225
+2 27848 98.7163 6.6092 0009249 287.1132 72.9029 14.20419878284777
UWE-1
-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
+1 28892U 05043C 08360.95471021 .00000212 00000-0 53911-4 0 2246
+2 28892 98.0766 249.7607 0017602 166.4442 193.7255 14.59692426168572
CUBESAT XI-V (CO-58)
-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
+1 28895U 05043F 08357.69608648 .00000096 00000-0 29631-4 0 1952
+2 28895 98.0826 247.0326 0018215 176.7596 183.3728 14.59726383167980
NCUBE-2
-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
+1 28897U 05043H 08361.68210475 .00000116 00000-0 33622-4 0 7331
+2 28897 98.0770 250.8333 0017263 165.7114 194.4566 14.59902801160859
CUTE-1.7+APD (CO-56)
-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
+1 28941U 06005C 08362.04508670 .00025005 26621-5 14111-3 0 6727
+2 28941 98.1232 140.9131 0130705 55.4465 305.8846 15.68311654160141
GENESAT-1
-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
+1 29655U 06058C 08361.88740499 .00009432 00000-0 10827-3 0 5954
+2 29655 40.0246 179.8937 0000993 133.2191 226.8707 15.61925028115491
CSTB1
-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
+1 31122U 07012F 08361.83277050 .00000554 00000-0 13192-3 0 5190
+2 31122 98.0208 60.0431 0086915 90.0872 271.0263 14.55195550 90096
MAST
-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
+1 31126U 07012K 08361.45044109 .00000116 00000-0 36590-4 0 4897
+2 31126 98.0170 57.9483 0095923 96.0388 265.1792 14.53467753 89945
LIBERTAD-1
-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
+1 31128U 07012M 08361.11848356 -.00000046 00000-0 00000+0 0 5153
+2 31128 98.0167 56.1909 0103953 101.1793 260.1128 14.52003877 89780
POLYSAT CP3
-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
+1 31129U 07012N 08362.11461613 .00000110 00000-0 35847-4 0 5807
+2 31129 98.0168 57.2173 0103655 97.9825 263.3167 14.52093134 89912
CAPE1
-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
+1 31130U 07012P 08361.45571293 .00000138 00000-0 42397-4 0 4875
+2 31130 98.0184 56.5249 0104045 100.0774 261.2180 14.52020087 89628
POLYSAT CP4
-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
+1 31132U 07012Q 08362.10821739 .00000259 00000-0 67195-4 0 4937
+2 31132 98.0207 60.2640 0086981 89.1672 271.9495 14.55171086 90005
NTS (CANX-6)
-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
+1 32784U 08021B 08362.23251555 .00000268 00000-0 41447-4 0 2467
+2 32784 97.9726 61.3106 0015129 221.7930 138.2127 14.81002066 35971
CUTE-1.7+APD II
-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
+1 32785U 08021C 08361.89276266 .00000135 00000-0 24153-4 0 2474
+2 32785 97.9710 61.0809 0014084 228.1801 131.8208 14.81431216 35937
COMPASS-1
-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
+1 32787U 08021E 08362.21962157 .00000445 00000-0 63538-4 0 2377
+2 32787 97.9676 61.3071 0014932 228.5257 131.4673 14.81522480 35986
AAUSAT-II
-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
+1 32788U 08021F 08361.45857142 .00000124 00000-0 22557-4 0 2370
+2 32788 97.9671 60.5801 0014502 231.9106 128.0805 14.81636497 35879
DELFI-C3
-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
+1 32789U 08021G 08362.21833081 .00000689 00000-0 94511-4 0 2490
+2 32789 97.9709 61.4076 0015059 227.9273 132.0655 14.81572680 35987
CANX-2
-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
+1 32790U 08021H 08361.82633071 .00000163 00000-0 27692-4 0 2342
+2 32790 97.9709 61.0017 0014508 228.1500 131.8470 14.81419853 35900
SEEDS II
-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
+1 32791U 08021J 08362.17596438 .00000116 00000-0 21766-4 0 2307
+2 32791 97.9700 61.2900 0015286 226.7454 133.2481 14.81365187 35943
PSLV DEB
-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
+1 32797U 08021L 08353.58596765 .00000187 00000-0 23883-4 0 1221
+2 32797 97.9710 52.8070 0014401 258.6058 101.4030 14.81416884 33391
Modified: trunk/data/galileo.tle
===================================================================
--- trunk/data/galileo.tle 2008-10-26 21:34:20 UTC (rev 173)
+++ trunk/data/galileo.tle 2008-12-27 14:06:23 UTC (rev 174)
@@ -1,6 +1,6 @@
GIOVE-A
-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
+1 28922U 05051A 08360.79339189 .00000071 00000-0 10000-3 0 4313
+2 28922 56.0611 161.9370 0006208 344.4102 15.5504 1.70197027 18615
GIOVE-B
-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
+1 32781U 08020A 08361.40630860 .00000095 00000-0 10000-3 0 1110
+2 32781 55.9625 196.8832 0016847 204.4933 155.4871 1.70950216 4177
Modified: trunk/data/geo.tle
===================================================================
--- trunk/data/geo.tle 2008-10-26 21:34:20 UTC (rev 173)
+++ trunk/data/geo.tle 2008-12-27 14:06:23 UTC (rev 174)
@@ -1,1119 +1,1128 @@
LES 9
-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
+1 08747U 76023B 08361.49101189 -.00000068 00000-0 10000-3 0 1963
+2 08747 10.7508 153.3577 0022425 317.5126 58.2734 1.00268614 65693
MARISAT 2
-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
+1 09478U 76101A 08357.24818028 -.00000282 00000-0 10000-3 0 953
+2 09478 13.2111 357.0195 0101031 196.5973 163.0580 0.97592087 61169
GOES 3
-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
+1 10953U 78062A 08361.02237431 -.00000128 00000-0 10000-3 0 3463
+2 10953 14.2996 1.4776 0003099 280.8612 79.1114 1.00273292 64935
ESIAFI 1 (COMSTAR 4)
-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
+1 12309U 81018A 08357.55364171 -.00000160 00000-0 10000-3 0 1824
+2 12309 13.7880 11.6351 0007681 262.4454 97.4620 1.00272147103422
SATCOM C5
-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
+1 13631U 82105A 08360.12300012 -.00000098 00000-0 10000-3 0 5725
+2 13631 12.2403 33.1486 0008694 235.4839 124.4164 1.00272996 62370
TDRS 1
-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
+1 13969U 83026B 08361.37317464 -.00000290 00000-0 10000-3 0 7792
+2 13969 13.2064 10.5893 0026185 234.4374 295.6683 1.00276741 67269
GSTAR 1
-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
+1 15677U 85035A 08359.18026433 -.00000089 00000-0 10000-3 0 903
+2 15677 10.2988 52.7769 0008718 238.1026 121.7439 1.00272428 61222
INTELSAT 511
-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
+1 15873U 85055A 08359.30800663 .00000102 00000-0 10000-3 0 3359
+2 15873 11.6775 40.8826 0015154 263.2679 96.5262 1.00106672 60630
GOES 7
-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
+1 17561U 87022A 08358.33212012 .00000061 00000-0 10000-3 0 7525
+2 17561 11.7833 38.9925 0002503 196.3434 159.6218 1.00276917 63140
GSTAR 3
-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
+1 19483U 88081A 08359.09739897 -.00000103 00000-0 10000-3 0 1606
+2 19483 14.0910 22.6104 0005466 305.6454 54.2994 1.00272350 70601
TDRS 3
-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
+1 19548U 88091B 08361.86416029 -.00000185 00000-0 10000-3 0 1729
+2 19548 11.5071 41.6288 0021925 298.9692 151.0113 1.00275994 61418
ASTRA 1A
-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
+1 19688U 88109B 08359.56139553 -.00000161 00000-0 10000-3 0 5191
+2 19688 7.1856 66.4193 0013450 287.6229 72.0690 0.98337488 53337
TDRS 4
-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
+1 19883U 89021B 08360.36684622 -.00000273 00000-0 10000-3 0 4883
+2 19883 10.1182 53.7927 0004021 227.5126 259.1862 1.00269186244971
INTELSAT 602 (IS-602)
-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
+1 20315U 89087A 08359.25462608 .00000045 00000-0 10000-3 0 8140
+2 20315 6.4803 68.3613 0002085 208.4148 85.8578 1.00272682 67960
LEASAT 5
-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
+1 20410U 90002B 08361.99928302 -.00000302 00000-0 10000-3 0 405
+2 20410 8.0117 36.2827 0000492 303.0515 216.2913 1.00270781 54713
INTELSAT 603 (IS-603)
-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
+1 20523U 90021A 08360.89377355 -.00000145 00000-0 10000-3 0 3920
+2 20523 5.9596 69.9095 0002872 252.4039 74.2213 1.00272628 61734
ASIASAT 1
-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
+1 20558U 90030A 08357.56604356 -.00000271 00000-0 10000-3 0 6419
+2 20558 8.6289 62.4276 0006331 198.4236 161.4416 0.99244807 68323
INSAT-1D
-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
+1 20643U 90051A 08360.70810103 -.00000026 00000-0 10000-3 0 878
+2 20643 9.3970 58.3382 0011941 39.0095 320.9931 1.00275907 54755
COSMOS 2085
-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
+1 20693U 90061A 08361.61708946 -.00000139 00000-0 10000-3 0 8891
+2 20693 11.8280 37.3955 0005230 244.8197 115.1159 1.00276423 67516
SKYNET 4C
-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
+1 20776U 90079A 08357.91100881 .00000037 00000-0 10000-3 0 8665
+2 20776 9.4756 49.0772 0003480 210.5155 166.1492 1.00273426 66925
EUTELSAT 2-F1
-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
+1 20777U 90079B 08360.97098691 -.00000237 00000-0 10000-3 0 8327
+2 20777 8.8338 61.4412 0005930 159.0440 200.8837 0.99349711 47364
SBS-6
-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
+1 20872U 90091A 08361.49434190 -.00000210 00000-0 10000-3 0 9954
+2 20872 1.3589 81.4334 0002039 173.5093 297.4530 1.00269532 55066
GALAXY 6
-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
+1 20873U 90091B 08360.23273060 .00000007 00000-0 10000-3 0 2195
+2 20873 5.7447 70.7910 0001812 152.6655 207.1227 0.99756031 61115
INMARSAT 2-F1
-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
+1 20918U 90093A 08361.44585200 .00000120 00000-0 10000-3 0 1952
+2 20918 6.2135 56.6697 0003377 223.6008 193.5343 1.00270898 62943
GSTAR 4
-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
+1 20946U 90100B 08357.51603534 -.00000273 00000-0 10000-3 0 2294
+2 20946 5.9283 70.6617 0007169 173.6805 186.1279 0.99146247 60989
COSMOS 2133
-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
+1 21111U 91010A 08358.66797580 -.00000050 00000-0 10000-3 0 945
+2 21111 10.9132 43.6121 0003054 282.0254 77.8944 1.00279379 65420
INMARSAT 2-F2
-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
+1 21149U 91018A 08361.24043550 -.00000126 00000-0 10000-3 0 3120
+2 21149 5.5282 56.8167 0004137 213.2713 173.5557 1.00271460 65238
TDRS 5
-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
+1 21639U 91054B 08358.55281638 .00000112 00000-0 10000-3 0 3657
+2 21639 9.4559 57.6806 0004295 259.3718 166.7556 1.00267127 63700
INTELSAT 605 (IS-605)
-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
+1 21653U 91055A 08358.26512959 .00000021 00000-0 10000-3 0 7197
+2 21653 3.9940 74.7612 0001375 203.7470 83.0769 1.00272136 63543
ANIK E1
-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
+1 21726U 91067A 08360.07576447 -.00000212 00000-0 10000-3 0 944
+2 21726 5.3284 72.8218 0008711 180.7707 178.9796 0.99170575 53971
INTELSAT 601 (IS-601)
-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
+1 21765U 91075A 08360.91402975 .00000138 00000-0 10000-3 0 6978
+2 21765 4.0533 74.5060 0000156 269.3615 127.4587 1.00273216 62682
EUTELSAT 2-F3
-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
+1 21803U 91083A 08361.11403189 -.00000166 00000-0 10000-3 0 6366
+2 21803 8.0012 64.5633 0004969 199.2434 165.9566 0.99296127 58291
GALAXY 5
-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
+1 21906U 92013A 08360.39323571 .00000016 00000-0 10000-3 0 8498
+2 21906 3.7953 75.7315 0014323 264.6666 94.8011 0.99289663 53030
INMARSAT 2-F4
-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
+1 21940U 92021B 08359.87161684 -.00000338 00000-0 10000-3 0 244
+2 21940 4.1677 50.2964 0001886 234.1852 231.9577 1.00266746 61101
EUTELSAT 2-F4
-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
+1 22028U 92041B 08357.39086573 -.00000047 00000-0 10000-3 0 1149
+2 22028 7.1824 67.8599 0006477 127.9654 231.9379 0.99080117 52961
SATCOM C3
-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
+1 22117U 92060B 08361.05106403 -.00000221 00000-0 10000-3 0 448
+2 22117 3.9549 74.6648 0001838 242.2881 77.2838 1.00271278 59633
HELLAS SAT 1 (DFS 3)
-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
+1 22175U 92066A 08357.39020069 .00000071 00000-0 10000-3 0 3189
+2 22175 6.4729 68.6687 0004928 215.7346 144.0583 0.99733765 56914
GORIZONT 27
-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
+1 22245U 92082A 08356.37905428 .00000033 00000-0 10000-3 0 4069
+2 22245 10.8989 46.7429 0016916 215.7490 144.0867 1.00214588 63160
SUPERBIRD A1
-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
+1 22253U 92084A 08350.40461251 -.00000128 00000-0 10000-3 0 7787
+2 22253 3.0343 76.6053 0005117 191.3218 120.1347 1.00270012 58447
COSMOS 2224
-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
+1 22269U 92088A 08360.87727299 -.00000018 00000-0 10000-3 0 5334
+2 22269 10.0428 49.4287 0003713 156.7859 203.1771 1.00251263 58179
TDRS 6
-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
+1 22314U 93003B 08357.41869032 .00000100 00000-0 10000-3 0 4016
+2 22314 8.7920 60.8265 0001107 160.1758 209.6460 1.00273947 58412
ASTRA 1C
-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
+1 22653U 93031A 08360.19946076 .00000026 00000-0 10000-3 0 3540
+2 22653 2.1472 80.1753 0004083 191.7032 255.9670 1.00271716 52318
INSAT-2B
-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
+1 22724U 93048B 08361.07007155 -.00000270 00000-0 10000-3 0 1619
+2 22724 7.5044 65.6797 0011149 46.5498 313.4097 0.99972158 56784
ACTS
-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
+1 22796U 93058B 08359.20145761 -.00000082 00000-0 10000-3 0 5971
+2 22796 9.0188 59.9019 0001726 211.6850 148.2021 1.00272000 62891
INTELSAT 701 (IS-701)
-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
+1 22871U 93066A 08358.65043944 .00000069 00000-0 10000-3 0 3019
+2 22871 0.0117 27.5241 0003101 255.9728 223.1962 1.00272127 55440
GORIZONT 28
-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
+1 22880U 93069A 08360.90768042 -.00000335 00000-0 10000-3 0 515
+2 22880 10.4173 50.0379 0004167 261.6015 218.0379 1.00220774 55532
GORIZONT 29
-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
+1 22907U 93072A 08361.28920523 .00000129 00000-0 10000-3 0 6162
+2 22907 10.3948 50.1632 0015223 199.3631 160.5323 1.00135206 55298
SOLIDARIDAD 1
-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
+1 22911U 93073A 08360.20643425 -.00000098 00000-0 10000-3 0 1310
+2 22911 7.4826 65.6807 0004415 149.9609 209.9172 1.00278117 53913
METEOSAT-6 (MOP-3)
-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
+1 22912U 93073B 08361.97947449 -.00000009 00000-0 10000-3 0 8509
+2 22912 7.9647 61.9110 0001976 229.0016 224.9425 1.00273355 53745
NATO 4B
-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
+1 22921U 93076A 08361.78752373 .00000158 00000-0 10000-3 0 1092
+2 22921 7.3921 54.2123 0002775 212.3699 147.5163 1.00273886 55169
DIRECTV 1 (DBS 1)
-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
+1 22930U 93078A 08359.42759455 -.00000157 00000-0 00000+0 0 5415
+2 22930 0.1317 89.5458 0003014 182.0020 244.5526 1.00271465 62866
THAICOM 1
-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
+1 22931U 93078B 08360.93130736 -.00000346 00000-0 10000-3 0 2826
+2 22931 0.1267 57.4465 0001841 202.9205 289.7419 1.00273072 54584
GOES 8
-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 08259.78833892 .00000086 00000-0 10000-3 0 869
-2 23124 0.0062 25.3167 0002484 140.9066 167.5622 1.00272487 66361
+1 23051U 94022A 08361.66716296 -.00000055 00000-0 10000-3 0 6159
+2 23051 5.3131 76.1044 0010031 166.6023 193.1739 0.98903727 61013
INTELSAT 2 (IS-2)
-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
+1 23175U 94040A 08358.27524991 -.00000015 00000-0 10000-3 0 3364
+2 23175 0.0330 129.6134 0002646 154.1766 76.4639 1.00271903 52274
BS-3N
-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
+1 23176U 94040B 08360.92467159 -.00000333 00000-0 10000-3 0 9710
+2 23176 0.0110 231.8904 0000265 307.2541 358.4082 1.00269317 52797
APSTAR 1
-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
+1 23185U 94043A 08362.13745282 -.00000253 00000-0 10000-3 0 828
+2 23185 3.9924 74.7829 0000891 187.6027 25.0945 1.00272466 52857
DIRECTV 2 (DBS 2)
-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
+1 23192U 94047A 08361.14624483 -.00000185 00000-0 10000-3 0 3882
+2 23192 1.9477 79.8218 0016548 181.4382 237.3329 0.98636696 62722
BRASILSAT B1
-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
+1 23199U 94049A 08360.38479750 -.00000255 00000-0 10000-3 0 2013
+2 23199 1.7240 80.8520 0001804 183.7854 260.2069 1.00269523 63532
OPTUS B3
-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
+1 23227U 94055A 08358.65463267 -.00000060 00000-0 10000-3 0 2705
+2 23227 1.0084 81.9249 0004480 172.4360 237.8282 1.00271180 52440
NSS-703
-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
+1 23305U 94064A 08359.78480998 .00000088 00000-0 10000-3 0 8678
+2 23305 0.0270 195.7068 0003158 87.8822 149.6081 1.00273324 52189
SOLIDARIDAD 2
-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
+1 23313U 94065A 08360.42292944 -.00000009 00000-0 10000-3 0 2558
+2 23313 0.7997 82.5437 0002364 186.8731 222.2307 1.00272504 52055
THAICOM 2
-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
+1 23314U 94065B 08360.94164941 -.00000105 00000-0 10000-3 0 1715
+2 23314 0.0937 41.8504 0006723 221.1830 249.2711 1.00270685 52036
EXPRESS 1
-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
+1 23319U 94067A 08361.57919037 -.00000329 00000-0 10000-3 0 6382
+2 23319 7.6858 64.9803 0003081 154.1279 205.7633 0.99827186 51894
ASTRA 1D
-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
+1 23331U 94070A 08360.00776090 .00000170 00000-0 00000+0 0 8523
+2 23331 1.2160 79.8203 0003182 198.3525 209.7668 1.00272577 52297
RADUGA 32
-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
+1 23448U 94087A 08361.68947904 -.00000044 00000-0 10000-3 0 943
+2 23448 9.8430 54.3220 0006319 149.6303 210.3482 1.00277285 68958
INTELSAT 704 (IS-704)
-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
+1 23461U 95001A 08361.90298574 .00000015 00000-0 10000-3 0 8633
+2 23461 0.0337 248.3168 0003756 28.9017 209.6187 1.00273192 51173
INTELSAT 705 (IS-705)
-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
+1 23528U 95013A 08360.91687163 -.00000265 00000-0 10000-3 0 8038
+2 23528 0.0105 300.3842 0002794 349.1655 85.3164 1.00271673 50349
BRASILSAT B2
-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
+1 23536U 95016A 08360.06147841 -.00000152 00000-0 00000+0 0 9446
+2 23536 0.8982 85.2108 0002611 175.8676 122.9525 1.00269592 50401
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
+1 23553U 95019A 08359.34566931 -.00000101 00000-0 10000-3 0 712
+2 23553 4.0777 74.6864 0002521 211.0422 190.6465 1.00271479 50201
INTELSAT 706 (IS-706)
-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
+1 23571U 95023A 08361.95041874 .00000130 00000-0 10000-3 0 8484
+2 23571 0.0089 318.7728 0002665 315.9871 213.4333 1.00271006 49847
DIRECTV 3 (DBS 3)
-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
+1 23598U 95029A 08359.21731701 -.00000204 00000-0 10000-3 0 9811
+2 23598 0.0338 268.6739 0003744 50.4578 130.1901 1.00272574 49546
TDRS 7
-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
+1 23613U 95035B 08361.20657076 .00000129 00000-0 10000-3 0 4359
+2 23613 10.6665 50.0915 0003790 208.7725 119.7982 1.00267903 49256
INTELSAT 4 (IS-4)
-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
+1 23636U 95040A 08361.90781882 -.00000041 00000-0 10000-3 0 9001
+2 23636 0.0224 256.5988 0003165 12.4939 225.4903 1.00272706 49043
COSMOS 2319
-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
+1 23653U 95045A 08357.38823156 .00000079 00000-0 10000-3 0 9610
+2 23653 9.4479 56.6559 0003223 97.7292 262.2197 1.00241665 48754
TELSTAR 4 (TELSTAR 402R)
-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
+1 23670U 95049A 08359.19436681 -.00000161 00000-0 10000-3 0 8732
+2 23670 4.9120 72.2005 0007106 184.5646 175.1612 1.00257212 48533
LUCH 1
-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
+1 23680U 95054A 08359.71055866 -.00000093 00000-0 10000-3 0 7068
+2 23680 8.5520 65.6679 0004996 286.6107 73.2112 1.00277442 48395
ASTRA 1E
-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
+1 23686U 95055A 08360.93841389 .00000154 00000-0 00000+0 0 9608
+2 23686 0.0701 174.1488 0005510 134.5558 147.3810 1.00274495 48378
ASIASAT 2
-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
+1 23723U 95064A 08361.86158498 -.00000291 00000-0 10000-3 0 8286
+2 23723 0.0103 321.8462 0001855 302.5358 242.0297 1.00271416 47913
TELECOM 2C
-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
+1 23730U 95067A 08360.19904359 .00000030 00000-0 10000-3 0 414
+2 23730 4.7437 72.9361 0005644 194.0425 261.7719 1.00272006 47927
ECHOSTAR 1
-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
+1 23754U 95073A 08361.51654981 .00000146 00000-0 10000-3 0 189
+2 23754 0.0324 279.5851 0002271 337.6230 236.0346 1.00270376 47455
INTELSAT 3R (IS-3R)
-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
+1 23764U 96002A 08359.48497764 -.00000252 00000-0 00000+0 0 5875
+2 23764 0.0243 88.3435 0001541 193.9368 302.6880 1.00270789 47433
AFRICASAT-1 (MEASAT-1)
-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
+1 23765U 96002B 08361.89149035 .00000148 00000-0 10000-3 0 7622
+2 23765 1.1816 81.4106 0000209 310.5095 70.7374 1.00272976 47447
KOREASAT 2
-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
+1 23768U 96003A 08359.92010286 -.00000347 00000-0 10000-3 0 6791
+2 23768 1.9252 79.6482 0000606 241.2205 220.6389 1.00273487 47408
HGS-3
-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
+1 23779U 96006A 08361.94504722 .00000170 00000-0 10000-3 0 1231
+2 23779 0.0341 170.0278 0003197 58.6118 245.3860 1.00272385 47201
INTELSAT 707 (IS-707)
-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
+1 23816U 96015A 08356.93458083 -.00000272 00000-0 10000-3 0 7920
+2 23816 0.0005 349.3090 0003033 293.0379 91.9531 1.00270079 46809
INMARSAT 3-F1
-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
+1 23839U 96020A 08361.98494723 .00000028 00000-0 10000-3 0 5244
+2 23839 0.0945 15.3802 0005793 254.5825 244.9413 1.00272839 46648
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
+1 23842U 96021A 08360.79181089 .00000137 00000-0 00000+0 0 9560
+2 23842 0.0347 215.4147 0002646 99.4305 84.0474 1.00272979 46540
MSAT M1
-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
+1 23846U 96022A 08360.32458586 -.00000064 00000-0 10000-3 0 3797
+2 23846 1.4273 80.4934 0005821 191.5918 192.4465 1.00271692 46458
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 08261.31079328 -.00000033 00000-0 00000+0 0 9785
-2 23865 0.0687 261.2461 0001543 289.8417 273.4350 1.00272248 45189
+1 23864U 96030A 08357.90817273 -.00000343 00000-0 10000-3 0 7972
+2 23864 0.0115 1.0918 0001919 171.2662 359.3389 1.00266437 46151
+AMOS 1
+1 23865U 96030B 08359.63651145 .00000003 00000-0 10000-3 0 165
+2 23865 0.4626 88.8266 0004376 162.7719 69.6783 1.00275030 46169
GALAXY 9 (G-9)
-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
+1 23877U 96033A 08359.13151399 -.00000209 00000-0 10000-3 0 82
+2 23877 0.3359 80.3479 0001418 183.5261 155.4522 1.00268942 46118
GORIZONT 32
-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
+1 23880U 96034A 08361.12006074 -.00000113 00000-0 10000-3 0 1016
+2 23880 9.0291 58.5048 0003741 207.8740 217.1956 1.00268628 46102
INTELSAT 709 (IS-709)
-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
+1 23915U 96035A 08361.89825019 -.00000169 00000-0 10000-3 0 8612
+2 23915 0.0095 14.3410 0002574 265.8400 224.0880 1.00271145 45938
APSTAR 1A
-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
+1 23943U 96039A 08361.29282295 -.00000324 00000-0 10000-3 0 9225
+2 23943 3.2964 76.2265 0001091 181.9095 72.4243 1.00267821 45737
TURKSAT 1C
-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
+1 23949U 96040B 08359.87363212 .00000170 00000-0 10000-3 0 9311
+2 23949 0.7278 80.2252 0001427 169.9728 189.0655 1.00274922 45659
TELECOM 2D
-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
+1 24209U 96044B 08360.73664692 -.00000051 00000-0 10000-3 0 8260
+2 24209 2.4690 78.0350 0006142 192.7047 81.1740 1.00271690 45473
INMARSAT 3-F2
-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
+1 24307U 96053A 08361.76889204 -.00000106 00000-0 10000-3 0 6215
+2 24307 0.0830 319.6708 0005874 315.9284 81.3018 1.00271341 45053
ECHOSTAR 2
-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
+1 24313U 96055A 08361.38839189 .00000044 00000-0 10000-3 0 9021
+2 24313 0.4445 82.1072 0003641 185.8057 202.0646 1.00340620 45083
AMC-1 (GE-1)
-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
+1 24315U 96054A 08357.19437360 -.00000088 00000-0 10000-3 0 582
+2 24315 0.0195 248.6462 0003582 20.0677 149.3671 1.00271131 45000
ARABSAT-2B
-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
+1 24652U 96063A 08359.78239450 .00000170 00000-0 10000-3 0 9156
+2 24652 0.0274 165.4121 0001745 104.9381 135.4254 1.00268825 44865
MEASAT-2
-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
+1 24653U 96063B 08358.63237529 -.00000203 00000-0 10000-3 0 8668
+2 24653 1.1375 81.7985 0001520 198.7952 187.5726 1.00271284 44410
EUROBIRD 9
-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
+1 24665U 96067A 08360.88814691 .00000079 00000-0 00000+0 0 7840
+2 24665 0.0550 88.0694 0007572 204.8113 130.5908 1.00273674 44699
INMARSAT 3-F3
-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
+1 24674U 96070A 08360.15792706 .00000057 00000-0 10000-3 0 5913
+2 24674 0.0679 338.6850 0006864 287.2938 62.9942 1.00273592 43999
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
+1 24713U 97002A 08359.38117848 -.00000098 00000-0 00000+0 0 8345
+2 24713 0.0132 43.8631 0002749 214.1759 231.4449 1.00271574 43596
NAHUEL 1A
-1 24714U 97002B 08264.08771706 -.00000264 00000-0 10000-3 0 7661
-2 24714 1.0755 82.4253 0004181 92.5206 144.1980 1.00270548 42639
+1 24714U 97002B 08360.06269571 -.00000244 00000-0 10000-3 0 8140
+2 24714 1.3257 81.2045 000...
[truncated message content] |
|
From: <cs...@us...> - 2008-10-26 22:45:57
|
Revision: 173
http://gpredict.svn.sourceforge.net/gpredict/?rev=173&view=rev
Author: csete
Date: 2008-10-26 21:34:20 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Fixed bug 2170642: Small error in user manual.
Modified Paths:
--------------
trunk/NEWS
trunk/doc/um/gpredict-user-manual.odt
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-10-26 20:24:27 UTC (rev 172)
+++ trunk/NEWS 2008-10-26 21:34:20 UTC (rev 173)
@@ -15,6 +15,7 @@
- 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.
+- Fixed bug 2170642: Small error in user manual.
x Windows: New installer instead of ZIP distribution.
- Updated PDF user manual.
Modified: trunk/doc/um/gpredict-user-manual.odt
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-10-26 20:24:30
|
Revision: 172
http://gpredict.svn.sourceforge.net/gpredict/?rev=172&view=rev
Author: csete
Date: 2008-10-26 20:24:27 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Updated with info on pass prediction time settings.
Modified Paths:
--------------
trunk/doc/um/gpredict-user-manual.odt
Modified: trunk/doc/um/gpredict-user-manual.odt
===================================================================
(Binary files differ)
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:37:10
|
Revision: 171
http://gpredict.svn.sourceforge.net/gpredict/?rev=171&view=rev
Author: csete
Date: 2008-10-26 17:37:07 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/configure.ac
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-26 17:33:09 UTC (rev 170)
+++ trunk/ChangeLog 2008-10-26 17:37:07 UTC (rev 171)
@@ -1,3 +1,20 @@
+2008-10-26; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-sat-list-popup.[ch]:
+ New files containing popup menu for satlist. Satlist was previously
+ using the generic sat-popup-menu, but that has been abandoned due to lack
+ of support for simulated real time.
+
+ * src/gtk-sat-list.c:
+ Use new gtk-sat-list-popup.
+
+ * src/sat-info.[ch]:
+ Added files containing functions to show satellite info.
+
+ * src/sat-popup-menu.[ch]:
+ Deleted.
+
+
2008-10-25; Alexandru Csete <oz...@gm...>
* src/gtk-sky-glance.[ch]:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-10-26 17:33:09 UTC (rev 170)
+++ trunk/NEWS 2008-10-26 17:37:07 UTC (rev 171)
@@ -4,7 +4,7 @@
- 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 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.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2008-10-26 17:33:09 UTC (rev 170)
+++ trunk/configure.ac 2008-10-26 17:37:07 UTC (rev 171)
@@ -2,7 +2,7 @@
AM_CONFIG_HEADER(build-config.h)
-AM_INIT_AUTOMAKE(gpredict, 1.1_beta)
+AM_INIT_AUTOMAKE(gpredict, 1.0b2)
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-26 17:33:12
|
Revision: 170
http://gpredict.svn.sourceforge.net/gpredict/?rev=170&view=rev
Author: csete
Date: 2008-10-26 17:33:09 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Removed obsolete references to sat-popup-menu.
Modified Paths:
--------------
trunk/src/gtk-azel-plot.c
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-view.c
trunk/src/gtk-sat-map.c
trunk/src/gtk-sky-glance.c
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2008-10-26 17:27:08 UTC (rev 169)
+++ trunk/src/gtk-azel-plot.c 2008-10-26 17:33:09 UTC (rev 170)
@@ -36,7 +36,6 @@
#include "config-keys.h"
#include "sat-cfg.h"
#include "time-tools.h"
-#include "sat-popup-menu.h"
#include "gtk-sat-data.h"
#include "gpredict-utils.h"
#include "gtk-azel-plot.h"
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2008-10-26 17:27:08 UTC (rev 169)
+++ trunk/src/gtk-polar-plot.c 2008-10-26 17:33:09 UTC (rev 170)
@@ -45,7 +45,6 @@
#include "config-keys.h"
#include "sat-cfg.h"
#include "time-tools.h"
-#include "sat-popup-menu.h"
#include "gtk-sat-data.h"
#include "gpredict-utils.h"
#include "gtk-polar-plot.h"
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2008-10-26 17:27:08 UTC (rev 169)
+++ trunk/src/gtk-polar-view.c 2008-10-26 17:33:09 UTC (rev 170)
@@ -36,8 +36,6 @@
#include "config-keys.h"
#include "sat-cfg.h"
#include "mod-cfg-get-param.h"
-//#include "time-tools.h"
-#include "sat-popup-menu.h"
#include "gtk-sat-data.h"
#include "gpredict-utils.h"
#include "gtk-polar-view-popup.h"
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2008-10-26 17:27:08 UTC (rev 169)
+++ trunk/src/gtk-sat-map.c 2008-10-26 17:33:09 UTC (rev 170)
@@ -45,8 +45,6 @@
#include "config-keys.h"
#include "sat-cfg.h"
#include "mod-cfg-get-param.h"
-//#include "time-tools.h"
-#include "sat-popup-menu.h"
#include "gtk-sat-data.h"
#include "gpredict-utils.h"
#include "compat.h"
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2008-10-26 17:27:08 UTC (rev 169)
+++ trunk/src/gtk-sky-glance.c 2008-10-26 17:33:09 UTC (rev 170)
@@ -43,7 +43,6 @@
#include "sat-cfg.h"
#include "mod-cfg-get-param.h"
#include "time-tools.h"
-#include "sat-popup-menu.h"
#include "gtk-sat-data.h"
#include "gpredict-utils.h"
#include "predict-tools.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:27:11
|
Revision: 169
http://gpredict.svn.sourceforge.net/gpredict/?rev=169&view=rev
Author: csete
Date: 2008-10-26 17:27:08 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Use new sat-info module.
Modified Paths:
--------------
trunk/src/Makefile.am
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-sat-list-popup.c
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-single-sat.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-10-26 17:26:35 UTC (rev 168)
+++ trunk/src/Makefile.am 2008-10-26 17:27:08 UTC (rev 169)
@@ -72,11 +72,11 @@
radio-conf.c radio-conf.h \
rotor-conf.c rotor-conf.h \
sat-cfg.c sat-cfg.h \
+ sat-info.c sat-info.h \
sat-log.c sat-log.h \
sat-log-browser.c sat-log-browser.h \
sat-monitor.c sat-monitor.h \
sat-pass-dialogs.c sat-pass-dialogs.h \
- sat-popup-menu.c sat-popup-menu.h \
sat-pref.c sat-pref.h \
sat-pref-general.c sat-pref-general.h \
sat-pref-formats.c sat-pref-formats.h \
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2008-10-26 17:26:35 UTC (rev 168)
+++ trunk/src/gtk-polar-view-popup.c 2008-10-26 17:27:08 UTC (rev 169)
@@ -43,7 +43,7 @@
#include "orbit-tools.h"
#include "predict-tools.h"
#include "sat-pass-dialogs.h"
-#include "sat-popup-menu.h"
+#include "sat-info.h"
#include "gtk-polar-view-popup.h"
Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c 2008-10-26 17:26:35 UTC (rev 168)
+++ trunk/src/gtk-sat-list-popup.c 2008-10-26 17:27:08 UTC (rev 169)
@@ -40,7 +40,7 @@
#include "predict-tools.h"
#include "sat-pass-dialogs.h"
#include "gtk-sat-list-popup.h"
-#include "sat-popup-menu.h"
+#include "sat-info.h"
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2008-10-26 17:26:35 UTC (rev 168)
+++ trunk/src/gtk-sat-map-popup.c 2008-10-26 17:27:08 UTC (rev 169)
@@ -41,7 +41,7 @@
#include "orbit-tools.h"
#include "predict-tools.h"
#include "sat-pass-dialogs.h"
-#include "sat-popup-menu.h"
+#include "sat-info.h"
#include "gtk-sat-map-popup.h"
#include "gtk-sat-data.h"
#include "gtk-sat-map-ground-track.h"
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2008-10-26 17:26:35 UTC (rev 168)
+++ trunk/src/gtk-single-sat.c 2008-10-26 17:27:08 UTC (rev 169)
@@ -39,7 +39,7 @@
#include "mod-cfg-get-param.h"
#include "gtk-sat-data.h"
#include "gpredict-utils.h"
-#include "sat-popup-menu.h"
+#include "sat-info.h"
#include "locator.h"
#include "sat-vis.h"
#ifdef HAVE_CONFIG_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:26:38
|
Revision: 168
http://gpredict.svn.sourceforge.net/gpredict/?rev=168&view=rev
Author: csete
Date: 2008-10-26 17:26:35 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Deleted obsolete files.
Removed Paths:
-------------
trunk/src/sat-popup-menu.c
trunk/src/sat-popup-menu.h
Deleted: trunk/src/sat-popup-menu.c
===================================================================
--- trunk/src/sat-popup-menu.c 2008-10-26 17:26:16 UTC (rev 167)
+++ trunk/src/sat-popup-menu.c 2008-10-26 17:26:35 UTC (rev 168)
@@ -1,622 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/gpredict/
- More details can be found at the project home page:
-
- http://gpredict.oz9aec.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-/** \brief Pop-up menu used by GtkSatList, GtkSatMap, etc.
- */
-#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-popup-menu.h"
-
-
-
-
-
-
-static gchar *epoch_to_str (sat_t *sat);
-
-#if 0
-
-/** \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, GtkWidget *toplevel)
-{
- 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),
- toplevel);
-
- 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),
- toplevel);
- 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),
- toplevel);
- 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));
-
-
-}
-#endif
-
-
-/** \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;
-}
-
-#if 0
-/** \brief Show details of the next pass.
- *
- */
-void
-show_next_pass (GtkWidget *menuitem, gpointer data)
-{
- sat_t *sat;
- qth_t *qth;
- pass_t *pass;
- GtkWidget *dialog;
- GtkWindow *toplevel = NULL;
-
-
- if (data != NULL)
- toplevel = GTK_WINDOW (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)) {
-
- pass = get_next_pass (sat, qth,
- 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 (GtkWidget *menuitem, gpointer data)
-{
- GtkWidget *dialog;
- GtkWindow *toplevel = NULL;
- GSList *passes = NULL;
- sat_t *sat;
- qth_t *qth;
-
-
- if (data != NULL)
- toplevel = GTK_WINDOW (data);
-
- 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)) {
-
-
- 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));
-
- 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);
- }
-}
-
-
-#endif
Deleted: trunk/src/sat-popup-menu.h
===================================================================
--- trunk/src/sat-popup-menu.h 2008-10-26 17:26:16 UTC (rev 167)
+++ trunk/src/sat-popup-menu.h 2008-10-26 17:26:35 UTC (rev 168)
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- Gpredict: Real-time satellite tracking and orbit prediction program
-
- Copyright (C) 2001-2008 Alexandru Csete, OZ9AEC.
-
- Authors: Alexandru Csete <oz...@gm...>
-
- Comments, questions and bugreports should be submitted via
- http://sourceforge.net/projects/gpredict/
- More details can be found at the project home page:
-
- http://gpredict.oz9aec.net/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, visit http://www.fsf.org/
-*/
-#ifndef SAT_POPUP_MENU_H
-#define SAT_POPUP_MENU_H 1
-
-#include <gtk/gtk.h>
-#include "sgpsdp/sgp4sdp4.h"
-#include "gtk-sat-data.h"
-
-//void sat_popup_menu_exec (sat_t *sat, qth_t *qth,
-// GdkEventButton *event,
-// GtkWidget *toplevel);
-
-void show_sat_info (GtkWidget *menuitem, gpointer data);
-//void show_next_pass (GtkWidget *menuitem, gpointer data);
-//void show_future_passes (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:26:19
|
Revision: 167
http://gpredict.svn.sourceforge.net/gpredict/?rev=167&view=rev
Author: csete
Date: 2008-10-26 17:26:16 +0000 (Sun, 26 Oct 2008)
Log Message:
-----------
Clean unused files.
Modified Paths:
--------------
trunk/src/sat-popup-menu.c
trunk/src/sat-popup-menu.h
Modified: trunk/src/sat-popup-menu.c
===================================================================
--- trunk/src/sat-popup-menu.c 2008-10-26 17:24:21 UTC (rev 166)
+++ trunk/src/sat-popup-menu.c 2008-10-26 17:26:16 UTC (rev 167)
@@ -48,8 +48,8 @@
static gchar *epoch_to_str (sat_t *sat);
+#if 0
-
/** \brief Show satellite popup menu.
* \param sat Pointer to the satellite data.
* \param qth The current location.
@@ -128,9 +128,9 @@
}
+#endif
-
/** \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.
@@ -487,7 +487,7 @@
return buff;
}
-
+#if 0
/** \brief Show details of the next pass.
*
*/
@@ -619,4 +619,4 @@
}
-
+#endif
Modified: trunk/src/sat-popup-menu.h
===================================================================
--- trunk/src/sat-popup-menu.h 2008-10-26 17:24:21 UTC (rev 166)
+++ trunk/src/sat-popup-menu.h 2008-10-26 17:26:16 UTC (rev 167)
@@ -32,12 +32,12 @@
#include "sgpsdp/sgp4sdp4.h"
#include "gtk-sat-data.h"
-void sat_popup_menu_exec (sat_t *sat, qth_t *qth,
- GdkEventButton *event,
- GtkWidget *toplevel);
+//void sat_popup_menu_exec (sat_t *sat, qth_t *qth,
+// GdkEventButton *event,
+// GtkWidget *toplevel);
void show_sat_info (GtkWidget *menuitem, gpointer data);
-void show_next_pass (GtkWidget *menuitem, gpointer data);
-void show_future_passes (GtkWidget *menuitem, gpointer data);
+//void show_next_pass (GtkWidget *menuitem, gpointer data);
+//void show_future_passes (GtkWidget *menuitem, gpointer data);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
