Thread: [Gpredict-svn] SF.net SVN: gpredict:[663] trunk/src (Page 5)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn
|
From: <aa...@us...> - 2010-10-02 21:35:15
|
Revision: 663
http://gpredict.svn.sourceforge.net/gpredict/?rev=663&view=rev
Author: aa1vs
Date: 2010-10-02 21:35:09 +0000 (Sat, 02 Oct 2010)
Log Message:
-----------
Add sorting to rig, rot, and qth preference screens.
Modified Paths:
--------------
trunk/src/sat-pref-qth.c
trunk/src/sat-pref-rig.c
trunk/src/sat-pref-rot.c
Modified: trunk/src/sat-pref-qth.c
===================================================================
--- trunk/src/sat-pref-qth.c 2010-10-02 19:57:00 UTC (rev 662)
+++ trunk/src/sat-pref-qth.c 2010-10-02 21:35:09 UTC (rev 663)
@@ -301,6 +301,7 @@
G_TYPE_BOOLEAN // Default
);
+ gtk_tree_sortable_set_sort_column_id( GTK_TREE_SORTABLE(liststore), QTH_LIST_COL_NAME,GTK_SORT_ASCENDING);
/* scan for .qth files in the user config directory and
add the contents of each .qth file to the list store
*/
@@ -1016,3 +1017,4 @@
return FALSE;
}
+
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2010-10-02 19:57:00 UTC (rev 662)
+++ trunk/src/sat-pref-rig.c 2010-10-02 21:35:09 UTC (rev 663)
@@ -250,6 +250,7 @@
G_TYPE_DOUBLE // LO UO
);
+ gtk_tree_sortable_set_sort_column_id( GTK_TREE_SORTABLE(liststore),RIG_LIST_COL_NAME,GTK_SORT_ASCENDING);
/* open configuration directory */
dirname = get_hwconf_dir ();
@@ -859,6 +860,3 @@
g_free (buff);
}
-
-
-
Modified: trunk/src/sat-pref-rot.c
===================================================================
--- trunk/src/sat-pref-rot.c 2010-10-02 19:57:00 UTC (rev 662)
+++ trunk/src/sat-pref-rot.c 2010-10-02 21:35:09 UTC (rev 663)
@@ -217,7 +217,7 @@
G_TYPE_DOUBLE, // Max El
G_TYPE_INT // Az type
);
-
+ gtk_tree_sortable_set_sort_column_id( GTK_TREE_SORTABLE(liststore),ROT_LIST_COL_NAME,GTK_SORT_ASCENDING);
/* open configuration directory */
dirname = get_hwconf_dir ();
@@ -681,6 +681,3 @@
g_free (text);
}
-
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2010-10-09 21:49:28
|
Revision: 666
http://gpredict.svn.sourceforge.net/gpredict/?rev=666&view=rev
Author: aa1vs
Date: 2010-10-09 21:49:21 +0000 (Sat, 09 Oct 2010)
Log Message:
-----------
Update copyright dates for modified files
Modified Paths:
--------------
trunk/src/first-time.c
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-sat-selector.c
trunk/src/gtk-sat-tree.c
trunk/src/main.c
trunk/src/mod-cfg.c
trunk/src/sat-log.c
trunk/src/sat-pref-qth.c
trunk/src/sat-pref-rig.c
trunk/src/sat-pref-rot.c
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/first-time.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/gtk-rig-ctrl.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/gtk-rot-ctrl.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/gtk-sat-selector.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/gtk-sat-tree.c
===================================================================
--- trunk/src/gtk-sat-tree.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/gtk-sat-tree.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/main.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/mod-cfg.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-log.c
===================================================================
--- trunk/src/sat-log.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/sat-log.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-qth.c
===================================================================
--- trunk/src/sat-pref-qth.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/sat-pref-qth.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/sat-pref-rig.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
Modified: trunk/src/sat-pref-rot.c
===================================================================
--- trunk/src/sat-pref-rot.c 2010-10-09 21:48:03 UTC (rev 665)
+++ trunk/src/sat-pref-rot.c 2010-10-09 21:49:21 UTC (rev 666)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2010-10-16 10:42:11
|
Revision: 683
http://gpredict.svn.sourceforge.net/gpredict/?rev=683&view=rev
Author: csete
Date: 2010-10-16 10:42:05 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Store references to GtkSkyGlance widget and window the same way as we store references to GtkRigCtrl and GtkRotCtrl (needed to implement autoupdate in GtkSkyGlance).
Modified Paths:
--------------
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2010-10-16 09:22:32 UTC (rev 682)
+++ trunk/src/gtk-sat-module.c 2010-10-16 10:42:05 UTC (rev 683)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
@@ -28,16 +28,15 @@
/** \brief Main module container.
*
* The GtkSatModule widget is the top level container that contains the
- * individual views.
+ * individual views. These views are of type GtkSatList, GtkSatMap, GtkSingleSat,
+ * GtkPolarView and GtkEventList (as of version 1.2).
*
- * more on layout ...
- *
- * Unfortunately, the GtkPaned widgets do not offer a sensible way to divide
- * the space between the children, e.g. set_position (50%). The only way to
- * set the gutter position is using pixel values, which by the way is in
- * contradiction with the philosophy behind the use of containers in Gtk+.
- * We try to work around this silly shortcoming by doing all sorts of hack
- * around the size-allocate signal.
+ * The views are organized in a grid (GtkTable) where each view can occupy one
+ * or more squares, see the create_module_layout() function.
+ *
+ * A module can have a GtkRigCtrl, a GtkRotCtrl and a GtkSkyGlance widget
+ * associated to it. These associations exist because theu share QTH and
+ * satellite data.
*/
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@@ -150,7 +149,7 @@
}
-
+/** \brief Initialise GtkSatModule widget */
static void
gtk_sat_module_init (GtkSatModule *module)
{
@@ -171,6 +170,9 @@
module->rotctrlwin = NULL;
module->rotctrl = NULL;
module->rigctrlwin = NULL;
+ module->rigctrl = NULL;
+ module->skgwin = NULL;
+ module->skg = NULL;
module->state = GTK_SAT_MOD_STATE_DOCKED;
module->busy = g_mutex_new();
@@ -215,6 +217,11 @@
if (module->rotctrlwin) {
gtk_widget_destroy (module->rotctrlwin);
}
+
+ /* destroy sky at a glance window */
+ if (module->skgwin) {
+ gtk_widget_destroy (module->skgwin);
+ }
/* clean up QTH */
if (module->qth) {
@@ -239,8 +246,12 @@
}
-/**** FIXME: Program goes into infinite loop when there is something
- wrong with cfg file. */
+/** \brief Create a new GtkSatModule widget.
+ * \param cfgfile The name of the configuration file (.mod)
+ *
+ * \bug Program goes into infinite loop when there is something
+ * wrong with cfg file.
+ */
GtkWidget *
gtk_sat_module_new (const gchar *cfgfile)
{
@@ -850,6 +861,13 @@
}
+/** \brief Update a child widget.
+ * \param child Pointer to the child widget (views)
+ * \param tstamp The current timestamp
+ *
+ * This function is called by the main loop of the GtkSatModule widget for
+ * each view in the layout grid.
+ */
static void
update_child (GtkWidget *child, gdouble tstamp)
{
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2010-10-16 09:22:32 UTC (rev 682)
+++ trunk/src/gtk-sat-module.h 2010-10-16 10:42:05 UTC (rev 683)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
@@ -97,9 +97,11 @@
GtkWidget *win; /*!< Window when module is not docked */
GtkWidget *rotctrlwin; /*!< Rotator controller window */
- GtkWidget *rotctrl;
+ GtkWidget *rotctrl; /*!< Rotator controller widget */
GtkWidget *rigctrlwin; /*!< Radio controller window */
- GtkWidget *rigctrl;
+ GtkWidget *rigctrl; /*!< Radio controller widget */
+ GtkWidget *skgwin; /*!< Sky at glance window */
+ GtkWidget *skg; /*!< Sky at glance widget */
GtkWidget *header;
guint head_count;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2010-10-16 10:43:30
|
Revision: 684
http://gpredict.svn.sourceforge.net/gpredict/?rev=684&view=rev
Author: csete
Date: 2010-10-16 10:43:22 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Allow only one GtkSkyGlance widget per module (consistent with GtkRigCtrl and GtkRotCtrl).
Modified Paths:
--------------
trunk/src/gtk-sat-module-popup.c
trunk/src/gtk-sat-module-popup.h
Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c 2010-10-16 10:42:05 UTC (rev 683)
+++ trunk/src/gtk-sat-module-popup.c 2010-10-16 10:43:22 UTC (rev 684)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
@@ -62,6 +62,7 @@
static void name_changed (GtkWidget *widget, gpointer data);
static void destroy_rotctrl (GtkWidget *window, gpointer data);
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);
@@ -756,42 +757,54 @@
static void sky_at_glance_cb (GtkWidget *menuitem, gpointer data)
{
GtkSatModule *module = GTK_SAT_MODULE (data);
- GtkWidget *skg;
- GtkWidget *window;
+ //GtkWidget *skg;
+ //GtkWidget *window;
gchar *buff;
+ /* if module is busy wait until done then go on */
+ g_mutex_lock(module->busy);
+
+
+ if (module->skgwin != NULL) {
+ /* there is already a sky at glance for this module */
+ gtk_window_present (GTK_WINDOW (module->skgwin));
+ g_mutex_unlock(module->busy);
+
+ return;
+ }
+
+
/* create window */
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ module->skgwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
buff = g_strdup_printf (_("The sky at a glance (%s)"), module->name);
- gtk_window_set_title (GTK_WINDOW (window), buff);
+ gtk_window_set_title (GTK_WINDOW (module->skgwin), buff);
g_free (buff);
- g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (window_delete), NULL);
+ g_signal_connect (G_OBJECT (module->skgwin), "delete_event", G_CALLBACK (window_delete), NULL);
+ g_signal_connect (G_OBJECT (module->skgwin), "destroy", G_CALLBACK (destroy_skg), module);
/* window icon */
buff = icon_file_name ("gpredict-planner.png");
- gtk_window_set_icon_from_file (GTK_WINDOW (window), buff, NULL);
+ gtk_window_set_icon_from_file (GTK_WINDOW (module->skgwin), buff, NULL);
g_free (buff);
- /* if module is busy wait until done then go on */
- g_mutex_lock(module->busy);
- /* create sky at a glance widget */
-
+ /* create sky at a glance widget */
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
- skg = gtk_sky_glance_new (module->satellites, module->qth, 0.0);
+ module->skg = gtk_sky_glance_new (module->satellites, module->qth, 0.0);
}
else {
- skg = gtk_sky_glance_new (module->satellites, module->qth, module->tmgCdnum);
+ module->skg = gtk_sky_glance_new (module->satellites, module->qth, module->tmgCdnum);
}
- g_mutex_unlock(module->busy);
- gtk_container_set_border_width (GTK_CONTAINER (window), 10);
- gtk_container_add (GTK_CONTAINER (window), skg);
+ gtk_container_set_border_width (GTK_CONTAINER (module->skgwin), 10);
+ gtk_container_add (GTK_CONTAINER (module->skgwin), module->skg);
- gtk_widget_show_all (window);
+ gtk_widget_show_all (module->skgwin);
+ g_mutex_unlock(module->busy);
+
}
/** \brief Open time manager. */
@@ -942,7 +955,23 @@
module->rotctrl = NULL;
}
-/* ensure that deleted top-level windows are destroyed */
+
+/** \brief Destroy sky at glance window.
+ * \param window Pointer to the sky at glance window.
+ * \param data Pointer to the GtkSatModule to which this widget is attached.
+ *
+ * This function is called automatically when the window is destroyed.
+ */
+static void destroy_skg (GtkWidget *window, gpointer data)
+{
+ GtkSatModule *module = GTK_SAT_MODULE (data);
+
+ module->skgwin = NULL;
+ module->skg = NULL;
+}
+
+
+/** \brief Ensure that deleted top-level windows are destroyed */
static gint window_delete (GtkWidget *widget,
GdkEvent *event,
gpointer data)
Modified: trunk/src/gtk-sat-module-popup.h
===================================================================
--- trunk/src/gtk-sat-module-popup.h 2010-10-16 10:42:05 UTC (rev 683)
+++ trunk/src/gtk-sat-module-popup.h 2010-10-16 10:43:22 UTC (rev 684)
@@ -2,7 +2,7 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2009 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2010-10-16 13:27:59
|
Revision: 686
http://gpredict.svn.sourceforge.net/gpredict/?rev=686&view=rev
Author: csete
Date: 2010-10-16 13:27:53 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Automatically refresh GtkSkyGlance every 60 seconds.
Modified Paths:
--------------
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2010-10-16 13:27:01 UTC (rev 685)
+++ trunk/src/gtk-sat-module.c 2010-10-16 13:27:53 UTC (rev 686)
@@ -65,6 +65,7 @@
#include "gtk-event-list.h"
#include "gtk-rig-ctrl.h"
#include "gtk-rot-ctrl.h"
+#include "gtk-sky-glance.h"
#include "compat.h"
//#ifdef G_OS_WIN32
@@ -93,9 +94,9 @@
static void get_grid_size (GtkSatModule *module, guint *rows, guint *cols);
static GtkWidget *create_view (GtkSatModule *module, guint num);
-
static void reload_sats_in_child (GtkWidget *widget, GtkSatModule *module);
+static void update_skg (GtkSatModule *module);
static GtkVBoxClass *parent_class = NULL;
@@ -173,6 +174,7 @@
module->rigctrl = NULL;
module->skgwin = NULL;
module->skg = NULL;
+ module->lastSkgUpd = 0.0;
module->state = GTK_SAT_MOD_STATE_DOCKED;
module->busy = g_mutex_new();
@@ -836,6 +838,15 @@
gtk_rig_ctrl_update (GTK_RIG_CTRL (mod->rigctrl), mod->tmgCdnum);
if (mod->rotctrl)
gtk_rot_ctrl_update (GTK_ROT_CTRL (mod->rotctrl), mod->tmgCdnum);
+
+ /* check and update Sky at glance */
+ /* FIXME: We should have some timeout counter to ensure that we don't
+ * update GtkSkyGlance too often when running with high throttle values;
+ * however, the update does not seem to add any significant load even
+ * when running at max throttle
+ */
+ if (mod->skg)
+ update_skg (mod);
mod->event_count++;
@@ -1471,3 +1482,38 @@
*cols = xmax;
*rows = ymax;
}
+
+
+/** \brief Update GtkSkyGlance view
+ * \param module Pointer to the GtkSatModule widget
+ *
+ * This function checks how long ago the GtkSkyGlance widget has been updated
+ * and performs an update if necessary. The current timeout is set to 60 sec.
+ *
+ * This is a cheap/lazy implementation of automatic update. Instead of
+ * performing a real update by "moving" the objects on the GtkSkyGlance canvas,
+ * we simply replace the current GtkSkyGlance object with a new one.
+ * Ugly but safe.
+ *
+ * To ensure smooth performance while running in simulated real time with high
+ * throttle value or manual time mode, the caller is responsible for only calling
+ * this function at an appropriate frequency (e.g. every 10 cycle).
+ */
+static void update_skg (GtkSatModule *module)
+{
+
+ /* threshold is ~60 seconds */
+ if G_UNLIKELY(fabs(module->tmgCdnum - module->lastSkgUpd) > 7.0e-4) {
+
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Updating GtkSkyGlance for %s"),
+ __FUNCTION__, module->name);
+
+ gtk_container_remove (GTK_CONTAINER (module->skgwin), module->skg);
+ module->skg = gtk_sky_glance_new (module->satellites, module->qth, module->tmgCdnum);
+ gtk_container_add (GTK_CONTAINER (module->skgwin), module->skg);
+ gtk_widget_show_all (module->skg);
+
+ module->lastSkgUpd = module->tmgCdnum;
+ }
+}
Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h 2010-10-16 13:27:01 UTC (rev 685)
+++ trunk/src/gtk-sat-module.h 2010-10-16 13:27:53 UTC (rev 686)
@@ -102,6 +102,7 @@
GtkWidget *rigctrl; /*!< Radio controller widget */
GtkWidget *skgwin; /*!< Sky at glance window */
GtkWidget *skg; /*!< Sky at glance widget */
+ gdouble lastSkgUpd; /*!< Daynum of last GtkSkyGlance update */
GtkWidget *header;
guint head_count;
@@ -124,7 +125,7 @@
gtk_sat_mod_state_t state; /*!< The state of the module. */
guint timerid; /*!< The timeout ID (FIXME: REMOVE) */
- GMutex *busy; /*!< Flag indicating whether timeout has
+ GMutex *busy; /*!< Flag indicating whether timeout has
finished or not. Also used for blocking
the module during TLE update. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2010-10-17 14:31:03
|
Revision: 690
http://gpredict.svn.sourceforge.net/gpredict/?rev=690&view=rev
Author: aa1vs
Date: 2010-10-17 14:30:56 +0000 (Sun, 17 Oct 2010)
Log Message:
-----------
Continuous network rotator control merge
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Property Changed:
----------------
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2010-10-17 00:28:35 UTC (rev 689)
+++ trunk/src/gtk-rot-ctrl.c 2010-10-17 14:30:56 UTC (rev 690)
@@ -89,7 +89,13 @@
static gboolean get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el);
static gboolean set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el);
+static gboolean send_rotctld_command(GtkRotCtrl *ctrl, gchar *buff, gchar *buffout, gint sizeout);
+static gboolean open_rotctld_socket (GtkRotCtrl *ctrl, gint *sock);
+static gboolean close_rotctld_socket (gint sock);
+
static gboolean have_conf (void);
+static gint sat_name_compare (sat_t* a,sat_t*b);
+static gint rot_name_compare (const gchar* a,const gchar *b);
static GtkVBoxClass *parent_class = NULL;
@@ -477,7 +483,7 @@
gchar *dirname; /* directory name */
gchar **vbuff;
const gchar *filename; /* file name */
-
+ gchar *rotname;
table = gtk_table_new (3, 3, FALSE);
@@ -499,15 +505,27 @@
dir = g_dir_open (dirname, 0, &error);
if (dir) {
/* read each .rot file */
+ GSList *rots=NULL;
+ gint i;
+ gint n;
while ((filename = g_dir_read_name (dir))) {
if (g_str_has_suffix (filename, ".rot")) {
vbuff = g_strsplit (filename, ".rot", 0);
- gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), vbuff[0]);
+ rots=g_slist_insert_sorted(rots,g_strdup(vbuff[0]),(GCompareFunc)rot_name_compare);
g_strfreev (vbuff);
}
}
+ n = g_slist_length (rots);
+ for (i = 0; i < n; i++) {
+ rotname = g_slist_nth_data (rots, i);
+ if (rotname) {
+ gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), rotname);
+ g_free(rotname);
+ }
+ }
+ g_slist_free(rots);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -605,7 +623,8 @@
GtkRotCtrl *ctrl = GTK_ROT_CTRL( user_data);
sat_t *sat = SAT (value);
- ctrl->sats = g_slist_append (ctrl->sats, sat);
+ //ctrl->sats = g_slist_append (ctrl->sats, sat);
+ ctrl->sats = g_slist_insert_sorted (ctrl->sats, sat, (GCompareFunc)sat_name_compare);
}
@@ -754,9 +773,12 @@
g_free (ctrl->conf);
ctrl->conf = NULL;
}
+
+ return TRUE;
}
+
/** \brief Rotor locked.
* \param button Pointer to the "Engage" button.
* \param data Pointer to the GtkRotCtrl widget.
@@ -771,6 +793,7 @@
if (!gtk_toggle_button_get_active (button)) {
gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
ctrl->engaged = FALSE;
+ close_rotctld_socket(ctrl->sock);
gtk_label_set_text (GTK_LABEL (ctrl->AzRead), "---");
gtk_label_set_text (GTK_LABEL (ctrl->ElRead), "---");
}
@@ -784,7 +807,7 @@
}
gtk_widget_set_sensitive (ctrl->DevSel, FALSE);
ctrl->engaged = TRUE;
-
+ open_rotctld_socket(ctrl,&(ctrl->sock));
ctrl->wrops = 0;
ctrl->rdops = 0;
}
@@ -928,8 +951,8 @@
gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet)));
}
}
- g_static_mutex_unlock(&(ctrl->busy));
-
+ g_static_mutex_unlock(&(ctrl->busy));
+
return TRUE;
}
@@ -944,13 +967,9 @@
static gboolean get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el)
{
gchar *buff,**vbuff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
-
-
+ gchar buffback[128];
+ gboolean retcode;
+
if ((az == NULL) || (el == NULL)) {
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s:%d: NULL storage."),
@@ -958,108 +977,36 @@
return FALSE;
}
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to create socket"),
- __FILE__, __LINE__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d Network socket created successfully"),
- __FILE__, __LINE__);
- }
+ /* send command */
+ buff = g_strdup_printf ("p\x0a");
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(ctrl->conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to connect to %s:%d"),
- __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d: Connection opened to %s:%d"),
- __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
- }
+ retcode=send_rotctld_command(ctrl,buff,buffback,128);
- /* send command */
- buff = g_strdup_printf ("p\x0aq\x0a");
-
- size = 4;
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: SIZE ERROR %d / %d"),
- __FILE__, __LINE__, written, size);
- }
- g_free (buff);
-
-
/* try to read answer */
- buff = g_try_malloc (128);
- if (buff == NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
- __FILE__, __FUNCTION__);
+ if (retcode) {
+ if (strncmp(buffback,"RPRT",4)==0){
+ retcode=FALSE;
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: rotctld returned error (%s)"),
+ __FILE__, __LINE__,buffback);
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
- return FALSE;
- }
+ } else {
+ vbuff = g_strsplit (buffback, "\n", 3);
+ *az = g_strtod (vbuff[0], NULL);
+ *el = g_strtod (vbuff[1], NULL);
+
+ g_strfreev (vbuff);
+ }
+ }
- size = read (sock, buff, 127);
- if (size == 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Got 0 bytes from rotctld"),
- __FILE__, __FUNCTION__);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%s: Read %d bytes from rotctld"),
- __FILE__, __FUNCTION__, size);
-
- buff[size] = 0;
- vbuff = g_strsplit (buff, "\n", 3);
- *az = g_strtod (vbuff[0], NULL);
- *el = g_strtod (vbuff[1], NULL);
-
- g_strfreev (vbuff);
- }
-
g_free (buff);
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
- ctrl->wrops++;
- ctrl->rdops++;
-
- return TRUE;
+ return retcode;
}
/** \brief Send new position to rotator device
- * \param ctrl Poitner to the GtkRotCtrl widget
+ * \param ctrl Pointer to the GtkRotCtrl widget
* \param az The new Azimuth
* \param el The new Elevation
* \return TRUE if the new position has been sent successfully
@@ -1071,76 +1018,29 @@
static gboolean set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el)
{
gchar *buff;
+ gchar buffback[128];
gchar azstr[8],elstr[8];
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
-
+ gboolean retcode;
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to create socket"),
- __FILE__, __LINE__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d Network socket created successfully"),
- __FILE__, __LINE__);
- }
-
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(ctrl->conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to connect to %s:%d"),
- __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d: Connection opened to %s:%d"),
- __FILE__, __LINE__, ctrl->conf->host, ctrl->conf->port);
- }
-
/* send command */
g_ascii_formatd (azstr, 8, "%7.2f", az);
g_ascii_formatd (elstr, 8, "%7.2f", el);
- buff = g_strdup_printf ("P %s %s\x0aq\x0a", azstr, elstr);
+ buff = g_strdup_printf ("P %s %s\x0a", azstr, elstr);
- size = 20;
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: SIZE ERROR %d / %d"),
- __FILE__, __LINE__, written, size);
- }
+ retcode=send_rotctld_command(ctrl,buff,buffback,128);
- //g_print ("SZ:%d WR:%d AZ:%s EL:%s STR:%s", size, written, azstr, elstr, buff);
-
g_free (buff);
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
+ if (retcode==TRUE)
+ if (strncmp(buffback,"RPRT 0",6)!=0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: rotctld returned error (%s)"),
+ __FILE__, __LINE__,buffback);
+
+ retcode=FALSE;
+ }
- close (sock);
-
- ctrl->wrops++;
-
- return TRUE;
+ return (retcode);
}
@@ -1234,6 +1134,8 @@
if (g_str_has_suffix (filename, ".rot")) {
i++;
+ /*once we have one we need nothing else*/
+ break;
}
}
}
@@ -1249,3 +1151,136 @@
return (i > 0) ? TRUE : FALSE;
}
+
+/** \brief open the rotcld socket. return true if successful false otherwise.*/
+
+static gboolean open_rotctld_socket (GtkRotCtrl * ctrl, gint *sock) {
+ struct sockaddr_in ServAddr;
+ struct hostent *h;
+ gint status;
+
+ ctrl->sock=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+ if (ctrl->sock < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Failed to create socket"),
+ __FUNCTION__);
+ return FALSE;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Network socket created successfully"),
+ __FUNCTION__);
+ }
+
+ memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
+ ServAddr.sin_family = AF_INET; /* Internet address family */
+ h = gethostbyname(ctrl->conf->host);
+ memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
+ ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
+
+ /* establish connection */
+ status = connect(ctrl->sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
+ if (status < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Failed to connect to %s:%d"),
+ __FUNCTION__, ctrl->conf->host, ctrl->conf->port);
+ return FALSE;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Connection opened to %s:%d"),
+ __FUNCTION__, ctrl->conf->host, ctrl->conf->port);
+ }
+
+ return TRUE;
+}
+
+
+/*close a rotcld socket. First send a q command to cleanly shut down rotctld*/
+static gboolean close_rotctld_socket (gint sock) {
+ gint written;
+ /*shutdown the rigctld connect*/
+ written = send(sock, "q\x0a", 2, 0);
+
+#ifndef WIN32
+ shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
+ close (sock);
+
+ return TRUE;
+}
+
+/** \brief Send a command to rigctld
+ * Inputs are a controller, a string command, and a buffer and length for returning the output from rigctld.
+ */
+
+gboolean send_rotctld_command(GtkRotCtrl *ctrl, gchar *buff, gchar *buffout, gint sizeout)
+{
+ gint written;
+ gint size;
+
+ size = strlen(buff);
+
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%s: Sending %d bytes as %s."),
+ __FILE__, __FUNCTION__, size, buff);
+
+
+ /* send command */
+ written = send(ctrl->sock, buff, size, 0);
+ if (written != size) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: SIZE ERROR %d / %d"),
+ __FUNCTION__, written, size);
+ }
+ if (written == -1) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: rotctld Socket Down"),
+ __FUNCTION__);
+ return FALSE;
+ }
+
+ /* try to read answer */
+ size = read (ctrl->sock, buffout, sizeout);
+
+ if (size == -1) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: rotctld Socket Down"),
+ __FUNCTION__);
+ return FALSE;
+ }
+
+ buffout[size]='\0';
+ if (size == 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%s: Got 0 bytes from rotctld"),
+ __FILE__, __FUNCTION__);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%s: Read %d bytes as %s from rotctld"),
+ __FILE__, __FUNCTION__, size, buffout);
+
+ }
+
+ ctrl->wrops++;
+
+ return TRUE;
+}
+
+/** \brief Compare Satellite Names.
+ *simple function to sort the list of satellites in the combo box.
+ */
+static gint sat_name_compare (sat_t* a,sat_t*b){
+ return (g_ascii_strcasecmp(a->nickname,b->nickname));
+}
+
+
+/** \brief Compare Rotator Names.
+ */
+static gint rot_name_compare (const gchar* a,const gchar *b){
+ return (g_ascii_strcasecmp(a,b));
+}
Property changes on: trunk/src/gtk-rot-ctrl.c
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/continuous_network/src/gtk-rot-ctrl.c:655-689
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2010-10-17 00:28:35 UTC (rev 689)
+++ trunk/src/gtk-rot-ctrl.h 2010-10-17 14:30:56 UTC (rev 690)
@@ -93,7 +93,8 @@
gboolean engaged; /*!< Flag indicating that rotor device is engaged. */
gint errcnt; /*!< Error counter. */
-
+ gint sock; /*!< socket for connecting to rotctld. */
+
/* debug related */
guint wrops;
guint rdops;
Property changes on: trunk/src/gtk-rot-ctrl.h
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/continuous_network/src/gtk-rot-ctrl.h:655-689
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2010-10-17 16:29:52
|
Revision: 691
http://gpredict.svn.sourceforge.net/gpredict/?rev=691&view=rev
Author: aa1vs
Date: 2010-10-17 16:29:44 +0000 (Sun, 17 Oct 2010)
Log Message:
-----------
First merge of continuouse network rig control
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
Property Changed:
----------------
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2010-10-17 14:30:56 UTC (rev 690)
+++ trunk/src/gtk-rig-ctrl.c 2010-10-17 16:29:44 UTC (rev 691)
@@ -109,16 +109,18 @@
static void exec_toggle_tx_cycle (GtkRigCtrl *ctrl);
static void exec_duplex_cycle (GtkRigCtrl *ctrl);
static void exec_dual_rig_cycle (GtkRigCtrl *ctrl);
-static gboolean set_freq_simplex (GtkRigCtrl *ctrl, radio_conf_t *conf, gdouble freq);
-static gboolean get_freq_simplex (GtkRigCtrl *ctrl, radio_conf_t *conf, gdouble *freq);
-static gboolean set_freq_toggle (GtkRigCtrl *ctrl, radio_conf_t *conf, gdouble freq);
-static gboolean set_toggle (GtkRigCtrl *ctrl, radio_conf_t *conf);
-static gboolean unset_toggle (GtkRigCtrl *ctrl, radio_conf_t *conf);
-static gboolean get_freq_toggle (GtkRigCtrl *ctrl, radio_conf_t *conf, gdouble *freq);
-static gboolean get_ptt (GtkRigCtrl *ctrl, radio_conf_t *conf);
-static gboolean set_ptt (GtkRigCtrl *ctrl, radio_conf_t *conf, gboolean ptt);
+static gboolean set_freq_simplex (GtkRigCtrl *ctrl, gint sock, gdouble freq);
+static gboolean get_freq_simplex (GtkRigCtrl *ctrl, gint sock, gdouble *freq);
+static gboolean set_freq_toggle (GtkRigCtrl *ctrl, gint sock, gdouble freq);
+static gboolean set_toggle (GtkRigCtrl *ctrl, gint sock);
+static gboolean unset_toggle (GtkRigCtrl *ctrl, gint sock);
+static gboolean get_freq_toggle (GtkRigCtrl *ctrl, gint sock, gdouble *freq);
+static gboolean get_ptt (GtkRigCtrl *ctrl, gint sock);
+static gboolean set_ptt (GtkRigCtrl *ctrl, gint sock, gboolean ptt);
static gboolean set_vfo (GtkRigCtrl *ctrl, vfo_t vfo);
static void update_count_down (GtkRigCtrl *ctrl, gdouble t);
+static gboolean open_rigctld_socket(radio_conf_t *conf, gint *sock);
+static gboolean close_rigctld_socket(gint sock);
/* misc utility functions */
static void load_trsp_list (GtkRigCtrl *ctrl);
@@ -127,8 +129,14 @@
static void track_downlink (GtkRigCtrl *ctrl);
static void track_uplink (GtkRigCtrl *ctrl);
static gboolean is_rig_tx_capable (const gchar *confname);
+static gboolean send_rigctld_command(GtkRigCtrl *ctrl, gint sock, gchar *buff, gchar *buffout, gint sizeout);
+static inline gboolean check_set_response (gchar *buff,gboolean retcode,const gchar* filename);
+static inline gboolean check_get_response (gchar *buff,gboolean retcode,const gchar* filename);
+static gint sat_name_compare (sat_t* a,sat_t*b);
+static gint rig_name_compare (const gchar* a,const gchar *b);
+
static GtkVBoxClass *parent_class = NULL;
static GdkColor ColBlack = { 0, 0, 0, 0};
@@ -652,7 +660,7 @@
gchar *dirname; /* directory name */
gchar **vbuff;
const gchar *filename; /* file name */
-
+ gchar *rigname;
table = gtk_table_new (4, 3, FALSE);
@@ -676,15 +684,26 @@
dir = g_dir_open (dirname, 0, &error);
if (dir) {
/* read each .rig file */
+ GSList *rigs=NULL;
+ gint i;
+ gint n;
while ((filename = g_dir_read_name (dir))) {
if (g_str_has_suffix (filename, ".rig")) {
-
- vbuff = g_strsplit (filename, ".rig", 0);
- gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), vbuff[0]);
+ vbuff = g_strsplit (filename, ".rig", 0);
+ rigs=g_slist_insert_sorted(rigs,g_strdup(vbuff[0]),(GCompareFunc)rig_name_compare);
g_strfreev (vbuff);
}
}
+ n = g_slist_length (rigs);
+ for (i = 0; i < n; i++) {
+ rigname = g_slist_nth_data (rigs, i);
+ if (rigname) {
+ gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), rigname);
+ g_free(rigname);
+ }
+ }
+ g_slist_free(rigs);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -809,7 +828,8 @@
GtkRigCtrl *ctrl = GTK_RIG_CTRL( user_data);
sat_t *sat = SAT (value);
- ctrl->sats = g_slist_append (ctrl->sats, sat);
+ //ctrl->sats = g_slist_append (ctrl->sats, sat);
+ ctrl->sats = g_slist_insert_sorted (ctrl->sats, sat, (GCompareFunc)sat_name_compare);
}
@@ -1169,7 +1189,6 @@
}
-
if (!gtk_toggle_button_get_active (button)) {
/* close socket */
gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
@@ -1180,9 +1199,16 @@
if ((ctrl->conf->type == RIG_TYPE_TOGGLE_AUTO) ||
(ctrl->conf->type == RIG_TYPE_TOGGLE_MAN)) {
+ unset_toggle (ctrl,ctrl->sock);
+ }
- unset_toggle (ctrl,ctrl->conf);
- }
+ if (ctrl->conf2 != NULL) {
+
+ close_rigctld_socket(ctrl->sock2);
+ }
+ close_rigctld_socket(ctrl->sock);
+
+
}
else {
@@ -1190,9 +1216,12 @@
gtk_widget_set_sensitive (ctrl->DevSel2, FALSE);
ctrl->engaged = TRUE;
ctrl->wrops = 0;
-
+
+ open_rigctld_socket(ctrl->conf,&(ctrl->sock));
+
/* set initial frequency */
if (ctrl->conf2 != NULL) {
+ open_rigctld_socket(ctrl->conf2,&(ctrl->sock2));
/* set initial dual mode */
exec_dual_rig_cycle (ctrl);
}
@@ -1217,7 +1246,7 @@
case RIG_TYPE_TOGGLE_AUTO:
case RIG_TYPE_TOGGLE_MAN:
- set_toggle (ctrl,ctrl->conf);
+ set_toggle (ctrl,ctrl->sock);
ctrl->last_toggle_tx = -1;
exec_toggle_cycle (ctrl);
break;
@@ -1361,7 +1390,7 @@
/* get PTT status */
if (ctrl->engaged && ctrl->conf->ptt)
- ptt = get_ptt (ctrl, ctrl->conf);
+ ptt = get_ptt (ctrl, ctrl->sock);
/* Dial feedback:
@@ -1375,7 +1404,7 @@
if ((ctrl->engaged) && (ctrl->lastrxf > 0.0)) {
if (ptt == FALSE) {
- if (!get_freq_simplex (ctrl, ctrl->conf, &readfreq)) {
+ if (!get_freq_simplex (ctrl, ctrl->sock, &readfreq)) {
/* error => use a passive value */
readfreq = ctrl->lastrxf;
ctrl->errcnt++;
@@ -1440,7 +1469,7 @@
/* if device is engaged, send freq command to radio */
if ((ctrl->engaged) && (ptt == FALSE) && (fabs(ctrl->lastrxf - tmpfreq) >= 1.0)) {
- if (set_freq_simplex (ctrl, ctrl->conf, tmpfreq)) {
+ if (set_freq_simplex (ctrl, ctrl->sock, tmpfreq)) {
/* reset error counter */
ctrl->errcnt = 0;
@@ -1451,7 +1480,7 @@
the tuning step is larger than what we work with (e.g. FT-817 has a
smallest tuning step of 10 Hz). Therefore we read back the actual
frequency from the rig. */
- get_freq_simplex (ctrl, ctrl->conf, &tmpfreq);
+ get_freq_simplex (ctrl, ctrl->sock, &tmpfreq);
ctrl->lastrxf = tmpfreq;
}
else {
@@ -1476,7 +1505,7 @@
/* get PTT status */
if (ctrl->engaged && ctrl->conf->ptt) {
- ptt = get_ptt (ctrl, ctrl->conf);
+ ptt = get_ptt (ctrl, ctrl->sock);
}
/* Dial feedback:
@@ -1490,7 +1519,7 @@
if ((ctrl->engaged) && (ctrl->lasttxf > 0.0)) {
if (ptt == TRUE) {
- if (!get_freq_simplex (ctrl, ctrl->conf, &readfreq)) {
+ if (!get_freq_simplex (ctrl, ctrl->sock, &readfreq)) {
/* error => use a passive value */
readfreq = ctrl->lasttxf;
ctrl->errcnt++;
@@ -1553,7 +1582,7 @@
/* if device is engaged, send freq command to radio */
if ((ctrl->engaged) && (ptt == TRUE) && (fabs(ctrl->lasttxf - tmpfreq) >= 1.0)) {
- if (set_freq_simplex (ctrl, ctrl->conf, tmpfreq)) {
+ if (set_freq_simplex (ctrl, ctrl->sock, tmpfreq)) {
/* reset error counter */
ctrl->errcnt = 0;
@@ -1564,7 +1593,7 @@
the tuning step is larger than what we work with (e.g. FT-817 has a
smallest tuning step of 10 Hz). Therefore we read back the actual
frequency from the rig. */
- get_freq_simplex (ctrl, ctrl->conf, &tmpfreq);
+ get_freq_simplex (ctrl, ctrl->sock, &tmpfreq);
ctrl->lasttxf = tmpfreq;
}
else {
@@ -1641,7 +1670,7 @@
if (ctrl->engaged && ctrl->conf->ptt) {
- ptt = get_ptt (ctrl, ctrl->conf);
+ ptt = get_ptt (ctrl, ctrl->sock);
}
/* if we are in TX mode do nothing */
@@ -1654,7 +1683,7 @@
/* if device is engaged, send freq command to radio */
if ((ctrl->engaged) && (fabs(ctrl->lasttxf - tmpfreq) >= 10.0)) {
- if (set_freq_toggle (ctrl, ctrl->conf, tmpfreq)) {
+ if (set_freq_toggle (ctrl, ctrl->sock, tmpfreq)) {
/* reset error counter */
ctrl->errcnt = 0;
}
@@ -1708,7 +1737,7 @@
if (ctrl->engaged && (ctrl->lastrxf > 0.0)) {
/* get frequency from receiver */
- if (!get_freq_simplex (ctrl, ctrl->conf, &readfreq)) {
+ if (!get_freq_simplex (ctrl, ctrl->sock, &readfreq)) {
/* error => use a passive value */
readfreq = ctrl->lastrxf;
ctrl->errcnt++;
@@ -1753,7 +1782,7 @@
/* if device is engaged, send freq command to radio */
if ((ctrl->engaged) && (fabs(ctrl->lasttxf - tmpfreq) >= 1.0)) {
- if (set_freq_simplex (ctrl, ctrl->conf2, tmpfreq)) {
+ if (set_freq_simplex (ctrl, ctrl->sock2, tmpfreq)) {
/* reset error counter */
ctrl->errcnt = 0;
@@ -1761,7 +1790,7 @@
g_usleep (WR_DEL);
/* The actual frequency migh be different from what we have set */
- get_freq_simplex (ctrl, ctrl->conf2, &tmpfreq);
+ get_freq_simplex (ctrl, ctrl->sock2, &tmpfreq);
ctrl->lasttxf = tmpfreq;
}
else {
@@ -1790,7 +1819,7 @@
/* if device is engaged, send freq command to radio */
if ((ctrl->engaged) && (fabs(ctrl->lastrxf - tmpfreq) >= 1.0)) {
- if (set_freq_simplex (ctrl, ctrl->conf, tmpfreq)) {
+ if (set_freq_simplex (ctrl, ctrl->sock, tmpfreq)) {
/* reset error counter */
ctrl->errcnt = 0;
@@ -1798,7 +1827,7 @@
g_usleep (WR_DEL);
/* The actual frequency migh be different from what we have set */
- get_freq_simplex (ctrl, ctrl->conf, &tmpfreq);
+ get_freq_simplex (ctrl, ctrl->sock, &tmpfreq);
ctrl->lastrxf = tmpfreq;
}
else {
@@ -1811,7 +1840,7 @@
/* check if uplink dial has changed */
if ((ctrl->engaged) && (ctrl->lasttxf > 0.0)) {
- if (!get_freq_simplex (ctrl, ctrl->conf2, &readfreq)) {
+ if (!get_freq_simplex (ctrl, ctrl->sock2, &readfreq)) {
/* error => use a passive value */
readfreq = ctrl->lasttxf;
ctrl->errcnt++;
@@ -1855,7 +1884,7 @@
/* if device is engaged, send freq command to radio */
if ((ctrl->engaged) && (fabs(ctrl->lastrxf - tmpfreq) >= 1.0)) {
- if (set_freq_simplex (ctrl, ctrl->conf, tmpfreq)) {
+ if (set_freq_simplex (ctrl, ctrl->sock, tmpfreq)) {
/* reset error counter */
ctrl->errcnt = 0;
@@ -1863,7 +1892,7 @@
g_usleep (WR_DEL);
/* The actual frequency migh be different from what we have set */
- get_freq_simplex (ctrl, ctrl->conf, &tmpfreq);
+ get_freq_simplex (ctrl, ctrl->sock, &tmpfreq);
ctrl->lastrxf = tmpfreq;
}
else {
@@ -1887,15 +1916,15 @@
/* if device is engaged, send freq command to radio */
if ((ctrl->engaged) && (fabs(ctrl->lasttxf - tmpfreq) >= 1.0)) {
- if (set_freq_simplex (ctrl, ctrl->conf2, tmpfreq)) {
+ if (set_freq_simplex (ctrl, ctrl->sock2, tmpfreq)) {
/* reset error counter */
ctrl->errcnt = 0;
/* give radio a chance to set frequency */
g_usleep (WR_DEL);
- /* The actual frequency migh be different from what we have set. */
- get_freq_simplex (ctrl, ctrl->conf2, &tmpfreq);
+ /* The actual frequency might be different from what we have set. */
+ get_freq_simplex (ctrl, ctrl->sock2, &tmpfreq);
ctrl->lasttxf = tmpfreq;
}
else {
@@ -1915,117 +1944,33 @@
* \return TRUE if PTT is ON, FALSE if PTT is OFF or an error occurred.
*
*/
-static gboolean get_ptt (GtkRigCtrl *ctrl, radio_conf_t *conf)
+static gboolean get_ptt (GtkRigCtrl *ctrl, gint sock)
{
gchar *buff,**vbuff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
+ gchar buffback[128];
+ gboolean retcode;
guint64 pttstat = 0;
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to create socket"),
- __FILE__, __LINE__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d Network socket created successfully"),
- __FILE__, __LINE__);
- }
+ if (ctrl->conf->ptt == PTT_TYPE_CAT) {
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to connect to %s:%d"),
- __FILE__, __LINE__, conf->host, conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d: Connection opened to %s:%d"),
- __FILE__, __LINE__, conf->host, conf->port);
- }
-
- if (conf->ptt == PTT_TYPE_CAT) {
/* send command get_ptt (t) */
- buff = g_strdup_printf ("t\x0aq\x0a");
- size = 4;
+ buff = g_strdup_printf ("t\x0a");
}
else {
/* send command \get_dcd */
- buff = g_strdup_printf ("%c\x0aq\x0a",0x8b);
- size = 4;
+ buff = g_strdup_printf ("%c\x0a",0x8b);
}
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: SIZE ERROR %d / %d"),
- __FILE__, __LINE__, written, size);
- }
- g_free (buff);
-
-
- /* try to read answer */
- buff = g_try_malloc (128);
- if (buff == NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
- __FILE__, __FUNCTION__);
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
- return FALSE;
- }
-
- size = read (sock, buff, 127);
- if (size == 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Got 0 bytes from rigctld"),
- __FILE__, __FUNCTION__);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%s: Read %d bytes from rigctld"),
- __FILE__, __FUNCTION__, size);
-
- buff[size] = 0;
- vbuff = g_strsplit (buff, "\n", 3);
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+ if (retcode) {
+ vbuff = g_strsplit (buffback, "\n", 3);
pttstat = g_ascii_strtoull (vbuff[0], NULL, 0); //FIXME base = 0 ok?
g_strfreev (vbuff);
}
g_free (buff);
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
-
return (pttstat == 1) ? TRUE : FALSE;
}
@@ -2037,48 +1982,11 @@
* \param ptt The new PTT value (TRUE=ON, FALSE=OFF)
* \return TRUE if the operation was successful, FALSE if an error has occurred
*/
-static gboolean set_ptt (GtkRigCtrl *ctrl, radio_conf_t *conf, gboolean ptt)
+static gboolean set_ptt (GtkRigCtrl *ctrl, gint sock, gboolean ptt)
{
gchar *buff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
-
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to create socket"),
- __FUNCTION__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Network socket created successfully"),
- __FUNCTION__);
- }
-
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to connect to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Connection opened to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- }
+ gchar buffback[128];
+ gboolean retcode;
/* send command */
if (ptt == TRUE) {
@@ -2088,26 +1996,11 @@
buff = g_strdup_printf ("T 0\x0aq\x0a");
}
- size = 6;
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: SIZE ERROR %d / %d"),
- __FUNCTION__, written, size);
- }
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
g_free (buff);
+ return(check_set_response(buffback,retcode,__FUNCTION__));
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
- ctrl->wrops++;
-
- return TRUE;
}
@@ -2122,72 +2015,19 @@
* gotten the current frequency from the ctrl; however, the param
* might become useful in the future.
*/
-static gboolean set_freq_simplex (GtkRigCtrl *ctrl, radio_conf_t *conf, gdouble freq)
+static gboolean set_freq_simplex (GtkRigCtrl *ctrl, gint sock, gdouble freq)
{
gchar *buff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
+ gchar buffback[128];
+ gboolean retcode;
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to create socket"),
- __FUNCTION__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Network socket created successfully"),
- __FUNCTION__);
- }
+ buff = g_strdup_printf ("F %10.0f\x0a", freq);
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(conf->port); /* Server port */
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
+ g_free(buff);
+ return(check_set_response(buffback,retcode,__FUNCTION__));
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to connect to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Connection opened to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- }
-
- /* send command */
- buff = g_strdup_printf ("F %10.0f\x0aq\x0a", freq);
-
- size = 15;
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: SIZE ERROR %d / %d"),
- __FUNCTION__, written, size);
- }
- g_free (buff);
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
- ctrl->wrops++;
-
- return TRUE;
}
@@ -2202,72 +2042,21 @@
* might become useful in the future.
*/
-static gboolean set_freq_toggle (GtkRigCtrl *ctrl, radio_conf_t *conf, gdouble freq)
+static gboolean set_freq_toggle (GtkRigCtrl *ctrl, gint sock, gdouble freq)
{
gchar *buff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
+ gchar buffback[128];
+ gboolean retcode;
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to create socket"),
- __FUNCTION__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Network socket created successfully"),
- __FUNCTION__);
- }
-
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to connect to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Connection opened to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- }
-
/* send command */
- buff = g_strdup_printf ("I %10.0f\x0aq\x0a", freq);
-
- size = 15;
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: SIZE ERROR %d / %d"),
- __FUNCTION__, written, size);
- }
- g_free (buff);
+ buff = g_strdup_printf ("I %10.0f\x0a", freq);
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
+ g_free(buff);
- close (sock);
-
- ctrl->wrops++;
-
- return TRUE;
+ return(check_set_response(buffback,retcode,__FUNCTION__));
+
}
@@ -2277,72 +2066,19 @@
* occurred.
*
*/
-static gboolean set_toggle (GtkRigCtrl *ctrl, radio_conf_t *conf)
+static gboolean set_toggle (GtkRigCtrl *ctrl, gint sock)
{
gchar *buff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
+ gchar buffback[128];
+ gboolean retcode;
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to create socket"),
- __FUNCTION__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Network socket created successfully"),
- __FUNCTION__);
- }
+ buff = g_strdup_printf ("S 1 %d\x0a",ctrl->conf->vfoDown);
+
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
+ g_free(buff);
+ return(check_set_response(buffback,retcode,__FUNCTION__));
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to connect to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Connection opened to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- }
-
- /* send command */
- buff = g_strdup_printf ("S 1 %d\x0aq\x0a",ctrl->conf->vfoDown);
-
- size = strlen(buff);
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: SIZE ERROR %d / %d"),
- __FUNCTION__, written, size);
- }
- g_free (buff);
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
- ctrl->wrops++;
-
- return TRUE;
}
/** \brief Turn off the radios toggle mode
@@ -2352,72 +2088,21 @@
*
*/
-static gboolean unset_toggle (GtkRigCtrl *ctrl, radio_conf_t *conf)
+static gboolean unset_toggle (GtkRigCtrl *ctrl, gint sock)
{
gchar *buff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
+ gchar buffback[128];
+ gboolean retcode;
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to create socket"),
- __FUNCTION__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Network socket created successfully"),
- __FUNCTION__);
- }
-
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to connect to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Connection opened to %s:%d"),
- __FUNCTION__, conf->host, conf->port);
- }
-
/* send command */
- buff = g_strdup_printf ("S 0 %d\x0aq\x0a",ctrl->conf->vfoDown);
-
- size = strlen(buff);
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: SIZE ERROR %d / %d"),
- __FUNCTION__, written, size);
- }
- g_free (buff);
+ buff = g_strdup_printf ("S 0 %d\x0a",ctrl->conf->vfoDown);
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
+ g_free(buff);
- close (sock);
-
- ctrl->wrops++;
-
- return TRUE;
+ return(check_set_response(buffback,retcode,__FUNCTION__));
+
}
@@ -2430,116 +2115,21 @@
* \return TRUE if the operation was successful, FALSE if a connection error
* occurred.
*/
-static gboolean get_freq_simplex (GtkRigCtrl *ctrl, radio_conf_t *conf, gdouble *freq)
+static gboolean get_freq_simplex (GtkRigCtrl *ctrl, gint sock, gdouble *freq)
{
gchar *buff,**vbuff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
+ gchar buffback[128];
+ gboolean retcode;
+ buff = g_strdup_printf ("f\x0a");
- if (freq == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%d: NULL storage."),
- __FILE__, __LINE__);
- return FALSE;
- }
-
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to create socket"),
- __FILE__, __LINE__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d Network socket created successfully"),
- __FILE__, __LINE__);
- }
-
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to connect to %s:%d"),
- __FILE__, __LINE__, conf->host, conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d: Connection opened to %s:%d"),
- __FILE__, __LINE__, conf->host, conf->port);
- }
-
- /* send command */
- buff = g_strdup_printf ("f\x0aq\x0a");
-
- size = 4;
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: SIZE ERROR %d / %d"),
- __FILE__, __LINE__, written, size);
- }
- g_free (buff);
-
-
- /* try to read answer */
- buff = g_try_malloc (128);
- if (buff == NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
- __FILE__, __FUNCTION__);
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
- return FALSE;
- }
-
- size = read (sock, buff, 127);
- if (size == 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Got 0 bytes from rigctld"),
- __FILE__, __FUNCTION__);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%s: Read %d bytes from rigctld"),
- __FILE__, __FUNCTION__, size);
-
- buff[size] = 0;
- vbuff = g_strsplit (buff, "\n", 3);
- *freq = g_ascii_strtod (vbuff[0], NULL);
-
- g_strfreev (vbuff);
- }
- g_free (buff);
-
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
-
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+ retcode=check_get_response(buffback,retcode,__FUNCTION__);
+ if (retcode) {
+ vbuff = g_strsplit (buffback, "\n", 3);
+ *freq = g_ascii_strtod (vbuff[0], NULL);
+ g_strfreev (vbuff);
+ }
return TRUE;
}
@@ -2550,16 +2140,12 @@
* occurred.
*/
-static gboolean get_freq_toggle (GtkRigCtrl *ctrl, radio_conf_t *conf, gdouble *freq)
+static gboolean get_freq_toggle (GtkRigCtrl *ctrl, gint sock, gdouble *freq)
{
gchar *buff,**vbuff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
+ gchar buffback[128];
+ gboolean retcode;
-
if (freq == NULL) {
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s:%d: NULL storage."),
@@ -2567,98 +2153,16 @@
return FALSE;
}
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to create socket"),
- __FILE__, __LINE__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d Network socket created successfully"),
- __FILE__, __LINE__);
- }
-
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: Failed to connect to %s:%d"),
- __FILE__, __LINE__, conf->host, conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d: Connection opened to %s:%d"),
- __FILE__, __LINE__, conf->host, conf->port);
- }
-
/* send command */
- buff = g_strdup_printf ("i\x0aq\x0a");
-
- size = 4;
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: SIZE ERROR %d / %d"),
- __FILE__, __LINE__, written, size);
- }
- g_free (buff);
-
-
- /* try to read answer */
- buff = g_try_malloc (128);
- if (buff == NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Failed to allocate 128 bytes (yes, this means trouble)"),
- __FILE__, __FUNCTION__);
+ buff = g_strdup_printf ("i\x0a");
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
- return FALSE;
- }
-
- size = read (sock, buff, 127);
- if (size == 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Got 0 bytes from rigctld"),
- __FILE__, __FUNCTION__);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%s: Read %d bytes from rigctld"),
- __FILE__, __FUNCTION__, size);
-
- buff[size] = 0;
- vbuff = g_strsplit (buff, "\n", 3);
- *freq = g_ascii_strtod (vbuff[0], NULL);
-
- g_strfreev (vbuff);
- }
- g_free (buff);
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
-
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+ retcode=check_get_response(buffback,retcode,__FUNCTION__);
+ if (retcode) {
+ vbuff = g_strsplit (buffback, "\n", 3);
+ *freq = g_ascii_strtod (vbuff[0], NULL);
+ g_strfreev (vbuff);
+ }
return TRUE;
}
@@ -2672,97 +2176,38 @@
static gboolean set_vfo (GtkRigCtrl *ctrl, vfo_t vfo)
{
gchar *buff;
- gint written,size;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
-
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to create socket"),
- __FUNCTION__);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Network socket created successfully"),
- __FUNCTION__);
- }
-
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(ctrl->conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to connect to %s:%d"),
- __FUNCTION__, ctrl->conf->host, ctrl->conf->port);
- return FALSE;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Connection opened to %s:%d"),
- __FUNCTION__, ctrl->conf->host, ctrl->conf->port);
- }
-
- /* prepare command */
+ gchar buffback[128];
+ gboolean retcode;
switch (vfo) {
case VFO_A:
- buff = g_strdup_printf ("V VFOA\x0aq\x0a");
- size = 9;
+ buff = g_strdup_printf ("V VFOA\x0a");
break;
case VFO_B:
- buff = g_strdup_printf ("V VFOB\x0aq\x0a");
- size = 9;
+ buff = g_strdup_printf ("V VFOB\x0a");
break;
case VFO_MAIN:
- buff = g_strdup_printf ("V Main\x0aq\x0a");
- size = 9;
+ buff = g_strdup_printf ("V Main\x0a");
break;
case VFO_SUB:
- buff = g_strdup_printf ("V Sub\x0aq\x0a");
- size = 8;
+ buff = g_strdup_printf ("V Sub\x0a");
break;
default:
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s: Invalid VFO argument. Using VFOA."),
__FUNCTION__);
- buff = g_strdup_printf ("V VFOA");
- size = 6;
+ buff = g_strdup_printf ("V VFOA\x0a");
break;
}
- /* send command */
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: SIZE ERROR %d / %d"),
- __FUNCTION__, written, size);
- }
- g_free (buff);
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
- ctrl->wrops++;
-
- return TRUE;
+ retcode=send_rigctld_command(ctrl,ctrl->sock,buff,buffback,128);
+
+ g_free(buff);
+
+ return(check_set_response(buffback,retcode,__FUNCTION__));
}
@@ -2926,6 +2371,8 @@
if (g_str_has_suffix (filename, ".rig")) {
i++;
+ /*once we have one we are done*/
+ break;
}
}
}
@@ -3048,64 +2495,51 @@
-gboolean send_rigctld_command(GtkRigCtrl *ctrl, gchar *buff, gint size)
+
+gboolean send_rigctld_command(GtkRigCtrl *ctrl, gint sock, gchar *buff, gchar *buffout, gint sizeout)
{
gint written;
- gint status;
- struct hostent *h;
- struct sockaddr_in ServAddr;
- gint sock; /*!< Network socket */
+ gint size;
+
+ size = strlen(buff)-1;
- /* create socket */
- sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (sock < 0) {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%s: sending %d bytes to rigctld as \"%s\""),
+ __FILE__, __FUNCTION__, size, buff);
+ /* send command */
+ written = send(sock, buff, strlen(buff), 0);
+ if (written != size) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to create socket"),
+ _("%s: SIZE ERROR %d / %d"),
+ __FUNCTION__, written, size);
+ }
+ if (written == -1) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: rigctld port closed"),
__FUNCTION__);
- return FALSE;
+ return FALSE;
}
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Network socket created successfully"),
+ /* try to read answer */
+ size = read (sock, buffout, 127);
+ if (size == -1) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: rigctld port closed"),
__FUNCTION__);
+ return FALSE;
}
- memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
- ServAddr.sin_family = AF_INET; /* Internet address family */
- h = gethostbyname(ctrl->conf->host);
- memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- ServAddr.sin_port = htons(ctrl->conf->port); /* Server port */
-
- /* establish connection */
- status = connect(sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
- if (status < 0) {
+ buffout[size]='\0';
+ if (size == 0) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to connect to %s:%d"),
- __FUNCTION__, ctrl->conf->host, ctrl->conf->port);
- return FALSE;
+ _("%s:%s: Got 0 bytes from rigctld"),
+ __FILE__, __FUNCTION__);
}
else {
sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Connection opened to %s:%d"),
- __FUNCTION__, ctrl->conf->host, ctrl->conf->port);
+ _("%s:%s: Read %d bytes from rigctld"),
+ __FILE__, __FUNCTION__, size);
+
}
-
- /* send command */
- written = send(sock, buff, size, 0);
- if (written != size) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: SIZE ERROR %d / %d"),
- __FUNCTION__, written, size);
- }
-
-#ifndef WIN32
- shutdown (sock, SHUT_RDWR);
-#else
- shutdown (sock, SD_BOTH);
-#endif
-
- close (sock);
-
ctrl->wrops++;
return TRUE;
@@ -3202,7 +2636,7 @@
}
else {
- ptt = get_ptt (ctrl, ctrl->conf);
+ ptt = get_ptt (ctrl, ctrl->sock);
if (ptt == FALSE) {
/* PTT is OFF => set TX freq then set PTT to ON */
@@ -3211,7 +2645,7 @@
__FUNCTION__);
exec_toggle_tx_cycle (ctrl);
- set_ptt(ctrl, ctrl->conf, TRUE);
+ set_ptt(ctrl, ctrl->sock, TRUE);
}
else {
/* PTT is ON => set to OFF */
@@ -3219,7 +2653,7 @@
_("%s: PTT is ON = Set PTT=OFF"),
__FUNCTION__);
- set_ptt(ctrl, ctrl->conf, FALSE);
+ set_ptt(ctrl, ctrl->sock, FALSE);
}
}
@@ -3233,3 +2667,94 @@
}
}
+
+
+static gboolean open_rigctld_socket (radio_conf_t *conf, gint *sock) {
+ struct sockaddr_in ServAddr;
+ struct hostent *h;
+ gint status;
+
+ *sock=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+ if (*sock < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Failed to create socket"),
+ __FUNCTION__);
+ return FALSE;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Network socket created successfully"),
+ __FUNCTION__);
+ }
+
+ memset(&ServAddr, 0, sizeof(ServAddr)); /* Zero out structure */
+ ServAddr.sin_family = AF_INET; /* Internet address family */
+ h = gethostbyname(conf->host);
+ memcpy((char *) &ServAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
+ ServAddr.sin_port = htons(conf->port); /* Server port */
+
+ /* establish connection */
+ status = connect(*sock, (struct sockaddr *) &ServAddr, sizeof(ServAddr));
+ if (status < 0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Failed to connect to %s:%d"),
+ __FUNCTION__, conf->host, conf->port);
+ return FALSE;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Connection opened to %s:%d"),
+ __FUNCTION__, conf->host, conf->port);
+ }
+
+ return TRUE;
+}
+
+static gboolean close_rigctld_socket (gint sock) {
+ gint written;
+ /*shutdown the rigctld connect*/
+ written = send(sock, "q\x0a", 2, 0);
+
+#ifndef WIN32
+ shutdown (sock, SHUT_RDWR);
+#else
+ shutdown (sock, SD_BOTH);
+#endif
+
+ close (sock);
+
+ return TRUE;
+}
+
+/*simple function to sort the list of satellites in the combo box.*/
+static gint sat_name_compare (sat_t* a,sat_t*b){
+ return (g_ascii_strcasecmp(a->nickname,b->nickname));
+}
+
+static gint rig_name_compare (const gchar* a,const gchar *b){
+ return (g_ascii_strcasecmp(a,b));
+}
+
+static inline gboolean check_set_response (gchar *buffback,gboolean retcode,const gchar *function){
+ if (retcode==TRUE)
+ if (strncmp(buffback,"RPRT 0",6)!=0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: %s rigctld returned error (%s)"),
+ __FILE__,function,buffback);
+
+ retcode=FALSE;
+ }
+ return retcode;
+}
+
+static inline gboolean check_get_response (gchar *buffback,gboolean retcode,const gchar *function){
+ if (retcode==TRUE)
+ if (strncmp(buffback,"RPRT",4)==0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: %s rigctld returned error (%s)"),
+ __FILE__,function,buffback);
+
+ retcode=FALSE;
+ }
+ return retcode;
+}
Property changes on: trunk/src/gtk-rig-ctrl.c
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/continuous_network/src/gtk-rig-ctrl.c:655-689
Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h 2010-10-17 14:30:56 UTC (rev 690)
+++ trunk/src/gtk-rig-ctrl.h 2010-10-17 16:29:44 UTC (rev 691)
@@ -108,7 +108,9 @@
glong last_toggle_tx; /*!< Last time when exec_toggle_tx_cycle() was executed (seconds)
-1 indicates that an update should be performed ASAP */
-
+
+ gint sock, sock2; /*!< Sockets for controlling the radio(s). */
+
/* debug related */
guint wrops;
guint rdops;
Property changes on: trunk/src/gtk-rig-ctrl.h
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/continuous_network/src/gtk-rig-ctrl.h:655-689
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2010-10-27 15:53:59
|
Revision: 692
http://gpredict.svn.sourceforge.net/gpredict/?rev=692&view=rev
Author: aa1vs
Date: 2010-10-27 15:53:53 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
Added support for "flipped" passes
Modified Paths:
--------------
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2010-10-17 16:29:44 UTC (rev 691)
+++ trunk/src/gtk-rot-ctrl.c 2010-10-27 15:53:53 UTC (rev 692)
@@ -97,6 +97,9 @@
static gint sat_name_compare (sat_t* a,sat_t*b);
static gint rot_name_compare (const gchar* a,const gchar *b);
+static gboolean is_flipped_pass (pass_t * pass,rot_az_type_t type);
+static inline void set_flipped_pass (GtkRotCtrl* ctrl);
+
static GtkVBoxClass *parent_class = NULL;
static GdkColor ColBlack = { 0, 0, 0, 0};
@@ -301,7 +304,8 @@
/* we need to update the pass */
free_pass (ctrl->pass);
ctrl->pass = get_pass (ctrl->target, ctrl->qth, t, 3.0);
-
+ set_flipped_pass(ctrl);
+
/* update polar plot */
gtk_polar_plot_set_pass (GTK_POLAR_PLOT (ctrl->plot), ctrl->pass);
}
@@ -314,7 +318,7 @@
else {
ctrl->pass = get_pass (ctrl->target, ctrl->qth, t, 3.0);
}
-
+ set_flipped_pass(ctrl);
/* update polar plot */
gtk_polar_plot_set_pass (GTK_POLAR_PLOT (ctrl->plot), ctrl->pass);
}
@@ -652,6 +656,9 @@
ctrl->pass = get_current_pass (ctrl->target, ctrl->qth, ctrl->t);
else
ctrl->pass = get_pass (ctrl->target, ctrl->qth, ctrl->t, 3.0);
+
+ set_flipped_pass(ctrl);
+
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -761,6 +768,9 @@
/* update new ranges of the Az and El controller widgets */
gtk_rot_knob_set_range (GTK_ROT_KNOB (ctrl->AzSet), ctrl->conf->minaz, ctrl->conf->maxaz);
gtk_rot_knob_set_range (GTK_ROT_KNOB (ctrl->ElSet), ctrl->conf->minel, ctrl->conf->maxel);
+
+ /*Update flipped when changing rotor if there is a plot*/
+ set_flipped_pass(ctrl);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -842,26 +852,45 @@
if (ctrl->tracking && ctrl->target) {
if (ctrl->target->el < 0.0) {
gdouble aosaz = 0.0;
-
+ gdouble aosel = 0.0;
+
if (ctrl->pass != NULL) {
aosaz = ctrl->pass->aos_az;
-
+ /* if this is a flipped pass and the rotor supports it*/
+ if ((ctrl->flipped)&&(ctrl->conf->maxel>=180.0)){
+ aosel=180;
+ if (aosaz>180)
+ aosaz-=180;
+ else
+ aosaz+=180;
+ }
+
if ((ctrl->conf->aztype == ROT_AZ_TYPE_180) && (aosaz > 180.0)) {
aosaz -= 360.0;
}
}
gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->AzSet), aosaz);
- gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->ElSet), 0.0);
+ gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->ElSet), aosel);
}
else {
+ setaz=ctrl->target->az;
+ setel=ctrl->target->el;
+ if ((ctrl->flipped)&&(ctrl->conf->maxel>=180.0)){
+ setel=180-setel;
+ if (setaz>180)
+ setaz-=180;
+ else
+ setaz+=180;
+ }
+
if ((ctrl->conf->aztype == ROT_AZ_TYPE_180) &&
- (ctrl->target->az > 180.0)) {
- gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->AzSet), ctrl->target->az - 360.0);
+ (setaz > 180.0)) {
+ gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->AzSet), setaz- 360.0);
}
else {
- gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->AzSet), ctrl->target->az);
+ gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->AzSet), setaz);
}
- gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->ElSet), ctrl->target->el);
+ gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->ElSet), setel);
}
}
@@ -1284,3 +1313,69 @@
static gint rot_name_compare (const gchar* a,const gchar *b){
return (g_ascii_strcasecmp(a,b));
}
+
+
+/** \brief Compute if a pass is flipped or not. this is a function of the rotator and the particular pass.
+ */
+static gboolean is_flipped_pass (pass_t * pass,rot_az_type_t type){
+ gdouble max_az,min_az;
+ gdouble caz,last_az=pass->aos_az;
+ guint num,i;
+ pass_detail_t *detail;
+ gboolean retval=FALSE;
+
+ num = g_slist_length (pass->details);
+ if (type==ROT_AZ_TYPE_360) {
+ min_az = 0;
+ max_az = 360;
+ }
+ else if (type==ROT_AZ_TYPE_180) {
+ min_az = -180;
+ max_az = 180;
+ }
+
+ /* Assume that min_az and max_az are atleat 360 degrees apart*/
+ /*get the azimuth that is in a settable range*/
+ while (last_az>max_az) {
+ last_az-=360;
+ }
+ while (last_az<min_az) {
+ last_az+=360;
+ }
+
+ for (i = 1; i < num-1; i++) {
+ detail = PASS_DETAIL(g_slist_nth_data (pass->details, i));
+ caz=detail->az;
+ while (caz>max_az) {
+ caz-=360;
+ }
+ while (caz<min_az) {
+ caz+=360;
+ }
+ if (fabs(caz-last_az)>180) {
+ retval=TRUE;
+ }
+ last_az=caz;
+
+ }
+ caz=pass->los_az;
+ while (caz>max_az) {
+ caz-=360;
+ }
+ while (caz<min_az) {
+ caz+=360;
+ }
+ if (fabs(caz-last_az)>180) {
+ retval=TRUE;
+ }
+
+ return retval;
+}
+
+static inline void set_flipped_pass (GtkRotCtrl* ctrl){
+ if (ctrl->conf)
+ if (ctrl->pass){
+ ctrl->flipped=is_flipped_pass(ctrl->pass,ctrl->conf->aztype);
+ }
+
+}
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2010-10-17 16:29:44 UTC (rev 691)
+++ trunk/src/gtk-rot-ctrl.h 2010-10-27 15:53:53 UTC (rev 692)
@@ -83,7 +83,8 @@
sat_t *target; /*!< Target satellite */
pass_t *pass; /*!< Next pass of target satellite */
qth_t *qth; /*!< The QTH for this module */
-
+ gboolean flipped; /*!< Whether the current pass loaded is a flip pass or not */
+
guint delay; /*!< Timeout delay. */
guint timerid; /*!< Timer ID */
gdouble tolerance; /*!< Error tolerance */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2010-10-30 22:47:06
|
Revision: 695
http://gpredict.svn.sourceforge.net/gpredict/?rev=695&view=rev
Author: aa1vs
Date: 2010-10-30 22:46:59 +0000 (Sat, 30 Oct 2010)
Log Message:
-----------
Change tab to spaces and change emacs indent-tabs-mode
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rig-ctrl.h
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-rot-ctrl.h
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2010-10-29 02:10:37 UTC (rev 694)
+++ trunk/src/gtk-rig-ctrl.c 2010-10-30 22:46:59 UTC (rev 695)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -660,7 +660,7 @@
gchar *dirname; /* directory name */
gchar **vbuff;
const gchar *filename; /* file name */
- gchar *rigname;
+ gchar *rigname;
table = gtk_table_new (4, 3, FALSE);
@@ -684,26 +684,26 @@
dir = g_dir_open (dirname, 0, &error);
if (dir) {
/* read each .rig file */
- GSList *rigs=NULL;
- gint i;
- gint n;
+ GSList *rigs=NULL;
+ gint i;
+ gint n;
while ((filename = g_dir_read_name (dir))) {
if (g_str_has_suffix (filename, ".rig")) {
- vbuff = g_strsplit (filename, ".rig", 0);
- rigs=g_slist_insert_sorted(rigs,g_strdup(vbuff[0]),(GCompareFunc)rig_name_compare);
+ vbuff = g_strsplit (filename, ".rig", 0);
+ rigs=g_slist_insert_sorted(rigs,g_strdup(vbuff[0]),(GCompareFunc)rig_name_compare);
g_strfreev (vbuff);
}
}
- n = g_slist_length (rigs);
- for (i = 0; i < n; i++) {
- rigname = g_slist_nth_data (rigs, i);
- if (rigname) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), rigname);
- g_free(rigname);
- }
- }
- g_slist_free(rigs);
+ n = g_slist_length (rigs);
+ for (i = 0; i < n; i++) {
+ rigname = g_slist_nth_data (rigs, i);
+ if (rigname) {
+ gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), rigname);
+ g_free(rigname);
+ }
+ }
+ g_slist_free(rigs);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -829,7 +829,7 @@
sat_t *sat = SAT (value);
//ctrl->sats = g_slist_append (ctrl->sats, sat);
- ctrl->sats = g_slist_insert_sorted (ctrl->sats, sat, (GCompareFunc)sat_name_compare);
+ ctrl->sats = g_slist_insert_sorted (ctrl->sats, sat, (GCompareFunc)sat_name_compare);
}
@@ -1180,13 +1180,13 @@
{
GtkRigCtrl *ctrl = GTK_RIG_CTRL (data);
- if (ctrl->conf == NULL) {
- /* we don't have a working configuration */
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Controller does not have a valid configuration"),
- __FUNCTION__);
- return;
- }
+ if (ctrl->conf == NULL) {
+ /* we don't have a working configuration */
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Controller does not have a valid configuration"),
+ __FUNCTION__);
+ return;
+ }
if (!gtk_toggle_button_get_active (button)) {
@@ -1200,14 +1200,14 @@
if ((ctrl->conf->type == RIG_TYPE_TOGGLE_AUTO) ||
(ctrl->conf->type == RIG_TYPE_TOGGLE_MAN)) {
unset_toggle (ctrl,ctrl->sock);
- }
+ }
if (ctrl->conf2 != NULL) {
- close_rigctld_socket(ctrl->sock2);
- }
- close_rigctld_socket(ctrl->sock);
-
+ close_rigctld_socket(ctrl->sock2);
+ }
+ close_rigctld_socket(ctrl->sock);
+
}
else {
@@ -1304,14 +1304,14 @@
{
GtkRigCtrl *ctrl = GTK_RIG_CTRL (data);
if (ctrl->conf == NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Controller does not have a valid configuration"),
- __FUNCTION__);
- return (TRUE);
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Controller does not have a valid configuration"),
+ __FUNCTION__);
+ return (TRUE);
- }
-
-
+ }
+
+
if (g_static_mutex_trylock(&(ctrl->busy))==FALSE) {
sat_log_log (SAT_LOG_LEVEL_ERROR,_("%s missed the deadline"),__FUNCTION__);
return TRUE;
@@ -1947,8 +1947,8 @@
static gboolean get_ptt (GtkRigCtrl *ctrl, gint sock)
{
gchar *buff,**vbuff;
- gchar buffback[128];
- gboolean retcode;
+ gchar buffback[128];
+ gboolean retcode;
guint64 pttstat = 0;
@@ -1962,14 +1962,14 @@
buff = g_strdup_printf ("%c\x0a",0x8b);
}
- retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
- if (retcode) {
- vbuff = g_strsplit (buffback, "\n", 3);
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+ if (retcode) {
+ vbuff = g_strsplit (buffback, "\n", 3);
pttstat = g_ascii_strtoull (vbuff[0], NULL, 0); //FIXME base = 0 ok?
g_strfreev (vbuff);
}
- g_free (buff);
+ g_free (buff);
return (pttstat == 1) ? TRUE : FALSE;
@@ -1985,7 +1985,7 @@
static gboolean set_ptt (GtkRigCtrl *ctrl, gint sock, gboolean ptt)
{
gchar *buff;
- gchar buffback[128];
+ gchar buffback[128];
gboolean retcode;
/* send command */
@@ -1996,10 +1996,10 @@
buff = g_strdup_printf ("T 0\x0aq\x0a");
}
- retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
-
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
g_free (buff);
- return(check_set_response(buffback,retcode,__FUNCTION__));
+ return(check_set_response(buffback,retcode,__FUNCTION__));
}
@@ -2018,15 +2018,15 @@
static gboolean set_freq_simplex (GtkRigCtrl *ctrl, gint sock, gdouble freq)
{
gchar *buff;
- gchar buffback[128];
- gboolean retcode;
+ gchar buffback[128];
+ gboolean retcode;
buff = g_strdup_printf ("F %10.0f\x0a", freq);
- retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
-
- g_free(buff);
- return(check_set_response(buffback,retcode,__FUNCTION__));
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
+ g_free(buff);
+ return(check_set_response(buffback,retcode,__FUNCTION__));
}
@@ -2045,17 +2045,17 @@
static gboolean set_freq_toggle (GtkRigCtrl *ctrl, gint sock, gdouble freq)
{
gchar *buff;
- gchar buffback[128];
- gboolean retcode;
+ gchar buffback[128];
+ gboolean retcode;
/* send command */
buff = g_strdup_printf ("I %10.0f\x0a", freq);
- retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
-
- g_free(buff);
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
+ g_free(buff);
- return(check_set_response(buffback,retcode,__FUNCTION__));
+ return(check_set_response(buffback,retcode,__FUNCTION__));
}
@@ -2069,15 +2069,15 @@
static gboolean set_toggle (GtkRigCtrl *ctrl, gint sock)
{
gchar *buff;
- gchar buffback[128];
- gboolean retcode;
+ gchar buffback[128];
+ gboolean retcode;
buff = g_strdup_printf ("S 1 %d\x0a",ctrl->conf->vfoDown);
-
- retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
-
- g_free(buff);
- return(check_set_response(buffback,retcode,__FUNCTION__));
+
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
+ g_free(buff);
+ return(check_set_response(buffback,retcode,__FUNCTION__));
}
@@ -2091,17 +2091,17 @@
static gboolean unset_toggle (GtkRigCtrl *ctrl, gint sock)
{
gchar *buff;
- gchar buffback[128];
- gboolean retcode;
+ gchar buffback[128];
+ gboolean retcode;
/* send command */
buff = g_strdup_printf ("S 0 %d\x0a",ctrl->conf->vfoDown);
- retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
-
- g_free(buff);
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+
+ g_free(buff);
- return(check_set_response(buffback,retcode,__FUNCTION__));
+ return(check_set_response(buffback,retcode,__FUNCTION__));
}
@@ -2118,18 +2118,18 @@
static gboolean get_freq_simplex (GtkRigCtrl *ctrl, gint sock, gdouble *freq)
{
gchar *buff,**vbuff;
- gchar buffback[128];
- gboolean retcode;
+ gchar buffback[128];
+ gboolean retcode;
buff = g_strdup_printf ("f\x0a");
- retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
- retcode=check_get_response(buffback,retcode,__FUNCTION__);
- if (retcode) {
- vbuff = g_strsplit (buffback, "\n", 3);
- *freq = g_ascii_strtod (vbuff[0], NULL);
- g_strfreev (vbuff);
- }
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+ retcode=check_get_response(buffback,retcode,__FUNCTION__);
+ if (retcode) {
+ vbuff = g_strsplit (buffback, "\n", 3);
+ *freq = g_ascii_strtod (vbuff[0], NULL);
+ g_strfreev (vbuff);
+ }
return TRUE;
}
@@ -2143,8 +2143,8 @@
static gboolean get_freq_toggle (GtkRigCtrl *ctrl, gint sock, gdouble *freq)
{
gchar *buff,**vbuff;
- gchar buffback[128];
- gboolean retcode;
+ gchar buffback[128];
+ gboolean retcode;
if (freq == NULL) {
sat_log_log (SAT_LOG_LEVEL_BUG,
@@ -2156,13 +2156,13 @@
/* send command */
buff = g_strdup_printf ("i\x0a");
- retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
- retcode=check_get_response(buffback,retcode,__FUNCTION__);
- if (retcode) {
- vbuff = g_strsplit (buffback, "\n", 3);
- *freq = g_ascii_strtod (vbuff[0], NULL);
- g_strfreev (vbuff);
- }
+ retcode=send_rigctld_command(ctrl,sock,buff,buffback,128);
+ retcode=check_get_response(buffback,retcode,__FUNCTION__);
+ if (retcode) {
+ vbuff = g_strsplit (buffback, "\n", 3);
+ *freq = g_ascii_strtod (vbuff[0], NULL);
+ g_strfreev (vbuff);
+ }
return TRUE;
}
@@ -2176,38 +2176,38 @@
static gboolean set_vfo (GtkRigCtrl *ctrl, vfo_t vfo)
{
gchar *buff;
- gchar buffback[128];
+ gchar buffback[128];
gboolean retcode;
switch (vfo) {
case VFO_A:
- buff = g_strdup_printf ("V VFOA\x0a");
+ buff = g_strdup_printf ("V VFOA\x0a");
break;
case VFO_B:
- buff = g_strdup_printf ("V VFOB\x0a");
+ buff = g_strdup_printf ("V VFOB\x0a");
break;
case VFO_MAIN:
- buff = g_strdup_printf ("V Main\x0a");
+ buff = g_strdup_printf ("V Main\x0a");
break;
case VFO_SUB:
- buff = g_strdup_printf ("V Sub\x0a");
+ buff = g_strdup_printf ("V Sub\x0a");
break;
default:
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s: Invalid VFO argument. Using VFOA."),
__FUNCTION__);
- buff = g_strdup_printf ("V VFOA\x0a");
+ buff = g_strdup_printf ("V VFOA\x0a");
break;
}
- retcode=send_rigctld_command(ctrl,ctrl->sock,buff,buffback,128);
+ retcode=send_rigctld_command(ctrl,ctrl->sock,buff,buffback,128);
- g_free(buff);
-
- return(check_set_response(buffback,retcode,__FUNCTION__));
+ g_free(buff);
+
+ return(check_set_response(buffback,retcode,__FUNCTION__));
}
@@ -2371,8 +2371,8 @@
if (g_str_has_suffix (filename, ".rig")) {
i++;
- /*once we have one we are done*/
- break;
+ /*once we have one we are done*/
+ break;
}
}
}
@@ -2499,13 +2499,13 @@
gboolean send_rigctld_command(GtkRigCtrl *ctrl, gint sock, gchar *buff, gchar *buffout, gint sizeout)
{
gint written;
- gint size;
-
- size = strlen(buff)-1;
+ gint size;
+
+ size = strlen(buff)-1;
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%s: sending %d bytes to rigctld as \"%s\""),
- __FILE__, __FUNCTION__, size, buff);
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%s: sending %d bytes to rigctld as \"%s\""),
+ __FILE__, __FUNCTION__, size, buff);
/* send command */
written = send(sock, buff, strlen(buff), 0);
if (written != size) {
@@ -2517,7 +2517,7 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: rigctld port closed"),
__FUNCTION__);
- return FALSE;
+ return FALSE;
}
/* try to read answer */
size = read (sock, buffout, 127);
@@ -2525,10 +2525,10 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: rigctld port closed"),
__FUNCTION__);
- return FALSE;
+ return FALSE;
}
- buffout[size]='\0';
+ buffout[size]='\0';
if (size == 0) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%s: Got 0 bytes from rigctld"),
@@ -2670,12 +2670,12 @@
static gboolean open_rigctld_socket (radio_conf_t *conf, gint *sock) {
- struct sockaddr_in ServAddr;
- struct hostent *h;
- gint status;
+ struct sockaddr_in ServAddr;
+ struct hostent *h;
+ gint status;
- *sock=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
- if (*sock < 0) {
+ *sock=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+ if (*sock < 0) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: Failed to create socket"),
__FUNCTION__);
@@ -2707,7 +2707,7 @@
__FUNCTION__, conf->host, conf->port);
}
- return TRUE;
+ return TRUE;
}
static gboolean close_rigctld_socket (gint sock) {
@@ -2728,33 +2728,33 @@
/*simple function to sort the list of satellites in the combo box.*/
static gint sat_name_compare (sat_t* a,sat_t*b){
- return (g_ascii_strcasecmp(a->nickname,b->nickname));
+ return (g_ascii_strcasecmp(a->nickname,b->nickname));
}
static gint rig_name_compare (const gchar* a,const gchar *b){
- return (g_ascii_strcasecmp(a,b));
+ return (g_ascii_strcasecmp(a,b));
}
static inline gboolean check_set_response (gchar *buffback,gboolean retcode,const gchar *function){
- if (retcode==TRUE)
- if (strncmp(buffback,"RPRT 0",6)!=0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: %s rigctld returned error (%s)"),
- __FILE__,function,buffback);
-
- retcode=FALSE;
- }
- return retcode;
+ if (retcode==TRUE)
+ if (strncmp(buffback,"RPRT 0",6)!=0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: %s rigctld returned error (%s)"),
+ __FILE__,function,buffback);
+
+ retcode=FALSE;
+ }
+ return retcode;
}
static inline gboolean check_get_response (gchar *buffback,gboolean retcode,const gchar *function){
- if (retcode==TRUE)
- if (strncmp(buffback,"RPRT",4)==0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: %s rigctld returned error (%s)"),
- __FILE__,function,buffback);
-
- retcode=FALSE;
- }
- return retcode;
+ if (retcode==TRUE)
+ if (strncmp(buffback,"RPRT",4)==0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: %s rigctld returned error (%s)"),
+ __FILE__,function,buffback);
+
+ retcode=FALSE;
+ }
+ return retcode;
}
Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h 2010-10-29 02:10:37 UTC (rev 694)
+++ trunk/src/gtk-rig-ctrl.h 2010-10-30 22:46:59 UTC (rev 695)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -98,7 +98,7 @@
guint timerid; /*!< Timer ID */
gboolean tracking; /*!< Flag set when we are tracking a target. */
- GStaticMutex busy;/*!< Flag set when control algorithm is busy. */
+ GStaticMutex busy;/*!< Flag set when control algorithm is busy. */
gboolean engaged; /*!< Flag indicating that rig device is engaged. */
gint errcnt; /*!< Error counter. */
@@ -108,8 +108,8 @@
glong last_toggle_tx; /*!< Last time when exec_toggle_tx_cycle() was executed (seconds)
-1 indicates that an update should be performed ASAP */
-
- gint sock, sock2; /*!< Sockets for controlling the radio(s). */
+
+ gint sock, sock2; /*!< Sockets for controlling the radio(s). */
/* debug related */
guint wrops;
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2010-10-29 02:10:37 UTC (rev 694)
+++ trunk/src/gtk-rot-ctrl.c 2010-10-30 22:46:59 UTC (rev 695)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -193,7 +193,7 @@
g_free (ctrl->conf);
ctrl->conf = NULL;
}
-
+
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
@@ -228,19 +228,19 @@
GTK_ROT_CTRL (widget)->qth = module->qth;
/* get next pass for target satellite */
- if (GTK_ROT_CTRL (widget)->target){
- if (GTK_ROT_CTRL (widget)->target->el > 0.0) {
- GTK_ROT_CTRL (widget)->pass = get_current_pass (GTK_ROT_CTRL (widget)->target,
- GTK_ROT_CTRL (widget)->qth,
- 0.0);
- }
- else {
- GTK_ROT_CTRL (widget)->pass = get_next_pass (GTK_ROT_CTRL (widget)->target,
- GTK_ROT_CTRL (widget)->qth,
- 3.0);
- }
- }
-
+ if (GTK_ROT_CTRL (widget)->target){
+ if (GTK_ROT_CTRL (widget)->target->el > 0.0) {
+ GTK_ROT_CTRL (widget)->pass = get_current_pass (GTK_ROT_CTRL (widget)->target,
+ GTK_ROT_CTRL (widget)->qth,
+ 0.0);
+ }
+ else {
+ GTK_ROT_CTRL (widget)->pass = get_next_pass (GTK_ROT_CTRL (widget)->target,
+ GTK_ROT_CTRL (widget)->qth,
+ 3.0);
+ }
+ }
+
/* initialise custom colors */
gdk_rgb_find_color (gtk_widget_get_colormap (widget), &ColBlack);
gdk_rgb_find_color (gtk_widget_get_colormap (widget), &ColWhite);
@@ -487,7 +487,7 @@
gchar *dirname; /* directory name */
gchar **vbuff;
const gchar *filename; /* file name */
- gchar *rotname;
+ gchar *rotname;
table = gtk_table_new (3, 3, FALSE);
@@ -509,27 +509,27 @@
dir = g_dir_open (dirname, 0, &error);
if (dir) {
/* read each .rot file */
- GSList *rots=NULL;
- gint i;
- gint n;
+ GSList *rots=NULL;
+ gint i;
+ gint n;
while ((filename = g_dir_read_name (dir))) {
if (g_str_has_suffix (filename, ".rot")) {
vbuff = g_strsplit (filename, ".rot", 0);
- rots=g_slist_insert_sorted(rots,g_strdup(vbuff[0]),(GCompareFunc)rot_name_compare);
+ rots=g_slist_insert_sorted(rots,g_strdup(vbuff[0]),(GCompareFunc)rot_name_compare);
g_strfreev (vbuff);
}
}
- n = g_slist_length (rots);
- for (i = 0; i < n; i++) {
- rotname = g_slist_nth_data (rots, i);
- if (rotname) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), rotname);
- g_free(rotname);
- }
- }
- g_slist_free(rots);
+ n = g_slist_length (rots);
+ for (i = 0; i < n; i++) {
+ rotname = g_slist_nth_data (rots, i);
+ if (rotname) {
+ gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), rotname);
+ g_free(rotname);
+ }
+ }
+ g_slist_free(rots);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -628,7 +628,7 @@
sat_t *sat = SAT (value);
//ctrl->sats = g_slist_append (ctrl->sats, sat);
- ctrl->sats = g_slist_insert_sorted (ctrl->sats, sat, (GCompareFunc)sat_name_compare);
+ ctrl->sats = g_slist_insert_sorted (ctrl->sats, sat, (GCompareFunc)sat_name_compare);
}
@@ -769,8 +769,8 @@
gtk_rot_knob_set_range (GTK_ROT_KNOB (ctrl->AzSet), ctrl->conf->minaz, ctrl->conf->maxaz);
gtk_rot_knob_set_range (GTK_ROT_KNOB (ctrl->ElSet), ctrl->conf->minel, ctrl->conf->maxel);
- /*Update flipped when changing rotor if there is a plot*/
- set_flipped_pass(ctrl);
+ /*Update flipped when changing rotor if there is a plot*/
+ set_flipped_pass(ctrl);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -801,7 +801,7 @@
if (!gtk_toggle_button_get_active (button)) {
gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
ctrl->engaged = FALSE;
- close_rotctld_socket(ctrl->sock);
+ close_rotctld_socket(ctrl->sock);
gtk_label_set_text (GTK_LABEL (ctrl->AzRead), "---");
gtk_label_set_text (GTK_LABEL (ctrl->ElRead), "---");
}
@@ -860,8 +860,8 @@
if (aosaz>180)
aosaz-=180;
else
- aosaz+=180;
- }
+ aosaz+=180;
+ }
if ((ctrl->conf->aztype == ROT_AZ_TYPE_180) && (aosaz > 180.0)) {
aosaz -= 360.0;
@@ -966,19 +966,19 @@
}
/* update controller circle on polar plot */
- if (ctrl->conf !=NULL){
- if ((ctrl->conf->aztype == ROT_AZ_TYPE_180) && (rotaz < 0.0)) {
- gtk_polar_plot_set_ctrl_pos (GTK_POLAR_PLOT (ctrl->plot),
- gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet))+360.0,
- gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet)));
- }
- else {
- gtk_polar_plot_set_ctrl_pos (GTK_POLAR_PLOT (ctrl->plot),
- gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet)),
- gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet)));
- }
+ if (ctrl->conf !=NULL){
+ if ((ctrl->conf->aztype == ROT_AZ_TYPE_180) && (rotaz < 0.0)) {
+ gtk_polar_plot_set_ctrl_pos (GTK_POLAR_PLOT (ctrl->plot),
+ gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet))+360.0,
+ gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet)));
+ }
+ else {
+ gtk_polar_plot_set_ctrl_pos (GTK_POLAR_PLOT (ctrl->plot),
+ gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet)),
+ gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet)));
+ }
}
- g_static_mutex_unlock(&(ctrl->busy));
+ g_static_mutex_unlock(&(ctrl->busy));
return TRUE;
}
@@ -994,9 +994,9 @@
static gboolean get_pos (GtkRotCtrl *ctrl, gdouble *az, gdouble *el)
{
gchar *buff,**vbuff;
- gchar buffback[128];
- gboolean retcode;
-
+ gchar buffback[128];
+ gboolean retcode;
+
if ((az == NULL) || (el == NULL)) {
sat_log_log (SAT_LOG_LEVEL_BUG,
_("%s:%d: NULL storage."),
@@ -1007,24 +1007,24 @@
/* send command */
buff = g_strdup_printf ("p\x0a");
- retcode=send_rotctld_command(ctrl,buff,buffback,128);
+ retcode=send_rotctld_command(ctrl,buff,buffback,128);
/* try to read answer */
- if (retcode) {
- if (strncmp(buffback,"RPRT",4)==0){
- retcode=FALSE;
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: rotctld returned error (%s)"),
- __FILE__, __LINE__,buffback);
+ if (retcode) {
+ if (strncmp(buffback,"RPRT",4)==0){
+ retcode=FALSE;
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: rotctld returned error (%s)"),
+ __FILE__, __LINE__,buffback);
- } else {
- vbuff = g_strsplit (buffback, "\n", 3);
- *az = g_strtod (vbuff[0], NULL);
- *el = g_strtod (vbuff[1], NULL);
-
- g_strfreev (vbuff);
- }
- }
+ } else {
+ vbuff = g_strsplit (buffback, "\n", 3);
+ *az = g_strtod (vbuff[0], NULL);
+ *el = g_strtod (vbuff[1], NULL);
+
+ g_strfreev (vbuff);
+ }
+ }
g_free (buff);
@@ -1045,27 +1045,27 @@
static gboolean set_pos (GtkRotCtrl *ctrl, gdouble az, gdouble el)
{
gchar *buff;
- gchar buffback[128];
+ gchar buffback[128];
gchar azstr[8],elstr[8];
- gboolean retcode;
+ gboolean retcode;
/* send command */
g_ascii_formatd (azstr, 8, "%7.2f", az);
g_ascii_formatd (elstr, 8, "%7.2f", el);
buff = g_strdup_printf ("P %s %s\x0a", azstr, elstr);
- retcode=send_rotctld_command(ctrl,buff,buffback,128);
+ retcode=send_rotctld_command(ctrl,buff,buffback,128);
g_free (buff);
- if (retcode==TRUE)
- if (strncmp(buffback,"RPRT 0",6)!=0) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%d: rotctld returned error (%s)"),
- __FILE__, __LINE__,buffback);
-
- retcode=FALSE;
- }
+ if (retcode==TRUE)
+ if (strncmp(buffback,"RPRT 0",6)!=0) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: rotctld returned error (%s)"),
+ __FILE__, __LINE__,buffback);
+
+ retcode=FALSE;
+ }
return (retcode);
}
@@ -1161,8 +1161,8 @@
if (g_str_has_suffix (filename, ".rot")) {
i++;
- /*once we have one we need nothing else*/
- break;
+ /*once we have one we need nothing else*/
+ break;
}
}
}
@@ -1182,12 +1182,12 @@
/** \brief open the rotcld socket. return true if successful false otherwise.*/
static gboolean open_rotctld_socket (GtkRotCtrl * ctrl, gint *sock) {
- struct sockaddr_in ServAddr;
- struct hostent *h;
- gint status;
+ struct sockaddr_in ServAddr;
+ struct hostent *h;
+ gint status;
- ctrl->sock=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
- if (ctrl->sock < 0) {
+ ctrl->sock=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+ if (ctrl->sock < 0) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: Failed to create socket"),
__FUNCTION__);
@@ -1219,7 +1219,7 @@
__FUNCTION__, ctrl->conf->host, ctrl->conf->port);
}
- return TRUE;
+ return TRUE;
}
@@ -1247,13 +1247,13 @@
gboolean send_rotctld_command(GtkRotCtrl *ctrl, gchar *buff, gchar *buffout, gint sizeout)
{
gint written;
- gint size;
+ gint size;
- size = strlen(buff);
-
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%s: Sending %d bytes as %s."),
- __FILE__, __FUNCTION__, size, buff);
+ size = strlen(buff);
+
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s:%s: Sending %d bytes as %s."),
+ __FILE__, __FUNCTION__, size, buff);
/* send command */
@@ -1267,21 +1267,21 @@
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: rotctld Socket Down"),
__FUNCTION__);
- return FALSE;
+ return FALSE;
}
/* try to read answer */
size = read (ctrl->sock, buffout, sizeout);
- if (size == -1) {
+ if (size == -1) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: rotctld Socket Down"),
__FUNCTION__);
- return FALSE;
+ return FALSE;
}
- buffout[size]='\0';
- if (size == 0) {
+ buffout[size]='\0';
+ if (size == 0) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%s: Got 0 bytes from rotctld"),
__FILE__, __FUNCTION__);
@@ -1302,14 +1302,14 @@
*simple function to sort the list of satellites in the combo box.
*/
static gint sat_name_compare (sat_t* a,sat_t*b){
- return (g_ascii_strcasecmp(a->nickname,b->nickname));
+ return (g_ascii_strcasecmp(a->nickname,b->nickname));
}
/** \brief Compare Rotator Names.
*/
static gint rot_name_compare (const gchar* a,const gchar *b){
- return (g_ascii_strcasecmp(a,b));
+ return (g_ascii_strcasecmp(a,b));
}
@@ -1331,8 +1331,8 @@
min_az = -180;
max_az = 180;
}
-
- /* Assume that min_az and max_az are atleat 360 degrees apart*/
+
+ /* Assume that min_az and max_az are atleat 360 degrees apart*/
/*get the azimuth that is in a settable range*/
while (last_az>max_az) {
last_az-=360;
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2010-10-29 02:10:37 UTC (rev 694)
+++ trunk/src/gtk-rot-ctrl.h 2010-10-30 22:46:59 UTC (rev 695)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -44,12 +44,12 @@
#define GTK_TYPE_ROT_CTRL (gtk_rot_ctrl_get_type ())
#define GTK_ROT_CTRL(obj) GTK_CHECK_CAST (obj,\
- gtk_rot_ctrl_get_type (),\
- GtkRotCtrl)
+ gtk_rot_ctrl_get_type (),\
+ GtkRotCtrl)
#define GTK_ROT_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\
- gtk_rot_ctrl_get_type (),\
- GtkRotCtrlClass)
+ gtk_rot_ctrl_get_type (),\
+ GtkRotCtrlClass)
#define IS_GTK_ROT_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_rot_ctrl_get_type ())
@@ -61,7 +61,7 @@
struct _gtk_rot_ctrl
{
- GtkVBox vbox;
+ GtkVBox vbox;
/* Azimuth widgets */
GtkWidget *AzSat,*AzSet,*AzRead,*AzDevSel;
@@ -83,7 +83,7 @@
sat_t *target; /*!< Target satellite */
pass_t *pass; /*!< Next pass of target satellite */
qth_t *qth; /*!< The QTH for this module */
- gboolean flipped; /*!< Whether the current pass loaded is a flip pass or not */
+ gboolean flipped; /*!< Whether the current pass loaded is a flip pass or not */
guint delay; /*!< Timeout delay. */
guint timerid; /*!< Timer ID */
@@ -94,8 +94,8 @@
gboolean engaged; /*!< Flag indicating that rotor device is engaged. */
gint errcnt; /*!< Error counter. */
- gint sock; /*!< socket for connecting to rotctld. */
-
+ gint sock; /*!< socket for connecting to rotctld. */
+
/* debug related */
guint wrops;
guint rdops;
@@ -103,7 +103,7 @@
struct _GtkRotCtrlClass
{
- GtkVBoxClass parent_class;
+ GtkVBoxClass parent_class;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2010-10-31 14:47:05
|
Revision: 697
http://gpredict.svn.sourceforge.net/gpredict/?rev=697&view=rev
Author: aa1vs
Date: 2010-10-31 14:46:55 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
Replacing tabs with spaces and updating c-mode commands
Modified Paths:
--------------
trunk/src/about.c
trunk/src/about.h
trunk/src/compat.c
trunk/src/compat.h
trunk/src/config-keys.h
trunk/src/defaults.h
trunk/src/first-time.c
trunk/src/first-time.h
trunk/src/gpredict-help.c
trunk/src/gpredict-help.h
trunk/src/gpredict-url-hook.c
trunk/src/gpredict-url-hook.h
trunk/src/gpredict-utils.c
trunk/src/gpredict-utils.h
trunk/src/gtk-azel-plot.c
trunk/src/gtk-azel-plot.h
trunk/src/gtk-event-list-popup.c
trunk/src/gtk-event-list-popup.h
trunk/src/gtk-event-list.c
trunk/src/gtk-event-list.h
trunk/src/gtk-freq-knob.c
trunk/src/gtk-freq-knob.h
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-plot.h
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view-popup.h
trunk/src/gtk-polar-view.c
trunk/src/gtk-polar-view.h
trunk/src/gtk-rot-knob.c
trunk/src/gtk-rot-knob.h
trunk/src/gtk-sat-data.c
trunk/src/gtk-sat-data.h
trunk/src/gtk-sat-list-col-sel.c
trunk/src/gtk-sat-list-col-sel.h
trunk/src/gtk-sat-list-popup.c
trunk/src/gtk-sat-list-popup.h
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-list.h
trunk/src/gtk-sat-map-ground-track.c
trunk/src/gtk-sat-map-ground-track.h
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-map-popup.h
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-map.h
trunk/src/gtk-sat-module-popup.c
trunk/src/gtk-sat-module-popup.h
trunk/src/gtk-sat-module-tmg.c
trunk/src/gtk-sat-module-tmg.h
trunk/src/gtk-sat-module.c
trunk/src/gtk-sat-module.h
trunk/src/gtk-sat-selector.c
trunk/src/gtk-sat-selector.h
trunk/src/gtk-sat-tree.c
trunk/src/gtk-sat-tree.h
trunk/src/gtk-single-sat.c
trunk/src/gtk-single-sat.h
trunk/src/gtk-sky-glance.c
trunk/src/gtk-sky-glance.h
trunk/src/gui.c
trunk/src/gui.h
trunk/src/loc-tree.c
trunk/src/loc-tree.h
trunk/src/locator.c
trunk/src/locator.h
trunk/src/main.c
trunk/src/map-selector.c
trunk/src/map-selector.h
trunk/src/menubar.c
trunk/src/menubar.h
trunk/src/mod-cfg-get-param.c
trunk/src/mod-cfg-get-param.h
trunk/src/mod-cfg.c
trunk/src/mod-cfg.h
trunk/src/mod-mgr.c
trunk/src/mod-mgr.h
trunk/src/orbit-tools.c
trunk/src/orbit-tools.h
trunk/src/pass-popup-menu.c
trunk/src/pass-popup-menu.h
trunk/src/pass-to-txt.c
trunk/src/pass-to-txt.h
trunk/src/predict-tools.c
trunk/src/predict-tools.h
trunk/src/print-pass.c
trunk/src/print-pass.h
trunk/src/qth-data.c
trunk/src/qth-data.h
trunk/src/qth-editor.c
trunk/src/qth-editor.h
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
trunk/src/sat-debugger.c
trunk/src/sat-info.c
trunk/src/sat-info.h
trunk/src/sat-log-browser.c
trunk/src/sat-log-browser.h
trunk/src/sat-log.c
trunk/src/sat-log.h
trunk/src/sat-monitor.c
trunk/src/sat-monitor.h
trunk/src/sat-pass-dialogs.c
trunk/src/sat-pass-dialogs.h
trunk/src/sat-pref-conditions.c
trunk/src/sat-pref-conditions.h
trunk/src/sat-pref-debug.c
trunk/src/sat-pref-debug.h
trunk/src/sat-pref-formats.c
trunk/src/sat-pref-formats.h
trunk/src/sat-pref-general.c
trunk/src/sat-pref-general.h
trunk/src/sat-pref-help.c
trunk/src/sat-pref-help.h
trunk/src/sat-pref-interfaces.c
trunk/src/sat-pref-interfaces.h
trunk/src/sat-pref-layout-utils.c
trunk/src/sat-pref-layout-utils.h
trunk/src/sat-pref-layout.c
trunk/src/sat-pref-layout.h
trunk/src/sat-pref-list-view.c
trunk/src/sat-pref-list-view.h
trunk/src/sat-pref-map-view.c
trunk/src/sat-pref-map-view.h
trunk/src/sat-pref-modules.c
trunk/src/sat-pref-modules.h
trunk/src/sat-pref-multi-pass.c
trunk/src/sat-pref-multi-pass.h
trunk/src/sat-pref-polar-view.c
trunk/src/sat-pref-polar-view.h
trunk/src/sat-pref-predict.c
trunk/src/sat-pref-predict.h
trunk/src/sat-pref-qth-data.h
trunk/src/sat-pref-qth-editor.c
trunk/src/sat-pref-qth-editor.h
trunk/src/sat-pref-qth.c
trunk/src/sat-pref-qth.h
trunk/src/sat-pref-refresh.c
trunk/src/sat-pref-refresh.h
trunk/src/sat-pref-rig-data.h
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig-editor.h
trunk/src/sat-pref-rig.c
trunk/src/sat-pref-rig.h
trunk/src/sat-pref-rot-data.h
trunk/src/sat-pref-rot-editor.c
trunk/src/sat-pref-rot-editor.h
trunk/src/sat-pref-rot.c
trunk/src/sat-pref-rot.h
trunk/src/sat-pref-single-pass.c
trunk/src/sat-pref-single-pass.h
trunk/src/sat-pref-single-sat.c
trunk/src/sat-pref-single-sat.h
trunk/src/sat-pref-sky-at-glance.c
trunk/src/sat-pref-sky-at-glance.h
trunk/src/sat-pref-tle.c
trunk/src/sat-pref-tle.h
trunk/src/sat-pref.c
trunk/src/sat-pref.h
trunk/src/sat-vis.c
trunk/src/sat-vis.h
trunk/src/save-pass.c
trunk/src/save-pass.h
trunk/src/time-tools.c
trunk/src/time-tools.h
trunk/src/tle-tools.c
trunk/src/tle-tools.h
trunk/src/tle-update.c
trunk/src/tle-update.h
Modified: trunk/src/about.c
===================================================================
--- trunk/src/about.c 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/about.c 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
Modified: trunk/src/about.h
===================================================================
--- trunk/src/about.h 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/about.h 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
Modified: trunk/src/compat.c
===================================================================
--- trunk/src/compat.c 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/compat.c 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -106,7 +106,7 @@
gchar *buff = g_win32_get_package_installation_directory (NULL, NULL);
dir = g_strconcat (buff, G_DIR_SEPARATOR_S,
"share", G_DIR_SEPARATOR_S,
- /* FIXME */
+ /* FIXME */
"gpredict", G_DIR_SEPARATOR_S,
"pixmaps", G_DIR_SEPARATOR_S,
"maps", NULL);
Modified: trunk/src/compat.h
===================================================================
--- trunk/src/compat.h 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/compat.h 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
Modified: trunk/src/config-keys.h
===================================================================
--- trunk/src/config-keys.h 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/config-keys.h 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
Modified: trunk/src/defaults.h
===================================================================
--- trunk/src/defaults.h 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/defaults.h 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
Modified: trunk/src/first-time.c
===================================================================
--- trunk/src/first-time.c 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/first-time.c 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -626,7 +626,7 @@
}
g_free (source);
}
- g_free (catfilename);
+ g_free (catfilename);
}
}
g_dir_close (srcdir);
@@ -885,10 +885,10 @@
}
g_dir_close (dir);
} else {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: %s directory does not exist. Incomplete installation."),
- __FUNCTION__, datadirname);
- }
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: %s directory does not exist. Incomplete installation."),
+ __FUNCTION__, datadirname);
+ }
g_free (datadirname);
}
g_free (targetdirname);
Modified: trunk/src/first-time.h
===================================================================
--- trunk/src/first-time.h 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/first-time.h 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
Modified: trunk/src/gpredict-help.c
===================================================================
--- trunk/src/gpredict-help.c 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/gpredict-help.c 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -50,46 +50,46 @@
void
gpredict_help_launch (gpredict_help_type_t type)
{
- browser_type_t idx;
- gint resp;
+ browser_type_t idx;
+ gint resp;
- idx = sat_cfg_get_int (SAT_CFG_INT_WEB_BROWSER_TYPE);
+ idx = sat_cfg_get_int (SAT_CFG_INT_WEB_BROWSER_TYPE);
- /* some sanity check before accessing the arrays ;-) */
- if ((idx < BROWSER_TYPE_NONE) || (idx >= BROWSER_TYPE_NUM)) {
- idx = BROWSER_TYPE_NONE;
- }
+ /* some sanity check before accessing the arrays ;-) */
+ if ((idx < BROWSER_TYPE_NONE) || (idx >= BROWSER_TYPE_NUM)) {
+ idx = BROWSER_TYPE_NONE;
+ }
- if (idx == BROWSER_TYPE_NONE) {
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Help browser is not set up yet."),
- __FUNCTION__);
+ if (idx == BROWSER_TYPE_NONE) {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Help browser is not set up yet."),
+ __FUNCTION__);
- resp = config_help ();
+ resp = config_help ();
- if (resp == GTK_RESPONSE_CANCEL) {
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Configure help browser cancelled."),
- __FUNCTION__);
+ if (resp == GTK_RESPONSE_CANCEL) {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Configure help browser cancelled."),
+ __FUNCTION__);
- return;
- }
+ return;
+ }
- /* else try again */
- idx = sat_cfg_get_int (SAT_CFG_INT_WEB_BROWSER_TYPE);
- }
+ /* else try again */
+ idx = sat_cfg_get_int (SAT_CFG_INT_WEB_BROWSER_TYPE);
+ }
- if ((idx <= BROWSER_TYPE_NONE) || (idx >= BROWSER_TYPE_NUM)) {
- return;
- }
+ if ((idx <= BROWSER_TYPE_NONE) || (idx >= BROWSER_TYPE_NUM)) {
+ return;
+ }
- /* launch help browser */
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Launching help browser %s."),
- __FUNCTION__, sat_help[idx].type);
+ /* launch help browser */
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Launching help browser %s."),
+ __FUNCTION__, sat_help[idx].type);
- g_print ("FIXME: FINSH IMPELMTATION\n");
+ g_print ("FIXME: FINSH IMPELMTATION\n");
}
@@ -106,45 +106,45 @@
static gint
config_help (void)
{
- GtkWidget *dialog;
- GtkWidget *label;
- gint resp;
+ GtkWidget *dialog;
+ GtkWidget *label;
+ gint resp;
- dialog = gtk_dialog_new_with_buttons (_("Configure Help Browser"),
- GTK_WINDOW (app),
- GTK_DIALOG_MODAL |
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
- GTK_RESPONSE_OK,
- NULL);
+ dialog = gtk_dialog_new_with_buttons (_("Configure Help Browser"),
+ GTK_WINDOW (app),
+ GTK_DIALOG_MODAL |
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OK,
+ GTK_RESPONSE_OK,
+ NULL);
- label = gtk_label_new (_("Please select a HTML browser to be used to view the help."));
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
- sat_pref_help_create (), TRUE, FALSE, 0);
+ label = gtk_label_new (_("Please select a HTML browser to be used to view the help."));
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ sat_pref_help_create (), TRUE, FALSE, 0);
- gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
+ gtk_widget_show_all (GTK_DIALOG (dialog)->vbox);
- resp = gtk_dialog_run (GTK_DIALOG (dialog));
+ resp = gtk_dialog_run (GTK_DIALOG (dialog));
- switch (resp) {
+ switch (resp) {
- /* save browser settings */
- case GTK_RESPONSE_OK:
- sat_pref_help_ok ();
- break;
-
- default:
- sat_pref_help_cancel ();
- break;
- }
+ /* save browser settings */
+ case GTK_RESPONSE_OK:
+ sat_pref_help_ok ();
+ break;
+
+ default:
+ sat_pref_help_cancel ();
+ break;
+ }
- gtk_widget_destroy (dialog);
+ gtk_widget_destroy (dialog);
- return resp;
+ return resp;
}
@@ -160,92 +160,92 @@
void
gpredict_help_show_txt (const gchar *filename)
{
- GtkWidget *dialog;
- GtkWidget *swin;
- GtkWidget *view;
- GtkTextBuffer *txtbuf;
- GIOChannel *chan;
- GError *error = NULL;
- gchar *fname;
- gchar *buff;
- gsize length;
+ GtkWidget *dialog;
+ GtkWidget *swin;
+ GtkWidget *view;
+ GtkTextBuffer *txtbuf;
+ GIOChannel *chan;
+ GError *error = NULL;
+ gchar *fname;
+ gchar *buff;
+ gsize length;
- /* get system data directory */
+ /* get system data directory */
#ifdef G_OS_UNIX
- fname = g_strconcat (PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S, filename, NULL);
+ fname = g_strconcat (PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S, filename, NULL);
#else
# ifdef G_OS_WIN32
buff = g_win32_get_package_installation_directory (NULL, NULL);
fname = g_strconcat (buff, G_DIR_SEPARATOR_S,
- "doc", G_DIR_SEPARATOR_S,
- filename, ".txt", NULL);
+ "doc", G_DIR_SEPARATOR_S,
+ filename, ".txt", NULL);
g_free (buff);
# endif
#endif
- /* load file into buffer */
- chan = g_io_channel_new_file (fname, "r", &error);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Failed to load %s (%s)"),
- __FUNCTION__, fname, error->message);
- g_free (fname);
- g_clear_error (&error);
+ /* load file into buffer */
+ chan = g_io_channel_new_file (fname, "r", &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Failed to load %s (%s)"),
+ __FUNCTION__, fname, error->message);
+ g_free (fname);
+ g_clear_error (&error);
- return;
- }
+ return;
+ }
- g_io_channel_read_to_end (chan, &buff, &length, &error);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error reading %s (%s)"),
- __FUNCTION__, fname, error->message);
+ g_io_channel_read_to_end (chan, &buff, &length, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading %s (%s)"),
+ __FUNCTION__, fname, error->message);
- g_free (buff);
- g_clear_error (&error);
- g_io_channel_shutdown (chan, TRUE, NULL);
- g_io_channel_unref (chan);
+ g_free (buff);
+ g_clear_error (&error);
+ g_io_channel_shutdown (chan, TRUE, NULL);
+ g_io_channel_unref (chan);
- return;
- }
+ return;
+ }
- g_free (fname);
-
- /* create text view and text buffer widgets */
- view = gtk_text_view_new ();
- gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
- gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
- txtbuf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+ g_free (fname);
+
+ /* create text view and text buffer widgets */
+ view = gtk_text_view_new ();
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+ gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+ txtbuf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
- gtk_text_buffer_set_text (txtbuf, buff, -1);
- g_free (buff);
+ gtk_text_buffer_set_text (txtbuf, buff, -1);
+ g_free (buff);
- /* scrolled window */
- swin = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
- GTK_SHADOW_ETCHED_IN);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
- GTK_POLICY_NEVER,
- GTK_POLICY_AUTOMATIC);
- gtk_container_add (GTK_CONTAINER (swin), view);
+ /* scrolled window */
+ swin = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
+ GTK_SHADOW_ETCHED_IN);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+ gtk_container_add (GTK_CONTAINER (swin), view);
- /* create and show dialogue with textbuffer */
- dialog = gtk_dialog_new_with_buttons (_("Gpredict Info"),
- NULL,
- 0,
- GTK_STOCK_CLOSE,
- GTK_RESPONSE_ACCEPT,
- NULL);
- gtk_widget_set_size_request (dialog, -1, 450);
- buff = icon_file_name ("gpredict-icon.png");
- gtk_window_set_icon_from_file (GTK_WINDOW (dialog), buff, NULL);
- g_free (buff);
+ /* create and show dialogue with textbuffer */
+ dialog = gtk_dialog_new_with_buttons (_("Gpredict Info"),
+ NULL,
+ 0,
+ GTK_STOCK_CLOSE,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
+ gtk_widget_set_size_request (dialog, -1, 450);
+ buff = icon_file_name ("gpredict-icon.png");
+ gtk_window_set_icon_from_file (GTK_WINDOW (dialog), buff, NULL);
+ g_free (buff);
- g_signal_connect_swapped (dialog, "response",
- G_CALLBACK (gtk_widget_destroy), dialog);
+ g_signal_connect_swapped (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), dialog);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), swin);
- gtk_widget_show_all (dialog);
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), swin);
+ gtk_widget_show_all (dialog);
}
Modified: trunk/src/gpredict-help.h
===================================================================
--- trunk/src/gpredict-help.h 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/gpredict-help.h 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -30,8 +30,8 @@
typedef enum {
- GPREDICT_HELP_GETTING_STARTED,
- GPREDICT_HELP_USER_MANUAL
+ GPREDICT_HELP_GETTING_STARTED,
+ GPREDICT_HELP_USER_MANUAL
} gpredict_help_type_t;
Modified: trunk/src/gpredict-url-hook.c
===================================================================
--- trunk/src/gpredict-url-hook.c 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/gpredict-url-hook.c 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -36,8 +36,8 @@
void
gpredict_url_hook_cb (GtkAboutDialog *about,
- const gchar *link,
- gpointer data)
+ const gchar *link,
+ gpointer data)
{
Modified: trunk/src/gpredict-url-hook.h
===================================================================
--- trunk/src/gpredict-url-hook.h 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/gpredict-url-hook.h 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -31,7 +31,7 @@
#include <gtk/gtk.h>
void gpredict_url_hook_cb (GtkAboutDialog *about,
- const gchar *link,
- gpointer data);
+ const gchar *link,
+ gpointer data);
#endif
Modified: trunk/src/gpredict-utils.c
===================================================================
--- trunk/src/gpredict-utils.c 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/gpredict-utils.c 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -51,28 +51,28 @@
GtkWidget *
gpredict_hpixmap_button (const gchar *file, const gchar *text, const gchar *tooltip)
{
- GtkWidget *button;
- GtkWidget *image;
- GtkWidget *box;
- gchar *path;
- GtkTooltips *tips;
+ GtkWidget *button;
+ GtkWidget *image;
+ GtkWidget *box;
+ gchar *path;
+ GtkTooltips *tips;
- path = icon_file_name (file);
- image = gtk_image_new_from_file (path);
- g_free (path);
- box = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0);
- if (text != NULL)
- gtk_box_pack_start (GTK_BOX (box), gtk_label_new (text), TRUE, TRUE, 0);
+ path = icon_file_name (file);
+ image = gtk_image_new_from_file (path);
+ g_free (path);
+ box = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0);
+ if (text != NULL)
+ gtk_box_pack_start (GTK_BOX (box), gtk_label_new (text), TRUE, TRUE, 0);
- button = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER (button), box);
+ button = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER (button), box);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, button, tooltip, NULL);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, button, tooltip, NULL);
- return button;
+ return button;
}
@@ -86,28 +86,28 @@
GtkWidget *
gpredict_vpixmap_button (const gchar *file, const gchar *text, const gchar *tooltip)
{
- GtkWidget *button;
- GtkWidget *image;
- GtkWidget *box;
- gchar *path;
- GtkTooltips *tips;
+ GtkWidget *button;
+ GtkWidget *image;
+ GtkWidget *box;
+ gchar *path;
+ GtkTooltips *tips;
- path = icon_file_name (file);
- image = gtk_image_new_from_file (path);
- g_free (path);
- box = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0);
- if (text != NULL)
- gtk_box_pack_start (GTK_BOX (box), gtk_label_new (text), TRUE, TRUE, 0);
+ path = icon_file_name (file);
+ image = gtk_image_new_from_file (path);
+ g_free (path);
+ box = gtk_vbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0);
+ if (text != NULL)
+ gtk_box_pack_start (GTK_BOX (box), gtk_label_new (text), TRUE, TRUE, 0);
- button = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER (button), box);
+ button = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER (button), box);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, button, tooltip, NULL);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, button, tooltip, NULL);
- return button;
+ return button;
}
@@ -119,26 +119,26 @@
GtkWidget *
gpredict_hstock_button (const gchar *stock_id, const gchar *text, const gchar *tooltip)
{
- GtkWidget *button;
- GtkWidget *image;
- GtkWidget *box;
- GtkTooltips *tips;
-
+ GtkWidget *button;
+ GtkWidget *image;
+ GtkWidget *box;
+ GtkTooltips *tips;
+
- image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
- box = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0);
- if (text != NULL)
- gtk_box_pack_start (GTK_BOX (box), gtk_label_new (text), TRUE, TRUE, 0);
+ image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
+ box = gtk_hbox_new (FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), image, TRUE, TRUE, 0);
+ if (text != NULL)
+ gtk_box_pack_start (GTK_BOX (box), gtk_label_new (text), TRUE, TRUE, 0);
- button = gtk_button_new ();
- gtk_container_add (GTK_CONTAINER (button), box);
+ button = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER (button), box);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, button, tooltip, NULL);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, button, tooltip, NULL);
- return button;
+ return button;
}
@@ -164,12 +164,12 @@
gpredict_set_combo_tooltips (GtkWidget *combo, gpointer text)
{
- /* for each child in the container call the internal
- function which actually creates the tooltips.
- */
- gtk_container_forall (GTK_CONTAINER (combo),
- set_combo_tooltip,
- text);
+ /* for each child in the container call the internal
+ function which actually creates the tooltips.
+ */
+ gtk_container_forall (GTK_CONTAINER (combo),
+ set_combo_tooltip,
+ text);
}
@@ -185,17 +185,17 @@
set_combo_tooltip (GtkWidget *combo, gpointer text)
{
- /* if current child is a button we have BINGO! */
- if (GTK_IS_BUTTON (combo)) {
+ /* if current child is a button we have BINGO! */
+ if (GTK_IS_BUTTON (combo)) {
- GtkTooltips *tips;
+ GtkTooltips *tips;
- tips = gtk_tooltips_new ();
+ tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, combo,
- (gchar *) text,
- NULL);
- }
+ gtk_tooltips_set_tip (tips, combo,
+ (gchar *) text,
+ NULL);
+ }
}
@@ -207,44 +207,44 @@
gint
gpredict_file_copy (const gchar *in, const gchar *out)
{
- gchar *contents;
- gboolean status=0;
- GError *err=NULL;
- gsize ulen;
- gssize slen;
+ gchar *contents;
+ gboolean status=0;
+ GError *err=NULL;
+ gsize ulen;
+ gssize slen;
- g_return_val_if_fail (in != NULL, 1);
- g_return_val_if_fail (out != NULL, 1);
+ g_return_val_if_fail (in != NULL, 1);
+ g_return_val_if_fail (out != NULL, 1);
- /* read source file */
- if (!g_file_get_contents (in, &contents, &ulen, &err)) {
+ /* read source file */
+ if (!g_file_get_contents (in, &contents, &ulen, &err)) {
- sat_log_log (SAT_LOG_LEVEL_ERROR, "%s: %s", __FUNCTION__, err->message);
- g_clear_error (&err);
+ sat_log_log (SAT_LOG_LEVEL_ERROR, "%s: %s", __FUNCTION__, err->message);
+ g_clear_error (&err);
- status = 1;
- }
- else {
+ status = 1;
+ }
+ else {
- /* write contents to new file */
- slen = (gssize) ulen;
+ /* write contents to new file */
+ slen = (gssize) ulen;
- if (!g_file_set_contents (out, contents, slen, &err)) {
+ if (!g_file_set_contents (out, contents, slen, &err)) {
- sat_log_log (SAT_LOG_LEVEL_ERROR, "%s: %s", __FUNCTION__, err->message);
- g_clear_error (&err);
+ sat_log_log (SAT_LOG_LEVEL_ERROR, "%s: %s", __FUNCTION__, err->message);
+ g_clear_error (&err);
- status = 1;
+ status = 1;
- }
+ }
- g_free (contents);
- }
+ g_free (contents);
+ }
- return status;
+ return status;
}
@@ -256,24 +256,24 @@
GtkWidget *
gpredict_mini_mod_button (const gchar *pixmapfile, const gchar *tooltip)
{
- GtkWidget *button;
- GtkWidget *image;
- gchar *path;
- GtkTooltips *tips;
+ GtkWidget *button;
+ GtkWidget *image;
+ gchar *path;
+ GtkTooltips *tips;
- path = icon_file_name (pixmapfile);
- image = gtk_image_new_from_file (path);
- g_free (path);
+ path = icon_file_name (pixmapfile);
+ image = gtk_image_new_from_file (path);
+ g_free (path);
- button = gtk_button_new ();
- gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
- gtk_container_add (GTK_CONTAINER (button), image);
+ button = gtk_button_new ();
+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+ gtk_container_add (GTK_CONTAINER (button), image);
- tips = gtk_tooltips_new ();
- gtk_tooltips_set_tip (tips, button, tooltip, NULL);
+ tips = gtk_tooltips_new ();
+ gtk_tooltips_set_tip (tips, button, tooltip, NULL);
- return button;
+ return button;
}
@@ -284,33 +284,33 @@
void
rgb2gdk (guint rgb, GdkColor *color)
{
- guint16 r,g,b;
- guint tmp;
+ guint16 r,g,b;
+ guint tmp;
- /* sanity checks */
- if (color == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: %s called with color = NULL"),
- __FILE__, __LINE__, __FUNCTION__);
- return;
- }
+ /* sanity checks */
+ if (color == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: %s called with color = NULL"),
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
- /* red */
- tmp = rgb & 0xFF0000;
- r = (guint16) (tmp >> 16);
+ /* red */
+ tmp = rgb & 0xFF0000;
+ r = (guint16) (tmp >> 16);
- /* green */
- tmp = rgb & 0x00FF00;
- g = (guint16) (tmp >> 8);
+ /* green */
+ tmp = rgb & 0x00FF00;
+ g = (guint16) (tmp >> 8);
- /* blue */
- tmp = rgb & 0x0000FF;
- b = (guint16) tmp;
+ /* blue */
+ tmp = rgb & 0x0000FF;
+ b = (guint16) tmp;
- /* store colours */
- color->red = 257 * r;
- color->green = 257 * g;
- color->blue = 257 * b;
+ /* store colours */
+ color->red = 257 * r;
+ color->green = 257 * g;
+ color->blue = 257 * b;
}
@@ -322,43 +322,43 @@
void
rgba2gdk (guint rgba, GdkColor *color, guint16 *alpha)
{
- guint16 r,g,b;
- guint tmp;
+ guint16 r,g,b;
+ guint tmp;
- /* sanity checks */
- if (color == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: %s called with color = NULL"),
- __FILE__, __LINE__, __FUNCTION__);
- return;
- }
- if (alpha == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: %s called with alpha = NULL"),
- __FILE__, __LINE__, __FUNCTION__);
- return;
- }
+ /* sanity checks */
+ if (color == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: %s called with color = NULL"),
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
+ if (alpha == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: %s called with alpha = NULL"),
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
- /* red */
- tmp = rgba & 0xFF000000;
- r = (guint16) (tmp >> 24);
+ /* red */
+ tmp = rgba & 0xFF000000;
+ r = (guint16) (tmp >> 24);
- /* green */
- tmp = rgba & 0x00FF0000;
- g = (guint16) (tmp >> 16);
+ /* green */
+ tmp = rgba & 0x00FF0000;
+ g = (guint16) (tmp >> 16);
- /* blue */
- tmp = rgba & 0x0000FF00;
- b = (guint16) (tmp >> 8);
+ /* blue */
+ tmp = rgba & 0x0000FF00;
+ b = (guint16) (tmp >> 8);
- /* alpha channel */
- *alpha = (guint16) (257 * (rgba & 0x000000FF));
+ /* alpha channel */
+ *alpha = (guint16) (257 * (rgba & 0x000000FF));
- /* store colours */
- color->red = 257 * r;
- color->green = 257 * g;
- color->blue = 257 * b;
+ /* store colours */
+ color->red = 257 * r;
+ color->green = 257 * g;
+ color->blue = 257 * b;
}
@@ -369,37 +369,37 @@
void
gdk2rgb (const GdkColor *color, guint *rgb)
{
- guint r,g,b;
- guint16 tmp;
+ guint r,g,b;
+ guint16 tmp;
- /* sanity checks */
- if (color == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: %s called with color = NULL"),
- __FILE__, __LINE__, __FUNCTION__);
- return;
- }
- if (rgb == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: %s called with rgb = NULL"),
- __FILE__, __LINE__, __FUNCTION__);
- return;
- }
+ /* sanity checks */
+ if (color == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: %s called with color = NULL"),
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
+ if (rgb == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: %s called with rgb = NULL"),
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
- /* red */
- tmp = color->red / 257;
- r = (guint) (tmp << 16);
+ /* red */
+ tmp = color->red / 257;
+ r = (guint) (tmp << 16);
- /* green */
- tmp = color->green / 257;
- g = (guint) (tmp << 8);
+ /* green */
+ tmp = color->green / 257;
+ g = (guint) (tmp << 8);
- /* blue */
- tmp = color->blue / 257;
- b = (guint) tmp;
+ /* blue */
+ tmp = color->blue / 257;
+ b = (guint) tmp;
- *rgb = (r | g | b);
+ *rgb = (r | g | b);
}
@@ -411,41 +411,41 @@
void
gdk2rgba (const GdkColor *color, guint16 alpha, guint *rgba)
{
- guint r,g,b,a;
- guint16 tmp;
+ guint r,g,b,a;
+ guint16 tmp;
- /* sanity checks */
- if (color == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: %s called with color = NULL"),
- __FILE__, __LINE__, __FUNCTION__);
- return;
- }
- if (rgba == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: %s called with rgba = NULL"),
- __FILE__, __LINE__, __FUNCTION__);
- return;
- }
+ /* sanity checks */
+ if (color == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: %s called with color = NULL"),
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
+ if (rgba == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s:%s: %s called with rgba = NULL"),
+ __FILE__, __LINE__, __FUNCTION__);
+ return;
+ }
- /* red */
- tmp = color->red / 257;
- r = (guint) (tmp << 24);
+ /* red */
+ tmp = color->red / 257;
+ r = (guint) (tmp << 24);
- /* green */
- tmp = color->green / 257;
- g = (guint) (tmp << 16);
+ /* green */
+ tmp = color->green / 257;
+ g = (guint) (tmp << 16);
- /* blue */
- tmp = color->blue / 257;
- b = (guint) (tmp << 8);
+ /* blue */
+ tmp = color->blue / 257;
+ b = (guint) (tmp << 8);
- /* alpha */
- tmp = alpha / 257;
- a = (guint) tmp;
+ /* alpha */
+ tmp = alpha / 257;
+ a = (guint) tmp;
- *rgba = (r | g | b | a);
+ *rgba = (r | g | b | a);
}
@@ -456,24 +456,24 @@
gchar *
rgba2html (guint rgba)
{
- gchar *col;
- guint8 r,g,b;
- guint16 tmp;
+ gchar *col;
+ guint8 r,g,b;
+ guint16 tmp;
- tmp = rgba & 0xFF000000;
- r = (guint8) (tmp >> 24);
+ tmp = rgba & 0xFF000000;
+ r = (guint8) (tmp >> 24);
- /* green */
- tmp = rgba & 0x00FF0000;
- g = (guint8) (tmp >> 16);
+ /* green */
+ tmp = rgba & 0x00FF0000;
+ g = (guint8) (tmp >> 16);
- /* blue */
- tmp = rgba & 0x0000FF00;
- b = (guint8) (tmp >> 8);
+ /* blue */
+ tmp = rgba & 0x0000FF00;
+ b = (guint8) (tmp >> 8);
- col = g_strdup_printf ("%X%X%X",r,g,b);
+ col = g_strdup_printf ("%X%X%X",r,g,b);
- return col;
+ return col;
}
Modified: trunk/src/gpredict-utils.h
===================================================================
--- trunk/src/gpredict-utils.h 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/gpredict-utils.h 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -49,7 +49,7 @@
const gchar *tooltip);
GtkWidget *gpredict_mini_mod_button (const gchar *pixmapfile,
- const gchar *tooltip);
+ const gchar *tooltip);
void gpredict_set_combo_tooltips (GtkWidget *combo, gpointer text);
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2010-10-31 12:47:44 UTC (rev 696)
+++ trunk/src/gtk-azel-plot.c 2010-10-31 14:46:55 UTC (rev 697)
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
Gpredict: Real-time satellite tracking and orbit prediction program
@@ -61,16 +61,16 @@
static void gtk_azel_plot_init (GtkAzelPlot *polview);
static void gtk_azel_plot_destroy (GtkObject *object);
static void size_allocate_cb (GtkWidget *widget,
- GtkAllocation *allocation,
- gpointer data);
+ GtkAllocation *allocation,
+ gpointer data);
static gboolean on_motion_notify (GooCanvasItem *item,
- GooCanvasItem *target,
- GdkEventMotion *event,
- gpointer data);
+ GooCanvasItem *target,
+ GdkEventMotion *event,
+ gpointer data);
static void on_item_created (GooCanvas *canvas,
- GooCanvasItem *item,
- GooCanvasItemModel *model,
- gpointer data);
+ GooCanvasItem *item,
+ GooCanvasItemModel *model,
+ gpointer data);
static void on_canvas_realized (GtkWidget *canvas, gpointer data);
static GooCanvasItemModel* create_canvas_model (GtkAzelPlot *polv);
static void get_canvas_bg_color (GtkAzelPlot *polv, GdkColor *color);
@@ -85,65 +85,65 @@
GtkType
gtk_azel_plot_get_type ()
{
- static GType gtk_azel_plot_type = 0;
+ static GType gtk_azel_plot_type = 0;
- if (!gtk_azel_plot_type) {
- static const GTypeInfo gtk_azel_plot_info = {
- sizeof (GtkAzelPlotClass),
- NULL, /* base init */
- NULL, /* base finalise */
- (GClassInitFunc) gtk_azel_plot_class_init,
- NULL, /* class finalise */
- NULL, /* class data */
- sizeof (GtkAzelPlot),
- 5, /* n_preallocs */
- (GInstanceInitFunc) gtk_azel_plot_init,
- };
+ if (!gtk_azel_plot_type) {
+ static const GTypeInfo gtk_azel_plot_info = {
+ sizeof (GtkAzelPlotClass),
+ NULL, /* base init */
+ NULL, /* base finalise */
+ (GClassInitFunc) gtk_azel_plot_class_init,
+ NULL, /* class finalise */
+ NULL, /* class data */
+ sizeof (GtkAzelPlot),
+ 5, /* n_preallocs */
+ (GInstanceInitFunc) gtk_azel_plot_init,
+ };
- gtk_azel_plot_type = g_type_register_static (GTK_TYPE_VBOX,
- "GtkAzelPlot",
- >k_azel_plot_info,
- 0);
- }
+ gtk_azel_plot_type = g_type_register_static (GTK_TYPE_VBOX,
+ "GtkAzelPlot",
+ >k_azel_plot_info,
+ 0);
+ }
- return gtk_azel_plot_type;
+ return gtk_azel_plot_type;
}
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;
+ object_class->destroy = gtk_azel_plot_destroy;
+ //widget_class->size_allocate = gtk_azel_plot_size_allocate;
}
static void
gtk_azel_plot_init (GtkAzelPlot *polview)
{
- polview->qth = NULL;
- polview->width = 0;
- polview->height = 0;
- polview->x0 = 0;
- polview->y0 = 0;
- polview->xmax = 0;
- polview->ymax = 0;
- polview->maxaz = 0.0;
- polview->qthinfo = FALSE;
- polview->cursinfo = FALSE;
- polview->extratick = FALSE;
+ polview->qth = NULL;
+ polview->width = 0;
+ polview->height = 0;
+ polview->x0 = 0;
+ polview->y0 = 0;
+ polview->xmax = 0;
+ polview->ymax = 0;
+ polview->maxaz = 0.0;
+ polview->qthinfo = FALSE;
+ polview->cursinfo = FALSE;
+ polview->extratick = FALSE;
}
@@ -151,7 +151,7 @@
gtk_azel_plot_destroy (GtkObject *object)
{
- (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
@@ -163,281 +163,281 @@
GtkWidget*
gtk_azel_plot_new (qth_t *qth, pass_t *pass)
{
- GtkWidget *polv;
- GooCanvasItemModel *root;
- GdkColor bg_color = {0, 0xFFFF, 0xFFFF, 0xFFFF};
- guint i,n;
- pass_detail_t *detail;
+ GtkWidget *polv;
+ GooCanvasItemModel *root;
+ GdkColor bg_color = {0, 0xFFFF, 0xFFFF, 0xFFFF};
+ guint i,n;
+ pass_detail_t *detail;
- polv = g_object_new (GTK_TYPE_AZEL_PLOT, NULL);
+ polv = g_object_new (GTK_TYPE_AZEL_PLOT, NULL);
- GTK_AZEL_PLOT (polv)->qth = qth;
- GTK_AZEL_PLOT (polv)->pass = pass;
+ GTK_AZEL_PLOT (polv)->qth = qth;
+ GTK_AZEL_PLOT (polv)->pass = pass;
- /* get settings */
- GTK_AZEL_PLOT (polv)->qthinfo = sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO);
- GTK_AZEL_PLOT (polv)->extratick = sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS);
- GTK_AZEL_PLOT (polv)->cursinfo = TRUE;
+ /* get settings */
+ GTK_AZEL_PLOT (polv)->qthinfo = sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_QTH_INFO);
+ GTK_AZEL_PLOT (polv)->extratick = sat_cfg_get_bool (SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS);
+ GTK_AZEL_PLOT (polv)->cursinfo = TRUE;
- /* check maximum Az */
- n = g_slist_length (pass->details);
- for (i = 0; i < n; i++) {
- detail = PASS_DETAIL (g_slist_nth_data (pass->details, i));
+ /* check maximum Az */
+ n = g_slist_length (pass->details);
+ for (i = 0; i < n; i++) {
+ detail = PASS_DETAIL (g_slist_nth_data (pass->details, i));
- if (detail->az > GTK_AZEL_PLOT (polv)->maxaz) {
- GTK_AZEL_PLOT (polv)->maxaz = detail->az;
- }
- }
+ if (detail->az > GTK_AZEL_PLOT (polv)->maxaz) {
+ GTK_AZEL_PLOT (polv)->maxaz = detail->az;
+ }
+ }
- if (GTK_AZEL_PLOT (polv)->maxaz > 180.0)
- GTK_AZEL_PLOT (polv)->maxaz = 360.0;
- else
- GTK_AZEL_PLOT (polv)->maxaz = 180.0;
+ if (GTK_AZEL_PLOT (polv)->maxaz > 180.0)
+ GTK_AZEL_PLOT (polv)->maxaz = 360.0;
+ else
+ GTK_AZEL_PLOT (polv)->maxaz = 180.0;
- /* create the canvas */
- GTK_AZEL_PLOT (polv)->canvas = goo_canvas_new ();
- get_canvas_bg_color (GTK_AZEL_PLOT (polv), &bg_color);
- gtk_widget_modify_base (GTK_AZEL_PLOT (polv)->canvas, GTK_STATE_NORMAL, &bg_color);
- gtk_widget_set_size_request (GTK_AZEL_PLOT (polv)->canvas,
- POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE);
- goo_canvas_set_bounds (GOO_CANVAS (GTK_AZEL_PLOT (polv)->canvas), 0, 0,
- POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE);
+ /* create the canvas */
+ GTK_AZEL_PLOT (polv)->canvas = goo_canvas_new ();
+ get_canvas_bg_color (GTK_AZEL_PLOT (polv), &bg_color);
+ gtk_widget_modify_base (GTK_AZEL_PLOT (polv)->canvas, GTK_STATE_NORMAL, &bg_color);
+ gtk_widget_set_size_request (GTK_AZEL_PLOT (polv)->canvas,
+ POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE);
+ goo_canvas_set_bounds (GOO_CANVAS (GTK_AZEL_PLOT (polv)->canvas), 0, 0,
+ POLV_DEFAULT_SIZE, POLV_DEFAULT_SIZE);
- /* connect size-request signal */
- g_signal_connect (GTK_AZEL_PLOT (polv)->canvas, "size-allocate",
- G_CALLBACK (size_allocate_cb), polv);
- g_signal_connect (GTK_AZEL_PLOT (polv)->canvas, "item_created",
- (GtkSignalFunc) on_item_created, polv);
- g_signal_connect_after (GTK_AZEL_PLOT (polv)->canvas, "realize",
- (GtkSignalFunc) on_canvas_realized, polv);
+ /* connect size-request signal */
+ g_signal_connect (GTK_AZEL_PLOT (polv)->canvas, "size-allocate",
+ G_CALLBACK (size_allocate_cb), polv);
+ g_signal_connect (GTK_AZEL_PLOT (polv)->canvas, "item_created",
+ (GtkSignalFunc) on_item_created, polv);
+ g_signal_connect_after (GTK_AZEL_PLOT (polv)->canvas, "realize",
+ (GtkSignalFunc) on_canvas_realized, polv);
- gtk_widget_show (GTK_AZEL_PLOT (polv)->canvas);
+ gtk_widget_show (GTK_AZEL_PLOT (polv)->canvas);
- /* Create the canvas model */
- root = create_canvas_model (GTK_AZEL_PLOT (polv));
- goo_canvas_set_root_item_model (GOO_CANVAS (GTK_AZEL_PLOT (polv)->canvas), root);
+ /* Create the canvas model */
+ root = create_canvas_model (GTK_AZEL_PLOT (polv));
+ goo_canvas_set_root_item_model (GOO_CANVAS (GTK_AZEL_PLOT (polv)->canvas), root);
- g_object_unref (root);
+ g_object_unref (root);
- gtk_container_add (GTK_CONTAINER (polv), GTK_AZEL_PLOT (polv)->canvas);
+ gtk_container_add (GTK_CONTAINER (polv), GTK_AZEL_PLOT (polv)->canvas);
- return polv;
+ return polv;
}
static GooCanvasItemModel *
create_canvas_model (GtkAzelPlot *polv)
{
- GooCanvasItemModel *root;
- guint32 col;
- guint i;
- gdouble xstep,ystep;
- gdouble t,az,el;
- time_t tim;
- gchar buff[7];
- gchar *txt;
+ GooCanvasItemModel *root;
+ guint32 col;
+ guint i;
+ gdouble xstep,ystep;
+ gdouble t,az,el;
+ time_t tim;
+ gchar buff[7];
+ gchar *txt;
- root = goo_canvas_group_model_new (NULL, NULL);
+ root = goo_canvas_group_model_new (NULL, NULL);
- /* graph dimensions */
- polv->width = POLV_DEFAULT_SIZE;
- polv->height = POLV_DEFAULT_SIZE;
+ /* graph dimensions */
+ polv->width = POLV_DEFAULT_SIZE;
+ polv->height = POLV_DEFAULT_SIZE;
- /* update coordinate system */
- polv->x0 = POLV_X_MARGIN;
- polv->xmax = polv->width - POLV_X_MARGIN;
- polv->y0 = polv->height - POLV_Y_MARGIN;
- polv->ymax = POLV_Y_MARGIN;
-
- col = sat_cfg_get_int (SAT_CFG_INT_POLAR_AXIS_COL);
+ /* update coordinate system */
+ polv->x0 = POLV_X_MARGIN;
+ polv->xmax = polv->width - POLV_X_MARGIN;
+ polv->y0 = polv->height - POLV_Y_MARGIN;
+ polv->ymax = POLV_Y_MARGIN;
+
+ col = sat_cfg_get_int (SAT_CFG_INT_POLAR_AXIS_COL);
- /* frame */
- polv->frame = goo_canvas_rect_model_new (root,
- (gdouble) polv->x0,
- (gdouble) polv->ymax,
- (gdouble) (polv->xmax - polv->x0),
- (gdouble) (polv->y0 - POLV_Y_MARGIN),
- "stroke-color-rgba", 0x000000FF,
- "line-cap", CAIRO_LINE_CAP_SQUARE,
- "line-join", CAIRO_LINE_JOIN_MITER,
- "line-width", 1.0,
- NULL);
+ /* frame */
+ polv->frame = goo_canvas_rect_model_new (root,
+ (gdouble) polv->x0,
+ (gdouble) polv->ymax,
+ (gdouble) (polv->xmax - polv->x0),
+ (gdouble) (polv->y0 - POLV_Y_MARGIN),
+ "stroke-color-rgba", 0x000000FF,
+ "line-cap", CAIRO_LINE_CAP_SQUARE,
+ "line-join", CAIRO_LINE_JOIN_MITER,
+ "line-width", 1.0,
+ NULL);
- xstep = (polv->xmax - polv->x0) / (AZEL_PLOT_NUM_TICKS+1);
- ystep = (polv->y0 - polv->ymax) / (AZEL_PLOT_NUM_TICKS+1);
+ xstep = (polv->xmax - polv->x0) / (AZEL_PLOT_NUM_TICKS+1);
+ ystep = (polv->y0 - polv->ymax) / (AZEL_PLOT_NUM_TICKS+1);
- /* tick marks */
- for (i = 0; i < AZEL_PLOT_NUM_TICKS; i++) {
+ /* tick marks */
+ for (i = 0; i < AZEL_PLOT_NUM_TICKS; i++) {
- /* bottom x tick marks */
- polv->xticksb[i] = goo_canvas_polyline_model_new_line (root,
- (gdouble) (polv->x0 + (i+1) * xstep),
- (gdouble) polv->y0,
- (gdouble) (polv->x0 + (i+1) * xstep),
- (gdouble) (polv->y0 - MARKER_SIZE),
- "fill-color-rgba", col,
- "line-cap", CAIRO_LINE_CAP_SQUARE,
- "line-join", CAIRO_LINE_JOIN_MITER,
- "line-width", 1.0,
- NULL);
+ /* bottom x tick marks */
+ polv->xticksb[i] = goo_canvas_polyline_model_new_line (root,
+ (gdouble) (polv->x0 + (i+1) * xstep),
+ (gdouble) polv->y0,
+ (gdouble) (polv->x0 + (i+1) * xstep),
+ (gdouble) (polv->y0 - MARKER_SIZE),
+ "fill-color-rgba", col,
+ "line-cap", CAIRO_LINE_CAP_SQUARE,
+ "line-join", CAIRO_LINE_JOIN_MITER,
+ "line-width", 1.0,
+ NULL);
- /* top x tick marks */
- polv->xtickst[i] = goo_canvas_polyline_model_new_line (root,
- (gdouble) (polv->x0 + (i+1) * xstep),
- (gdouble) polv->ymax,
- (gdouble) (polv->x0 + (i+1) * xstep),
- (gdouble) (polv->ymax + MARKER_SIZE),
- "fill-color-rgba", col,
- "line-cap", CAIRO_LINE_CAP_SQUARE,
- "line-join", CAIRO_LINE_JOIN_MITER,
- "line-width", 1.0,
- NULL);
+ /* top x tick marks */
+ polv->xtickst[i] = goo_canvas_polyline_model_new_line (root,
+ (gdouble) (polv->x0 + (i+1) * xstep),
+ (gdouble) polv->ymax,
+ (gdouble) (polv->x0 + (i+1) * xstep),
+ (gdouble) (polv->ymax + MARKER_SIZE),
+ "fill-color-rgba", col,
+ "line-cap", CAIRO_LINE_CAP_SQUARE,
+ "line-join", CAIRO_LINE_JOIN_MITER,
+ "line-width", 1.0,
+ NULL);
- /* x tick labels */
- /* get time */
- xy_to_graph (polv, polv->x0 + (i+1) * xstep, 0.0, &t, &az, &el);
+ /* x tick labels */
+ /* get time */
+ xy_to_graph (polv, polv->x0 + (i+1) * xstep, 0.0, &t, &az, &el);
- /* convert julian date to struct tm */
- tim = (t - 2440587.5)*86400.0;
+ /* convert julian date to struct tm */
+ tim = (t - 2440587.5)*86400.0;
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- strftime (buff, 7, "%H:%M", localtime (&tim));
- else
- strftime (buff, 7, "%H:%M", gmtime (&tim));
-
- buff[6]='\0';
+ /* format either local time or UTC depending on check box */
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
+ strftime (buff, 7, "%H:%M", localtime (&tim));
+ else
+ strftime (buff, 7, "%H:%M", gmtime (&tim));
+
+ buff[6]='\0';
- polv->xlab[i] = goo_canvas_text_model_new (root, buff,
- (gfloat) (polv->x0 + (i+1) * xstep),
- (gfloat) (polv->y0 + 5),
- -1,
- GTK_ANCHOR_N,
- "font", "Sans 8",
- "fill-color-rgba", 0x000000FF,
- NULL);
+ polv->xlab[i] = goo_canvas_text_model_new (root, buff,
+ (gfloat) (polv->x0 + (i+1) * xstep),
+ (gfloat) (polv->y0 + 5),
+ -1,
+ GTK_ANCHOR_N,
+ "font", "Sans 8",
+ "fill-color-rgba", 0x000000FF,
+ NULL);
- /* left y tick marks */
- polv->yticksl[i] = goo_canvas_polyline_model_new_line (root,
- (gdouble) polv->x0,
- (gdouble) (polv->y0 - (i+1) * ystep),
- (gdouble) (polv->x0 + MARKER_SIZE),
- (gdouble) (polv->y0 - (i+1) * ystep),
- "fill-color-rgba", col,
- "line-cap", CAIRO_LINE_CAP_SQUARE,
- "line-join", CAIRO_LINE_JOIN_MITER,
- "line-width", 1.0,
- NULL);
+ /* left y tick marks */
+ polv->yticksl[i] = goo_canvas_polyline_model_new_line (root,
+ (gdouble) polv->x0,
+ (gdouble) (polv->y0 - (i+1) * ystep),
+ (gdouble) (polv->x0 + MARKER_SIZE),
+ (gdouble) (polv->y0 - (i+1) * ystep),
+ "fill-color-rgba", col,
+ "line-cap", CAIRO_LINE_CAP_SQUARE,
+ "line-join", CAIRO_LINE_JOIN_MITER,
+ "line-width", 1.0,
+ NULL);
- /* right y tick marks */
- polv->yticksr[i] = goo_canvas_polyline_model_new_line (root,
- (gdouble) polv->xmax,
- (gdouble) (polv->y0 - (i+1) * ystep),
- (gdouble) (polv->xmax - MARKER_SIZE),
- (gdouble) (polv->y0 - (i+1) * ystep),
- "fill-color-rgba", col,
- "line-cap", CAIRO_LINE_CAP_SQUARE,
- "line-join", CAIRO_LINE_JOIN_MITER,
- "line-width", 1.0,
- NULL);
+ /* right y tick marks */
+ polv->yticksr[i] = goo_canvas_polyline_model_new_line (root,
+ (gdouble) polv->xmax,
+ (gdouble) (polv->y0 - (i+1) * ystep),
+ (gdouble) (polv->xmax - MARKER_SIZE),
+ (gdouble) (polv->y0 - (i+1) * ystep),
+ "fill-color-rgba", col,
+ "line-cap", CAIRO_LINE_CAP_SQUARE,
+ "line-join", CAIRO_LINE_JOIN_MITER,
+ "line-width", 1.0,
+ NULL);
- /* Az tick labels */
- txt = g_strdup_printf ("%.0f\302\260", polv->maxaz / (AZEL_PLOT_NUM_TICKS+1) * (i+1));
- polv->azlab[i] = goo_canvas_text_model_new (root, txt,
- (gfloat) (polv->x0 - 5),
- (gfloat) (polv->y0 - (i+1) * ystep),
- -1,
- GTK_ANCHOR_E,
- "font", "Sans 8",
- "fill-color-rgba", 0x0000BFFF,
- NULL);
- g_free (txt);
+ /* Az tick labels */
+ txt = g_strdup_...
[truncated message content] |
|
From: <aa...@us...> - 2011-02-02 18:38:46
|
Revision: 757
http://gpredict.svn.sourceforge.net/gpredict/?rev=757&view=rev
Author: aa1vs
Date: 2011-02-02 18:38:40 +0000 (Wed, 02 Feb 2011)
Log Message:
-----------
List satellites in single sat view alphabetically instead of hash order.
Modified Paths:
--------------
trunk/src/gtk-sat-selector.c
trunk/src/gtk-single-sat.c
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-02-02 17:54:48 UTC (rev 756)
+++ trunk/src/gtk-sat-selector.c 2011-02-02 18:38:40 UTC (rev 757)
@@ -866,11 +866,11 @@
gchar *cat_a, *cat_b;
gint temp;
- cat_a=load_cat_file_cat(a);
- cat_b=load_cat_file_cat(b);
- temp = g_ascii_strcasecmp(cat_a,cat_b);
+ cat_a = load_cat_file_cat (a);
+ cat_b = load_cat_file_cat (b);
+ temp = g_ascii_strcasecmp (cat_a,cat_b);
g_free (cat_a);
g_free (cat_b);
- return(temp);
+ return (temp);
}
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-02-02 17:54:48 UTC (rev 756)
+++ trunk/src/gtk-single-sat.c 2011-02-02 18:38:40 UTC (rev 757)
@@ -118,8 +118,8 @@
static void select_satellite (GtkWidget *menuitem, gpointer data);
static void show_next_pass_cb (GtkWidget *menuitem, gpointer data);
static void show_next_passes_cb (GtkWidget *menuitem, gpointer data);
+static gint sat_name_compare (sat_t *a,sat_t *b);
-
static GtkVBoxClass *parent_class = NULL;
@@ -724,7 +724,7 @@
GtkSingleSat *single_sat = GTK_SINGLE_SAT (user_data);
sat_t *sat = SAT (value);
- single_sat->sats = g_slist_append (single_sat->sats, sat);
+ single_sat->sats = g_slist_insert_sorted (single_sat->sats,sat, sat_name_compare);
}
@@ -1145,3 +1145,7 @@
}
}
+
+static gint sat_name_compare (sat_t *a,sat_t *b) {
+ return g_ascii_strcasecmp(a->nickname,b->nickname);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-13 14:50:52
|
Revision: 762
http://gpredict.svn.sourceforge.net/gpredict/?rev=762&view=rev
Author: aa1vs
Date: 2011-02-13 14:50:46 +0000 (Sun, 13 Feb 2011)
Log Message:
-----------
Add additional field to satellite selection list stores
Modified Paths:
--------------
trunk/src/gtk-sat-selector.c
trunk/src/gtk-sat-selector.h
trunk/src/mod-cfg.c
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-02-09 01:22:01 UTC (rev 761)
+++ trunk/src/gtk-sat-selector.c 2011-02-13 14:50:46 UTC (rev 762)
@@ -2,9 +2,10 @@
/*
Gpredict: Real-time satellite tracking and orbit prediction program
- Copyright (C) 2001-2010 Alexandru Csete, OZ9AEC.
+ Copyright (C) 2001-2011 Alexandru Csete, OZ9AEC.
Authors: Alexandru Csete <oz...@gm...>
+ Charles Suprin <ham...@gm...>
Comments, questions and bugreports should be submitted via
http://sourceforge.net/projects/gpredict/
@@ -402,7 +403,8 @@
store = gtk_list_store_new (GTK_SAT_SELECTOR_COL_NUM,
G_TYPE_STRING, // name
G_TYPE_INT, // catnum
- G_TYPE_DOUBLE // epoch
+ G_TYPE_DOUBLE, // epoch
+ G_TYPE_BOOLEAN // selected
);
selector->models = g_slist_append (selector->models, store);
gtk_combo_box_append_text (GTK_COMBO_BOX (selector->groups), _("All satellites"));
@@ -525,7 +527,8 @@
store = gtk_list_store_new (GTK_SAT_SELECTOR_COL_NUM,
G_TYPE_STRING, // name
G_TYPE_INT, // catnum
- G_TYPE_DOUBLE // epoch
+ G_TYPE_DOUBLE, // epoch
+ G_TYPE_BOOLEAN // selected
);
selector->models = g_slist_append (selector->models, store);
@@ -920,10 +923,14 @@
{
const gchar *searchstring;
gchar *satname;
+ gboolean selected;
gtk_tree_model_get( model, iter, GTK_SAT_SELECTOR_COL_NAME, &satname, -1 );
+ gtk_tree_model_get( model, iter, GTK_SAT_SELECTOR_COL_SELECTED, &selected, -1 );
searchstring = gtk_entry_get_text( entry );
-
+ /*if it is already selected then remove it from the available list*/
+ if (selected)
+ return( FALSE);
if( strcasestr( satname, searchstring ) != NULL )
return( TRUE );
else
Modified: trunk/src/gtk-sat-selector.h
===================================================================
--- trunk/src/gtk-sat-selector.h 2011-02-09 01:22:01 UTC (rev 761)
+++ trunk/src/gtk-sat-selector.h 2011-02-13 14:50:46 UTC (rev 762)
@@ -42,6 +42,7 @@
GTK_SAT_SELECTOR_COL_NAME = 0, /*!< Satellite name. */
GTK_SAT_SELECTOR_COL_CATNUM, /*!< Catalogue Number. */
GTK_SAT_SELECTOR_COL_EPOCH, /*!< Element set epoch. */
+ GTK_SAT_SELECTOR_COL_SELECTED, /*!< Track whether element is selected. */
GTK_SAT_SELECTOR_COL_NUM /*!< The number of columns. */
} gtk_sat_selector_col_t;
@@ -51,6 +52,7 @@
GTK_SAT_SELECTOR_FLAG_NAME = 1 << GTK_SAT_SELECTOR_COL_NAME, /*!< Satellite name. */
GTK_SAT_SELECTOR_FLAG_CATNUM = 1 << GTK_SAT_SELECTOR_COL_CATNUM, /*!< Catalogue Number. */
GTK_SAT_SELECTOR_FLAG_EPOCH = 1 << GTK_SAT_SELECTOR_COL_EPOCH, /*!< Element set epoch. */
+ GTK_SAT_SELECTOR_FLAG_SELECTED = 1 << GTK_SAT_SELECTOR_COL_SELECTED, /*!< Item selected or not. */
} gtk_sat_selector_flag_t;
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2011-02-09 01:22:01 UTC (rev 761)
+++ trunk/src/mod-cfg.c 2011-02-13 14:50:46 UTC (rev 762)
@@ -643,7 +643,8 @@
store = gtk_list_store_new (GTK_SAT_SELECTOR_COL_NUM,
G_TYPE_STRING, // name
G_TYPE_INT, // catnum
- G_TYPE_DOUBLE // epoch
+ G_TYPE_DOUBLE, // epoch
+ G_TYPE_BOOLEAN // selected
);
/* sort the list by name */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-02-19 23:27:43
|
Revision: 768
http://gpredict.svn.sourceforge.net/gpredict/?rev=768&view=rev
Author: aa1vs
Date: 2011-02-19 23:27:37 +0000 (Sat, 19 Feb 2011)
Log Message:
-----------
Do not polar plot pass points below the horizon.
Modified Paths:
--------------
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view.c
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2011-02-16 12:39:58 UTC (rev 767)
+++ trunk/src/gtk-polar-plot.c 2011-02-19 23:27:37 UTC (rev 768)
@@ -932,7 +932,8 @@
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (pv->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ 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;
@@ -1042,7 +1043,8 @@
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (pv->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ 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;
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-02-16 12:39:58 UTC (rev 767)
+++ trunk/src/gtk-polar-view-popup.c 2011-02-19 23:27:37 UTC (rev 768)
@@ -234,7 +234,8 @@
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ 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;
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-02-16 12:39:58 UTC (rev 767)
+++ trunk/src/gtk-polar-view.c 2011-02-19 23:27:37 UTC (rev 768)
@@ -1030,7 +1030,8 @@
for (i = 1; i < num-1; i++) {
detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ if (detail->el>=0)
+ azel_to_xy (pv, detail->az, detail->el, &x, &y);
points->coords[2*i] = (double) x;
points->coords[2*i+1] = (double) y;
@@ -1175,10 +1176,11 @@
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));
- azel_to_xy (pv, detail->az, detail->el, &x, &y);
+ 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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-21 11:45:44
|
Revision: 789
http://gpredict.svn.sourceforge.net/gpredict/?rev=789&view=rev
Author: aa1vs
Date: 2011-03-21 11:45:37 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
Include geo and decayed orbits in has_aos and make dynamic calls to decayed instead of static orbit type check.
Modified Paths:
--------------
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-list.c
trunk/src/gtk-sat-map-ground-track.c
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-module.c
trunk/src/gtk-single-sat.c
trunk/src/orbit-tools.c
trunk/src/predict-tools.c
Modified: trunk/src/gtk-event-list-popup.c
===================================================================
--- trunk/src/gtk-event-list-popup.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-event-list-popup.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -149,8 +149,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
pass = get_next_pass (sat, qth,
@@ -216,8 +215,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-polar-view-popup.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -388,8 +388,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (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));
@@ -453,8 +452,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-list-popup.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -151,8 +151,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
pass = get_next_pass (sat, qth,
@@ -219,8 +218,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool (SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-list.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -654,7 +654,7 @@
if (sat->otype == ORBIT_TYPE_GEO) {
buff = g_strdup ("G");
}
- else if (sat->otype == ORBIT_TYPE_DECAYED) {
+ else if (decayed(sat)) {
buff = g_strdup ("D");
}
else if (sat->range_rate > 0.001) {
Modified: trunk/src/gtk-sat-map-ground-track.c
===================================================================
--- trunk/src/gtk-sat-map-ground-track.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-map-ground-track.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -123,7 +123,7 @@
/* calculate (lat,lon) for the required orbits */
- while (sat->orbit <= max_orbit) {
+ while (sat->orbit <= max_orbit && !decayed(sat)) {
/* We use 30 sec time steps. If resolution is too fine, the
line drawing routine will filter out unnecessary points
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-map-popup.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -282,8 +282,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (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));
@@ -347,8 +346,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-sat-module.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -964,8 +964,6 @@
and the other requirements are fulfilled
*/
if ((GTK_SAT_MODULE (module)->event_count == 0) &&
- (sat->otype != ORBIT_TYPE_GEO) &&
- (sat->otype != ORBIT_TYPE_DECAYED) &&
has_aos (sat, module->qth)) {
/* Note that has_aos may return TRUE for geostationary sats
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/gtk-single-sat.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -436,7 +436,7 @@
if (sat->otype == ORBIT_TYPE_GEO) {
buff = g_strdup ("Geostationary");
}
- else if (sat->otype == ORBIT_TYPE_DECAYED) {
+ else if (decayed(sat)) {
buff = g_strdup ("Decayed");
}
else if (sat->range_rate > 0.0) {
@@ -1026,8 +1026,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (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));
@@ -1092,8 +1091,7 @@
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
/* check wheather sat actially has AOS */
- if ((sat->otype != ORBIT_TYPE_GEO) && (sat->otype != ORBIT_TYPE_DECAYED) &&
- has_aos (sat, qth)) {
+ if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
passes = get_next_passes (sat, qth,
Modified: trunk/src/orbit-tools.c
===================================================================
--- trunk/src/orbit-tools.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/orbit-tools.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -94,13 +94,25 @@
gboolean
decayed (sat_t *sat)
{
+
+#if 0
+ /*this code was used for debugging basically it print out the
+ time of decay for comparison to other sources.
+ */
+ time_t t;
+ gdouble eol;
+ char something[100];
+ eol=sat->jul_epoch + ((16.666666 - sat->meanmo) /
+ (10.0 * fabs (sat->tle.xndt2o/(twopi/xmnpda/xmnpda))));
+ /* convert julian date to struct tm */
+ t = (eol - 2440587.5)*86400.;
+ strftime(something,100,"%F %R",gmtime(&t));
+ printf("%s Decayed at %s %f\n",sat->nickname,something,eol);
+#endif
- /* tle.xndt2o/(twopi/xmnpda/xmnpda) is the value before converted the
+ /* tle.xndt2o/(twopi/xmnpda/xmnpda) is the value before converted the
value matches up with the value in predict 2.2.3 */
- /*** FIXME decayed is treated as a static quantity.
- It is time dependent. Also sat->jul_utc is often zero
- when this function is called
- ***/
+
if (sat->jul_epoch + ((16.666666 - sat->meanmo) /
(10.0 * fabs (sat->tle.xndt2o/(twopi/xmnpda/xmnpda)))) < sat->jul_utc)
return TRUE;
@@ -124,27 +136,36 @@
double lin, sma, apogee;
gboolean retcode = FALSE;
-
/* FIXME */
- if (sat->meanmo == 0.0) {
- retcode = FALSE;
- }
- else {
+ /*the first condition takes care of geostationary satellites and
+ decayed satellites. The second deals with LEOS from the original
+ predict code. However, nothing correctly handles geos with poor
+ station keeping that are tracing a figure 8.
+ */
- /* xincl is already in RAD by select_ephemeris */
- lin = sat->tle.xincl;
- if (lin >= pio2)
- lin = pi - lin;
+ if ((sat->otype == ORBIT_TYPE_GEO) || (decayed(sat))) {
+ retcode = FALSE;
+ } else {
- sma = 331.25 * exp(log(1440.0/sat->meanmo) * (2.0/3.0));
- apogee = sma * (1.0 + sat->tle.eo) - xkmper;
-
- if ((acos(xkmper/(apogee+xkmper))+(lin)) > fabs(qth->lat*de2ra))
- retcode = TRUE;
- else
- retcode = FALSE;
-
+ if (sat->meanmo == 0.0) {
+ retcode = FALSE;
+ }
+ else {
+
+ /* xincl is already in RAD by select_ephemeris */
+ lin = sat->tle.xincl;
+ if (lin >= pio2)
+ lin = pi - lin;
+
+ sma = 331.25 * exp(log(1440.0/sat->meanmo) * (2.0/3.0));
+ apogee = sma * (1.0 + sat->tle.eo) - xkmper;
+
+ if ((acos(xkmper/(apogee+xkmper))+(lin)) > fabs(qth->lat*de2ra))
+ retcode = TRUE;
+ else
+ retcode = FALSE;
+
+ }
}
-
return retcode;
}
Modified: trunk/src/predict-tools.c
===================================================================
--- trunk/src/predict-tools.c 2011-03-20 15:05:07 UTC (rev 788)
+++ trunk/src/predict-tools.c 2011-03-21 11:45:37 UTC (rev 789)
@@ -136,9 +136,7 @@
predict_calc (sat, qth, start);
/* check whether satellite has aos */
- if ((sat->otype == ORBIT_TYPE_GEO) ||
- (sat->otype == ORBIT_TYPE_DECAYED) ||
- !has_aos (sat, qth)) {
+ if (!has_aos (sat, qth)) {
return 0.0;
@@ -235,9 +233,7 @@
predict_calc (sat, qth, start);
/* check whether satellite has aos */
- if ((sat->otype == ORBIT_TYPE_GEO) ||
- (sat->otype == ORBIT_TYPE_DECAYED) ||
- !has_aos (sat, qth)) {
+ if (!has_aos (sat, qth)) {
return 0.0;
@@ -343,9 +339,7 @@
predict_calc (sat, qth, start);
/* check whether satellite has aos */
- if ((sat->otype == ORBIT_TYPE_GEO) ||
- (sat->otype == ORBIT_TYPE_DECAYED) ||
- !has_aos (sat, qth)) {
+ if (!has_aos (sat, qth)) {
return 0.0;
@@ -1078,9 +1072,7 @@
predict_calc (sat, qth, t);
/* check whether satellite has aos */
- if ((sat->otype == ORBIT_TYPE_GEO) ||
- (sat->otype == ORBIT_TYPE_DECAYED) ||
- !has_aos (sat, qth)) {
+ if (!has_aos (sat, qth)) {
return NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-26 19:56:20
|
Revision: 796
http://gpredict.svn.sourceforge.net/gpredict/?rev=796&view=rev
Author: aa1vs
Date: 2011-03-26 19:56:13 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
Change time printing routines to julian_print_time in time-tools.c.
Modified Paths:
--------------
trunk/src/gtk-azel-plot.c
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view.c
trunk/src/gtk-sat-list.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
trunk/src/pass-to-txt.c
trunk/src/predict-tools.c
trunk/src/sat-pass-dialogs.c
trunk/src/time-tools.c
trunk/src/time-tools.h
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-azel-plot.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -234,7 +234,6 @@
guint i;
gdouble xstep,ystep;
gdouble t,az,el;
- time_t tim;
gchar buff[7];
gchar *txt;
@@ -298,17 +297,8 @@
/* get time */
xy_to_graph (polv, polv->x0 + (i+1) * xstep, 0.0, &t, &az, &el);
- /* convert julian date to struct tm */
- tim = (t - 2440587.5)*86400.0;
+ julian_print_time (buff, 7, "%H:%M", t);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- strftime (buff, 7, "%H:%M", localtime (&tim));
- else
- strftime (buff, 7, "%H:%M", gmtime (&tim));
-
- buff[6]='\0';
-
polv->xlab[i] = goo_canvas_text_model_new (root, buff,
(gfloat) (polv->x0 + (i+1) * xstep),
(gfloat) (polv->y0 + 5),
@@ -694,7 +684,6 @@
{
GtkAzelPlot *polv = GTK_AZEL_PLOT (data);
gdouble t,az,el;
- time_t tim;
gfloat x,y;
gchar *text;
gchar buff[10];
@@ -715,17 +704,8 @@
xy_to_graph (polv, x, y, &t, &az, &el);
- /* convert julian date to struct tm */
- tim = (t - 2440587.5)*86400.0;
+ julian_print_time(buff, 10, "%H:%M:%S", t);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- strftime (buff, 10, "%H:%M:%S", localtime (&tim));
- else
- strftime (buff, 10, "%H:%M:%S", gmtime (&tim));
-
- buff[8]='\0';
-
/* cursor track */
text = g_strdup_printf ("T: %s, AZ: %.0f\302\260, EL: %.0f\302\260", buff, az, el);
g_object_set (polv->curs, "text", text, NULL);
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-polar-plot.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -970,7 +970,6 @@
create_time_tick (GtkPolarPlot *pv, gdouble time, gfloat x, gfloat y)
{
GooCanvasItemModel *item;
- time_t t;
gchar buff[7];
GtkAnchorType anchor;
GooCanvasItemModel *root;
@@ -980,17 +979,8 @@
col = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL);
- /* convert julian date to struct tm */
- t = (time - 2440587.5)*86400.;
+ julian_print_time (buff, 8, "%H:%M", time);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- strftime (buff, 8, "%H:%M", localtime (&t));
- else
- strftime (buff, 8, "%H:%M", gmtime (&t));
-
- buff[6]='\0';
-
if (x > pv->cx) {
anchor = GTK_ANCHOR_EAST;
x -= 5;
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-polar-view-popup.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -325,7 +325,6 @@
create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y)
{
GooCanvasItemModel *item;
- time_t t;
gchar buff[7];
GtkAnchorType anchor;
GooCanvasItemModel *root;
@@ -338,17 +337,8 @@
MOD_CFG_POLAR_TRACK_COL,
SAT_CFG_INT_POLAR_TRACK_COL);
- /* convert julian date to struct tm */
- t = (time - 2440587.5)*86400.;
+ julian_print_time (buff, 8, "%H:%M", time);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- strftime (buff, 8, "%H:%M", localtime (&t));
- else
- strftime (buff, 8, "%H:%M", gmtime (&t));
-
- buff[6]='\0';
-
if (x > pv->cx) {
anchor = GTK_ANCHOR_EAST;
x -= 5;
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-polar-view.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -1113,17 +1113,8 @@
MOD_CFG_POLAR_TRACK_COL,
SAT_CFG_INT_POLAR_TRACK_COL);
- /* convert julian date to struct tm */
- t = (time - 2440587.5)*86400.;
-
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- strftime (buff, 8, "%H:%M", localtime (&t));
- else
- strftime (buff, 8, "%H:%M", gmtime (&t));
-
- buff[6]='\0';
-
+ julian_print_time (buff, 8, "%H:%M", time);
+
if (x > pv->cx) {
anchor = GTK_ANCHOR_EAST;
x -= 5;
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-sat-list.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -43,6 +43,7 @@
#include "locator.h"
#include "sat-vis.h"
#include "sat-info.h"
+#include "time-tools.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
@@ -742,8 +743,6 @@
gchar *tfstr;
gchar *fmtstr;
gchar *alstr;
- time_t t;
- guint size;
if (sat->aos > sat->los) {
@@ -764,26 +763,13 @@
}
else {
- /* convert julian date to struct tm */
- t = (number - 2440587.5)*86400.;
-
/* format the number */
tfstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
fmtstr = g_strconcat (alstr, tfstr, NULL);
g_free (tfstr);
+
+ julian_print_time (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH,
- fmtstr, localtime (&t));
- else
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH,
- fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > MAX_LENGTH */
- buff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
gtk_list_store_set (GTK_LIST_STORE (model), iter,
SAT_LIST_COL_NEXT_EVENT, buff,
-1);
@@ -1109,8 +1095,6 @@
gchar buff[TIME_FORMAT_MAX_LENGTH];
gchar *fmtstr;
guint coli = GPOINTER_TO_UINT (column);
- time_t t;
- guint size;
gtk_tree_model_get (model, iter, coli, &number, -1);
@@ -1121,22 +1105,11 @@
NULL);
}
else {
-
- /* convert julian date to struct tm */
- t = (number - 2440587.5)*86400.;
-
+
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > TIME_FORMAT_MAX_LENGTH */
- buff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
+ julian_print_time (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
g_object_set (renderer,
"text", buff,
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-sat-module.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -69,6 +69,7 @@
#include "gtk-rot-ctrl.h"
#include "gtk-sky-glance.h"
#include "compat.h"
+#include "time-tools.h"
//#ifdef G_OS_WIN32
//# include "libc_internal.h"
@@ -1345,27 +1346,14 @@
update_header (GtkSatModule *module)
{
gchar *fmtstr;
- time_t t;
- guint size;
gchar buff[TIME_FORMAT_MAX_LENGTH+1];
gchar *buff2;
- t = (module->tmgCdnum - 2440587.5)*86400.;
-
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
-
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
- if (size < TIME_FORMAT_MAX_LENGTH)
- buff[size]='\0';
- else
- buff[TIME_FORMAT_MAX_LENGTH]='\0';
-
+ julian_print_time (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, module->tmgCdnum);
+
if (module->qth->type==QTH_GPSD_TYPE) {
buff2=g_strdup_printf("%s GPS %0.3f seconds old", buff,fabs(module->tmgCdnum-module->qth->gpsd_update)*(24*3600));
gtk_label_set_text (GTK_LABEL (module->header), buff2);
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-sat-selector.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -786,22 +786,10 @@
}
else {
- /* convert julian date to struct tm */
- t = (number - 2440587.5)*86400.;
-
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
+ julian_print_time(buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > TIME_FORMAT_MAX_LENGTH */
- buff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
g_object_set (renderer,
"text", buff,
NULL);
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-single-sat.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -49,8 +49,8 @@
#include "orbit-tools.h"
#include "predict-tools.h"
#include "sat-pass-dialogs.h"
+#include "time-tools.h"
-
/** \brief Column titles indexed with column symb. refs. */
const gchar *SINGLE_SAT_FIELD_TITLE[SINGLE_SAT_FIELD_NUMBER] = {
N_("Azimuth"),
@@ -392,8 +392,6 @@
gint retcode;
gchar *fmtstr;
gchar *alstr;
- time_t t;
- guint size;
sat_vis_t vis;
@@ -495,22 +493,10 @@
}
if (number > 0.0) {
- /* convert julian date to struct tm */
- t = (number - 2440587.5)*86400.;
-
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
+ julian_print_time (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > MAX_LENGTH */
- tbuf[TIME_FORMAT_MAX_LENGTH-1]='\0';
-
g_free (fmtstr);
buff = g_strconcat (alstr, tbuf, NULL);
@@ -527,21 +513,10 @@
case SINGLE_SAT_FIELD_AOS:
if (sat->aos > 0.0) {
- /* convert julian date to struct tm */
- t = (sat->aos - 2440587.5)*86400.;
-
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > MAX_LENGTH */
- tbuf[TIME_FORMAT_MAX_LENGTH-1]='\0';
+ julian_print_time(tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, sat->aos);
g_free (fmtstr);
@@ -555,21 +530,10 @@
case SINGLE_SAT_FIELD_LOS:
if (sat->los > 0.0) {
- /* convert julian date to struct tm */
- t = (sat->los - 2440587.5)*86400.;
- /* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > MAX_LENGTH */
- tbuf[TIME_FORMAT_MAX_LENGTH-1]='\0';
+ julian_print_time (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, sat->los);
g_free (fmtstr);
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/gtk-sky-glance.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -108,9 +108,7 @@
static gdouble t2x (GtkSkyGlance *skg, gdouble t);
static gdouble x2t (GtkSkyGlance *skg, gdouble x);
-static gchar *time_to_str (gdouble julutc);
-
static GtkVBoxClass *parent_class = NULL;
@@ -334,7 +332,6 @@
GooCanvasItemModel *hrt,*hrl,*hrm;
guint i,n;
gdouble th,tm;
- time_t tt;
gdouble xh,xm;
gchar buff[3];
@@ -405,13 +402,8 @@
NULL);
/* hour tick label */
- tt = (th - 2440587.5)*86400.0;
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- strftime (buff, 3, "%H", localtime (&tt));
- else
- strftime (buff, 3, "%H", gmtime (&tt));
-
- buff[2] = '\0';
+ julian_print_time (buff, 3, "%H", th);
+
hrl = goo_canvas_text_model_new (root, buff, xh, skg->h + 12,
-1, GTK_ANCHOR_N,
"font", "Sans 8",
@@ -628,7 +620,6 @@
GtkSkyGlance *skg = GTK_SKY_GLANCE (data);
GooCanvasPoints *pts;
gdouble t;
- time_t tt;
gchar buff[6];
/* update cursor tracking line and time label */
@@ -643,17 +634,8 @@
/* get time corresponding to x */
t = x2t (skg, event->x);
- /* convert julian date to struct tm */
- tt = (t - 2440587.5)*86400.;
+ julian_print_time (buff, 6, "%H:%M", t);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- strftime (buff, 6, "%H:%M", localtime (&tt));
- else
- strftime (buff, 6, "%H:%M", gmtime (&tt));
-
- buff[5] = '\0';
-
/* in order to avoid label clipping close to the edges of
the chart, the label is placed left/right of the cursor
tracking line depending on which half we are in.
@@ -994,9 +976,9 @@
/* tooltips vars */
gchar *tooltip; /* the complete tooltips string */
- gchar *aosstr; /* AOS time string */
- gchar *losstr; /* LOS time string */
- gchar *tcastr; /* TCA time string */
+ gchar aosstr[100]; /* AOS time string */
+ gchar losstr[100]; /* LOS time string */
+ gchar tcastr[100]; /* TCA time string */
/* FIXME:
@@ -1037,9 +1019,9 @@
tmppass = (pass_t *) g_slist_nth_data (passes, i);
skypass->pass = copy_pass (tmppass);
- aosstr = time_to_str (skypass->pass->aos);
- losstr = time_to_str (skypass->pass->los);
- tcastr = time_to_str (skypass->pass->tca);
+ julian_print_time (aosstr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->aos);
+ julian_print_time (losstr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->los);
+ julian_print_time (tcastr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->tca);
/* box tooltip will contain pass summary */
tooltip = g_strdup_printf("<big><b>%s</b>\n</big>\n"\
@@ -1052,10 +1034,6 @@
tcastr, skypass->pass->maxel_az, skypass->pass->max_el,
losstr, skypass->pass->los_az);
- g_free (aosstr);
- g_free (losstr);
- g_free (tcastr);
-
skypass->box = goo_canvas_rect_model_new (root, 10, 10, 20, 20, /* dummy coordinates */
"stroke-color-rgba", bcol,
"fill-color-rgba", fcol,
@@ -1092,47 +1070,3 @@
skg->satlab = g_slist_append (skg->satlab, lab);
}
}
-
-
-
-/** \brief Convert "jul_utc" time to formatted string
- * \param julutc The time to convert
- * \return A newly allocated string containing the formatted time (should be freed by caller)
- *
- * \bug This code is duplicated many places.
- */
-static gchar *time_to_str (gdouble julutc)
-{
- gchar buff[TIME_FORMAT_MAX_LENGTH];
- gchar *fmtstr;
- gchar *timestr;
- time_t t;
- guint size;
-
-
- /* convert julian date to struct time_t */
- t = (julutc - 2440587.5)*86400.;
-
- /* format the number */
- fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
-
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) {
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- }
- else {
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
- }
-
- g_free (fmtstr);
-
-
- if (size == 0)
- /* size > MAX_LENGTH */
- buff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
- timestr = g_strdup (buff);
-
-
- return timestr;
-}
Modified: trunk/src/pass-to-txt.c
===================================================================
--- trunk/src/pass-to-txt.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/pass-to-txt.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -34,6 +34,7 @@
#include "locator.h"
#include "sat-vis.h"
#include "pass-to-txt.h"
+#include "time-tools.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
@@ -191,7 +192,6 @@
pass_to_txt_tblheader (pass_t *pass, qth_t *qth, gint fields)
{
gchar *fmtstr;
- time_t t;
guint size;
gchar tbuff[TIME_FORMAT_MAX_LENGTH];
guint i;
@@ -203,13 +203,8 @@
/* first, get the length of the time field */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- t = (pass->aos - 2440587.5)*86400.;
+ size = julian_print_time (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
g_free (fmtstr);
/* add time column */
@@ -249,8 +244,6 @@
pass_to_txt_tblcontents (pass_t *pass, qth_t *qth, gint fields)
{
gchar *fmtstr;
- time_t t;
- guint size;
gchar tbuff[TIME_FORMAT_MAX_LENGTH];
guint i,num;
gchar *line;
@@ -264,17 +257,8 @@
/* first, get the length of the time field */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- t = (pass->aos - 2440587.5)*86400.;
+ julian_print_time (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > MAX_LENGTH */
- tbuff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
/* get number of rows */
num = g_slist_length (pass->details);
@@ -284,15 +268,7 @@
detail = PASS_DETAIL (g_slist_nth_data (pass->details, i));
/* time */
- t = (detail->time - 2440587.5)*86400.;
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > MAX_LENGTH */
- tbuff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
+ julian_print_time (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, detail->time);
line = g_strdup_printf (" %s", tbuff);
@@ -492,7 +468,6 @@
passes_to_txt_tblheader (GSList *passes, qth_t *qth, gint fields)
{
gchar *fmtstr;
- time_t t;
guint size;
gchar tbuff[TIME_FORMAT_MAX_LENGTH];
guint i;
@@ -506,17 +481,8 @@
/* first, get the length of the time field */
pass = PASS (g_slist_nth_data (passes, 0));
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- t = (pass->aos - 2440587.5)*86400.;
+ size = julian_print_time (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > TIME_FORMAT_MAX_LENGTH */
- tbuff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
g_free (fmtstr);
/* add AOS, TCA, and LOS columns */
@@ -556,8 +522,6 @@
passes_to_txt_tblcontents (GSList *passes, qth_t *qth, gint fields)
{
gchar *fmtstr;
- time_t t;
- guint size;
gchar tbuff[TIME_FORMAT_MAX_LENGTH];
guint i,num;
gchar *line = NULL;
@@ -570,17 +534,8 @@
/* first, get the length of the time field */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- t = (pass->aos - 2440587.5)*86400.;
+ julian_print_time(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > TIME_FORMAT_MAX_LENGTH */
- tbuff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
/* get number of rows */
num = g_slist_length (passes);
@@ -589,47 +544,21 @@
pass = PASS (g_slist_nth_data (passes, i));
/* AOS */
- t = (pass->aos - 2440587.5)*86400.;
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
+ julian_print_time(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
- if (size == 0)
- /* size > TIME_FORMAT_MAX_LENGTH */
- tbuff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
line = g_strdup_printf (" %s", tbuff);
/* TCA */
- t = (pass->tca - 2440587.5)*86400.;
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
+ julian_print_time(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->tca);
- if (size == 0)
- /* size > TIME_FORMAT_MAX_LENGTH */
- tbuff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
-
buff = g_strdup (line);
g_free (line);
line = g_strdup_printf ("%s %s", buff, tbuff);
g_free (buff);
/* LOS */
- t = (pass->los - 2440587.5)*86400.;
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
+ julian_print_time(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->los);
- if (size == 0)
- /* size > TIME_FORMAT_MAX_LENGTH */
- tbuff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
-
-
buff = g_strdup (line);
g_free (line);
line = g_strdup_printf ("%s %s", buff, tbuff);
Modified: trunk/src/predict-tools.c
===================================================================
--- trunk/src/predict-tools.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/predict-tools.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -502,7 +502,7 @@
/* Find los of next pass or of current pass */
los = find_los (sat, qth, t0, maxdt); // See if a pass is ongoing
- aos = find_aos (sat, qth, t0, maxdt);
+ aos = find_aos (sat, qth, t0, start + maxdt - t0);
/* sat_log_log(SAT_LOG_LEVEL_MSG, "%s:%s:%d: found aos %f and los %f for t0=%f", */
/* __FILE__, */
/* __FUNCTION__, */
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/sat-pass-dialogs.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -862,27 +862,10 @@
}
else {
- /* convert julian date to struct tm */
- t = (number - 2440587.5)*86400.;
-
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
+ julian_print_time (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
- /* format either local time or UTC depending on check box */
- if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
- else
- size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));
-
- if (size == 0)
- /* size > MAX_LENGTH */
- buff[TIME_FORMAT_MAX_LENGTH-1] = '\0';
- /*
- if (size < TIME_FORMAT_MAX_LENGTH)
- buff[size]='\0';
- else
- buff[TIME_FORMAT_MAX_LENGTH]='\0';
-*/
g_object_set (renderer,
"text", buff,
NULL);
Modified: trunk/src/time-tools.c
===================================================================
--- trunk/src/time-tools.c 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/time-tools.c 2011-03-26 19:56:13 UTC (rev 796)
@@ -34,6 +34,7 @@
#endif
#include "sgpsdp/sgp4sdp4.h"
#include "time-tools.h"
+#include "sat-cfg.h"
//#ifdef G_OS_WIN32
//# include "libc_internal.h"
//# include "libc_interface.h"
@@ -62,7 +63,24 @@
return daynum;
}
+int
+julian_print_time(char *s, size_t max, const char *format, gdouble jultime){
+ // printf("Someone called me\n");
+ time_t tim;
+ size_t size=0;
+ tim = (jultime - 2440587.5)*86400.0;
+ if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME))
+ size = strftime (s, max, format, localtime (&tim));
+ else
+ size = strftime (s, max, format, gmtime (&tim));
+ if (size<max)
+ s[size] = '\0';
+ else
+ s[max-1] = '\0';
+ return size;
+}
+
/* This function calculates the day number from m/d/y. */
/* Legacy code no longer in use
long
Modified: trunk/src/time-tools.h
===================================================================
--- trunk/src/time-tools.h 2011-03-26 17:38:17 UTC (rev 795)
+++ trunk/src/time-tools.h 2011-03-26 19:56:13 UTC (rev 796)
@@ -30,6 +30,7 @@
gdouble get_current_daynum (void);
//long get_daynum_from_dmy (int d, int m, int y);
+int julian_print_time(char *s, size_t max, const char *format, gdouble jultime);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Alexandru C. <oz...@gm...> - 2011-03-26 21:24:28
|
Nice cleanup, but the name julian_print_time() seems a bit misleading. Maybe something like daynum_to_str() or strftime_jd() since it is a wrapper around strftime()? Alex On Sat, Mar 26, 2011 at 8:56 PM, <aa...@us...> wrote: > Revision: 796 > http://gpredict.svn.sourceforge.net/gpredict/?rev=796&view=rev > Author: aa1vs > Date: 2011-03-26 19:56:13 +0000 (Sat, 26 Mar 2011) > > Log Message: > ----------- > Change time printing routines to julian_print_time in time-tools.c. > > Modified Paths: > -------------- > trunk/src/gtk-azel-plot.c > trunk/src/gtk-polar-plot.c > trunk/src/gtk-polar-view-popup.c > trunk/src/gtk-polar-view.c > trunk/src/gtk-sat-list.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 > trunk/src/pass-to-txt.c > trunk/src/predict-tools.c > trunk/src/sat-pass-dialogs.c > trunk/src/time-tools.c > trunk/src/time-tools.h > .... > > Modified: trunk/src/time-tools.c > =================================================================== > --- trunk/src/time-tools.c 2011-03-26 17:38:17 UTC (rev 795) > +++ trunk/src/time-tools.c 2011-03-26 19:56:13 UTC (rev 796) > @@ -34,6 +34,7 @@ > #endif > #include "sgpsdp/sgp4sdp4.h" > #include "time-tools.h" > +#include "sat-cfg.h" > //#ifdef G_OS_WIN32 > //# include "libc_internal.h" > //# include "libc_interface.h" > @@ -62,7 +63,24 @@ > return daynum; > } > > +int > +julian_print_time(char *s, size_t max, const char *format, gdouble jultime){ > + // printf("Someone called me\n"); > + time_t tim; > + size_t size=0; > + tim = (jultime - 2440587.5)*86400.0; > + if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME)) > + size = strftime (s, max, format, localtime (&tim)); > + else > + size = strftime (s, max, format, gmtime (&tim)); > > + if (size<max) > + s[size] = '\0'; > + else > + s[max-1] = '\0'; > + return size; > +} > + > /* This function calculates the day number from m/d/y. */ > /* Legacy code no longer in use > long > > Modified: trunk/src/time-tools.h > =================================================================== > --- trunk/src/time-tools.h 2011-03-26 17:38:17 UTC (rev 795) > +++ trunk/src/time-tools.h 2011-03-26 19:56:13 UTC (rev 796) > @@ -30,6 +30,7 @@ > > gdouble get_current_daynum (void); > //long get_daynum_from_dmy (int d, int m, int y); > +int julian_print_time(char *s, size_t max, const char *format, gdouble jultime); > #endif > |
|
From: <aa...@us...> - 2011-03-26 20:09:09
|
Revision: 797
http://gpredict.svn.sourceforge.net/gpredict/?rev=797&view=rev
Author: aa1vs
Date: 2011-03-26 20:09:02 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
Clean up compiler warnings.
Modified Paths:
--------------
trunk/src/gtk-polar-view.c
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-selector.c
trunk/src/sat-pass-dialogs.c
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-03-26 19:56:13 UTC (rev 796)
+++ trunk/src/gtk-polar-view.c 2011-03-26 20:09:02 UTC (rev 797)
@@ -42,6 +42,7 @@
#include "gtk-polar-view-popup.h"
#include "gtk-polar-view.h"
#include "sat-info.h"
+#include "time-tools.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
@@ -1100,7 +1101,6 @@
static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y)
{
GooCanvasItemModel *item;
- time_t t;
gchar buff[7];
GtkAnchorType anchor;
GooCanvasItemModel *root;
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-03-26 19:56:13 UTC (rev 796)
+++ trunk/src/gtk-sat-list.c 2011-03-26 20:09:02 UTC (rev 797)
@@ -44,6 +44,7 @@
#include "sat-vis.h"
#include "sat-info.h"
#include "time-tools.h"
+#include "orbit-tools.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2011-03-26 19:56:13 UTC (rev 796)
+++ trunk/src/gtk-sat-map.c 2011-03-26 20:09:02 UTC (rev 797)
@@ -57,6 +57,7 @@
#include "sat-debugger.h"
#include "sat-info.h"
#include "predict-tools.h"
+#include "orbit-tools.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
#endif
@@ -1890,7 +1891,6 @@
/*get rid of a decayed satellite*/
if (decayed(sat) && obj!=NULL) {
- SAT_MAP_OBJ (g_hash_table_remove (satmap->obj, catnum));
/*remove items*/
idx = goo_canvas_item_model_find_child (root,obj->marker);
if (idx !=-1)
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-03-26 19:56:13 UTC (rev 796)
+++ trunk/src/gtk-sat-selector.c 2011-03-26 20:09:02 UTC (rev 797)
@@ -46,8 +46,8 @@
#include "sat-cfg.h"
#include "gtk-sat-selector.h"
#include "gpredict-utils.h"
+#include "time-tools.h"
-
static void gtk_sat_selector_class_init (GtkSatSelectorClass *class);
static void gtk_sat_selector_init (GtkSatSelector *selector);
static void gtk_sat_selector_destroy (GtkObject *object);
@@ -773,8 +773,6 @@
gchar buff[TIME_FORMAT_MAX_LENGTH];
gchar *fmtstr;
guint coli = GPOINTER_TO_UINT (column);
- time_t t;
- guint size;
gtk_tree_model_get (model, iter, coli, &number, -1);
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2011-03-26 19:56:13 UTC (rev 796)
+++ trunk/src/sat-pass-dialogs.c 2011-03-26 20:09:02 UTC (rev 797)
@@ -47,6 +47,7 @@
#include "gtk-azel-plot.h"
#include "save-pass.h"
#include "print-pass.h"
+#include "time-tools.h"
@@ -849,8 +850,6 @@
gchar buff[TIME_FORMAT_MAX_LENGTH];
gchar *fmtstr;
guint coli = GPOINTER_TO_UINT (column);
- time_t t;
- guint size;
gtk_tree_model_get (model, iter, coli, &number, -1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-28 00:17:24
|
Revision: 798
http://gpredict.svn.sourceforge.net/gpredict/?rev=798&view=rev
Author: aa1vs
Date: 2011-03-28 00:17:18 +0000 (Mon, 28 Mar 2011)
Log Message:
-----------
Rename julian_print_time daynum_to_str.
Modified Paths:
--------------
trunk/src/gtk-azel-plot.c
trunk/src/gtk-polar-plot.c
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-polar-view.c
trunk/src/gtk-sat-list.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
trunk/src/pass-to-txt.c
trunk/src/sat-pass-dialogs.c
trunk/src/time-tools.c
trunk/src/time-tools.h
Modified: trunk/src/gtk-azel-plot.c
===================================================================
--- trunk/src/gtk-azel-plot.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-azel-plot.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -297,7 +297,7 @@
/* get time */
xy_to_graph (polv, polv->x0 + (i+1) * xstep, 0.0, &t, &az, &el);
- julian_print_time (buff, 7, "%H:%M", t);
+ daynum_to_str (buff, 7, "%H:%M", t);
polv->xlab[i] = goo_canvas_text_model_new (root, buff,
(gfloat) (polv->x0 + (i+1) * xstep),
@@ -704,7 +704,7 @@
xy_to_graph (polv, x, y, &t, &az, &el);
- julian_print_time(buff, 10, "%H:%M:%S", t);
+ daynum_to_str(buff, 10, "%H:%M:%S", t);
/* cursor track */
text = g_strdup_printf ("T: %s, AZ: %.0f\302\260, EL: %.0f\302\260", buff, az, el);
Modified: trunk/src/gtk-polar-plot.c
===================================================================
--- trunk/src/gtk-polar-plot.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-polar-plot.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -979,7 +979,7 @@
col = sat_cfg_get_int (SAT_CFG_INT_POLAR_TRACK_COL);
- julian_print_time (buff, 8, "%H:%M", time);
+ daynum_to_str (buff, 8, "%H:%M", time);
if (x > pv->cx) {
anchor = GTK_ANCHOR_EAST;
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-polar-view-popup.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -337,7 +337,7 @@
MOD_CFG_POLAR_TRACK_COL,
SAT_CFG_INT_POLAR_TRACK_COL);
- julian_print_time (buff, 8, "%H:%M", time);
+ daynum_to_str (buff, 8, "%H:%M", time);
if (x > pv->cx) {
anchor = GTK_ANCHOR_EAST;
Modified: trunk/src/gtk-polar-view.c
===================================================================
--- trunk/src/gtk-polar-view.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-polar-view.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -1113,7 +1113,7 @@
MOD_CFG_POLAR_TRACK_COL,
SAT_CFG_INT_POLAR_TRACK_COL);
- julian_print_time (buff, 8, "%H:%M", time);
+ daynum_to_str (buff, 8, "%H:%M", time);
if (x > pv->cx) {
anchor = GTK_ANCHOR_EAST;
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-sat-list.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -769,7 +769,7 @@
fmtstr = g_strconcat (alstr, tfstr, NULL);
g_free (tfstr);
- julian_print_time (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
+ daynum_to_str (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
gtk_list_store_set (GTK_LIST_STORE (model), iter,
SAT_LIST_COL_NEXT_EVENT, buff,
@@ -1110,7 +1110,7 @@
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
+ daynum_to_str (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
g_object_set (renderer,
"text", buff,
Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-sat-module.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -1352,7 +1352,7 @@
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, module->tmgCdnum);
+ daynum_to_str (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, module->tmgCdnum);
if (module->qth->type==QTH_GPSD_TYPE) {
buff2=g_strdup_printf("%s GPS %0.3f seconds old", buff,fabs(module->tmgCdnum-module->qth->gpsd_update)*(24*3600));
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-sat-selector.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -786,7 +786,7 @@
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time(buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
+ daynum_to_str(buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
g_object_set (renderer,
"text", buff,
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-single-sat.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -495,7 +495,7 @@
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
+ daynum_to_str (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
g_free (fmtstr);
@@ -516,7 +516,7 @@
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time(tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, sat->aos);
+ daynum_to_str(tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, sat->aos);
g_free (fmtstr);
@@ -533,7 +533,7 @@
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, sat->los);
+ daynum_to_str (tbuf, TIME_FORMAT_MAX_LENGTH, fmtstr, sat->los);
g_free (fmtstr);
Modified: trunk/src/gtk-sky-glance.c
===================================================================
--- trunk/src/gtk-sky-glance.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/gtk-sky-glance.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -402,7 +402,7 @@
NULL);
/* hour tick label */
- julian_print_time (buff, 3, "%H", th);
+ daynum_to_str (buff, 3, "%H", th);
hrl = goo_canvas_text_model_new (root, buff, xh, skg->h + 12,
-1, GTK_ANCHOR_N,
@@ -634,7 +634,7 @@
/* get time corresponding to x */
t = x2t (skg, event->x);
- julian_print_time (buff, 6, "%H:%M", t);
+ daynum_to_str (buff, 6, "%H:%M", t);
/* in order to avoid label clipping close to the edges of
the chart, the label is placed left/right of the cursor
@@ -1019,9 +1019,9 @@
tmppass = (pass_t *) g_slist_nth_data (passes, i);
skypass->pass = copy_pass (tmppass);
- julian_print_time (aosstr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->aos);
- julian_print_time (losstr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->los);
- julian_print_time (tcastr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->tca);
+ daynum_to_str (aosstr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->aos);
+ daynum_to_str (losstr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->los);
+ daynum_to_str (tcastr,TIME_FORMAT_MAX_LENGTH, sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT),skypass->pass->tca);
/* box tooltip will contain pass summary */
tooltip = g_strdup_printf("<big><b>%s</b>\n</big>\n"\
Modified: trunk/src/pass-to-txt.c
===================================================================
--- trunk/src/pass-to-txt.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/pass-to-txt.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -203,7 +203,7 @@
/* first, get the length of the time field */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- size = julian_print_time (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
+ size = daynum_to_str (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
g_free (fmtstr);
@@ -257,7 +257,7 @@
/* first, get the length of the time field */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
+ daynum_to_str (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
/* get number of rows */
num = g_slist_length (pass->details);
@@ -268,7 +268,7 @@
detail = PASS_DETAIL (g_slist_nth_data (pass->details, i));
/* time */
- julian_print_time (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, detail->time);
+ daynum_to_str (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, detail->time);
line = g_strdup_printf (" %s", tbuff);
@@ -481,7 +481,7 @@
/* first, get the length of the time field */
pass = PASS (g_slist_nth_data (passes, 0));
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- size = julian_print_time (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
+ size = daynum_to_str (tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
g_free (fmtstr);
@@ -534,7 +534,7 @@
/* first, get the length of the time field */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
+ daynum_to_str(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
/* get number of rows */
num = g_slist_length (passes);
@@ -544,12 +544,12 @@
pass = PASS (g_slist_nth_data (passes, i));
/* AOS */
- julian_print_time(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
+ daynum_to_str(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->aos);
line = g_strdup_printf (" %s", tbuff);
/* TCA */
- julian_print_time(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->tca);
+ daynum_to_str(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->tca);
buff = g_strdup (line);
g_free (line);
@@ -557,7 +557,7 @@
g_free (buff);
/* LOS */
- julian_print_time(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->los);
+ daynum_to_str(tbuff, TIME_FORMAT_MAX_LENGTH, fmtstr, pass->los);
buff = g_strdup (line);
g_free (line);
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/sat-pass-dialogs.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -863,7 +863,7 @@
/* format the number */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
- julian_print_time (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
+ daynum_to_str (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, number);
g_object_set (renderer,
"text", buff,
Modified: trunk/src/time-tools.c
===================================================================
--- trunk/src/time-tools.c 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/time-tools.c 2011-03-28 00:17:18 UTC (rev 798)
@@ -64,7 +64,7 @@
}
int
-julian_print_time(char *s, size_t max, const char *format, gdouble jultime){
+daynum_to_str(char *s, size_t max, const char *format, gdouble jultime){
// printf("Someone called me\n");
time_t tim;
size_t size=0;
Modified: trunk/src/time-tools.h
===================================================================
--- trunk/src/time-tools.h 2011-03-26 20:09:02 UTC (rev 797)
+++ trunk/src/time-tools.h 2011-03-28 00:17:18 UTC (rev 798)
@@ -30,7 +30,7 @@
gdouble get_current_daynum (void);
//long get_daynum_from_dmy (int d, int m, int y);
-int julian_print_time(char *s, size_t max, const char *format, gdouble jultime);
+int daynum_to_str(char *s, size_t max, const char *format, gdouble jultime);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-03-29 00:42:06
|
Revision: 800
http://gpredict.svn.sourceforge.net/gpredict/?rev=800&view=rev
Author: aa1vs
Date: 2011-03-29 00:42:01 +0000 (Tue, 29 Mar 2011)
Log Message:
-----------
Apply Stephan Fillods patch to repair Win32 networking.
Modified Paths:
--------------
trunk/src/gtk-rig-ctrl.c
trunk/src/gtk-rot-ctrl.c
Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c 2011-03-29 00:30:50 UTC (rev 799)
+++ trunk/src/gtk-rig-ctrl.c 2011-03-29 00:42:01 UTC (rev 800)
@@ -2540,7 +2540,7 @@
return FALSE;
}
/* try to read answer */
- size = read (sock, buffout, 127);
+ size = recv (sock, buffout, 127, 0);
if (size == -1) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: rigctld port closed"),
@@ -2742,11 +2742,12 @@
#ifndef WIN32
shutdown (*sock, SHUT_RDWR);
+ close (*sock);
#else
shutdown (*sock, SD_BOTH);
+ closesocket (*sock);
#endif
- close (*sock);
*sock = 0;
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2011-03-29 00:30:50 UTC (rev 799)
+++ trunk/src/gtk-rot-ctrl.c 2011-03-29 00:42:01 UTC (rev 800)
@@ -1372,12 +1372,12 @@
#ifndef WIN32
shutdown (*sock, SHUT_RDWR);
+ close (*sock);
#else
shutdown (*sock, SD_BOTH);
+ closesocket (*sock);
#endif
- close (*sock);
-
*sock=0;
return TRUE;
@@ -1414,7 +1414,7 @@
}
/* try to read answer */
- size = read (ctrl->sock, buffout, sizeout);
+ size = recv (ctrl->sock, buffout, sizeout, 0);
if (size == -1) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-07-14 00:39:58
|
Revision: 853
http://gpredict.svn.sourceforge.net/gpredict/?rev=853&view=rev
Author: aa1vs
Date: 2011-07-14 00:39:52 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
Clean pendantic compiler warning.
Modified Paths:
--------------
trunk/src/gtk-event-list.c
trunk/src/gtk-event-list.h
Modified: trunk/src/gtk-event-list.c
===================================================================
--- trunk/src/gtk-event-list.c 2011-07-14 00:32:57 UTC (rev 852)
+++ trunk/src/gtk-event-list.c 2011-07-14 00:39:52 UTC (rev 853)
@@ -171,6 +171,7 @@
sizeof (GtkEventList),
5, /* n_preallocs */
(GInstanceInitFunc) gtk_event_list_init,
+ NULL
};
gtk_event_list_type = g_type_register_static (GTK_TYPE_VBOX,
@@ -204,7 +205,7 @@
static void gtk_event_list_init (GtkEventList *list)
{
-
+ (void) list; /* avoid unused warning compiler warning. */
}
@@ -230,6 +231,9 @@
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
+ /* FIXME */
+ (void) cfgdata; /* avoid unused warning compiler warning. */
+ (void) columns; /* avoid unused warning compiler warning. */
widget = g_object_new (GTK_TYPE_EVENT_LIST, NULL);
evlist = GTK_EVENT_LIST (widget);
@@ -246,10 +250,6 @@
/* initialise column flags */
evlist->flags = EVENT_LIST_COL_DEF;
- /* FIXME: Not used */
- evlist->refresh = 3;
- evlist->counter = 1;
-
/* create the tree view and add columns */
evlist->treeview = gtk_tree_view_new ();
@@ -360,6 +360,7 @@
GtkTreeIter item;
sat_t *sat = SAT (value);
+ (void) key; /* avoid unused warning compiler warning. */
gtk_list_store_append (store, &item);
gtk_list_store_set (store, &item,
@@ -425,6 +426,7 @@
sat_t *sat;
gdouble number, now;
+ (void) path; /* avoid unused warning compiler warning. */
/* get the catalogue number for this row
then look it up in the hash table
@@ -542,6 +544,8 @@
GtkTreeIter *iter,
gpointer column)
{
+ (void) col; /* avoid unused warning compiler warning. */
+
gboolean value;
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
@@ -572,6 +576,8 @@
GtkTreeIter *iter,
gpointer column)
{
+ (void) col; /* avoid unused warning compiler warning. */
+
gdouble number;
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
@@ -623,6 +629,8 @@
GtkTreeIter *iter,
gpointer column)
{
+ (void) col; /* avoid unused warning compiler warning. */
+
gdouble number;
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
@@ -664,6 +672,7 @@
gint sort_col;
GtkSortType sort_type;
+ (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 */
@@ -692,6 +701,8 @@
/** \brief Reload configuration */
void gtk_event_list_reconf (GtkWidget *widget, GKeyFile *cfgdat)
{
+ (void) cfgdat; /* avoid unused warning compiler warning. */
+ (void) widget; /* avoid unused warning compiler warning. */
sat_log_log (SAT_LOG_LEVEL_WARN, _("%s: FIXME I am not implemented"));
}
@@ -769,6 +780,8 @@
GtkTreeIter iter;
guint *catnum;
sat_t *sat;
+
+ (void) column; /* avoid unused warning compiler warning. */
catnum = g_new0 (guint, 1);
model = gtk_tree_view_get_model(tree_view);
Modified: trunk/src/gtk-event-list.h
===================================================================
--- trunk/src/gtk-event-list.h 2011-07-14 00:32:57 UTC (rev 852)
+++ trunk/src/gtk-event-list.h 2011-07-14 00:39:52 UTC (rev 853)
@@ -67,8 +67,6 @@
qth_t *qth; /*!< Pointer to current location. */
guint32 flags; /*!< Flags indicating which columns are visible */
- guint refresh; /*!< Refresh rate, ie. how many cycles should pass between updates */
- guint counter; /*!< cycle counter */
gdouble tstamp; /*!< time stamp of calculations; set by GtkSatModule */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-07-14 11:40:24
|
Revision: 861
http://gpredict.svn.sourceforge.net/gpredict/?rev=861&view=rev
Author: aa1vs
Date: 2011-07-14 11:40:18 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
Clean pendantic compiler warning.
Modified Paths:
--------------
trunk/src/gtk-single-sat.c
trunk/src/gtk-single-sat.h
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-07-14 04:10:53 UTC (rev 860)
+++ trunk/src/gtk-single-sat.c 2011-07-14 11:40:18 UTC (rev 861)
@@ -140,6 +140,7 @@
sizeof (GtkSingleSat),
5, /* n_preallocs */
(GInstanceInitFunc) gtk_single_sat_init,
+ NULL
};
gtk_single_sat_type = g_type_register_static (GTK_TYPE_VBOX,
@@ -176,6 +177,7 @@
static void
gtk_single_sat_init (GtkSingleSat *list)
{
+ (void) list; /* avoid unused parameter compiler warning */
/* GtkWidget *vbox,*hbox; */
@@ -735,7 +737,9 @@
{
GtkSingleSat *single_sat = GTK_SINGLE_SAT (user_data);
sat_t *sat = SAT (value);
-
+
+ (void) key; /* avoid unused parameter compiler warning */
+
single_sat->sats = g_slist_insert_sorted (single_sat->sats,sat, (GCompareFunc) sat_name_compare);
}
Modified: trunk/src/gtk-single-sat.h
===================================================================
--- trunk/src/gtk-single-sat.h 2011-07-14 04:10:53 UTC (rev 860)
+++ trunk/src/gtk-single-sat.h 2011-07-14 11:40:18 UTC (rev 861)
@@ -138,7 +138,7 @@
guint32 flags; /*!< Flags indicating which columns are visible. */
guint refresh; /*!< Refresh rate. */
guint counter; /*!< cycle counter. */
- gint selected; /*!< index of selected sat. */
+ guint selected; /*!< index of selected sat. */
gdouble tstamp; /*!< time stamp of calculations; update by GtkSatModule */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-07-16 00:28:22
|
Revision: 873
http://gpredict.svn.sourceforge.net/gpredict/?rev=873&view=rev
Author: aa1vs
Date: 2011-07-16 00:28:15 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Clean pendantic compiler warning.
Modified Paths:
--------------
trunk/src/sat-pref-conditions.c
trunk/src/sat-pref-debug.c
trunk/src/sat-pref-formats.c
trunk/src/sat-pref-help.c
trunk/src/sat-pref-layout.c
trunk/src/sat-pref-list-view.c
trunk/src/sat-pref-map-view.c
trunk/src/sat-pref-multi-pass.c
trunk/src/sat-pref-polar-view.c
trunk/src/sat-pref-qth-editor.c
trunk/src/sat-pref-qth.c
trunk/src/sat-pref-refresh.c
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig.c
trunk/src/sat-pref-rot-editor.c
trunk/src/sat-pref-rot.c
trunk/src/sat-pref-single-sat.c
trunk/src/sat-pref-tle.c
Modified: trunk/src/sat-pref-conditions.c
===================================================================
--- trunk/src/sat-pref-conditions.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-conditions.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -405,7 +405,10 @@
static void
spin_changed_cb (GtkWidget *spinner, gpointer data)
{
- dirty = TRUE;
+ (void) spinner; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
+ dirty = TRUE;
}
@@ -454,7 +457,9 @@
static void
reset_cb (GtkWidget *button, gpointer data)
{
-
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
/* get defaults */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel),
sat_cfg_get_int_def (SAT_CFG_INT_PRED_MIN_EL));
Modified: trunk/src/sat-pref-debug.c
===================================================================
--- trunk/src/sat-pref-debug.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-debug.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -234,7 +234,10 @@
static void
state_change_cb (GtkWidget *widget, gpointer data)
{
- dirty = TRUE;
+ (void) widget; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
+ dirty = TRUE;
}
@@ -243,7 +246,10 @@
reset_cb (GtkWidget *button, gpointer data)
{
gint num = sat_cfg_get_int_def (SAT_CFG_INT_LOG_CLEAN_AGE);
-
+
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
switch (num) {
case SEC_PER_DAY:
Modified: trunk/src/sat-pref-formats.c
===================================================================
--- trunk/src/sat-pref-formats.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-formats.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -193,6 +193,9 @@
tfprev_cb (gpointer data)
{
const gchar *fmtstr;
+
+ (void) data; /* avoid unused parameter compiler warning */
+
//struct timeval tval;
//struct timezone tzone;
GTimeVal tval;
@@ -229,8 +232,9 @@
static void
systog_cb (GtkToggleButton *togglebutton, gpointer user_data)
{
- sat_cfg_set_bool (SAT_CFG_BOOL_USE_IMPERIAL,
- gtk_toggle_button_get_active (togglebutton));
+ (void) user_data; /* avoid unused parameter compiler warning */
+ sat_cfg_set_bool (SAT_CFG_BOOL_USE_IMPERIAL,
+ gtk_toggle_button_get_active (togglebutton));
sat_pref_qth_sys_changed (gtk_toggle_button_get_active (togglebutton));
}
@@ -241,8 +245,10 @@
reset_cb (GtkWidget *button, gpointer data)
{
gchar *fmtstr;
+
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
-
fmtstr = sat_cfg_get_str_def (SAT_CFG_STR_TIME_FORMAT);
gtk_entry_set_text (GTK_ENTRY (tfentry), fmtstr);
g_free (fmtstr);
Modified: trunk/src/sat-pref-help.c
===================================================================
--- trunk/src/sat-pref-help.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-help.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -176,6 +176,8 @@
browser_changed_cb (GtkComboBox *cbox, gpointer data)
{
gint idx;
+
+ (void) data; /* avoid unused parameter compiler warning */
idx = gtk_combo_box_get_active (cbox);
Modified: trunk/src/sat-pref-layout.c
===================================================================
--- trunk/src/sat-pref-layout.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-layout.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -140,7 +140,9 @@
void sat_pref_layout_cancel (GKeyFile *cfg)
{
gchar *str;
-
+
+ (void) cfg; /* avoid unused parameter compiler warning */
+
str = sat_cfg_get_str (SAT_CFG_STR_MODULE_GRID);
gtk_entry_set_text (GTK_ENTRY (gridstr), str);
g_free (str);
@@ -322,6 +324,7 @@
gint idx;
gchar *icon;
+ (void) data; /* avoid unused parameter compiler warning */
idx = gtk_combo_box_get_active (combo);
if (idx < PREDEF_NUM) {
@@ -463,6 +466,7 @@
guint i,sel=PREDEF_NUM-1;
gchar *buffer;
+ (void) button; /* avoid unused parameter compiler warning */
/* views */
if (cfg == NULL) {
@@ -509,6 +513,8 @@
/** \brief Toggle window positioning settings. */
static void window_pos_toggle_cb (GtkWidget *toggle, gpointer data)
{
+ (void) toggle; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
dirty = TRUE;
}
@@ -522,8 +528,9 @@
{
gchar *entry, *end, *j;
gint len, pos;
+
+ (void) data; /* avoid unused parameter compiler warning */
-
/* step 1: ensure that only valid characters are entered
(stolen from xlog, tnx pg4i)
*/
Modified: trunk/src/sat-pref-list-view.c
===================================================================
--- trunk/src/sat-pref-list-view.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-list-view.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -190,6 +190,7 @@
void
sat_pref_list_view_cancel (GKeyFile *cfg)
{
+ (void) cfg; /* avoid unused parameter compiler warning */
}
@@ -290,6 +291,7 @@
guint32 flags;
guint i;
+ (void) button; /* avoid unused parameter compiler warning */
if (cfg == NULL) {
@@ -340,7 +342,11 @@
toggle_rh_cb (GtkToggleButton *toggle, gpointer data)
{
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ruleshint)) != rh_flag)
- dirty = TRUE;
+ (void) toggle; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ruleshint)) != rh_flag)
+
+ dirty = TRUE;
}
Modified: trunk/src/sat-pref-map-view.c
===================================================================
--- trunk/src/sat-pref-map-view.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-map-view.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -710,6 +710,9 @@
*/
static void content_changed (GtkToggleButton *but, gpointer data)
{
+ (void) but; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
dirty = TRUE;
}
@@ -723,17 +726,28 @@
*/
static void colour_changed (GtkWidget *but, gpointer data)
{
+ (void) but; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
dirty = TRUE;
}
static void orbit_changed (GtkWidget *spin, gpointer data)
{
+ (void) spin; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
dirty = TRUE;
}
static gboolean shadow_changed (GtkRange *range, GtkScrollType scroll, gdouble value, gpointer data)
{
+ (void) range; /* avoid unused parameter compiler warning */
+ (void) scroll; /* avoid unused parameter compiler warning */
+ (void) value; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
dirty = TRUE;
/* prevent other signal handlers from being executed */
@@ -758,6 +772,7 @@
guint16 alpha;
guint rgba;
+ (void) button; /* avoid unused parameter compiler warning */
if (cfg == NULL) {
/* global mode, get defaults */
@@ -916,6 +931,8 @@
*/
void sat_pref_map_view_cancel (GKeyFile *cfg)
{
+ (void) cfg; /* avoid unused parameter compiler warning */
+
dirty = FALSE;
g_free (mapf);
@@ -1206,8 +1223,10 @@
static void select_map_cb (GtkWidget *button, gpointer data)
{
gchar *mapfile;
+
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
-
/* execute map selector */
mapfile = select_map (mapf);
Modified: trunk/src/sat-pref-multi-pass.c
===================================================================
--- trunk/src/sat-pref-multi-pass.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-multi-pass.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -218,7 +218,11 @@
reset_cb (GtkWidget *button, gpointer data)
{
guint i;
-
+
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
+
/* get defaults */
flags = sat_cfg_get_int_def (SAT_CFG_INT_PRED_MULTI_COL);
Modified: trunk/src/sat-pref-polar-view.c
===================================================================
--- trunk/src/sat-pref-polar-view.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-polar-view.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -673,6 +673,9 @@
*/
static void content_changed (GtkToggleButton *but, gpointer data)
{
+ (void) but; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
dirty = TRUE;
}
@@ -686,6 +689,9 @@
*/
static void colour_changed (GtkWidget *but, gpointer data)
{
+ (void) but; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
dirty = TRUE;
}
@@ -705,7 +711,9 @@
guint16 alpha;
guint rgba;
+ (void) button; /* avoid unused parameter compiler warning */
+
if (cfg == NULL) {
/* global mode, get defaults */
@@ -860,6 +868,8 @@
*/
void sat_pref_polar_view_cancel (GKeyFile *cfg)
{
+ (void) cfg; /* avoid unused parameter compiler warning */
+
dirty = FALSE;
}
Modified: trunk/src/sat-pref-qth-editor.c
===================================================================
--- trunk/src/sat-pref-qth-editor.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-qth-editor.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -647,6 +647,7 @@
gchar *entry, *end, *j;
gint len, pos;
+ (void) data; /* avoid unused parameter compiler warning */
/* step 1: ensure that only valid characters are entered
(stolen from xlog, tnx pg4i)
@@ -710,6 +711,7 @@
guint qthalt;
gboolean selected = FALSE;
+ (void) widget; /* avoid unused parameter compiler warning */
switch (mode) {
@@ -791,7 +793,10 @@
gchar *locator;
gint retcode;
gdouble latf,lonf;
-
+
+ (void) widget; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
locator = g_try_malloc (7);
/* no need to check locator != NULL, since hamlib func will do it for us
@@ -852,6 +857,9 @@
gint retcode;
gdouble latf,lonf;
gchar *msg;
+
+ (void) entry; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
retcode = locator2longlat (&lonf, &latf, gtk_entry_get_text (GTK_ENTRY (qra)));
Modified: trunk/src/sat-pref-qth.c
===================================================================
--- trunk/src/sat-pref-qth.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-qth.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -551,6 +551,8 @@
{
GtkTreeView *qthlist = GTK_TREE_VIEW (data);
+ (void) button; /* avoid unused parameter compiler warning */
+
sat_pref_qth_editor_run (qthlist, TRUE);
}
@@ -561,14 +563,20 @@
GtkTreeViewColumn *column,
gpointer user_data)
{
- sat_pref_qth_editor_run (tree_view, FALSE);
+ (void) path; /* avoid unused parameter compiler warning */
+ (void) column; /* avoid unused parameter compiler warning */
+ (void) user_data; /* avoid unused parameter compiler warning */
+
+ sat_pref_qth_editor_run (tree_view, FALSE);
}
static void
edit_cb (GtkWidget *button, gpointer data)
{
GtkTreeView *qthlist = GTK_TREE_VIEW (data);
-
+
+ (void) button; /* avoid unused parameter compiler warning */
+
sat_pref_qth_editor_run (qthlist, FALSE);
}
@@ -594,6 +602,7 @@
GtkTreeSelection *selection;
GtkTreeIter iter;
+ (void) button; /* avoid unused parameter compiler warning */
/* if this is the only entry, tell user that it is not
possible to delete
@@ -745,6 +754,7 @@
{
gchar *thisqth;
+ (void) path; /* avoid unused parameter compiler warning */
gtk_tree_model_get (model, iter,
QTH_LIST_COL_NAME, &thisqth,
@@ -789,7 +799,9 @@
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
gchar hmf = ' ';
-
+
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
/* check whether configuration requests the use
@@ -874,11 +886,13 @@
GtkTreeIter *iter,
gpointer data)
{
- qth_t qth;
+ qth_t qth;
gboolean def = FALSE;
gchar *filename,*confdir;
- gchar *buff;
+ gchar *buff;
+ (void) path; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
gtk_tree_model_get (model, iter,
QTH_LIST_COL_DEF, &def,
@@ -1027,8 +1041,9 @@
gint alti;
GtkTreeViewColumn *column;
gchar *title;
+
+ (void) path; /* avoid unused parameter compiler warning */
-
/* first, get the current altitude and other data */
gtk_tree_model_get (model, iter,
QTH_LIST_COL_ALT, &alti,
Modified: trunk/src/sat-pref-refresh.c
===================================================================
--- trunk/src/sat-pref-refresh.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-refresh.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -290,6 +290,7 @@
void
sat_pref_refresh_cancel (GKeyFile *cfg)
{
+ (void) cfg; /* avoid unused parameter compiler warning */
dirty = FALSE;
}
@@ -395,6 +396,9 @@
static void
spin_changed_cb (GtkWidget *spinner, gpointer data)
{
+ (void) spinner; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
dirty = TRUE;
}
@@ -455,6 +459,7 @@
{
gint val;
+ (void) button; /* avoid unused parameter compiler warning */
/* views */
if (cfg == NULL) {
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-rig-editor.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -478,6 +478,7 @@
gchar *entry, *end, *j;
gint len, pos;
+ (void) data; /* avoid unused parameter compiler warning */
/* step 1: ensure that only valid characters are entered
(stolen from xlog, tnx pg4i)
@@ -532,6 +533,9 @@
static void
type_changed (GtkWidget *widget, gpointer data)
{
+
+ (void) data; /* avoid unused parameter compiler warning */
+
/* PTT consistency */
if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == RIG_TYPE_TRX) {
if (gtk_combo_box_get_active (GTK_COMBO_BOX (ptt)) == PTT_TYPE_NONE) {
@@ -563,7 +567,8 @@
static void
ptt_changed (GtkWidget *widget, gpointer data)
{
-
+ (void) data; /* avoid unused parameter compiler warning */
+
if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == PTT_TYPE_NONE) {
if (gtk_combo_box_get_active (GTK_COMBO_BOX (type)) == RIG_TYPE_TRX) {
/* not good, we need to have PTT for this type */
@@ -581,6 +586,7 @@
static void
vfo_changed (GtkWidget *widget, gpointer data)
{
+ (void) data; /* avoid unused parameter compiler warning */
if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == 0) {
if (gtk_combo_box_get_active (GTK_COMBO_BOX (type)) == RIG_TYPE_DUPLEX) {
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-rig.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -466,6 +466,9 @@
GtkTreeIter item; /* new item added to the list store */
GtkListStore *liststore;
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
radio_conf_t conf = {
.name = NULL,
.host = NULL,
@@ -520,6 +523,9 @@
GtkTreeSelection *selection;
GtkTreeIter iter;
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
radio_conf_t conf = {
.name = NULL,
.host = NULL,
@@ -618,6 +624,8 @@
GtkTreeSelection *selection;
GtkTreeIter iter;
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
/* If there are no entries, we have a bug since the button should
have been disabled. */
@@ -656,6 +664,11 @@
GtkTreeViewColumn *column,
gpointer user_data)
{
+ (void) tree_view; /* avoid unused parameter compiler warning */
+ (void) path; /* avoid unused parameter compiler warning */
+ (void) column; /* avoid unused parameter compiler warning */
+ (void) user_data; /* avoid unused parameter compiler warning */
+
edit_cb (editbutton, NULL);
}
@@ -680,6 +693,8 @@
gchar *fname;
gchar **buff;
guint coli = GPOINTER_TO_UINT (column);
+
+ (void) col; /* avoid unused parameter compiler warning */
gtk_tree_model_get (model, iter, coli, &fname, -1);
@@ -708,7 +723,9 @@
{
guint type;
guint coli = GPOINTER_TO_UINT (column);
-
+
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &type, -1);
switch (type) {
@@ -762,6 +779,8 @@
gint ptt;
guint coli = GPOINTER_TO_UINT (column);
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &ptt, -1);
switch (ptt) {
@@ -802,6 +821,8 @@
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
/* convert to MHz */
@@ -831,6 +852,8 @@
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
switch (number) {
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-rot-editor.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -364,6 +364,7 @@
gchar *entry, *end, *j;
gint len, pos;
+ (void) data; /* avoid unused parameter compiler warning */
/* step 1: ensure that only valid characters are entered
(stolen from xlog, tnx pg4i)
@@ -414,6 +415,8 @@
{
gint type = gtk_combo_box_get_active (box);
+ (void) data; /* avoid unused parameter compiler warning */
+
switch (type) {
case ROT_AZ_TYPE_360:
Modified: trunk/src/sat-pref-rot.c
===================================================================
--- trunk/src/sat-pref-rot.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-rot.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -428,6 +428,9 @@
GtkTreeIter item; /* new item added to the list store */
GtkListStore *liststore;
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
rotor_conf_t conf = {
.name = NULL,
.host = NULL,
@@ -480,6 +483,9 @@
GtkTreeSelection *selection;
GtkTreeIter iter;
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
rotor_conf_t conf = {
.name = NULL,
.host = NULL,
@@ -576,6 +582,8 @@
GtkTreeSelection *selection;
GtkTreeIter iter;
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
/* If there are no entries, we have a bug since the button should
have been disabled. */
@@ -614,6 +622,11 @@
GtkTreeViewColumn *column,
gpointer user_data)
{
+ (void) tree_view; /* avoid unused parameter compiler warning */
+ (void) path; /* avoid unused parameter compiler warning */
+ (void) column; /* avoid unused parameter compiler warning */
+ (void) user_data; /* avoid unused parameter compiler warning */
+
edit_cb (editbutton, NULL);
}
@@ -635,6 +648,8 @@
guint coli = GPOINTER_TO_UINT (column);
gchar *text;
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
text = g_strdup_printf ("%.0f\302\260", number);
@@ -661,6 +676,8 @@
guint coli = GPOINTER_TO_UINT (column);
gchar *text;
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
switch (number) {
Modified: trunk/src/sat-pref-single-sat.c
===================================================================
--- trunk/src/sat-pref-single-sat.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-single-sat.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -141,6 +141,8 @@
void
sat_pref_single_sat_cancel (GKeyFile *cfg)
{
+ (void) cfg; /* avoid unused parameter compiler warning */
+
dirty = FALSE;
reset = FALSE;
}
@@ -257,8 +259,9 @@
reset_cb (GtkWidget *button, gpointer cfg)
{
guint i;
+
+ (void) button; /* avoid unused parameter compiler warning */
-
if (cfg == NULL) {
/* global mode, get defaults */
flags = sat_cfg_get_int_def (SAT_CFG_INT_SINGLE_SAT_FIELDS);
Modified: trunk/src/sat-pref-tle.c
===================================================================
--- trunk/src/sat-pref-tle.c 2011-07-15 22:38:47 UTC (rev 872)
+++ trunk/src/sat-pref-tle.c 2011-07-16 00:28:15 UTC (rev 873)
@@ -377,6 +377,8 @@
reset_cb (GtkWidget *button, gpointer data)
{
+ (void) button; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
/* get defaults */
/* update frequency */
@@ -423,6 +425,9 @@
static void
value_changed_cb (GtkWidget *widget, gpointer data)
{
+ (void) widget; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
dirty = TRUE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-07-16 00:36:31
|
Revision: 874
http://gpredict.svn.sourceforge.net/gpredict/?rev=874&view=rev
Author: aa1vs
Date: 2011-07-16 00:36:24 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Clean pendantic compiler warning.
Modified Paths:
--------------
trunk/src/gtk-freq-knob.c
trunk/src/gtk-polar-view-popup.c
trunk/src/gtk-rot-ctrl.c
trunk/src/gtk-sat-list-col-sel.c
trunk/src/gtk-sat-map.c
trunk/src/gtk-sat-tree.c
Modified: trunk/src/gtk-freq-knob.c
===================================================================
--- trunk/src/gtk-freq-knob.c 2011-07-16 00:28:15 UTC (rev 873)
+++ trunk/src/gtk-freq-knob.c 2011-07-16 00:36:24 UTC (rev 874)
@@ -91,6 +91,7 @@
sizeof (GtkFreqKnob),
5, /* n_preallocs */
(GInstanceInitFunc) gtk_freq_knob_init,
+ NULL,
};
gtk_freq_knob_type = g_type_register_static (GTK_TYPE_VBOX,
Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c 2011-07-16 00:28:15 UTC (rev 873)
+++ trunk/src/gtk-polar-view-popup.c 2011-07-16 00:36:24 UTC (rev 874)
@@ -177,7 +177,8 @@
sat_obj_t *obj = NULL;
sat_t *sat;
qth_t *qth;
- gint idx,i;
+ gint idx;
+ guint i;
GooCanvasItemModel *root;
pass_detail_t *detail;
guint num;
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2011-07-16 00:28:15 UTC (rev 873)
+++ trunk/src/gtk-rot-ctrl.c 2011-07-16 00:36:24 UTC (rev 874)
@@ -127,6 +127,7 @@
sizeof (GtkRotCtrl),
5, /* n_preallocs */
(GInstanceInitFunc) gtk_rot_ctrl_init,
+ NULL
};
gtk_rot_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
@@ -676,8 +677,9 @@
{
GtkRotCtrl *ctrl = GTK_ROT_CTRL( user_data);
sat_t *sat = SAT (value);
-
- //ctrl->sats = g_slist_append (ctrl->sats, sat);
+
+ (void) key; /* avoid unused variable warning */
+
ctrl->sats = g_slist_insert_sorted (ctrl->sats, sat, (GCompareFunc)sat_name_compare);
}
Modified: trunk/src/gtk-sat-list-col-sel.c
===================================================================
--- trunk/src/gtk-sat-list-col-sel.c 2011-07-16 00:28:15 UTC (rev 873)
+++ trunk/src/gtk-sat-list-col-sel.c 2011-07-16 00:36:24 UTC (rev 874)
@@ -77,6 +77,7 @@
sizeof (GtkSatListColSel),
5, /* n_preallocs */
(GInstanceInitFunc) gtk_sat_list_col_sel_init,
+ NULL
};
gtk_sat_list_col_sel_type = g_type_register_static (GTK_TYPE_VBOX,
@@ -113,7 +114,7 @@
static void
gtk_sat_list_col_sel_init (GtkSatListColSel *list)
{
-
+ (void) list; /* avoid unusued parameter compiler warning */
}
static void
@@ -257,7 +258,7 @@
GtkSatListColSel *sel = GTK_SAT_LIST_COL_SEL (data);
guint i;
gboolean checked;
-
+ (void) path; /* avoid unusued parameter compiler warning */
/* get row number */
gtk_tree_model_get (model, iter, 2, &i, -1);
Modified: trunk/src/gtk-sat-map.c
===================================================================
--- trunk/src/gtk-sat-map.c 2011-07-16 00:28:15 UTC (rev 873)
+++ trunk/src/gtk-sat-map.c 2011-07-16 00:36:24 UTC (rev 874)
@@ -130,6 +130,7 @@
sizeof (GtkSatMap),
5, /* n_preallocs */
(GInstanceInitFunc) gtk_sat_map_init,
+ NULL
};
gtk_sat_map_type = g_type_register_static (GTK_TYPE_VBOX,
@@ -450,6 +451,8 @@
static void
size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer data)
{
+ (void) widget; /* avoid unusued parameter compiler warning */
+ (void) allocation; /* avoid unusued parameter compiler warning */
GTK_SAT_MAP (data)->resize = TRUE;
}
@@ -590,6 +593,8 @@
{
GtkSatMap *satmap = GTK_SAT_MAP(data);
+ (void) canvas; /* avoid unusued parameter compiler warning */
+
/* raise info items */
goo_canvas_item_model_raise (satmap->sel, NULL);
goo_canvas_item_model_raise (satmap->locnam, NULL);
@@ -822,6 +827,9 @@
GtkSatMap *satmap = GTK_SAT_MAP (data);
gfloat lat,lon;
gchar *text;
+
+ (void) target; /* avoid unusued parameter compiler warning */
+ (void) item; /* avoid unusued parameter compiler warning */
/* set text only if QTH info is enabled */
if (satmap->cursinfo) {
@@ -864,6 +872,7 @@
GooCanvasItemModel *model,
gpointer data)
{
+ (void) canvas; /* avoid unusued parameter compiler warning */
if (!goo_canvas_item_model_get_parent (model)) {
/* root item / canvas */
g_signal_connect (item, "motion_notify_event",
@@ -897,6 +906,8 @@
gint *catpoint = NULL;
sat_t *sat = NULL;
+ (void) target; /* avoid unusued parameter compiler warning */
+
switch (event->button) {
/* double-left-click */
@@ -966,6 +977,8 @@
sat_map_obj_t *obj = NULL;
guint32 col;
+ (void) target; /* avoid unusued parameter compiler warning */
+
catpoint = g_try_new0 (gint, 1);
*catpoint = catnum;
@@ -1127,6 +1140,8 @@
void
gtk_sat_map_reconf (GtkWidget *widget, GKeyFile *cfgdat)
{
+ (void) widget; /* avoid unusued parameter compiler warning */
+ (void) cfgdat; /* avoid unusued parameter compiler warning */
}
@@ -1353,7 +1368,7 @@
rangelon = ssplon;
else {
- if ((180 - azi) >= 0)
+ if ((180.0 - azi) >= 0)
rangelon = ssplon - arccos (num, dem);
else
rangelon = ssplon + arccos (num, dem);
@@ -1665,6 +1680,8 @@
{
gsize size;
+ (void) satmap; /* avoid unusued parameter compiler warning */
+ (void) sat; /* avoid unusued parameter compiler warning */
size = 2*sizeof(double);
/* call g_qsort_with_data, which warps the qsort function
@@ -1695,6 +1712,8 @@
{
double *ea = (double *)a;
double *eb = (double *)b;
+
+ (void) data; /* avoid unusued parameter compiler warning */
if (ea[0] < eb[0]) {
return -1;
@@ -1730,6 +1749,8 @@
double *ea = (double *)a;
double *eb = (double *)b;
+ (void) data; /* avoid unusued parameter compiler warning */
+
if (ea[1] < eb[1]) {
return -1;
}
@@ -1763,6 +1784,8 @@
gfloat x,y;
gchar *tooltip;
+ (void) key; /* avoid unusued parameter compiler warning */
+
if (decayed(sat)) {
return;
}
Modified: trunk/src/gtk-sat-tree.c
===================================================================
--- trunk/src/gtk-sat-tree.c 2011-07-16 00:28:15 UTC (rev 873)
+++ trunk/src/gtk-sat-tree.c 2011-07-16 00:36:24 UTC (rev 874)
@@ -100,6 +100,7 @@
sizeof (GtkSatTree),
1, /* n_preallocs */
(GInstanceInitFunc) gtk_sat_tree_init,
+ NULL
};
gtk_sat_tree_type = g_type_register_static (GTK_TYPE_VBOX,
@@ -136,7 +137,7 @@
static void
gtk_sat_tree_init (GtkSatTree *sat_tree)
{
-
+ (void) sat_tree; /* avoid unused parameter compiler warning */
}
static void
@@ -311,6 +312,7 @@
const gchar *fname;
guint num = 0;
+ (void) flags; /* avoid unused parameter compiler warning */
/* create a new tree store */
store = gtk_tree_store_new (GTK_SAT_TREE_COL_NUM,
@@ -501,6 +503,7 @@
gboolean toggle_item;
guint catnum;
+ (void) cell; /* avoid unused parameter compiler warning */
/* get toggled iter */
gtk_tree_model_get_iter (model, &iter, path);
@@ -634,6 +637,7 @@
GtkSatTree *sat_tree = GTK_SAT_TREE (data);
guint cat1, cat2;
+ (void) path; /* avoid unused parameter compiler warning */
cat1 = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (data), "tmp"));
@@ -692,6 +696,7 @@
{
guint cat1, cat2;
+ (void) path; /* avoid unused parameter compiler warning */
cat1 = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (data), "tmp"));
@@ -784,6 +789,7 @@
gchar *sat1,*sat2;
gint ret = 0;
+ (void) userdata; /* avoid unused parameter compiler warning */
gtk_tree_model_get(model, a, GTK_SAT_TREE_COL_NAME, &sat1, -1);
gtk_tree_model_get(model, b, GTK_SAT_TREE_COL_NAME, &sat2, -1);
@@ -808,6 +814,8 @@
static void
expand_cb (GtkWidget *button, gpointer tree)
{
+ (void) button; /* avoid unused parameter compiler warning */
+
gtk_tree_view_expand_all (GTK_TREE_VIEW (GTK_SAT_TREE (tree)->tree));
}
@@ -821,6 +829,8 @@
static void
collapse_cb (GtkWidget *button, gpointer tree)
{
+ (void) button; /* avoid unused parameter compiler warning */
+
gtk_tree_view_collapse_all (GTK_TREE_VIEW (GTK_SAT_TREE (tree)->tree));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-07-16 01:02:46
|
Revision: 875
http://gpredict.svn.sourceforge.net/gpredict/?rev=875&view=rev
Author: aa1vs
Date: 2011-07-16 01:02:39 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Clean pendantic compiler warning.
Modified Paths:
--------------
trunk/src/loc-tree.c
trunk/src/mod-cfg.c
trunk/src/pass-popup-menu.c
trunk/src/pass-to-txt.c
trunk/src/print-pass.c
trunk/src/qth-editor.c
trunk/src/sat-log-browser.c
trunk/src/sat-pass-dialogs.c
Modified: trunk/src/loc-tree.c
===================================================================
--- trunk/src/loc-tree.c 2011-07-16 00:36:24 UTC (rev 874)
+++ trunk/src/loc-tree.c 2011-07-16 01:02:39 UTC (rev 875)
@@ -493,6 +493,8 @@
guint coli = GPOINTER_TO_UINT (column);
gchar hmf = ' ';
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
@@ -552,6 +554,8 @@
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, GPOINTER_TO_UINT (column), &number, -1);
if (coli == TREE_COL_ALT) {
@@ -590,6 +594,9 @@
GtkTreeIter iter;
+ (void) selection; /* avoid unused parameter compiler warning */
+ (void) sel_path; /* avoid unused parameter compiler warning */
+
if (gtk_tree_model_get_iter(model, &iter, path)) {
guint value;
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2011-07-16 00:36:24 UTC (rev 874)
+++ trunk/src/mod-cfg.c 2011-07-16 01:02:39 UTC (rev 875)
@@ -420,6 +420,9 @@
*/
mod_cfg_status_t mod_cfg_delete (gchar *modname, gboolean needcfm)
{
+ (void) modname; /* avoid unused parameter compiler warning */
+ (void) needcfm; /* avoid unused parameter compiler warning */
+
return MOD_CFG_CANCEL;
}
@@ -1091,6 +1094,8 @@
GtkResponseType response;
qth_t qth;
+ (void) button; /* avoid unused parameter compiler warning */
+
qth.name = NULL;
qth.loc = NULL;
qth.desc = NULL;
@@ -1131,8 +1136,8 @@
static void sat_activated_cb (GtkSatSelector *selector, gint catnr, gpointer data)
{
GtkListStore *store;
+ (void) data; /* avoid unused parameter compiler warning */
-
/* Add satellite to selected list */
store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (satlist)));
add_selected_sat (store, catnr);
@@ -1159,6 +1164,7 @@
gchar *sat1,*sat2;
gint ret = 0;
+ (void) userdata; /* avoid unused parameter compiler warning */
gtk_tree_model_get(model, a, GTK_SAT_SELECTOR_COL_NAME, &sat1, -1);
gtk_tree_model_get(model, b, GTK_SAT_SELECTOR_COL_NAME, &sat2, -1);
@@ -1190,7 +1196,10 @@
gboolean haveselection = FALSE; /* this flag is set to TRUE if there is a selection */
gint catnr;
GtkSatSelector *selector = GTK_SAT_SELECTOR(data);
-
+
+ (void) path; /* avoid unused parameter compiler warning */
+ (void) column; /* avoid unused parameter compiler warning */
+
/* get the selected row in the treeview */
selection = gtk_tree_view_get_selection (view);
haveselection = gtk_tree_selection_get_selected (selection, &model, &iter);
@@ -1215,7 +1224,8 @@
gchar *name;
gdouble epoch;
-
+ (void) button; /* avoid unused parameter compiler warning */
+
/* get the selected row in the treeview */
gtk_sat_selector_get_selected (selector, &catnum, &name, &epoch);
@@ -1242,6 +1252,7 @@
gboolean haveselection = FALSE; /* this flag is set to TRUE if there is a selection */
gint catnr;
+ (void) button; /* avoid unused parameter compiler warning */
/* get the selected row in the treeview */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (satlist));
Modified: trunk/src/pass-popup-menu.c
===================================================================
--- trunk/src/pass-popup-menu.c 2011-07-16 00:36:24 UTC (rev 874)
+++ trunk/src/pass-popup-menu.c 2011-07-16 01:02:39 UTC (rev 875)
@@ -151,6 +151,9 @@
static void
polar_plot_pass_details (GtkWidget *menuitem, gpointer data)
{
+ (void) menuitem; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
g_print ("FIXME: %s:%s not implemented!\n", __FILE__, __FUNCTION__);
}
@@ -159,6 +162,9 @@
static void
azel_plot_pass_details (GtkWidget *menuitem, gpointer data)
{
+ (void) menuitem; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
g_print ("FIXME: %s:%s not implemented!\n", __FILE__, __FUNCTION__);
}
Modified: trunk/src/pass-to-txt.c
===================================================================
--- trunk/src/pass-to-txt.c 2011-07-16 00:36:24 UTC (rev 874)
+++ trunk/src/pass-to-txt.c 2011-07-16 01:02:39 UTC (rev 875)
@@ -132,8 +132,9 @@
gchar *fmtstr;
time_t aos,los;
guint size;
+
+ (void) fields; /* avoid unused parameter compiler warning */
-
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
loc = sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME);
aos = (pass->aos - 2440587.5)*86400.;
@@ -200,6 +201,7 @@
gchar *sep;
gchar *buff;
+ (void) qth; /* avoid unused parameter compiler warning */
/* first, get the length of the time field */
fmtstr = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
@@ -451,6 +453,8 @@
{
gchar *header;
pass_t *pass;
+
+ (void) fields; /* avoid unused parameter compiler warning */
pass = PASS (g_slist_nth_data (passes, 0));
@@ -477,6 +481,7 @@
gchar *buff;
pass_t *pass;
+ (void) qth; /* avoid unused parameter compiler warning */
/* first, get the length of the time field */
pass = PASS (g_slist_nth_data (passes, 0));
@@ -529,6 +534,7 @@
gchar *buff;
pass_t *pass;
+ (void) qth; /* avoid unused parameter compiler warning */
pass = PASS (g_slist_nth_data (passes, 0));
Modified: trunk/src/print-pass.c
===================================================================
--- trunk/src/print-pass.c 2011-07-16 00:36:24 UTC (rev 874)
+++ trunk/src/print-pass.c 2011-07-16 01:02:39 UTC (rev 875)
@@ -175,6 +175,8 @@
*/
void print_passes (GSList *passes)
{
+ (void) passes; /* avoid unused parameter compiler warning */
+
sat_log_log (SAT_LOG_LEVEL_BUG, _("%s: Not implemented!"), __FUNCTION__);
}
@@ -230,8 +232,8 @@
PangoFontDescription *desc;
gchar *page_str;
+ (void) operation; /* avoid unused parameter compiler warning */
-
cr = gtk_print_context_get_cairo_context (context);
width = gtk_print_context_get_width (context);
@@ -303,7 +305,10 @@
gpointer user_data)
{
PrintData *data = (PrintData *)user_data;
-
+
+ (void) operation; /* avoid unused parameter compiler warning */
+ (void) context; /* avoid unused parameter compiler warning */
+
g_free (data->pgheader);
g_strfreev (data->lines);
g_free (data);
Modified: trunk/src/qth-editor.c
===================================================================
--- trunk/src/qth-editor.c 2011-07-16 00:36:24 UTC (rev 874)
+++ trunk/src/qth-editor.c 2011-07-16 01:02:39 UTC (rev 875)
@@ -617,6 +617,7 @@
gchar *entry, *end, *j;
gint len, pos;
+ (void) data; /* avoid unused parameter compiler warning */
/* step 1: ensure that only valid characters are entered
(stolen from xlog, tnx pg4i)
@@ -680,6 +681,7 @@
guint qthalt;
gboolean selected = FALSE;
+ (void) widget; /* avoid unused parameter compiler warning */
switch (mode) {
@@ -761,7 +763,10 @@
gchar *locator;
gint retcode;
gdouble latf,lonf;
-
+
+ (void) widget; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
locator = g_try_malloc (7);
/* no need to check locator != NULL, since hamlib func will do it for us
@@ -823,6 +828,9 @@
gdouble latf,lonf;
gchar *msg;
+ (void) entry; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
retcode = locator2longlat (&lonf, &latf, gtk_entry_get_text (GTK_ENTRY (qra)));
if (retcode == RIG_OK) {
Modified: trunk/src/sat-log-browser.c
===================================================================
--- trunk/src/sat-log-browser.c 2011-07-16 00:36:24 UTC (rev 874)
+++ trunk/src/sat-log-browser.c 2011-07-16 01:02:39 UTC (rev 875)
@@ -308,6 +308,10 @@
gpointer data)
{
+ (void) widget; /* avoid unused parameter compiler warning */
+ (void) event; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
/* return FALSE to indicate that message window
should be destroyed */
return FALSE;
@@ -319,6 +323,10 @@
message_window_destroy (GtkWidget *widget,
gpointer data)
{
+
+ (void) widget; /* avoid unused parameter compiler warning */
+ (void) data; /* avoid unused parameter compiler warning */
+
/* clean up memory */
/* GSList, ... */
@@ -332,6 +340,8 @@
gint response,
gpointer data)
{
+ (void) data; /* avoid unused parameter compiler warning */
+
switch (response) {
/* close button */
Modified: trunk/src/sat-pass-dialogs.c
===================================================================
--- trunk/src/sat-pass-dialogs.c 2011-07-16 00:36:24 UTC (rev 874)
+++ trunk/src/sat-pass-dialogs.c 2011-07-16 01:02:39 UTC (rev 875)
@@ -541,6 +541,7 @@
*/
static void single_pass_response (GtkWidget *dialog, gint response, gpointer data)
{
+ (void) data; /* avoid unused parameter compiler warning */
switch (response) {
@@ -675,6 +676,8 @@
guint coli = GPOINTER_TO_UINT (column);
gchar hmf = ' ';
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
/* check whether configuration requests the use
@@ -729,6 +732,8 @@
gdouble number;
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
+
+ (void) col; /* avoid unused parameter compiler warning */
gtk_tree_model_get (model, iter, coli, &number, -1);
@@ -752,6 +757,8 @@
gdouble number;
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
+
+ (void) col; /* avoid unused parameter compiler warning */
gtk_tree_model_get (model, iter, coli, &number, -1);
@@ -780,6 +787,8 @@
gdouble number;
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
+
+ (void) col; /* avoid unused parameter compiler warning */
gtk_tree_model_get (model, iter, coli, &number, -1);
@@ -807,6 +816,8 @@
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
/* format the number */
@@ -828,6 +839,8 @@
gchar *buff;
guint coli = GPOINTER_TO_UINT (column);
+ (void) col; /* avoid unused parameter compiler warning */
+
gtk_tree_model_get (model, iter, coli, &number, -1);
/* format the number */
@@ -851,6 +864,7 @@
gchar *fmtstr;
guint coli = GPOINTER_TO_UINT (column);
+ (void) col; /* avoid unused parameter compiler warning */
gtk_tree_model_get (model, iter, coli, &number, -1);
@@ -878,6 +892,10 @@
static gint single_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
{
+ (void) dialog; /* avoid unused parameter compiler warning */
+ (void) event; /* avoid unused parameter compiler warning */
+ (void) pass; /* avoid unused parameter compiler warning */
+
/* dialog will be destroyed */
return FALSE;
}
@@ -885,7 +903,10 @@
static void single_pass_dialog_destroy (GtkWidget *dialog, gpointer data)
{
pass_t *pass = PASS(g_object_get_data (G_OBJECT (dialog), "pass"));
+
+ (void) data; /* avoid unused parameter compiler warning */
+
free_pass (PASS(pass));
gtk_widget_destroy (dialog);
@@ -1127,6 +1148,8 @@
*/
static void multi_pass_response (GtkWidget *dialog, gint response, gpointer data)
{
+ (void) data; /* avoid unused parameter compiler warning */
+
switch (response) {
case RESPONSE_PRINT:
@@ -1150,6 +1173,10 @@
static gint multi_pass_dialog_delete (GtkWidget *dialog, GdkEvent *event, gpointer pass)
{
+ (void) dialog; /* avoid unused parameter compiler warning */
+ (void) event; /* avoid unused parameter compiler warning */
+ (void) pass; /* avoid unused parameter compiler warning */
+
/* dialog will be destroyed */
return FALSE;
}
@@ -1159,6 +1186,8 @@
{
GSList *passes = (GSList *) g_object_get_data (G_OBJECT (dialog), "passes");
+ (void) data; /* avoid unused parameter compiler warning */
+
free_passes (passes);
@@ -1227,8 +1256,8 @@
guint coli = GPOINTER_TO_UINT (column);
guint h,m,s;
+ (void) col; /* avoid unused parameter compiler warning */
-
gtk_tree_model_get (model, iter, coli, &number, -1);
if (number == 0.0) {
@@ -1338,6 +1367,7 @@
pass_t *pass = NULL;
qth_t *qth;
+ (void) data; /* avoid unused parameter compiler warning */
/* get selected satellite */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
@@ -1388,6 +1418,8 @@
pass_t *pass = NULL;
qth_t *qth;
+ (void) path; /* avoid unused parameter compiler warning */
+ (void) column; /* avoid unused parameter compiler warning */
/* get selected satellite */
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aa...@us...> - 2011-10-05 00:45:31
|
Revision: 917
http://gpredict.svn.sourceforge.net/gpredict/?rev=917&view=rev
Author: aa1vs
Date: 2011-10-05 00:45:25 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
Use signed 32 bit integers for orbit counts.
Modified Paths:
--------------
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-map.h
trunk/src/gtk-single-sat.c
trunk/src/predict-tools.h
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-10-05 00:41:52 UTC (rev 916)
+++ trunk/src/gtk-sat-list.c 2011-10-05 00:45:25 UTC (rev 917)
@@ -511,7 +511,7 @@
G_TYPE_DOUBLE, // delay
G_TYPE_DOUBLE, // mean anomaly
G_TYPE_DOUBLE, // phase
- G_TYPE_ULONG, // orbit
+ G_TYPE_LONG, // orbit
G_TYPE_STRING); // visibility
Modified: trunk/src/gtk-sat-map.h
===================================================================
--- trunk/src/gtk-sat-map.h 2011-10-05 00:41:52 UTC (rev 916)
+++ trunk/src/gtk-sat-map.h 2011-10-05 00:45:25 UTC (rev 917)
@@ -101,7 +101,7 @@
guint newrcnum; /*!< Number of RC parts in this cycle. */
ground_track_t track_data; /*!< Ground track data. */
- unsigned long track_orbit; /*!< Orbit when the ground track has been updated. */
+ long track_orbit; /*!< Orbit when the ground track has been updated. */
} sat_map_obj_t;
Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c 2011-10-05 00:41:52 UTC (rev 916)
+++ trunk/src/gtk-single-sat.c 2011-10-05 00:45:25 UTC (rev 917)
@@ -700,7 +700,7 @@
case SINGLE_SAT_FIELD_ORBIT:
- buff = g_strdup_printf ("%lu", sat->orbit);
+ buff = g_strdup_printf ("%ld", sat->orbit);
break;
Modified: trunk/src/predict-tools.h
===================================================================
--- trunk/src/predict-tools.h 2011-10-05 00:41:52 UTC (rev 916)
+++ trunk/src/predict-tools.h 2011-10-05 00:45:25 UTC (rev 917)
@@ -46,7 +46,7 @@
gdouble max_el; /*!< Maximum elevation during pass */
gdouble aos_az; /*!< Azimuth at AOS */
gdouble los_az; /*!< Azimuth at LOS */
- guint orbit; /*!< Orbit number */
+ gint orbit; /*!< Orbit number */
gdouble maxel_az; /*!< Azimuth at maximum elevation */
gchar vis[4]; /*!< Visibility string, e.g. VSE, -S-, V-- */
GSList *details; /*!< List of pass_detail_t entries */
@@ -78,7 +78,7 @@
gdouble phase;
gdouble footprint;
sat_vis_t vis;
- guint orbit;
+ gint orbit;
} pass_detail_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X