Thread: [Gpredict-svn] SF.net SVN: gpredict:[925] trunk (Page 10)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn
|
From: <aa...@us...> - 2011-10-09 13:48:27
|
Revision: 925
http://gpredict.svn.sourceforge.net/gpredict/?rev=925&view=rev
Author: aa1vs
Date: 2011-10-09 13:48:21 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
Add transponder file for ARISSAT/Radioskaf-b from Michael Schulz, K5TRI.
Modified Paths:
--------------
trunk/ChangeLog
Added Paths:
-----------
trunk/data/trsp/37772.trsp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-09 13:37:23 UTC (rev 924)
+++ trunk/ChangeLog 2011-10-09 13:48:21 UTC (rev 925)
@@ -3,7 +3,10 @@
* src/tle-update.c
Eliminate compiler warning.
+ * data/trsp/37772.trsp
+ Add transponder file for ARISSAT/Radioskaf-b from Michael Schulz, K5TRI.
+
2011-10-08 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-sat-map-groundtrack.c
Added: trunk/data/trsp/37772.trsp
===================================================================
--- trunk/data/trsp/37772.trsp (rev 0)
+++ trunk/data/trsp/37772.trsp 2011-10-09 13:48:21 UTC (rev 925)
@@ -0,0 +1,19 @@
+[ARISSat U/V Lin]
+UP_LOW=435742000
+UP_HIGH=435758000
+DOWN_LOW=145922000
+DOWN_HIGH=145938000
+INVERT=true
+
+[Digitalker/ SSTV FM]
+DOWN_LOW=145950000
+
+[Telemetry Mode v]
+DOWN_LOW=145920000
+
+[CW TLM Beacon BPSK-1000]
+DOWN_LOW=145919000
+
+[CW TLM Beacon BPSK-400]
+DOWN_LOW=145939000
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-10-10 00:38:59
|
Revision: 926
http://gpredict.svn.sourceforge.net/gpredict/?rev=926&view=rev
Author: aa1vs
Date: 2011-10-10 00:38:52 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Add internationalization to several strings.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-module-popup.c
trunk/src/menubar.c
trunk/src/mod-mgr.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-09 13:48:21 UTC (rev 925)
+++ trunk/ChangeLog 2011-10-10 00:38:52 UTC (rev 926)
@@ -1,3 +1,11 @@
+2011-10-10 Charles Suprin <hamaa1vs at gmail.com>
+
+ * ChangeLog
+ * src/gtk-sat-module-popup.c
+ * src/menubar.c
+ * src/mod-mgr.c
+ Add internationalization to several strings.
+
2011-10-09 Charles Suprin <hamaa1vs at gmail.com>
* src/tle-update.c
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2011-10-09 13:48:21 UTC (rev 925)
+++ trunk/src/gtk-sat-module-popup.c 2011-10-10 00:38:52 UTC (rev 926)
@@ -425,7 +425,7 @@
newmod->win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (newmod->win),
newmod->name);
- title = g_strconcat ("GPREDICT: ",
+ title = g_strconcat (_("GPREDICT: "),
newmod->name,
" (", newmod->qth->name, ")",
NULL);
@@ -548,7 +548,7 @@
/* create window */
GTK_SAT_MODULE (module)->win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- title = g_strconcat ("GPREDICT: ",
+ title = g_strconcat (_("GPREDICT: "),
GTK_SAT_MODULE (module)->name,
" (", GTK_SAT_MODULE (module)->qth->name, ")",
NULL);
@@ -688,7 +688,7 @@
/* create window */
GTK_SAT_MODULE (module)->win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- title = g_strconcat ("GPREDICT: ",
+ title = g_strconcat (_("GPREDICT: "),
GTK_SAT_MODULE (module)->name,
" (", GTK_SAT_MODULE (module)->qth->name, ")",
NULL);
Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c 2011-10-09 13:48:21 UTC (rev 925)
+++ trunk/src/menubar.c 2011-10-10 00:38:52 UTC (rev 926)
@@ -1058,7 +1058,7 @@
/* create window */
GTK_SAT_MODULE (module)->win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- title = g_strconcat ("GPREDICT: ",
+ title = g_strconcat (_("GPREDICT: "),
GTK_SAT_MODULE (module)->name,
" (", GTK_SAT_MODULE (module)->qth->name, ")",
NULL);
Modified: trunk/src/mod-mgr.c
===================================================================
--- trunk/src/mod-mgr.c 2011-10-09 13:48:21 UTC (rev 925)
+++ trunk/src/mod-mgr.c 2011-10-10 00:38:52 UTC (rev 926)
@@ -681,7 +681,7 @@
/* create window */
GTK_SAT_MODULE (module)->win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- title = g_strconcat ("GPREDICT: ",
+ title = g_strconcat (_("GPREDICT: "),
GTK_SAT_MODULE (module)->name,
" (", GTK_SAT_MODULE (module)->qth->name, ")",
NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-10-12 23:16:54
|
Revision: 927
http://gpredict.svn.sourceforge.net/gpredict/?rev=927&view=rev
Author: aa1vs
Date: 2011-10-12 23:16:48 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Filter decayed satellites from satellite list. (Bug 3414666)
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-list.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-10 00:38:52 UTC (rev 926)
+++ trunk/ChangeLog 2011-10-12 23:16:48 UTC (rev 927)
@@ -1,3 +1,11 @@
+2011-10-12 Charles Suprin <hamaa1vs at gmail.com>
+
+ * ChangeLog
+ * src/gtk-sat-list.c
+ * src/gtk-sat-list.h
+ Filter decayed satellites from satellite list. (Bug 3414666)
+
+
2011-10-10 Charles Suprin <hamaa1vs at gmail.com>
* ChangeLog
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-10-10 00:38:52 UTC (rev 926)
+++ trunk/src/gtk-sat-list.c 2011-10-12 23:16:48 UTC (rev 927)
@@ -322,7 +322,7 @@
gtk_sat_list_new (GKeyFile *cfgdata, GHashTable *sats, qth_t *qth, guint32 columns)
{
GtkWidget *widget;
- GtkTreeModel *model;
+ GtkTreeModel *model, *filter, *sortable;
guint i;
GtkCellRenderer *renderer;
@@ -435,7 +435,11 @@
/* create model and finalise treeview */
model = create_and_fill_model (GTK_SAT_LIST (widget)->satellites);
- gtk_tree_view_set_model (GTK_TREE_VIEW (GTK_SAT_LIST (widget)->treeview), model);
+ filter = gtk_tree_model_filter_new (model, NULL);
+ sortable = gtk_tree_model_sort_new_with_model(filter);
+ GTK_SAT_LIST(widget)->sortable = sortable;
+ gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER(filter), SAT_LIST_COL_DECAY);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (GTK_SAT_LIST (widget)->treeview), sortable);
/* We need a special sort function for AOS/LOS events that works
with all date and time formats (see bug #1861323)
@@ -443,18 +447,20 @@
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model),
SAT_LIST_COL_AOS,
event_cell_compare_function,
- NULL, NULL);
+ widget, NULL);
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model),
SAT_LIST_COL_LOS,
event_cell_compare_function,
- NULL, NULL);
+ widget, NULL);
/* satellite name should be initial sorting criteria */
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
GTK_SAT_LIST(widget)->sort_column,
GTK_SAT_LIST(widget)->sort_order);
g_object_unref (model);
+ g_object_unref (filter);
+ g_object_unref (sortable);
g_signal_connect (GTK_SAT_LIST (widget)->treeview, "button-press-event",
G_CALLBACK (button_press_cb), widget);
@@ -512,7 +518,8 @@
G_TYPE_DOUBLE, // mean anomaly
G_TYPE_DOUBLE, // phase
G_TYPE_LONG, // orbit
- G_TYPE_STRING); // visibility
+ G_TYPE_STRING, // visibility
+ G_TYPE_BOOLEAN); // decay
g_hash_table_foreach (sats, sat_list_add_satellites, liststore);
@@ -559,6 +566,7 @@
SAT_LIST_COL_MA, sat->ma,
SAT_LIST_COL_PHASE, sat->phase,
SAT_LIST_COL_ORBIT, sat->orbit,
+ SAT_LIST_COL_DECAY, !decayed(sat),
-1);
@@ -592,10 +600,12 @@
/* get and tranverse the model */
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (satlist->treeview));
+ model = gtk_tree_model_filter_get_model( GTK_TREE_MODEL_FILTER(
+ gtk_tree_model_sort_get_model( GTK_TREE_MODEL_SORT(
+ gtk_tree_view_get_model (GTK_TREE_VIEW (satlist->treeview))))));
/*save the sort information */
- gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
+ gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (satlist->sortable),
&(satlist->sort_column),
&(satlist->sort_order));
@@ -670,6 +680,7 @@
SAT_LIST_COL_MA, sat->ma,
SAT_LIST_COL_PHASE, sat->phase,
SAT_LIST_COL_ORBIT, sat->orbit,
+ SAT_LIST_COL_DECAY, !decayed(sat),
-1);
/* doppler shift @ 100 MHz */
@@ -1204,12 +1215,11 @@
gdouble ta,tb;
gint sort_col;
GtkSortType sort_type;
+ GtkSatList *satlist = GTK_SAT_LIST(user_data);
- (void) user_data; /* avoid unusued parameter compiler warning */
-
/* Since this function is used for both AOS and LOS columns,
we need to get the sort column */
- gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
+ gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (satlist->sortable),
&sort_col,
&sort_type);
Modified: trunk/src/gtk-sat-list.h
===================================================================
--- trunk/src/gtk-sat-list.h 2011-10-10 00:38:52 UTC (rev 926)
+++ trunk/src/gtk-sat-list.h 2011-10-12 23:16:48 UTC (rev 927)
@@ -74,6 +74,7 @@
GKeyFile *cfgdata;
gint sort_column;
GtkSortType sort_order;
+ GtkTreeModel *sortable; /*!< a sortable version of the tree model for filtering */
void (* update) (GtkWidget *widget); /*!< update function */
};
@@ -111,6 +112,7 @@
SAT_LIST_COL_PHASE, /*!< Phase. */
SAT_LIST_COL_ORBIT, /*!< Orbit Number. */
SAT_LIST_COL_VISIBILITY, /*!< Visibility. */
+ SAT_LIST_COL_DECAY, /*!< Whether the satellite is decayed or not. */
SAT_LIST_COL_NUMBER
} sat_list_col_t;
@@ -142,7 +144,8 @@
SAT_LIST_FLAG_MA = 1 << SAT_LIST_COL_MA, /*!< Mean Anomaly. */
SAT_LIST_FLAG_PHASE = 1 << SAT_LIST_COL_PHASE, /*!< Phase. */
SAT_LIST_FLAG_ORBIT = 1 << SAT_LIST_COL_ORBIT, /*!< Orbit Number. */
- SAT_LIST_FLAG_VISIBILITY = 1 << SAT_LIST_COL_VISIBILITY /*!< Visibility. */
+ SAT_LIST_FLAG_VISIBILITY = 1 << SAT_LIST_COL_VISIBILITY, /*!< Visibility. */
+ SAT_LIST_FLAG_DECAY = 1 << SAT_LIST_COL_DECAY /*!< Decayed. */
} sat_list_flag_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-10-12 23:20:27
|
Revision: 928
http://gpredict.svn.sourceforge.net/gpredict/?rev=928&view=rev
Author: aa1vs
Date: 2011-10-12 23:20:21 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Filter decayed satellites from event list. (Bug 3414666)
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-event-list.c
trunk/src/gtk-event-list.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-12 23:16:48 UTC (rev 927)
+++ trunk/ChangeLog 2011-10-12 23:20:21 UTC (rev 928)
@@ -5,7 +5,12 @@
* src/gtk-sat-list.h
Filter decayed satellites from satellite list. (Bug 3414666)
+ * ChangeLog
+ * src/gtk-event-list.c
+ * src/gtk-event-list.h
+ Filter decayed satellites from event list. (Bug 3414666)
+
2011-10-10 Charles Suprin <hamaa1vs at gmail.com>
* ChangeLog
Modified: trunk/src/gtk-event-list.c
===================================================================
--- trunk/src/gtk-event-list.c 2011-10-12 23:16:48 UTC (rev 927)
+++ trunk/src/gtk-event-list.c 2011-10-12 23:20:21 UTC (rev 928)
@@ -43,6 +43,7 @@
#include "locator.h"
#include "sat-vis.h"
#include "sat-info.h"
+#include "orbit-tools.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
@@ -234,7 +235,7 @@
{
GtkWidget *widget;
GtkEventList *evlist;
- GtkTreeModel *model;
+ GtkTreeModel *model, *filter, *sortable;
guint i;
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
@@ -326,20 +327,26 @@
/* create model and finalise treeview */
model = create_and_fill_model (evlist->satellites);
- gtk_tree_view_set_model (GTK_TREE_VIEW (evlist->treeview), model);
+ filter = gtk_tree_model_filter_new (model, NULL);
+ sortable =gtk_tree_model_sort_new_with_model(filter);
+ evlist->sortable = sortable;
+ gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER(filter), EVENT_LIST_COL_DECAY);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (evlist->treeview), sortable);
/* The time sort function needs to be special */
- gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (model),
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
EVENT_LIST_COL_TIME,
event_cell_compare_function,
NULL, NULL);
/* initial sorting criteria */
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
evlist->sort_column,
- evlist->sort_order),
+ evlist->sort_order);
g_object_unref (model);
+ g_object_unref (filter);
+ g_object_unref (sortable);
g_signal_connect (evlist->treeview, "button-press-event",
G_CALLBACK (button_press_cb), widget);
@@ -374,7 +381,8 @@
G_TYPE_DOUBLE, // az
G_TYPE_DOUBLE, // el
G_TYPE_BOOLEAN, // TRUE if AOS, FALSE if LOS
- G_TYPE_DOUBLE); // time
+ G_TYPE_DOUBLE, // time
+ G_TYPE_BOOLEAN); // decayed
/* add each satellite from hash table */
g_hash_table_foreach (sats, event_list_add_satellites, liststore);
@@ -407,6 +415,7 @@
EVENT_LIST_COL_EL, sat->el,
EVENT_LIST_COL_EVT, (sat->el >= 0) ? TRUE : FALSE,
EVENT_LIST_COL_TIME, 0.0,
+ EVENT_LIST_COL_DECAY, !decayed(sat),
-1);
}
@@ -428,10 +437,12 @@
}
/* get and tranverse the model */
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (evlist->treeview));
+ model = gtk_tree_model_filter_get_model( GTK_TREE_MODEL_FILTER(
+ gtk_tree_model_sort_get_model( GTK_TREE_MODEL_SORT (
+ gtk_tree_view_get_model (GTK_TREE_VIEW (evlist->treeview))))));
/*save the sort information */
- gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
+ gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (evlist->sortable),
&(evlist->sort_column),
&(evlist->sort_order));
@@ -449,8 +460,9 @@
evlist->counter = 1;
/* get and tranverse the model */
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (evlist->treeview));
+ model = gtk_tree_model_filter_get_model(gtk_tree_view_get_model (GTK_TREE_VIEW (evlist->treeview)));
+
/* update */
gtk_tree_model_foreach (model, event_list_update_sats, evlist);
}
@@ -518,6 +530,7 @@
EVENT_LIST_COL_EL, sat->el,
EVENT_LIST_COL_EVT, (sat->el >= 0) ? TRUE : FALSE,
EVENT_LIST_COL_TIME, number,
+ EVENT_LIST_COL_DECAY, !decayed(sat),
-1);
}
@@ -712,17 +725,12 @@
{
gint result;
gdouble ta,tb;
- gint sort_col;
- GtkSortType sort_type;
+ gint sort_col = EVENT_LIST_COL_TIME; /* hard coded as it is the only option */
+ /* extracting from models was not working */
+ /* with filter and sorting */
(void) user_data; /* avoid unused warning compiler warning. */
- /* Since this function is used for both AOS and LOS columns,
- we need to get the sort column */
- gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model),
- &sort_col,
- &sort_type);
-
/* get a and b */
gtk_tree_model_get (model, a, sort_col, &ta, -1);
gtk_tree_model_get (model, b, sort_col, &tb, -1);
Modified: trunk/src/gtk-event-list.h
===================================================================
--- trunk/src/gtk-event-list.h 2011-10-12 23:16:48 UTC (rev 927)
+++ trunk/src/gtk-event-list.h 2011-10-12 23:20:21 UTC (rev 928)
@@ -72,8 +72,10 @@
GKeyFile *cfgdata;
gint sort_column;
GtkSortType sort_order;
+ GtkTreeModel *sortable;
void (* update) (GtkWidget *widget); /*!< update function */
+
};
struct _GtkEventListClass
@@ -90,6 +92,7 @@
EVENT_LIST_COL_EL, /*!< Satellite Elevation. */
EVENT_LIST_COL_EVT, /*!< Next event (AOS or LOS). */
EVENT_LIST_COL_TIME, /*!< Time countdown. */
+ EVENT_LIST_COL_DECAY, /*!< Whether satellite is decayed or not. */
EVENT_LIST_COL_NUMBER
} event_list_col_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-10-23 11:39:13
|
Revision: 932
http://gpredict.svn.sourceforge.net/gpredict/?rev=932&view=rev
Author: aa1vs
Date: 2011-10-23 11:39:07 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
Eliminate calls to deprecated gtk_box_pack_start_defaults.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-rig-ctrl.c
trunk/src/loc-tree.c
trunk/src/mod-cfg.c
trunk/src/sat-debugger.c
trunk/src/sat-log-browser.c
trunk/src/sat-pref.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-23 11:32:12 UTC (rev 931)
+++ trunk/ChangeLog 2011-10-23 11:39:07 UTC (rev 932)
@@ -3,7 +3,15 @@
* src/gtk-sat-map-groundtrack.c
Use more robust check on orbit change time.
+ * src/gtk-rig-ctrl.c
+ * src/sat-debugger.c
+ * src/sat-pref.c
+ * src/sat-log-browser.c
+ * src/mod-cfg.c
+ * src/loc-tree.c
+ Eliminate calls to deprecated gtk_box_pack_start_defaults.
+
2011-10-13 Charles Suprin <hamaa1vs at gmail.com>
* ChangeLog
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2011-10-23 11:32:12 UTC (rev 931)
+++ trunk/src/gtk-rig-ctrl.c 2011-10-23 11:39:07 UTC (rev 932)
@@ -428,7 +428,7 @@
/* satellite downlink frequency */
ctrl->SatFreqDown = gtk_freq_knob_new (145890000.0, TRUE);
g_signal_connect (ctrl->SatFreqDown, "freq-changed", G_CALLBACK (downlink_changed_cb), ctrl);
- gtk_box_pack_start_defaults (GTK_BOX (vbox), ctrl->SatFreqDown);
+ gtk_box_pack_start (GTK_BOX (vbox), ctrl->SatFreqDown, TRUE, TRUE, 0);
/* Downlink doppler */
label = gtk_label_new (_("Doppler:"));
@@ -453,13 +453,13 @@
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label),"<span size='large'><b>Radio:</b></span>");
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_box_pack_start_defaults (GTK_BOX (hbox2), label);
+ gtk_box_pack_start (GTK_BOX (hbox2), label, TRUE, TRUE, 0);
ctrl->RigFreqDown = gtk_freq_knob_new (145890000.0, FALSE);
- gtk_box_pack_start_defaults (GTK_BOX (hbox2), ctrl->RigFreqDown);
+ gtk_box_pack_start (GTK_BOX (hbox2), ctrl->RigFreqDown, TRUE, TRUE, 0);
/* finish packing ... */
- gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox1);
- gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox2);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox1, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox2, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (frame), vbox);
return frame;
@@ -492,7 +492,7 @@
/* satellite uplink frequency */
ctrl->SatFreqUp = gtk_freq_knob_new (145890000.0, TRUE);
g_signal_connect (ctrl->SatFreqUp, "freq-changed", G_CALLBACK (uplink_changed_cb), ctrl);
- gtk_box_pack_start_defaults (GTK_BOX (vbox), ctrl->SatFreqUp);
+ gtk_box_pack_start (GTK_BOX (vbox), ctrl->SatFreqUp, TRUE, TRUE, 0);
/* Uplink doppler */
label = gtk_label_new (_("Doppler:"));
@@ -517,13 +517,13 @@
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label),"<span size='large'><b>Radio:</b></span>");
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_box_pack_start_defaults (GTK_BOX (hbox2), label);
+ gtk_box_pack_start (GTK_BOX (hbox2), label, TRUE, TRUE, 0);
ctrl->RigFreqUp = gtk_freq_knob_new (145890000.0, FALSE);
- gtk_box_pack_start_defaults (GTK_BOX (hbox2), ctrl->RigFreqUp);
+ gtk_box_pack_start (GTK_BOX (hbox2), ctrl->RigFreqUp, TRUE, TRUE, 0);
- gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox1);
- gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox2);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox1, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox2, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (frame), vbox);
Modified: trunk/src/loc-tree.c
===================================================================
--- trunk/src/loc-tree.c 2011-10-23 11:32:12 UTC (rev 931)
+++ trunk/src/loc-tree.c 2011-10-23 11:39:07 UTC (rev 932)
@@ -270,7 +270,7 @@
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
GTK_RESPONSE_ACCEPT,
FALSE);
- gtk_box_pack_start_defaults (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), swin);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(dialog))), swin, TRUE, TRUE, 0);
/* connect selection checker for the tree-view;
we have waited so far, because we want to pass the dialog as
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2011-10-23 11:32:12 UTC (rev 931)
+++ trunk/src/mod-cfg.c 2011-10-23 11:39:07 UTC (rev 932)
@@ -1001,7 +1001,7 @@
contents = sat_pref_modules_create (cfgdata);
gtk_widget_show_all (contents);
- gtk_box_pack_start_defaults (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (dialog))), contents);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (dialog))), contents, TRUE, TRUE, 0);
/* execute dialog */
switch (gtk_dialog_run (GTK_DIALOG (dialog))) {
Modified: trunk/src/sat-debugger.c
===================================================================
--- trunk/src/sat-debugger.c 2011-10-23 11:32:12 UTC (rev 931)
+++ trunk/src/sat-debugger.c 2011-10-23 11:39:07 UTC (rev 932)
@@ -32,10 +32,10 @@
hbox = gtk_hbox_new (TRUE,5);
- gtk_box_pack_start_defaults (GTK_BOX (hbox), gtk_label_new ("LON:"));
- gtk_box_pack_start_defaults (GTK_BOX (hbox), lonsp);
- gtk_box_pack_start_defaults (GTK_BOX (hbox), gtk_label_new ("LAT:"));
- gtk_box_pack_start_defaults (GTK_BOX (hbox), latsp);
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new ("LON:"), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), lonsp, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new ("LAT:"), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), latsp, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (window), hbox);
gtk_container_set_border_width (GTK_CONTAINER (window), 20);
Modified: trunk/src/sat-log-browser.c
===================================================================
--- trunk/src/sat-log-browser.c 2011-10-23 11:32:12 UTC (rev 931)
+++ trunk/src/sat-log-browser.c 2011-10-23 11:39:07 UTC (rev 932)
@@ -143,8 +143,11 @@
hbox = gtk_hbox_new (FALSE, 10);
- gtk_box_pack_start_defaults (GTK_BOX (hbox),
- create_message_list ());
+ gtk_box_pack_start (GTK_BOX (hbox),
+ create_message_list (),
+ TRUE,
+ TRUE,
+ 0);
gtk_box_pack_start (GTK_BOX (hbox),
create_message_summary (),
Modified: trunk/src/sat-pref.c
===================================================================
--- trunk/src/sat-pref.c 2011-10-23 11:32:12 UTC (rev 931)
+++ trunk/src/sat-pref.c 2011-10-23 11:39:07 UTC (rev 932)
@@ -174,7 +174,7 @@
NULL);
g_free (iconfile);
- gtk_box_pack_start_defaults (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(window))), hbox);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(window))), hbox, TRUE, TRUE, 0);
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG(window))), 10);
gtk_button_clicked (GTK_BUTTON (genbut));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-10-23 16:43:29
|
Revision: 936
http://gpredict.svn.sourceforge.net/gpredict/?rev=936&view=rev
Author: aa1vs
Date: 2011-10-23 16:43:23 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
Replace part of satellite update with call to predict_calc.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-module.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-23 13:58:57 UTC (rev 935)
+++ trunk/ChangeLog 2011-10-23 16:43:23 UTC (rev 936)
@@ -21,6 +21,10 @@
* data/trsp/5580.trsp
Add transponder data for Prospero and SRMVU satellites.
+ * src/gtk-sat-module.c
+ Replace part of satellite update with call to predict_calc.
+
+
2011-10-13 Charles Suprin <hamaa1vs at gmail.com>
* ChangeLog
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-10-23 13:58:57 UTC (rev 935)
+++ trunk/src/gtk-sat-module.c 2011-10-23 16:43:23 UTC (rev 936)
@@ -1035,63 +1035,8 @@
sat->los = find_los (sat, module->qth, daynum, maxdt);
}
- /*data may have been updated by gpsd*/
- obs_geodetic.lon = module->qth->lon * de2ra;
- obs_geodetic.lat = module->qth->lat * de2ra;
- obs_geodetic.alt = module->qth->alt / 1000.0;
- obs_geodetic.theta = 0;
+ predict_calc( sat, module->qth, daynum);
-
- sat->jul_utc = daynum;
- sat->tsince = (sat->jul_utc - sat->jul_epoch) * xmnpda;
-
-
-
- /* call the norad routines according to the deep-space flag */
- if (sat->flags & DEEP_SPACE_EPHEM_FLAG)
- SDP4 (sat, sat->tsince);
- else
- SGP4 (sat, sat->tsince);
-
- /* scale position and velocity to km and km/sec */
- Convert_Sat_State (&sat->pos, &sat->vel);
-
- /* get the velocity of the satellite */
- Magnitude (&sat->vel);
- sat->velo = sat->vel.w;
- Calculate_Obs (sat->jul_utc, &sat->pos, &sat->vel, &obs_geodetic, &obs_set);
- Calculate_LatLonAlt (sat->jul_utc, &sat->pos, &sat_geodetic);
-
- /*** FIXME: should we ensure sat_geodetic.lon stays between -pi and pi? */
- while (sat_geodetic.lon < -pi)
- sat_geodetic.lon += twopi;
-
- while (sat_geodetic.lon > (pi))
- sat_geodetic.lon -= twopi;
-
- sat->az = Degrees (obs_set.az);
- sat->el = Degrees (obs_set.el);
- sat->range = obs_set.range;
- sat->range_rate = obs_set.range_rate;
- sat->ssplat = Degrees (sat_geodetic.lat);
- sat->ssplon = Degrees (sat_geodetic.lon);
- sat->alt = sat_geodetic.alt;
- sat->ma = Degrees (sat->phase);
- sat->ma *= 256.0/360.0;
- sat->phase = Degrees (sat->phase);
-
- /* same formulas, but the one from predict is nicer */
- //sat->footprint = 2.0 * xkmper * acos (xkmper/sat->pos.w);
- sat->footprint = 12756.33 * acos (xkmper / (xkmper+sat->alt));
- age = sat->jul_utc - sat->jul_epoch;
- sat->orbit = (long) floor((sat->tle.xno * xmnpda/twopi +
- age * sat->tle.bstar * ae) * age +
- sat->tle.xmo/twopi) + sat->tle.revnum - 1;
-
-
- /*** FIXME: Squint + AOS / LOS code */
-
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-10-27 22:13:40
|
Revision: 939
http://gpredict.svn.sourceforge.net/gpredict/?rev=939&view=rev
Author: aa1vs
Date: 2011-10-27 22:13:31 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
Consolidate popup callback functions into single file.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/gtk-event-list-popup.c
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
Added Paths:
-----------
trunk/src/gtk-sat-popup-common.c
trunk/src/gtk-sat-popup-common.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-26 18:30:16 UTC (rev 938)
+++ trunk/ChangeLog 2011-10-27 22:13:31 UTC (rev 939)
@@ -1,3 +1,16 @@
+2011-10-27 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-event-list-popup.c
+ * src/gtk-sat-list-popup.c
+ * src/gtk-sat-map-popup.c
+ * src/gtk-polar-view-popup.c
+ * src/gtk-sat-popup-common.c
+ * src/gtk-sat-popup-common.h
+ * src/gtk-single-sat.c
+ * src/Makefile.am
+ Consolidate popup callback functions into single function and file.
+
+
2011-10-26 Charles Suprin <hamaa1vs at gmail.com>
* src/tle-update.c
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2011-10-26 18:30:16 UTC (rev 938)
+++ trunk/src/Makefile.am 2011-10-27 22:13:31 UTC (rev 939)
@@ -52,6 +52,7 @@
gtk-sat-module.c gtk-sat-module.h \
gtk-sat-module-popup.c gtk-sat-module-popup.h \
gtk-sat-module-tmg.c gtk-sat-module-tmg.h \
+ gtk-sat-popup-common.c gtk-sat-popup-common.h \
gtk-sat-selector.c gtk-sat-selector.h \
gtk-single-sat.c gtk-single-sat.h \
gtk-sky-glance.c gtk-sky-glance.h \
Modified: trunk/src/gtk-event-list-popup.c
===================================================================
--- trunk/src/gtk-event-list-popup.c 2011-10-26 18:30:16 UTC (rev 938)
+++ trunk/src/gtk-event-list-popup.c 2011-10-27 22:13:31 UTC (rev 939)
@@ -41,14 +41,8 @@
#include "sat-pass-dialogs.h"
#include "gtk-event-list-popup.h"
#include "sat-info.h"
+#include "gtk-sat-popup-common.h"
-
-
-
-static void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
-static void show_future_passes_cb (GtkWidget *menuitem, gpointer data);
-
-
/** \brief Show satellite popup menu.
* \param sat Pointer to the satellite data.
* \param qth The current location.
@@ -99,6 +93,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
g_signal_connect (menuitem, "activate",
G_CALLBACK (show_next_pass_cb),
list);
@@ -110,6 +105,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
g_signal_connect (menuitem, "activate",
G_CALLBACK (show_future_passes_cb),
list);
@@ -127,144 +123,3 @@
}
-
-
-
-
-/** \brief Show details of the next pass.
- *
- */
-static void show_next_pass_cb (GtkWidget *menuitem, gpointer data)
-{
- sat_t *sat;
- qth_t *qth;
- pass_t *pass;
- GtkWidget *dialog;
- GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
- GtkEventList *list = GTK_EVENT_LIST (data);
-
-
- /* get next pass */
- sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
- qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
-
- /* check wheather sat actially has AOS */
- if (has_aos (sat, qth)) {
-
- if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- pass = get_next_pass (sat, qth,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
- }
- else {
- pass = get_pass (sat, qth, list->tstamp,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
- }
-
- if (pass != NULL) {
- show_pass (sat->nickname, 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->nickname,
- 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->nickname);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- }
-
-}
-
-
-static void show_future_passes_cb (GtkWidget *menuitem, gpointer data)
-{
- GtkWidget *dialog;
- GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
- GtkEventList *list = GTK_EVENT_LIST (data);
- GSList *passes = NULL;
- sat_t *sat;
- qth_t *qth;
-
-
-
- sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
- qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
-
- /* check wheather sat actially has AOS */
- if (has_aos (sat, qth)) {
-
- if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- passes = get_next_passes (sat, qth,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
- sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
- }
- else {
- passes = get_passes (sat, qth, list->tstamp,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
- sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
- }
-
- if (passes != NULL) {
- show_passes (sat->nickname, 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->nickname,
- 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->nickname);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- }
-}
-
-
-
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-10-26 18:30:16 UTC (rev 938)
+++ trunk/src/gtk-polar-view-popup.c 2011-10-27 22:13:31 UTC (rev 939)
@@ -45,13 +45,11 @@
#include "sat-pass-dialogs.h"
#include "sat-info.h"
#include "gtk-polar-view-popup.h"
+#include "gtk-sat-popup-common.h"
-
static void track_toggled (GtkCheckMenuItem *item, gpointer data);
/* static void target_toggled (GtkCheckMenuItem *item, gpointer data); */
static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y);
-static void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
-static void show_next_passes_cb (GtkWidget *menuitem, gpointer data);
/** \brief Show satellite popup menu.
@@ -109,6 +107,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_object_set_data (G_OBJECT (menuitem), "tstamp", &(pview->tstamp));
g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), pview);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
@@ -117,7 +116,8 @@
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_passes_cb), pview);
+ g_object_set_data (G_OBJECT (menuitem), "tstamp", &(pview->tstamp));
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), pview);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
/* separator */
@@ -380,139 +380,3 @@
return item;
}
-
-
-
-static void
- show_next_pass_cb (GtkWidget *menuitem, gpointer data)
-{
- GtkPolarView *pv = GTK_POLAR_VIEW (data);
- sat_t *sat;
- qth_t *qth;
- pass_t *pass;
- GtkWidget *dialog;
- GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
-
-
- /* get next pass */
- sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
- qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
-
- /* check wheather sat actially has AOS */
- if (has_aos (sat, qth)) {
- if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- pass = get_next_pass (sat, qth,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
- }
- else {
- pass = get_pass (sat, qth, pv->tstamp,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
- }
-
- if (pass != NULL) {
- show_pass (sat->nickname, 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->nickname,
- 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->nickname);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- }
-
-}
-
-
-static void show_next_passes_cb (GtkWidget *menuitem, gpointer data)
-{
- GtkPolarView *pv = GTK_POLAR_VIEW (data);
- GtkWidget *dialog;
- GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
- GSList *passes = NULL;
- sat_t *sat;
- qth_t *qth;
-
-
- sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
- qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
-
- /* check wheather sat actially has AOS */
- if (has_aos (sat, qth)) {
-
- if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- passes = get_next_passes (sat, qth,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
- sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
- }
- else {
- passes = get_passes (sat, qth, pv->tstamp,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
- sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
-
- }
-
-
- if (passes != NULL) {
- show_passes (sat->nickname, 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->nickname,
- 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->nickname);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- }
-
-}
Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c 2011-10-26 18:30:16 UTC (rev 938)
+++ trunk/src/gtk-sat-list-popup.c 2011-10-27 22:13:31 UTC (rev 939)
@@ -41,14 +41,8 @@
#include "sat-pass-dialogs.h"
#include "gtk-sat-list-popup.h"
#include "sat-info.h"
+#include "gtk-sat-popup-common.h"
-
-
-
-void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
-void show_future_passes_cb (GtkWidget *menuitem, gpointer data);
-
-
/** \brief Show satellite popup menu.
* \param sat Pointer to the satellite data.
* \param qth The current location.
@@ -100,6 +94,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
g_signal_connect (menuitem, "activate",
G_CALLBACK (show_next_pass_cb),
list);
@@ -111,6 +106,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
g_signal_connect (menuitem, "activate",
G_CALLBACK (show_future_passes_cb),
list);
@@ -128,146 +124,3 @@
}
-
-
-
-
-/** \brief Show details of the next pass.
- *
- */
-void
-show_next_pass_cb (GtkWidget *menuitem, gpointer data)
-{
- sat_t *sat;
- qth_t *qth;
- pass_t *pass;
- GtkWidget *dialog;
- GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
- GtkSatList *list = GTK_SAT_LIST (data);
-
-
- /* get next pass */
- sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
- qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
-
- /* check wheather sat actially has AOS */
- if (has_aos (sat, qth)) {
-
- if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- pass = get_next_pass (sat, qth,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
- }
- else {
- pass = get_pass (sat, qth, list->tstamp,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
- }
-
- if (pass != NULL) {
- show_pass (sat->nickname, 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->nickname,
- 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->nickname);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- }
-
-}
-
-
-void
-show_future_passes_cb (GtkWidget *menuitem, gpointer data)
-{
- GtkWidget *dialog;
- GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
- GtkSatList *list = GTK_SAT_LIST (data);
- GSList *passes = NULL;
- sat_t *sat;
- qth_t *qth;
-
-
-
- sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
- qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
-
- /* check wheather sat actially has AOS */
- if (has_aos (sat, qth)) {
-
- if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- passes = get_next_passes (sat, qth,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
- sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
- }
- else {
- passes = get_passes (sat, qth, list->tstamp,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
- sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
- }
-
- if (passes != NULL) {
- show_passes (sat->nickname, 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->nickname,
- 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->nickname);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- }
-}
-
-
-
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2011-10-26 18:30:16 UTC (rev 938)
+++ trunk/src/gtk-sat-map-popup.c 2011-10-27 22:13:31 UTC (rev 939)
@@ -45,14 +45,12 @@
#include "gtk-sat-map-popup.h"
#include "gtk-sat-data.h"
#include "gtk-sat-map-ground-track.h"
+#include "gtk-sat-popup-common.h"
-
static void coverage_toggled (GtkCheckMenuItem *item, gpointer data);
static void track_toggled (GtkCheckMenuItem *item, gpointer data);
/* static void target_toggled (GtkCheckMenuItem *item, gpointer data); */
-static void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
-static void show_next_passes_cb (GtkWidget *menuitem, gpointer data);
/** \brief Show satellite popup menu.
@@ -108,6 +106,7 @@
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
g_object_set_data (G_OBJECT (menuitem), "sat", sat);
g_object_set_data (G_OBJECT (menuitem), "qth", qth);
+ g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), satmap);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
@@ -116,7 +115,8 @@
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_passes_cb), satmap);
+ g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), satmap);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
/* separator */
@@ -288,142 +288,6 @@
}
-
-static void show_next_pass_cb (GtkWidget *menuitem, gpointer data)
-{
- GtkSatMap *satmap = GTK_SAT_MAP (data);
- sat_t *sat;
- qth_t *qth;
- pass_t *pass;
- GtkWidget *dialog;
- GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
-
-
- /* get next pass */
- sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
- qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
-
- /* check wheather sat actially has AOS */
- if (has_aos (sat, qth)) {
- if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- pass = get_next_pass (sat, qth,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
- }
- else {
- pass = get_pass (sat, qth, satmap->tstamp,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD));
- }
-
- if (pass != NULL) {
- show_pass (sat->nickname, 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->nickname,
- 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->nickname);
-
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
- }
-
-}
-
-
-static void show_next_passes_cb (GtkWidget *menuitem, gpointer data)
-{
- GtkSatMap *satmap = GTK_SAT_MAP (data);
- GtkWidget *dialog;
- GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
- GSList *passes = NULL;
- sat_t *sat;
- qth_t *qth;
-
-
- sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
- qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
-
- /* check whether sat actually has AOS */
- if (has_aos (sat, qth)) {
-
- if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- passes = get_next_passes (sat, qth,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
- sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
- }
- else {
- passes = get_passes (sat, qth, satmap->tstamp,
- sat_cfg_get_int (SAT_CFG_INT_PRED_LOOK_AHEAD),
- sat_cfg_get_int (SAT_CFG_INT_PRED_NUM_PASS));
-
- }
-
-
- if (passes != NULL) {
- show_passes (sat->nickname, 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->nickname,
- 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,
- ...
[truncated message content] |
|
From: <aa...@us...> - 2011-10-29 02:17:40
|
Revision: 940
http://gpredict.svn.sourceforge.net/gpredict/?rev=940&view=rev
Author: aa1vs
Date: 2011-10-29 02:17:34 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Attempt to resolve "Show next pass shows the current pass".
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-popup-common.c
trunk/src/gtk-sat-popup-common.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-27 22:13:31 UTC (rev 939)
+++ trunk/ChangeLog 2011-10-29 02:17:34 UTC (rev 940)
@@ -1,5 +1,12 @@
2011-10-27 Charles Suprin <hamaa1vs at gmail.com>
+ * src/gtk-sat-popup-common.c
+ * src/gtk-sat-popup-common.h
+ * src/gtk-sat-map-popup.c
+ Attempt to resolve "Show next pass shows the current pass".
+
+2011-10-27 Charles Suprin <hamaa1vs at gmail.com>
+
* src/gtk-event-list-popup.c
* src/gtk-sat-list-popup.c
* src/gtk-sat-map-popup.c
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2011-10-27 22:13:31 UTC (rev 939)
+++ trunk/src/gtk-sat-map-popup.c 2011-10-29 02:17:34 UTC (rev 940)
@@ -99,8 +99,20 @@
/* separator */
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
+#if 1
+ add_pass_menu_items(menu,sat,qth,&satmap->tstamp,GTK_WIDGET(satmap));
+#else
/* next pass and predict passes */
+ if (sat->el > 0.0) {
+ menuitem = gtk_image_menu_item_new_with_label (_("Show current 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_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_current_pass_cb), satmap);
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+ }
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);
@@ -118,7 +130,7 @@
g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), satmap);
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
+#endif
/* separator */
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
Modified: trunk/src/gtk-sat-popup-common.c
===================================================================
--- trunk/src/gtk-sat-popup-common.c 2011-10-27 22:13:31 UTC (rev 939)
+++ trunk/src/gtk-sat-popup-common.c 2011-10-29 02:17:34 UTC (rev 940)
@@ -39,7 +39,46 @@
#include "gtk-sat-popup-common.h"
#include "sat-pass-dialogs.h"
-void show_next_pass_cb (GtkWidget *menuitem, gpointer data)
+void add_pass_menu_items (GtkWidget *menu, sat_t *sat, qth_t *qth, gdouble *tstamp, GtkWidget *widget) {
+ GtkWidget *menuitem;
+ GtkWidget *image;
+
+ /* next pass and predict passes */
+ if (sat->el > 0.0) {
+ menuitem = gtk_image_menu_item_new_with_label (_("Show current 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_object_set_data (G_OBJECT (menuitem), "tstamp", tstamp);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_current_pass_cb), widget);
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+ }
+
+ /* the next pass menu item */
+ 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_object_set_data (G_OBJECT (menuitem), "tstamp", tstamp);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), widget);
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+
+ /* finally the future pass menu item */
+ 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_object_set_data (G_OBJECT (menuitem), "tstamp", tstamp);
+ g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), widget);
+ gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+
+
+}
+
+void show_current_pass_cb (GtkWidget *menuitem, gpointer data)
{
sat_t *sat;
qth_t *qth;
@@ -50,10 +89,30 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
tstamp = (gdouble *) (g_object_get_data (G_OBJECT (menuitem), "tstamp"));
- show_next_pass_dialog (sat,qth,*tstamp,toplevel);
+ if (sat->el>0.0)
+ show_next_pass_dialog (sat,qth,*tstamp,toplevel);
}
+void show_next_pass_cb (GtkWidget *menuitem, gpointer data)
+{
+ sat_t *sat;
+ qth_t *qth;
+ GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
+ gdouble *tstamp;
+ sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
+ qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
+ tstamp = (gdouble *) (g_object_get_data (G_OBJECT (menuitem), "tstamp"));
+
+ if (sat->el <0)
+ show_next_pass_dialog (sat,qth,*tstamp,toplevel);
+ else
+ /*if the satellite is currently visible
+ go to end of pass and then add 10 minutes*/
+ show_next_pass_dialog (sat,qth,sat->los+0.007,toplevel);
+}
+
+
void show_future_passes_cb (GtkWidget *menuitem, gpointer data)
{
GtkWindow *toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (data)));
Modified: trunk/src/gtk-sat-popup-common.h
===================================================================
--- trunk/src/gtk-sat-popup-common.h 2011-10-27 22:13:31 UTC (rev 939)
+++ trunk/src/gtk-sat-popup-common.h 2011-10-29 02:17:34 UTC (rev 940)
@@ -32,7 +32,8 @@
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
-
+void add_pass_menu_items (GtkWidget *menu, sat_t *sat, qth_t *qth, gdouble *tstamp, GtkWidget *widget);
+void show_current_pass_cb (GtkWidget *menuitem, gpointer data);
void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
void show_future_passes_cb (GtkWidget *menuitem, gpointer data);
void show_next_pass_dialog (sat_t *sat, qth_t *qth, gdouble tstamp, GtkWindow *toplevel);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-10-29 21:47:01
|
Revision: 943
http://gpredict.svn.sourceforge.net/gpredict/?rev=943&view=rev
Author: aa1vs
Date: 2011-10-29 21:46:55 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Add current pass menuitem to popups. (Bug 3292729: Show next pass shows the current pass.)
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/gtk-event-list-popup.c
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/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/ChangeLog 2011-10-29 21:46:55 UTC (rev 943)
@@ -1,5 +1,22 @@
-2011-10-27 Charles Suprin <hamaa1vs at gmail.com>
+2011-10-29 Charles Suprin <hamaa1vs at gmail.com>
+ * data/trsp/37841.trsp
+ Move SRVMU to correct catalog number.
+
+ * data/trsp/37841.trsp
+ Add transponder data for JUGNU.
+
+ * src/gtk-event-list-popup.c
+ * src/gtk-sat-list-popup.c
+ * src/gtk-sat-map-popup.c
+ * src/gtk-polar-view-popup.c
+ * src/gtk-single-sat.c
+ * NEWS
+ Add current pass menuitem to popups. (Bug 3292729: Show next pass shows the current pass.)
+
+
+2011-10-28 Charles Suprin <hamaa1vs at gmail.com>
+
* src/gtk-sat-popup-common.c
* src/gtk-sat-popup-common.h
* src/gtk-sat-map-popup.c
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/NEWS 2011-10-29 21:46:55 UTC (rev 943)
@@ -19,6 +19,7 @@
- Fixed bug 3416451: No ground track for new satellites.
- Fixed bug 3417553: Gpredict crashes
- Fixed bug 3419879: gpredict doesn't change the satellite names on world map.
+- Fixed bug 3292729: Show next pass shows the current pass.
Changes in version 1.3 (1 Mar 2011)
Modified: trunk/src/gtk-event-list-popup.c
===================================================================
--- trunk/src/gtk-event-list-popup.c 2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-event-list-popup.c 2011-10-29 21:46:55 UTC (rev 943)
@@ -86,32 +86,10 @@
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_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
- g_signal_connect (menuitem, "activate",
- G_CALLBACK (show_next_pass_cb),
- list);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+ /* add the menu items for current,next, and future passes. */
+ add_pass_menu_items(menu,sat,qth,&list->tstamp,GTK_WIDGET(list));
- 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_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
- g_signal_connect (menuitem, "activate",
- G_CALLBACK (show_future_passes_cb),
- list);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
gtk_widget_show_all (menu);
/* Note: event can be NULL here when called from view_onPopupMenu;
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-polar-view-popup.c 2011-10-29 21:46:55 UTC (rev 943)
@@ -100,26 +100,10 @@
/* separator */
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+
+ /* add the menu items for current,next, and future passes. */
+ add_pass_menu_items(menu,sat,qth,&pview->tstamp,GTK_WIDGET(pview));
- /* 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_object_set_data (G_OBJECT (menuitem), "tstamp", &(pview->tstamp));
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), pview);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
- menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
- 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_object_set_data (G_OBJECT (menuitem), "tstamp", &(pview->tstamp));
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), pview);
- 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);
Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c 2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-sat-list-popup.c 2011-10-29 21:46:55 UTC (rev 943)
@@ -87,32 +87,9 @@
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_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
- g_signal_connect (menuitem, "activate",
- G_CALLBACK (show_next_pass_cb),
- list);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
- menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
- image = gtk_image_new_from_stock (GTK_STOCK_INDEX,
- GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
- g_object_set_data (G_OBJECT (menuitem), "sat", sat);
- g_object_set_data (G_OBJECT (menuitem), "qth", qth);
- g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
- g_signal_connect (menuitem, "activate",
- G_CALLBACK (show_future_passes_cb),
- list);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+ /* add the menu items for current,next, and future passes. */
+ add_pass_menu_items(menu,sat,qth,&list->tstamp,GTK_WIDGET(list));
-
gtk_widget_show_all (menu);
/* Note: event can be NULL here when called from view_onPopupMenu;
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-sat-map-popup.c 2011-10-29 21:46:55 UTC (rev 943)
@@ -99,38 +99,10 @@
/* separator */
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-#if 1
+
+ /* add the menu items for current,next, and future passes. */
add_pass_menu_items(menu,sat,qth,&satmap->tstamp,GTK_WIDGET(satmap));
-#else
- /* next pass and predict passes */
- if (sat->el > 0.0) {
- menuitem = gtk_image_menu_item_new_with_label (_("Show current 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_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_current_pass_cb), satmap);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
- }
- 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_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), satmap);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
- menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
- 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_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
- g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), satmap);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-#endif
+
/* separator */
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-single-sat.c 2011-10-29 21:46:55 UTC (rev 943)
@@ -847,36 +847,8 @@
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
- /* Show next pass */
- 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", single_sat->qth);
- g_object_set_data (G_OBJECT (menuitem), "tstamp", &(single_sat->tstamp));
-/* g_signal_connect (menuitem, "activate",
- G_CALLBACK (show_next_pass),
- gtk_widget_get_toplevel (button));*/
- g_signal_connect (menuitem, "activate",
- G_CALLBACK (show_next_pass_cb), data);
-
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
- /* Show future passes */
- 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", single_sat->qth);
- g_object_set_data (G_OBJECT (menuitem), "tstamp", &(single_sat->tstamp));
-/* g_signal_connect (menuitem, "activate",
- G_CALLBACK (show_future_passes),
- gtk_widget_get_toplevel (button));*/
- g_signal_connect (menuitem, "activate",
- G_CALLBACK (show_future_passes_cb), data);
- gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+ /* add the menu items for current,next, and future passes. */
+ add_pass_menu_items(menu,sat,single_sat->qth,&single_sat->tstamp,data);
/* separator */
// menuitem = gtk_separator_menu_item_new ();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-11-12 17:50:16
|
Revision: 950
http://gpredict.svn.sourceforge.net/gpredict/?rev=950&view=rev
Author: aa1vs
Date: 2011-11-12 17:50:10 +0000 (Sat, 12 Nov 2011)
Log Message:
-----------
Update user manual for GPSD and other features.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/um/gpredict-user-manual.odt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-11-12 17:46:29 UTC (rev 949)
+++ trunk/ChangeLog 2011-11-12 17:50:10 UTC (rev 950)
@@ -1,3 +1,9 @@
+2011-11-12 Charles Suprin <hamaa1vs at gmail.com>
+
+ * doc/um/gpredict-user-manual.odt
+ Update user manual for GPSD and other features.
+
+
2011-11-06 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-sat-map.c
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: <aa...@us...> - 2011-11-13 01:28:16
|
Revision: 953
http://gpredict.svn.sourceforge.net/gpredict/?rev=953&view=rev
Author: aa1vs
Date: 2011-11-13 01:28:10 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
Eliminate duplicate code in polar view and the popup.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view.c
trunk/src/gtk-polar-view.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-11-12 19:49:28 UTC (rev 952)
+++ trunk/ChangeLog 2011-11-13 01:28:10 UTC (rev 953)
@@ -15,7 +15,12 @@
* src/gtk-sat-map.c
Add comments.
+ * src/gtk-polar-view.c
+ * src/gtk-polar-view.h
+ * src/gtk-polar-view-popup.c
+ Eliminate duplicate code in polar view and the popup.
+
2011-11-05 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-polar-view.c
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-11-12 19:49:28 UTC (rev 952)
+++ trunk/src/gtk-polar-view-popup.c 2011-11-13 01:28:10 UTC (rev 953)
@@ -49,7 +49,6 @@
static void track_toggled (GtkCheckMenuItem *item, gpointer data);
/* static void target_toggled (GtkCheckMenuItem *item, gpointer data); */
-static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y);
/** \brief Show satellite popup menu.
@@ -161,15 +160,6 @@
sat_obj_t *obj = NULL;
sat_t *sat;
/* qth_t *qth; Unused */
- gint idx;
- guint i;
- GooCanvasItemModel *root;
- pass_detail_t *detail;
- guint num;
- GooCanvasPoints *points;
- gfloat x,y;
- guint32 col;
- guint tres,ttidx;
gint *catnum;
@@ -189,8 +179,6 @@
obj->showtrack = !obj->showtrack;
gtk_check_menu_item_set_active (item, obj->showtrack);
- root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas));
-
catnum = g_new0 (gint, 1);
*catnum = sat->tle.catnr;
@@ -205,69 +193,7 @@
g_hash_table_remove (pv->showtracks_off,
catnum);
-
- /* create points */
- num = g_slist_length (obj->pass->details);
- if (num == 0) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%d: Pass has no details."),
- __FILE__, __LINE__);
- return;
- }
-
- /* time resolution for time ticks; we need
- 3 additional points to AOS and LOS ticks.
- */
- tres = (num-2) / (TRACK_TICK_NUM-1);
-
- points = goo_canvas_points_new (num);
-
- /* first point should be (aos_az,0.0) */
- azel_to_xy (pv, obj->pass->aos_az, 0.0, &x, &y);
- points->coords[0] = (double) x;
- points->coords[1] = (double) y;
- obj->trtick[0] = create_time_tick (pv, obj->pass->aos, x, y);
-
- ttidx = 1;
-
- for (i = 1; i < num-1; i++) {
- detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i));
- if (detail->el >=0.0)
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
- points->coords[2*i] = (double) x;
- points->coords[2*i+1] = (double) y;
-
- if (!(i % tres)) {
- /* create a time tick */
- if (ttidx<TRACK_TICK_NUM)
- obj->trtick[ttidx] = create_time_tick (pv, detail->time, x, y);
- ttidx++;
- }
- }
-
- /* last point should be (los_az, 0.0) */
- azel_to_xy (pv, obj->pass->los_az, 0.0, &x, &y);
- points->coords[2*(num-1)] = (double) x;
- points->coords[2*(num-1)+1] = (double) y;
-
- /* create poly-line */
- col = mod_cfg_get_int (pv->cfgdata,
- MOD_CFG_POLAR_SECTION,
- MOD_CFG_POLAR_TRACK_COL,
- SAT_CFG_INT_POLAR_TRACK_COL);
-
- obj->track = goo_canvas_polyline_model_new (root, FALSE, 0,
- "points", points,
- "line-width", 1.0,
- "stroke-color-rgba", col,
- "line-cap", CAIRO_LINE_CAP_SQUARE,
- "line-join", CAIRO_LINE_JOIN_MITER,
- NULL);
- goo_canvas_points_unref (points);
-
- /* put track on the bottom of the sack */
- goo_canvas_item_model_lower (obj->track, NULL);
-
+ gtk_polar_view_create_track (pv, obj, sat);
}
else {
/* add it to the hide */
@@ -277,20 +203,9 @@
/* remove it from the show */
g_hash_table_remove (pv->showtracks_on,
catnum);
- /* delete sky track */
- idx = goo_canvas_item_model_find_child (root, obj->track);
- if (idx != -1) {
- goo_canvas_item_model_remove_child (root, idx);
- }
-
- for (i = 0; i < TRACK_TICK_NUM; i++) {
- idx = goo_canvas_item_model_find_child (root, obj->trtick[i]);
-
- if (idx != -1) {
- goo_canvas_item_model_remove_child (root, idx);
- }
- }
+ /* delete sky track */
+ gtk_polar_view_delete_track (pv, obj, sat);
}
}
@@ -324,43 +239,3 @@
gtk_check_menu_item_set_active (item, obj->istarget);
}
#endif
-
-
-static GooCanvasItemModel *
- create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y)
-{
- GooCanvasItemModel *item;
- gchar buff[7];
- GtkAnchorType anchor;
- GooCanvasItemModel *root;
- guint32 col;
-
- root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas));
-
- col = mod_cfg_get_int (pv->cfgdata,
- MOD_CFG_POLAR_SECTION,
- MOD_CFG_POLAR_TRACK_COL,
- SAT_CFG_INT_POLAR_TRACK_COL);
-
- daynum_to_str (buff, 8, "%H:%M", time);
-
- if (x > pv->cx) {
- anchor = GTK_ANCHOR_EAST;
- x -= 5;
- }
- else {
- anchor = GTK_ANCHOR_WEST;
- x += 5;
- }
-
- item = goo_canvas_text_model_new (root, buff,
- (gdouble) x, (gdouble) y,
- -1, anchor,
- "font", "Sans 7",
- "fill-color-rgba", col,
- NULL);
-
- goo_canvas_item_model_lower (item, NULL);
-
- return item;
-}
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-11-12 19:49:28 UTC (rev 952)
+++ trunk/src/gtk-polar-view.c 2011-11-13 01:28:10 UTC (rev 953)
@@ -68,7 +68,6 @@
gpointer data);
static void update_sat (gpointer key, gpointer value, gpointer data);
static void update_track (gpointer key, gpointer value, gpointer data);
-static void create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat);
static void correct_pole_coor (GtkPolarView *polv, polar_view_pole_t pole,
gfloat *x, gfloat *y, GtkAnchorType *anch);
static gboolean on_motion_notify (GooCanvasItem *item,
@@ -94,7 +93,12 @@
static gchar *los_time_to_str (GtkPolarView *polv, sat_t *sat);
static void gtk_polar_view_store_showtracks (GtkPolarView *pv);
static void gtk_polar_view_load_showtracks (GtkPolarView *pv);
+static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y);
+static void azel_to_xy (GtkPolarView *p, gdouble az, gdouble el, gfloat *x, gfloat *y);
+static void xy_to_azel (GtkPolarView *p, gfloat x, gfloat y, gfloat *az, gfloat *el);
+
+
static GtkVBoxClass *parent_class = NULL;
@@ -833,17 +837,9 @@
/* remove sky track */
if (obj->showtrack) {
- idx = goo_canvas_item_model_find_child (root, obj->track);
- if (idx != -1)
- goo_canvas_item_model_remove_child (root, idx);
+ gtk_polar_view_delete_track(polv,obj,sat);
+ }
- for (i = 0; i < TRACK_TICK_NUM; i++) {
- idx = goo_canvas_item_model_find_child (root, obj->trtick[i]);
- if (idx != -1)
- goo_canvas_item_model_remove_child (root, idx);
- }
- }
-
/* free pass info */
free_pass (obj->pass);
obj->pass=NULL;
@@ -946,7 +942,7 @@
/* Finally, create the sky track if necessary */
if (obj->showtrack)
- create_track (polv, obj, sat);
+ gtk_polar_view_create_track (polv, obj, sat);
}
}
@@ -1033,7 +1029,7 @@
/* Finally, create the sky track if necessary */
if (obj->showtrack)
- create_track (polv, obj, sat);
+ gtk_polar_view_create_track (polv, obj, sat);
} else {
/* obj == NULL */
@@ -1128,7 +1124,6 @@
}
-/**** FIXME: DUPLICATE from gtk-polar-view-popup.c - needed by create_track ******/
static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y)
{
GooCanvasItemModel *item;
@@ -1175,7 +1170,7 @@
* Note: This function is only used when the the satellite comes within range
* and the ALWAYS_SHOW_SKY_TRACK option is TRUE.
*/
-static void create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat)
+void gtk_polar_view_create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat)
{
guint i;
GooCanvasItemModel *root;
@@ -1277,12 +1272,29 @@
}
+void gtk_polar_view_delete_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat)
+{
+ gint idx,i;
+ GooCanvasItemModel *root;
+
+ root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas));
+ idx = goo_canvas_item_model_find_child (root, obj->track);
+
+ if (idx != -1) {
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+
+ for (i = 0; i < TRACK_TICK_NUM; i++) {
+ idx = goo_canvas_item_model_find_child (root, obj->trtick[i]);
+
+ if (idx != -1) {
+ goo_canvas_item_model_remove_child (root, idx);
+ }
+ }
+}
-
-
-
/** \brief Convert Az/El to canvas based XY coordinates. */
-void
+static void
azel_to_xy (GtkPolarView *p, gdouble az, gdouble el, gfloat *x, gfloat *y)
{
gdouble rel;
@@ -1328,7 +1340,7 @@
/** \brief Convert canvas based coordinates to Az/El. */
-void
+static void
xy_to_azel (GtkPolarView *p, gfloat x, gfloat y, gfloat *az, gfloat *el)
{
gfloat rel;
Modified: trunk/src/gtk-polar-view.h
===================================================================
--- trunk/src/gtk-polar-view.h 2011-11-12 19:49:28 UTC (rev 952)
+++ trunk/src/gtk-polar-view.h 2011-11-13 01:28:10 UTC (rev 953)
@@ -152,12 +152,12 @@
void gtk_polar_view_update (GtkWidget *widget);
void gtk_polar_view_reconf (GtkWidget *widget, GKeyFile *cfgdat);
-void azel_to_xy (GtkPolarView *p, gdouble az, gdouble el, gfloat *x, gfloat *y);
-void xy_to_azel (GtkPolarView *p, gfloat x, gfloat y, gfloat *az, gfloat *el);
-
void gtk_polar_view_reload_sats (GtkWidget *polv, GHashTable *sats);
void gtk_polar_view_select_sat (GtkWidget *widget, gint catnum);
+void gtk_polar_view_create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat);
+void gtk_polar_view_delete_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-11-22 02:19:05
|
Revision: 958
http://gpredict.svn.sourceforge.net/gpredict/?rev=958&view=rev
Author: aa1vs
Date: 2011-11-22 02:18:59 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
Apply compare function to all categories.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-selector.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-11-21 02:05:58 UTC (rev 957)
+++ trunk/ChangeLog 2011-11-22 02:18:59 UTC (rev 958)
@@ -1,5 +1,11 @@
2011-11-21 Charles Suprin <hamaa1vs at gmail.com>
+ * src/gtk-sat-selector.c
+ Apply compare function to all categories.
+
+
+2011-11-21 Charles Suprin <hamaa1vs at gmail.com>
+
* src/gtk-sat-map.c
Apply consistent checking of pole to eliminate disagreements. (Bug 3437555: Graphical Glitch Plotting Footprints near pole)
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-11-21 02:05:58 UTC (rev 957)
+++ trunk/src/gtk-sat-selector.c 2011-11-22 02:18:59 UTC (rev 958)
@@ -673,6 +673,11 @@
newmodel = GTK_TREE_MODEL (g_slist_nth_data (selector->models, sel));
/* We changed the GtkTreeModel so we need to reset the sort column ID */
+ gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (newmodel),
+ GTK_SAT_SELECTOR_COL_NAME,
+ compare_func,
+ NULL,
+ NULL);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (newmodel),
GTK_SAT_SELECTOR_COL_NAME,
GTK_SORT_ASCENDING);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-11-23 15:15:58
|
Revision: 959
http://gpredict.svn.sourceforge.net/gpredict/?rev=959&view=rev
Author: aa1vs
Date: 2011-11-23 15:15:52 +0000 (Wed, 23 Nov 2011)
Log Message:
-----------
Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.)
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/gtk-event-list-popup.c
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view.c
trunk/src/gtk-sat-data.c
trunk/src/gtk-sat-list-popup.c
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-map.c
trunk/src/sat-info.c
trunk/src/sgpsdp/sgp4sdp4.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/ChangeLog 2011-11-23 15:15:52 UTC (rev 959)
@@ -1,5 +1,20 @@
-2011-11-21 Charles Suprin <hamaa1vs at gmail.com>
+2011-11-23 Charles Suprin <hamaa1vs at gmail.com>
+ * src/gtk-event-list-popup.c
+ * src/gtk-sat-data.c
+ * src/gtk-sat-list-popup.c
+ * src/gtk-sat-map.c
+ * src/gtk-sat-map-popup.c
+ * src/gtk-polar-view.c
+ * src/gtk-polar-view-popup.c
+ * src/gtk-single-sat.c
+ * src/sat-info.c
+ * src/sgpsdp/sgp4sdp4.h
+ Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.)
+
+
+2011-11-22 Charles Suprin <hamaa1vs at gmail.com>
+
* src/gtk-sat-selector.c
Apply compare function to all categories.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/NEWS 2011-11-23 15:15:52 UTC (rev 959)
@@ -22,6 +22,7 @@
- Fixed bug 3419879: gpredict doesn't change the satellite names on world map.
- Fixed bug 3292729: Show next pass shows the current pass.
- Fixed bug 3437555: Graphical Glitch Plotting Footprints near pole.
+- Fixed bug 3441490: Satellite Nickname Not escaped for PANGO.
Changes in version 1.3 (1 Mar 2011)
Modified: trunk/src/gtk-event-list-popup.c
===================================================================
--- trunk/src/gtk-event-list-popup.c 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-event-list-popup.c 2011-11-23 15:15:52 UTC (rev 959)
@@ -65,7 +65,7 @@
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->nickname);
+ buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname);
gtk_label_set_markup (GTK_LABEL (label), buff);
g_free (buff);
gtk_container_add (GTK_CONTAINER (menuitem), label);
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-polar-view-popup.c 2011-11-23 15:15:52 UTC (rev 959)
@@ -73,16 +73,16 @@
gchar *buff;
sat_obj_t *obj = NULL;
gint *catnum;
+
-
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->nickname);
+ buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname);
gtk_label_set_markup (GTK_LABEL (label), buff);
g_free (buff);
gtk_container_add (GTK_CONTAINER (menuitem), label);
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-polar-view.c 2011-11-23 15:15:52 UTC (rev 959)
@@ -888,7 +888,7 @@
"<tt>Az: %5.1f\302\260\n" \
"El: %5.1f\302\260\n" \
"%s</tt>",
- sat->nickname,
+ sat->escapednickname,
sat->az, sat->el,
losstr);
@@ -981,7 +981,7 @@
"<tt>Az: %5.1f\302\260\n" \
"El: %5.1f\302\260\n" \
"</tt>",
- sat->nickname,
+ sat->escapednickname,
sat->az, sat->el);
obj->marker = goo_canvas_rect_model_new (root,
Modified: trunk/src/gtk-sat-data.c
===================================================================
--- trunk/src/gtk-sat-data.c 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-sat-data.c 2011-11-23 15:15:52 UTC (rev 959)
@@ -95,6 +95,8 @@
g_clear_error (&error);
sat->nickname = g_strdup (sat->name);
}
+ sat->escapednickname = g_markup_escape_text (sat->nickname, -1);
+
sat->website = g_key_file_get_string (data, "Satellite", "WEBSITE", NULL); /* website may be NULL */
/* get TLE data */
Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-sat-list-popup.c 2011-11-23 15:15:52 UTC (rev 959)
@@ -66,7 +66,7 @@
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->nickname);
+ buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname);
gtk_label_set_markup (GTK_LABEL (label), buff);
g_free (buff);
gtk_container_add (GTK_CONTAINER (menuitem), label);
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-sat-map-popup.c 2011-11-23 15:15:52 UTC (rev 959)
@@ -82,7 +82,7 @@
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->nickname);
+ buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname);
gtk_label_set_markup (GTK_LABEL (label), buff);
g_free (buff);
gtk_container_add (GTK_CONTAINER (menuitem), label);
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/gtk-sat-map.c 2011-11-23 15:15:52 UTC (rev 959)
@@ -752,13 +752,13 @@
buff = g_strdup_printf (_("<span background=\"#%s\"> "\
"Next: %s in %s%d:%s%d%s%d </span>"),
satmap->infobgd,
- sat->nickname,
+ sat->escapednickname,
ch, h, cm, m, cs, s);
else
buff = g_strdup_printf (_("<span background=\"#%s\"> " \
"Next: %s in %s%d%s%d </span>"),
satmap->infobgd,
- sat->nickname,
+ sat->escapednickname,
cm, m, cs, s);
g_object_set (satmap->next,
@@ -1831,7 +1831,7 @@
guint32 col,covcol,shadowcol;
gfloat x,y;
gchar *tooltip;
-
+
(void) key; /* avoid unusued parameter compiler warning */
if (decayed(sat)) {
@@ -1910,11 +1910,10 @@
"Lat: %5.1f\302\260\n" \
" Az: %5.1f\302\260\n" \
" El: %5.1f\302\260</tt>",
- sat->nickname,
+ sat->escapednickname,
sat->ssplon, sat->ssplat,
sat->az, sat->el);
-
/* create satellite marker and label + shadows. We create shadows first */
obj->shadowm = goo_canvas_rect_model_new (root,
x - MARKER_SIZE_HALF + 1,
@@ -2104,7 +2103,7 @@
" Az: %5.1f\302\260\n" \
" El: %5.1f\302\260\n" \
"%s</tt>",
- sat->nickname,
+ sat->escapednickname,
sat->ssplon, sat->ssplat,
sat->az, sat->el,
aosstr);
@@ -2312,11 +2311,11 @@
if (isgeo) {
if (sat->el > 0.0) {
text = g_strdup_printf ("<span background=\"#%s\"> %s: Always in range </span>",
- satmap->infobgd, sat->nickname);
+ satmap->infobgd, sat->escapednickname);
}
else {
text = g_strdup_printf ("<span background=\"#%s\"> %s: Always out of range </span>",
- satmap->infobgd, sat->nickname);
+ satmap->infobgd, sat->escapednickname);
}
}
else {
@@ -2352,13 +2351,13 @@
if (h > 0) {
text = g_strdup_printf ("<span background=\"#%s\"> "\
"%s %s in %s%d:%s%d%s%d </span>",
- satmap->infobgd, sat->nickname,
+ satmap->infobgd, sat->escapednickname,
alsstr, ch, h, cm, m, cs, s);
}
else {
text = g_strdup_printf ("<span background=\"#%s\"> "\
"%s %s in %s%d%s%d </span>",
- satmap->infobgd, sat->nickname,
+ satmap->infobgd, sat->escapednickname,
alsstr, cm, m, cs, s);
}
Modified: trunk/src/sat-info.c
===================================================================
--- trunk/src/sat-info.c 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/sat-info.c 2011-11-23 15:15:52 UTC (rev 959)
@@ -97,7 +97,7 @@
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->nickname);
+ str = g_strdup_printf (_("<b>%s</b>"), sat->escapednickname);
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);
Modified: trunk/src/sgpsdp/sgp4sdp4.h
===================================================================
--- trunk/src/sgpsdp/sgp4sdp4.h 2011-11-22 02:18:59 UTC (rev 958)
+++ trunk/src/sgpsdp/sgp4sdp4.h 2011-11-23 15:15:52 UTC (rev 959)
@@ -156,6 +156,7 @@
typedef struct {
char *name;
char *nickname;
+ char *escapednickname;
char *website;
tle_t tle; /*!< Keplerian elements */
int flags; /*!< Flags for algo ctrl */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2011-12-06 21:41:52
|
Revision: 962
http://gpredict.svn.sourceforge.net/gpredict/?rev=962&view=rev
Author: csete
Date: 2011-12-06 21:41:46 +0000 (Tue, 06 Dec 2011)
Log Message:
-----------
Typos (bug 3451841).
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/about.c
trunk/src/gtk-sat-module.c
trunk/src/sat-info.c
trunk/src/sat-pass-dialogs.c
trunk/src/sat-pref-qth.c
trunk/src/sat-pref-rot-editor.c
trunk/src/sat-pref-rot.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/ChangeLog 2011-12-06 21:41:46 UTC (rev 962)
@@ -1,3 +1,16 @@
+2011-12-06 Alexandru Csete <oz9aec at gmail.com>
+
+ * src/about.c:
+ * src/gtk-sat-module.c:
+ * src/gtk-sat-module.c:
+ * src/sat-info.c:
+ * src/sat-pass-dialogs.c:
+ * src/sat-pref-qth.c:
+ * src/sat-pref-rot.c:
+ * src/sat-pref-rot-editor.c:
+ Fix typos (bug 3451841).
+
+
2011-11-23 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-event-list-popup.c
@@ -10,7 +23,8 @@
* src/gtk-single-sat.c
* src/sat-info.c
* src/sgpsdp/sgp4sdp4.h
- Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.)
+ Escape satellite nicknames and use them when in markup.
+ (Bug 3441490: Satellite Nickname Not escaped for PANGO.)
2011-11-22 Charles Suprin <hamaa1vs at gmail.com>
@@ -22,13 +36,16 @@
2011-11-21 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-sat-map.c
- Apply consistent checking of pole to eliminate disagreements. (Bug 3437555: Graphical Glitch Plotting Footprints near pole)
+ Apply consistent checking of pole to eliminate disagreements.
+ (Bug 3437555: Graphical Glitch Plotting Footprints near pole)
* src/gtk-sat-list.c
* src/gtk-sat-list.h
* src/gtk-event-list.c
* src/gtk-event-list.c
- Bold entries for satellites above horizon. (Feature Request 3169710: Highlight satellites within range in the list view)
+ Bold entries for satellites above horizon.
+ (Feature Request 3169710: Highlight satellites within range in the list view)
+
* src/gtk-single-sat.c
Eliminate segfault.
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/NEWS 2011-12-06 21:41:46 UTC (rev 962)
@@ -23,7 +23,9 @@
- Fixed bug 3292729: Show next pass shows the current pass.
- Fixed bug 3437555: Graphical Glitch Plotting Footprints near pole.
- Fixed bug 3441490: Satellite Nickname Not escaped for PANGO.
+- Fixed bug 3451841: Typos.
+
Changes in version 1.3 (1 Mar 2011)
- Feature request 2873824: Flip Passes.
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/src/about.c 2011-12-06 21:41:46 UTC (rev 962)
@@ -67,7 +67,7 @@
const gchar license[] = N_("Copyright (C) 2001-2011 Alexandru Csete OZ9AEC and contributors.\n"\
"Contact: oz9aec at gmail.com\n\n"\
"Gpredict is free software; you can redistribute it and "\
- "mofdify it under the terms of the GNU General Public License "\
+ "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.\n\n"\
"This program is distributed free of charge in the hope that it will "\
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/src/gtk-sat-module.c 2011-12-06 21:41:46 UTC (rev 962)
@@ -1077,7 +1077,7 @@
name = g_strdup (module->name);
sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Module %s recevied CLOSE signal."),
+ _("%s: Module %s received CLOSE signal."),
__FUNCTION__, name);
switch (module->state) {
@@ -1212,7 +1212,7 @@
name = g_strdup (module->name);
sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Module %s recevied CONFIG signal."),
+ _("%s: Module %s received CONFIG signal."),
__FUNCTION__, name);
/* stop timeout */
Modified: trunk/src/sat-info.c
===================================================================
--- trunk/src/sat-info.c 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/src/sat-info.c 2011-12-06 21:41:46 UTC (rev 962)
@@ -155,7 +155,7 @@
g_free (str);
/* international designator */
- label = gtk_label_new (_("Internation designator:"));
+ label = gtk_label_new (_("International designator:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/src/sat-pass-dialogs.c 2011-12-06 21:41:46 UTC (rev 962)
@@ -71,7 +71,7 @@
/** \brief Descriptive text for multi-pass list columns. */
const gchar *MULTI_PASS_COL_HINT[MULTI_PASS_COL_NUMBER] = {
- N_("Aquisition of signal (AOS)"),
+ N_("Acquisition of signal (AOS)"),
N_("Time of Closest Approach (TCA)"),
N_("Loss of signal (LOS)"),
N_("Duration of pass"),
Modified: trunk/src/sat-pref-qth.c
===================================================================
--- trunk/src/sat-pref-qth.c 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/src/sat-pref-qth.c 2011-12-06 21:41:46 UTC (rev 962)
@@ -980,7 +980,7 @@
/* remove file */
if (g_remove (buff)) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed top remove %s"),
+ _("%s:%d: Failed to remove %s"),
__FILE__, __LINE__, filename);
}
else {
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/src/sat-pref-rot-editor.c 2011-12-06 21:41:46 UTC (rev 962)
@@ -176,7 +176,7 @@
gtk_entry_set_max_length (GTK_ENTRY (host), 50);
gtk_entry_set_text (GTK_ENTRY (host), "localhost");
gtk_widget_set_tooltip_text (host,
- _("Enter the host where rigctld is running. "\
+ _("Enter the host where rotctld is running. "\
"You can use both host name and IP address, "\
"e.g. 192.168.1.100\n\n"\
"If gpredict and rotctld are running on the "\
Modified: trunk/src/sat-pref-rot.c
===================================================================
--- trunk/src/sat-pref-rot.c 2011-11-23 19:57:19 UTC (rev 961)
+++ trunk/src/sat-pref-rot.c 2011-12-06 21:41:46 UTC (rev 962)
@@ -690,7 +690,7 @@
break;
default:
- text = g_strdup_printf (_("Uknown (%d)"), number);
+ text = g_strdup_printf (_("Unknown (%d)"), number);
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-12-26 15:53:27
|
Revision: 964
http://gpredict.svn.sourceforge.net/gpredict/?rev=964&view=rev
Author: aa1vs
Date: 2011-12-26 15:53:21 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Add transponder data for RS-30/Yubileiny.
Modified Paths:
--------------
trunk/ChangeLog
Added Paths:
-----------
trunk/data/trsp/32953.trsp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-12-24 14:42:52 UTC (rev 963)
+++ trunk/ChangeLog 2011-12-26 15:53:21 UTC (rev 964)
@@ -1,3 +1,9 @@
+2011-12-26 Charles Suprin <hamaa1vs at gmail.com>
+
+ * data/trsp/32953.trsp
+ Add transponder data for RS-30/Yubileiny.
+
+
2011-12-24 Charles Suprin <hamaa1vs at gmail.com>
* src/compat.c
Added: trunk/data/trsp/32953.trsp
===================================================================
--- trunk/data/trsp/32953.trsp (rev 0)
+++ trunk/data/trsp/32953.trsp 2011-12-26 15:53:21 UTC (rev 964)
@@ -0,0 +1,5 @@
+[Telemetry Beacon 1 Beacon]
+DOWN_LOW = 435215000
+
+[Telemetry Beacon 2 Beacon]
+DOWN_LOW = 435315000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-12-26 16:41:37
|
Revision: 965
http://gpredict.svn.sourceforge.net/gpredict/?rev=965&view=rev
Author: aa1vs
Date: 2011-12-26 16:41:31 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
Update transponder database to include all satellites in AMSAT-US operational list.
Modified Paths:
--------------
trunk/ChangeLog
trunk/data/trsp/27844.trsp
trunk/data/trsp/28895.trsp
trunk/data/trsp/33493.trsp
Added Paths:
-----------
trunk/data/trsp/25509.trsp
trunk/data/trsp/29655.trsp
trunk/data/trsp/37224.trsp
trunk/data/trsp/37227.trsp
trunk/data/trsp/37853.trsp
trunk/data/trsp/37854.trsp
trunk/data/trsp/37855.trsp
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-12-26 15:53:21 UTC (rev 964)
+++ trunk/ChangeLog 2011-12-26 16:41:31 UTC (rev 965)
@@ -3,7 +3,19 @@
* data/trsp/32953.trsp
Add transponder data for RS-30/Yubileiny.
+ * data/trsp/37854.trsp
+ * data/trsp/29655.trsp
+ * data/trsp/28895.trsp
+ * data/trsp/25509.trsp
+ * data/trsp/37227.trsp
+ * data/trsp/33493.trsp
+ * data/trsp/27844.trsp
+ * data/trsp/37853.trsp
+ * data/trsp/37855.trsp
+ * data/trsp/37224.trsp
+ Update transponder database to include all satellites in AMSAT-US operational list.
+
2011-12-24 Charles Suprin <hamaa1vs at gmail.com>
* src/compat.c
Added: trunk/data/trsp/25509.trsp
===================================================================
--- trunk/data/trsp/25509.trsp (rev 0)
+++ trunk/data/trsp/25509.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -0,0 +1,7 @@
+[Mode V/A Inverting]
+UP_HIGH=145915000
+DOWN_LOW=29420000
+
+[Mode L/U Packet]
+UP_HIGH=1266687000
+DOWN_LOW=437910000
Modified: trunk/data/trsp/27844.trsp
===================================================================
--- trunk/data/trsp/27844.trsp 2011-12-26 15:53:21 UTC (rev 964)
+++ trunk/data/trsp/27844.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -1,3 +1,7 @@
+[Mode U Beacon]
+DOWN_LOW=437400000
+MODE=CW
+
[Mode U TLM]
DOWN_LOW=436837500
MODE=CW
Modified: trunk/data/trsp/28895.trsp
===================================================================
--- trunk/data/trsp/28895.trsp 2011-12-26 15:53:21 UTC (rev 964)
+++ trunk/data/trsp/28895.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -1,3 +1,7 @@
+[Mode U BEACON]
+DOWN_LOW=437465000
+MODE=CW
+
[Mode U TLM]
DOWN_LOW=437425000
MODE=CW
Added: trunk/data/trsp/29655.trsp
===================================================================
--- trunk/data/trsp/29655.trsp (rev 0)
+++ trunk/data/trsp/29655.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -0,0 +1,3 @@
+[Mode TLM Beacon]
+DOWN_LOW=4370750
+MODE=1k2 AFSK
Modified: trunk/data/trsp/33493.trsp
===================================================================
--- trunk/data/trsp/33493.trsp 2011-12-26 15:53:21 UTC (rev 964)
+++ trunk/data/trsp/33493.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -2,6 +2,10 @@
DOWN_LOW=437250000
MODE=CW
-[Mode U FM]
+[Mode U FM 1200]
DOWN_LOW=437425000
MODE=1k2 AFSK
+
+[Mode U FM 9600]
+DOWN_LOW=437425000
+MODE=9k2 GMSK
Added: trunk/data/trsp/37224.trsp
===================================================================
--- trunk/data/trsp/37224.trsp (rev 0)
+++ trunk/data/trsp/37224.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -0,0 +1,2 @@
+[Mode U Telemetry 1200 bps]
+DOWN_LOW=43705000
Added: trunk/data/trsp/37227.trsp
===================================================================
--- trunk/data/trsp/37227.trsp (rev 0)
+++ trunk/data/trsp/37227.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -0,0 +1,21 @@
+[FO-69 Mode U Telemetry 1200 bps]
+DOWN_LOW=437345000
+
+[FO-69 Mode V/U Telemetry 1200 bps]
+DOWN_LOW=437345000
+UP_HIGH=145980000
+
+[FO-69 Mode V/U Telemetry 9600 bps]
+DOWN_LOW=437345000
+UP_HIGH=145825000
+
+[FO-70 Mode U Telemetry 1200 bps]
+DOWN_LOW=145825000
+
+[FO-70 Mode U/V Telemetry 1200 bps]
+UP_LOW=432025000
+DOWN_HIGH=145825000
+
+[FO-70 Mode U/V Telemetry 9600 bps]
+UP_LOW=437345000
+DOWN_HIGH=145825000
Added: trunk/data/trsp/37853.trsp
===================================================================
--- trunk/data/trsp/37853.trsp (rev 0)
+++ trunk/data/trsp/37853.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -0,0 +1,2 @@
+[9600bps Beacon]
+DOWN_LOW = 437345000
Added: trunk/data/trsp/37854.trsp
===================================================================
--- trunk/data/trsp/37854.trsp (rev 0)
+++ trunk/data/trsp/37854.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -0,0 +1,2 @@
+[CW Beacon]
+DOWN_LOW = 437475000
Added: trunk/data/trsp/37855.trsp
===================================================================
--- trunk/data/trsp/37855.trsp (rev 0)
+++ trunk/data/trsp/37855.trsp 2011-12-26 16:41:31 UTC (rev 965)
@@ -0,0 +1,5 @@
+[MCubed GMSK Beacon]
+DOWN_LOW = 437485000
+
+[Explorer 1 Prime Unit 2 Beacon]
+DOWN_LOW = 437505000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X