[Gpredict-svn] SF.net SVN: gpredict:[954] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
|
From: <aa...@us...> - 2011-11-13 13:56:51
|
Revision: 954
http://gpredict.svn.sourceforge.net/gpredict/?rev=954&view=rev
Author: aa1vs
Date: 2011-11-13 13:56:43 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
Eliminate compiler warnings.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-azel-plot.c
trunk/src/gtk-event-list.c
trunk/src/gtk-freq-knob.c
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-view.c
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-knob.c
trunk/src/gtk-sat-list-col-sel.c
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-module-popup.c
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-selector.c
trunk/src/gtk-single-sat.c
trunk/src/gtk-sky-glance.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/ChangeLog 2011-11-13 13:56:43 UTC (rev 954)
@@ -1,3 +1,24 @@
+2011-11-13 Charles Suprin <hamaa1vs at gmail.com>
+
+ * src/gtk-sat-module-popup.c
+ * src/gtk-rot-knob.c
+ * src/gtk-sky-glance.c
+ * src/gtk-rig-ctrl.c
+ * src/gtk-sat-list.c
+ * src/gtk-sat-module.c
+ * src/gtk-sat-list-col-sel.c
+ * src/gtk-sat-selector.c
+ * src/gtk-single-sat.c
+ * src/gtk-polar-plot.c
+ * src/gtk-event-list.c
+ * src/gtk-sat-map.c
+ * src/gtk-freq-knob.c
+ * src/gtk-rot-ctrl.c
+ * src/gtk-azel-plot.c
+ * src/gtk-polar-view.c
+ Eliminate compiler warnings.
+
+
2011-11-12 Charles Suprin <hamaa1vs at gmail.com>
* doc/um/gpredict-user-manual.odt
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-azel-plot.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -114,18 +114,18 @@
static void
gtk_azel_plot_class_init (GtkAzelPlotClass *class)
{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GObjectClass *gobject_class;*/
+ GtkObjectClass *object_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*gobject_class = G_OBJECT_CLASS (class);*/
+ object_class = (GtkObjectClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
+
+ parent_class = g_type_class_peek_parent (class);
- parent_class = g_type_class_peek_parent (class);
-
object_class->destroy = gtk_azel_plot_destroy;
//widget_class->size_allocate = gtk_azel_plot_size_allocate;
}
Modified: trunk/src/gtk-event-list.c
===================================================================
--- trunk/src/gtk-event-list.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-event-list.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -187,15 +187,15 @@
static void gtk_event_list_class_init (GtkEventListClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
Modified: trunk/src/gtk-freq-knob.c
===================================================================
--- trunk/src/gtk-freq-knob.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-freq-knob.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -107,16 +107,16 @@
static void
gtk_freq_knob_class_init (GtkFreqKnobClass *class)
{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GObjectClass *gobject_class;*/
+ GtkObjectClass *object_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
+
+ /*gobject_class = G_OBJECT_CLASS (class);*/
+ object_class = (GtkObjectClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
- gobject_class = G_OBJECT_CLASS (class);
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
-
parent_class = g_type_class_peek_parent (class);
object_class->destroy = gtk_freq_knob_destroy;
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-polar-plot.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -125,15 +125,15 @@
static void
gtk_polar_plot_class_init (GtkPolarPlotClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-polar-view.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -134,15 +134,15 @@
static void
gtk_polar_view_class_init (GtkPolarViewClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-rig-ctrl.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -180,15 +180,15 @@
static void gtk_rig_ctrl_class_init (GtkRigCtrlClass *class)
{
- GObjectClass *gobject_class;
+ //GObjectClass *gobject_class;
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ //GtkWidgetClass *widget_class;
+ //GtkContainerClass *container_class;
- gobject_class = G_OBJECT_CLASS (class);
+ //gobject_class = G_OBJECT_CLASS (class);
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ //widget_class = (GtkWidgetClass*) class;
+ //container_class = (GtkContainerClass*) class;
parent_class = g_type_class_peek_parent (class);
@@ -2871,7 +2871,11 @@
gint written;
/*shutdown the rigctld connect*/
written = send(*sock, "q\x0a", 2, 0);
-
+ if (written != 2) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: Sent 2 bytes but sent %d."),
+ __FILE__, __FUNCTION__, written);
+ }
#ifndef WIN32
shutdown (*sock, SHUT_RDWR);
close (*sock);
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-rot-ctrl.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -143,15 +143,15 @@
static void
gtk_rot_ctrl_class_init (GtkRotCtrlClass *class)
{
- GObjectClass *gobject_class;
+ //GObjectClass *gobject_class;
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ //GtkWidgetClass *widget_class;
+ //GtkContainerClass *container_class;
- gobject_class = G_OBJECT_CLASS (class);
+ //gobject_class = G_OBJECT_CLASS (class);
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ //widget_class = (GtkWidgetClass*) class;
+ //container_class = (GtkContainerClass*) class;
parent_class = g_type_class_peek_parent (class);
@@ -1354,7 +1354,11 @@
gint written;
/*shutdown the rigctld connect*/
written = send(*sock, "q\x0a", 2, 0);
-
+ if (written != 2) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: Sent 2 bytes but sent %d."),
+ __FILE__, __FUNCTION__, written);
+ }
#ifndef WIN32
shutdown (*sock, SHUT_RDWR);
close (*sock);
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-rot-knob.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -95,16 +95,16 @@
static void
gtk_rot_knob_class_init (GtkRotKnobClass *class)
{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
-
- gobject_class = G_OBJECT_CLASS (class);
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
-
+ /*GObjectClass *gobject_class;*/
+ GtkObjectClass *object_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
+
+ /*gobject_class = G_OBJECT_CLASS (class);*/
+ object_class = (GtkObjectClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
+
parent_class = g_type_class_peek_parent (class);
object_class->destroy = gtk_rot_knob_destroy;
Modified: trunk/src/gtk-sat-list-col-sel.c
===================================================================
--- trunk/src/gtk-sat-list-col-sel.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-sat-list-col-sel.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -93,16 +93,16 @@
static void
gtk_sat_list_col_sel_class_init (GtkSatListColSelClass *class)
{
- GObjectClass *gobject_class;
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GObjectClass *gobject_class;*/
+ GtkObjectClass *object_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
+
+ /*gobject_class = G_OBJECT_CLASS (class);*/
+ object_class = (GtkObjectClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
- gobject_class = G_OBJECT_CLASS (class);
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
-
parent_class = g_type_class_peek_parent (class);
object_class->destroy = gtk_sat_list_col_sel_destroy;
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-sat-list.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -261,15 +261,15 @@
static void
gtk_sat_list_class_init (GtkSatListClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-sat-map.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -152,15 +152,15 @@
static void
gtk_sat_map_class_init (GtkSatMapClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
@@ -1272,8 +1272,19 @@
gdouble qrb1, qrb2, az1, az2;
ret1 = qrb (sat->ssplon, sat->ssplat, 0.0, 90.0, &qrb1, &az1);
+ if (ret1 != RIG_OK) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Bad data measuring distance to North Pole %f %f."),
+ __FUNCTION__, sat->ssplon, sat->ssplat);
+ }
ret2 = qrb (sat->ssplon, sat->ssplat, 0.0, -90.0, &qrb2, &az2);
-
+ if (ret2 != RIG_OK) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Bad data measuring distance to South Pole %f %f."),
+ __FUNCTION__, sat->ssplon, sat->ssplat);
+ }
+
+
if ((qrb1 <= 0.5*sat->footprint) || (qrb2 <= 0.5*sat->footprint))
return TRUE;
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-sat-module-popup.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -65,7 +65,7 @@
static void destroy_rigctrl (GtkWidget *window, gpointer data);
static void destroy_skg (GtkWidget *window, gpointer data);
static gint window_delete (GtkWidget *widget, GdkEvent *event, gpointer data);
-static sat_nickname_compare (sat_t *a, sat_t *b);
+static gint sat_nickname_compare (const sat_t *a, const sat_t *b);
/** \brief Create and run GtkSatModule popup menu.
@@ -158,7 +158,7 @@
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), satsubmenu);
sats = g_hash_table_get_values(module->satellites);
- sats = g_list_sort(sats , sat_nickname_compare );
+ sats = g_list_sort(sats , (GCompareFunc) sat_nickname_compare );
n = g_list_length(sats);
for (i = 0; i < n; i++) {
@@ -1233,6 +1233,6 @@
return FALSE;
}
-static sat_nickname_compare (sat_t *a, sat_t *b) {
- gpredict_strcmp(a->nickname, b->nickname);
+static gint sat_nickname_compare (const sat_t *a, const sat_t *b) {
+ return gpredict_strcmp(a->nickname, b->nickname);
}
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-sat-module.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -137,15 +137,15 @@
static void
gtk_sat_module_class_init (GtkSatModuleClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
@@ -842,9 +842,10 @@
qth_small_save(mod->qth,&(mod->qth_event));
}
/* update satellite data */
- g_hash_table_foreach (mod->satellites,
- gtk_sat_module_update_sat,
- module);
+ if (mod->satellites != NULL)
+ g_hash_table_foreach (mod->satellites,
+ gtk_sat_module_update_sat,
+ module);
/* update children */
for (i = 0; i < mod->nviews; i++) {
@@ -854,9 +855,10 @@
/* update satellite data (it may have got out of sync during child updates) */
- g_hash_table_foreach (mod->satellites,
- gtk_sat_module_update_sat,
- module);
+ if (mod->satellites != NULL)
+ g_hash_table_foreach (mod->satellites,
+ gtk_sat_module_update_sat,
+ module);
/* send notice to radio and rotator controller */
if (mod->rigctrl)
@@ -954,10 +956,6 @@
sat_t *sat;
GtkSatModule *module;
gdouble daynum;
- double age;
- obs_set_t obs_set = {0,0,0,0};
- geodetic_t sat_geodetic = {0,0,0,0};
- geodetic_t obs_geodetic = {0,0,0,0};
gdouble maxdt;
(void) key; /* prevent unused parameter compiler warning */
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-sat-selector.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -156,15 +156,15 @@
static void gtk_sat_selector_class_init (GtkSatSelectorClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-single-sat.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -155,15 +155,15 @@
static void
gtk_single_sat_class_init (GtkSingleSatClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2011-11-13 01:28:10 UTC (rev 953)
+++ trunk/src/gtk-sky-glance.c 2011-11-13 13:56:43 UTC (rev 954)
@@ -146,15 +146,15 @@
static void
gtk_sky_glance_class_init (GtkSkyGlanceClass *class)
{
- GObjectClass *gobject_class;
+ /*GObjectClass *gobject_class;*/
GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
+ /*GtkWidgetClass *widget_class;*/
+ /*GtkContainerClass *container_class;*/
- gobject_class = G_OBJECT_CLASS (class);
+ /*gobject_class = G_OBJECT_CLASS (class);*/
object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
+ /*widget_class = (GtkWidgetClass*) class;*/
+ /*container_class = (GtkContainerClass*) class;*/
parent_class = g_type_class_peek_parent (class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|