gpredict-svn Mailing List for Gpredict (Page 36)
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
gpredict-svn — Subversion commit archive for Gpredict.
You can subscribe to this list here.
| 2008 |
Jan
(24) |
Feb
|
Mar
(6) |
Apr
(14) |
May
(9) |
Jun
|
Jul
|
Aug
(25) |
Sep
(60) |
Oct
(26) |
Nov
|
Dec
(20) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
(2) |
Mar
(22) |
Apr
(61) |
May
(57) |
Jun
|
Jul
(3) |
Aug
(83) |
Sep
(35) |
Oct
(50) |
Nov
(28) |
Dec
(34) |
| 2010 |
Jan
(29) |
Feb
(15) |
Mar
(2) |
Apr
|
May
(6) |
Jun
(2) |
Jul
(24) |
Aug
(2) |
Sep
(9) |
Oct
(43) |
Nov
(22) |
Dec
(6) |
| 2011 |
Jan
(24) |
Feb
(22) |
Mar
(31) |
Apr
(13) |
May
(10) |
Jun
(10) |
Jul
(43) |
Aug
(12) |
Sep
(18) |
Oct
(33) |
Nov
(18) |
Dec
(4) |
|
From: <cs...@us...> - 2008-09-03 22:47:57
|
Revision: 83
http://gpredict.svn.sourceforge.net/gpredict/?rev=83&view=rev
Author: csete
Date: 2008-09-03 22:48:06 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
Disabled debug output.
Modified Paths:
--------------
trunk/src/gtk-rot-knob.c
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2008-09-03 22:46:59 UTC (rev 82)
+++ trunk/src/gtk-rot-knob.c 2008-09-03 22:48:06 UTC (rev 83)
@@ -439,7 +439,7 @@
gtk_rot_knob_update (knob);
- g_print ("VAL: %.2f\n", knob->value);
+ /*g_print ("VAL: %.2f\n", knob->value);*/
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-03 22:46:49
|
Revision: 82
http://gpredict.svn.sourceforge.net/gpredict/?rev=82&view=rev
Author: csete
Date: 2008-09-03 22:46:59 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-09-03 22:45:47 UTC (rev 81)
+++ trunk/ChangeLog 2008-09-03 22:46:59 UTC (rev 82)
@@ -1,3 +1,12 @@
+2008-09-03; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-rot-knob.[ch]:
+ Added API functions to get/set range of the control widget.
+
+ * src/gtk-rot-ctrl.[ch]:
+ Implemented controller algorithm (except device I/O).
+
+
2008-08-28; Alexandru Csete <oz...@gm...>
* src/gtk-rot-knob.c:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-09-03 22:45:43
|
Revision: 81
http://gpredict.svn.sourceforge.net/gpredict/?rev=81&view=rev
Author: csete
Date: 2008-09-03 22:45:47 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
Implemented controller algorithm (except device I/O).
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 2008-09-03 21:24:41 UTC (rev 80)
+++ trunk/src/gtk-rot-ctrl.c 2008-09-03 22:45:47 UTC (rev 81)
@@ -40,6 +40,7 @@
#include <math.h>
#include "compat.h"
#include "sat-log.h"
+#include "predict-tools.h"
#include "gtk-rot-knob.h"
#include "gtk-rot-ctrl.h"
#ifdef HAVE_CONFIG_H
@@ -135,6 +136,8 @@
{
ctrl->sats = NULL;
ctrl->target = NULL;
+ ctrl->pass = NULL;
+ ctrl->qth = NULL;
ctrl->tracking = FALSE;
ctrl->busy = FALSE;
@@ -177,6 +180,14 @@
GTK_ROT_CTRL (widget)->target = SAT (g_slist_nth_data (GTK_ROT_CTRL (widget)->sats, 0));
+ /* store QTH */
+ GTK_ROT_CTRL (widget)->qth = module->qth;
+
+ /* get next pass for target satellite */
+ 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);
@@ -229,6 +240,21 @@
buff = g_strdup_printf (FMTSTR, ctrl->target->el);
gtk_label_set_text (GTK_LABEL (ctrl->ElSat), buff);
g_free (buff);
+
+ /* update next pass if necessary */
+ if (ctrl->pass != NULL) {
+ if (ctrl->target->aos > ctrl->pass->aos) {
+ /* update pass */
+ free_pass (ctrl->pass);
+ ctrl->pass = get_next_pass (ctrl->target, ctrl->qth, 3.0);
+ /* TODO: update polar plot */
+ }
+ }
+ else {
+ /* we don't have any current pass; store the current one */
+ ctrl->pass = get_next_pass (ctrl->target, ctrl->qth, 3.0);
+ /* TODO: update polar plot */
+ }
}
}
@@ -530,11 +556,23 @@
i = gtk_combo_box_get_active (satsel);
if (i >= 0) {
ctrl->target = SAT (g_slist_nth_data (ctrl->sats, i));
+
+ /* update next pass */
+ if (ctrl->pass != NULL)
+ free_pass (ctrl->pass);
+ ctrl->pass = get_next_pass (ctrl->target, ctrl->qth, 3.0);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s:%s: Invalid satellite selection: %d"),
__FILE__, __FUNCTION__, i);
+
+ /* clear pass just in case... */
+ if (ctrl->pass != NULL) {
+ free_pass (ctrl->pass);
+ ctrl->pass = NULL;
+ }
+
}
}
@@ -603,6 +641,9 @@
{
GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+ /* TODO: update device */
+
+ /* TODO: update ranges */
}
@@ -644,16 +685,38 @@
ctrl->busy = TRUE;
+ /* If we are tracking and the target satellite is within
+ range, set the rotor position controller knob values to
+ the target values. If the target satellite is out of range
+ set the rotor controller to 0 deg El and to the Az where the
+ target sat is expected to come up
+ */
+ if (ctrl->tracking) {
+ if (ctrl->target->el < 0.0) {
+ gdouble aosaz = 0.0;
+
+ if (ctrl->pass != NULL) {
+ aosaz = ctrl->pass->aos_az;
+ }
+ gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->AzSet), aosaz);
+ gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->ElSet), 0.0);
+ }
+ else {
+ gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->AzSet), ctrl->target->az);
+ gtk_rot_knob_set_value (GTK_ROT_KNOB (ctrl->ElSet), ctrl->target->el);
+ }
+
+ /* TODO: Update controller thread on polar plot */
+ }
if (ctrl->engaged) {
-
-
-
+ /* if tolerance exceeded */
+ /* TODO: send controller values to rotator device */
+ /* TODO: read back current position from device */
+ /* TODO: update polar plot */
}
- /* update current pointing marker on polar view */
-
ctrl->busy = FALSE;
return TRUE;
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-09-03 21:24:41 UTC (rev 80)
+++ trunk/src/gtk-rot-ctrl.h 2008-09-03 22:45:47 UTC (rev 81)
@@ -72,9 +72,11 @@
GtkWidget *DevSel;
/* satellites */
- GSList *sats;
- sat_t *target;
-
+ GSList *sats; /*!< List of sats in parent module */
+ sat_t *target; /*!< Target satellite */
+ pass_t *pass; /*!< Next pass of target satellite */
+ qth_t *qth; /*!< The QTH for this module */
+
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: <cs...@us...> - 2008-09-03 21:24:33
|
Revision: 80
http://gpredict.svn.sourceforge.net/gpredict/?rev=80&view=rev
Author: csete
Date: 2008-09-03 21:24:41 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
Added API functions to get/set range of the control widget.
Modified Paths:
--------------
trunk/src/gtk-rot-knob.c
trunk/src/gtk-rot-knob.h
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2008-08-28 22:13:14 UTC (rev 79)
+++ trunk/src/gtk-rot-knob.c 2008-09-03 21:24:41 UTC (rev 80)
@@ -130,7 +130,7 @@
*
*/
GtkWidget *
-gtk_rot_knob_new (gfloat min, gfloat max, gfloat val)
+gtk_rot_knob_new (gdouble min, gdouble max, gdouble val)
{
GtkWidget *widget;
GtkWidget *table;
@@ -300,7 +300,7 @@
*
*/
void
-gtk_rot_knob_set_value (GtkRotKnob *knob, gfloat val)
+gtk_rot_knob_set_value (GtkRotKnob *knob, gdouble val)
{
/* set the new value */
if (val <= knob->min)
@@ -322,14 +322,73 @@
* Hint: For reading the value you can also access knob->value.
*
*/
-gfloat
+gdouble
gtk_rot_knob_get_value (GtkRotKnob *knob)
{
return knob->value;
}
+/** \brief Get the upper limit of the control widget
+ * \param[in] knob The rotor control widget.
+ * \return The upper limit of the control widget.
+ */
+gdouble
+gtk_rot_knob_get_max (GtkRotKnob *knob)
+{
+ return knob->max;
+}
+
+/** \brief Get the lower limit of the control widget
+ * \param[in] knob The rotor control widget.
+ * \return The lower limit of the control widget.
+ */
+gdouble
+gtk_rot_knob_get_min (GtkRotKnob *knob)
+{
+ return knob->min;
+}
+
+
+/** \brief Set the lower limit of the control widget
+ * \param[in] knob The rotor control widget.
+ * \param[in] min The new lower limit of the control widget.
+ */
+void
+gtk_rot_knob_set_min (GtkRotKnob *knob, gdouble min)
+{
+ /* just som sanity check we have only 3 digits */
+ if (min < 1000)
+ knob->min = min;
+}
+
+/** \brief Set the upper limit of the control widget
+ * \param[in] knob The rotor control widget.
+ * \param[in] min The new upper limit of the control widget.
+ */
+void
+gtk_rot_knob_set_max (GtkRotKnob *knob, gdouble max)
+{
+ /* just som sanity check we have only 3 digits */
+ if (max < 1000)
+ knob->max = max;
+}
+
+
+/** \brief Set the range of the control widget
+ * \param[in] knob The rotor control widget.
+ * \param[in] min The new lower limit of the control widget.
+ * \param[in] max The new upper limit of the control widget.
+ */
+void
+gtk_rot_knob_set_range (GtkRotKnob *knob, gdouble min, gdouble max)
+{
+ gtk_rot_knob_set_min (knob, min);
+ gtk_rot_knob_set_max (knob, max);
+}
+
+
/** \brief Update rotor display widget.
* \param[in] knob The rotor control widget.
*
@@ -369,7 +428,7 @@
button_clicked_cb (GtkWidget *button, gpointer data)
{
GtkRotKnob *knob = GTK_ROT_KNOB (data);
- gfloat delta = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (button), "delta")) / 100.0;
+ gdouble delta = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (button), "delta")) / 100.0;
if ((delta > 0.0) && ((knob->value + delta) <= knob->max)) {
knob->value += delta;
@@ -382,3 +441,5 @@
g_print ("VAL: %.2f\n", knob->value);
}
+
+
Modified: trunk/src/gtk-rot-knob.h
===================================================================
--- trunk/src/gtk-rot-knob.h 2008-08-28 22:13:14 UTC (rev 79)
+++ trunk/src/gtk-rot-knob.h 2008-09-03 21:24:41 UTC (rev 80)
@@ -64,9 +64,9 @@
GtkWidget *digits[7]; /*!< Labels for the digits */
GtkWidget *buttons[10]; /*!< Buttons; 0..4 up; 5..9 down */
- gfloat min;
- gfloat max;
- gfloat value;
+ gdouble min;
+ gdouble max;
+ gdouble value;
};
struct _GtkRotKnobClass
@@ -77,9 +77,15 @@
GtkType gtk_rot_knob_get_type (void);
-GtkWidget* gtk_rot_knob_new (gfloat min, gfloat max, gfloat val);
-void gtk_rot_knob_set_value (GtkRotKnob *knob, gfloat val);
-gfloat gtk_rot_knob_get_value (GtkRotKnob *knob);
+GtkWidget* gtk_rot_knob_new (gdouble min, gdouble max, gdouble val);
+void gtk_rot_knob_set_value (GtkRotKnob *knob, gdouble val);
+gdouble gtk_rot_knob_get_value (GtkRotKnob *knob);
+void gtk_rot_knob_set_max (GtkRotKnob *knob, gdouble max);
+gdouble gtk_rot_knob_get_max (GtkRotKnob *knob);
+gdouble gtk_rot_knob_get_min (GtkRotKnob *knob);
+void gtk_rot_knob_set_min (GtkRotKnob *knob, gdouble min);
+void gtk_rot_knob_set_max (GtkRotKnob *knob, gdouble max);
+void gtk_rot_knob_set_range (GtkRotKnob *knob, gdouble min, gdouble max);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-28 22:13:05
|
Revision: 79
http://gpredict.svn.sourceforge.net/gpredict/?rev=79&view=rev
Author: csete
Date: 2008-08-28 22:13:14 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-28 22:12:08 UTC (rev 78)
+++ trunk/ChangeLog 2008-08-28 22:13:14 UTC (rev 79)
@@ -1,3 +1,12 @@
+2008-08-28; Alexandru Csete <oz...@gm...>
+
+ * src/gtk-rot-knob.c:
+ Fixed bug that prevented the knob value to be set to min/max.
+
+ * src/gtk-rot-ctrl.[ch]:
+ Done some work on rotator control window.
+
+
2008-08-27; Alexandru Csete <oz...@gm...>
* src/radio-conf.[ch]:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-28 22:11:57
|
Revision: 78
http://gpredict.svn.sourceforge.net/gpredict/?rev=78&view=rev
Author: csete
Date: 2008-08-28 22:12:08 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
Updated.
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 2008-08-28 18:00:53 UTC (rev 77)
+++ trunk/src/gtk-rot-ctrl.c 2008-08-28 22:12:08 UTC (rev 78)
@@ -31,13 +31,16 @@
* The master rotator control UI is implemented as a Gtk+ Widget in order
* to allow multiple instances. The widget is created from the module
* popup menu and each module can have several rotator control windows
- * attached to it.
+ * attached to it. Note, however, that current implementation only
+ * allows one rotor control window per module.
*
*/
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <math.h>
+#include "compat.h"
#include "sat-log.h"
+#include "gtk-rot-knob.h"
#include "gtk-rot-ctrl.h"
#ifdef HAVE_CONFIG_H
# include <build-config.h>
@@ -64,6 +67,8 @@
static void track_toggle_cb (GtkToggleButton *button, gpointer data);
static void delay_changed_cb (GtkSpinButton *spin, gpointer data);
static void toler_changed_cb (GtkSpinButton *spin, gpointer data);
+static void rot_selected_cb (GtkComboBox *box, gpointer data);
+static void rot_locked_cb (GtkToggleButton *button, gpointer data);
static gboolean rot_ctrl_timeout_cb (gpointer data);
@@ -133,6 +138,7 @@
ctrl->tracking = FALSE;
ctrl->busy = FALSE;
+ ctrl->engaged = FALSE;
ctrl->delay = 1000;
ctrl->timerid = 0;
ctrl->tolerance = 1.0;
@@ -236,12 +242,26 @@
static
GtkWidget *create_az_widgets (GtkRotCtrl *ctrl)
{
- GtkWidget *frame;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkWidget *label;
+
frame = gtk_frame_new (_("Azimuth"));
+ table = gtk_table_new (2, 2, FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 5);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+ gtk_container_add (GTK_CONTAINER (frame), table);
+
ctrl->AzSet = gtk_rot_knob_new (0.0, 360.0, 180.0);
- gtk_container_add (GTK_CONTAINER (frame), ctrl->AzSet);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->AzSet, 1, 2, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), _("Read:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
return frame;
}
@@ -256,10 +276,28 @@
static
GtkWidget *create_el_widgets (GtkRotCtrl *ctrl)
{
- GtkWidget *frame;
+ GtkWidget *frame;
+ GtkWidget *table;
+ GtkWidget *label;
+
frame = gtk_frame_new (_("Elevation"));
+
+ table = gtk_table_new (2, 2, FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 5);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+ gtk_container_add (GTK_CONTAINER (frame), table);
+ ctrl->ElSet = gtk_rot_knob_new (0.0, 90.0, 45.0);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->ElSet, 1, 2, 0, 1);
+
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), _("Read:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+
+
return frame;
}
@@ -274,12 +312,14 @@
guint i, n;
sat_t *sat = NULL;
-
+
buff = g_strdup_printf (FMTSTR, 0.0);
table = gtk_table_new (4, 3, FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
-
+ gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+
/* sat selector */
satsel = gtk_combo_box_new_text ();
n = g_slist_length (ctrl->sats);
@@ -292,14 +332,12 @@
gtk_combo_box_set_active (GTK_COMBO_BOX (satsel), 0);
gtk_widget_set_tooltip_text (satsel, _("Select target object"));
g_signal_connect (satsel, "changed", G_CALLBACK (sat_selected_cb), ctrl);
- gtk_table_attach (GTK_TABLE (table), satsel, 0, 2, 0, 1,
- GTK_FILL, GTK_FILL, 5, 5);
+ gtk_table_attach_defaults (GTK_TABLE (table), satsel, 0, 2, 0, 1);
/* tracking button */
track = gtk_toggle_button_new_with_label (_("Track"));
gtk_widget_set_tooltip_text (track, _("Track the satellite when it is within range"));
- gtk_table_attach (GTK_TABLE (table), track, 2, 3, 0, 1,
- GTK_SHRINK, GTK_SHRINK, 5, 0);
+ gtk_table_attach_defaults (GTK_TABLE (table), track, 2, 3, 0, 1);
g_signal_connect (track, "toggled", G_CALLBACK (track_toggle_cb), ctrl);
/* Azimuth */
@@ -340,14 +378,72 @@
create_conf_widgets (GtkRotCtrl *ctrl)
{
GtkWidget *frame,*table,*label,*timer,*toler;
+ GtkWidget *lock;
+ GDir *dir = NULL; /* directory handle */
+ GError *error = NULL; /* error flag and info */
+ gchar *cfgdir;
+ gchar *dirname; /* directory name */
+ gchar **vbuff;
+ const gchar *filename; /* file name */
+
- table = gtk_table_new (2, 3, TRUE);
+
+ table = gtk_table_new (3, 3, FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+
+ label = gtk_label_new (_("Device:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+
+ ctrl->DevSel = gtk_combo_box_new_text ();
+ gtk_widget_set_tooltip_text (ctrl->DevSel, _("Select antenna rotator device"));
+
+ /* open configuration directory */
+ cfgdir = get_conf_dir ();
+ dirname = g_strconcat (cfgdir, G_DIR_SEPARATOR_S,
+ "hwconf", NULL);
+ g_free (cfgdir);
+
+ dir = g_dir_open (dirname, 0, &error);
+ if (dir) {
+ /* read each .rig file */
+ while ((filename = g_dir_read_name (dir))) {
+
+ if (g_strrstr (filename, ".rot")) {
+
+ vbuff = g_strsplit (filename, ".rot", 0);
+ gtk_combo_box_append_text (GTK_COMBO_BOX (ctrl->DevSel), vbuff[0]);
+ g_strfreev (vbuff);
+ }
+ }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s:%d: Failed to open hwconf dir (%s)"),
+ __FILE__, __LINE__, error->message);
+ g_clear_error (&error);
+ }
+
+ g_free (dirname);
+ g_dir_close (dir);
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (ctrl->DevSel), 0);
+ g_signal_connect (ctrl->DevSel, "changed", G_CALLBACK (rot_selected_cb), ctrl);
+ gtk_table_attach_defaults (GTK_TABLE (table), ctrl->DevSel, 1, 2, 0, 1);
+
+ /* Engage button */
+ lock = gtk_toggle_button_new_with_label (_("Engage"));
+ gtk_widget_set_tooltip_text (lock, _("Engage the selcted rotor device"));
+ g_signal_connect (lock, "toggled", G_CALLBACK (rot_locked_cb), ctrl);
+ gtk_table_attach_defaults (GTK_TABLE (table), lock, 2, 3, 0, 1);
+
/* Timeout */
label = gtk_label_new (_("Cycle:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
timer = gtk_spin_button_new_with_range (100, 5000, 10);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (timer), 0);
@@ -356,17 +452,17 @@
"commands sent to the rotator."));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (timer), ctrl->delay);
g_signal_connect (timer, "value-changed", G_CALLBACK (delay_changed_cb), ctrl);
- gtk_table_attach (GTK_TABLE (table), timer, 1, 2, 0, 1,
+ gtk_table_attach (GTK_TABLE (table), timer, 1, 2, 1, 2,
GTK_FILL, GTK_FILL, 0, 0);
label = gtk_label_new (_("msec"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 0, 1);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 1, 2);
/* Tolerance */
label = gtk_label_new (_("Tolerance:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
toler = gtk_spin_button_new_with_range (0.0, 10.0, 0.1);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (toler), 1);
@@ -377,13 +473,13 @@
"is smaller than the tolerance, no new commands are sent"));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (toler), ctrl->tolerance);
g_signal_connect (toler, "value-changed", G_CALLBACK (toler_changed_cb), ctrl);
- gtk_table_attach (GTK_TABLE (table), toler, 1, 2, 1, 2,
+ gtk_table_attach (GTK_TABLE (table), toler, 1, 2, 2, 3,
GTK_FILL, GTK_FILL, 0, 0);
label = gtk_label_new (_("deg"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 1, 2);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3);
frame = gtk_frame_new (_("Settings"));
@@ -495,8 +591,43 @@
}
+/** \brief New rotor device selected.
+ * \param box Pointer to the rotor selector combo box.
+ * \param data Pointer to the GtkRotCtrl widget.
+ *
+ * This function is called when the user selects a new rotor controller
+ * device.
+ */
+static void
+rot_selected_cb (GtkComboBox *box, gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+
+}
+/** \brief Rotor locked.
+ * \param button Pointer to the "Engage" button.
+ * \param data Pointer to the GtkRotCtrl widget.
+ *
+ * This function is called when the user toggles the "Engage" button.
+ */
+static void
+rot_locked_cb (GtkToggleButton *button, gpointer data)
+{
+ GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+
+ if (gtk_toggle_button_get_active (button)) {
+ gtk_widget_set_sensitive (ctrl->DevSel, FALSE);
+ ctrl->engaged = FALSE;
+ }
+ else {
+ gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
+ ctrl->engaged = TRUE;
+ }
+}
+
+
/** \brief Rotator controller timeout function
* \param data Pointer to the GtkRotCtrl widget.
* \return Always TRUE to let the timer continue.
@@ -513,13 +644,19 @@
ctrl->busy = TRUE;
- /* do something */
+
+ if (ctrl->engaged) {
+
+
+
+ }
+ /* update current pointing marker on polar view */
+
+
ctrl->busy = FALSE;
return TRUE;
}
-
-
Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h 2008-08-28 18:00:53 UTC (rev 77)
+++ trunk/src/gtk-rot-ctrl.h 2008-08-28 22:12:08 UTC (rev 78)
@@ -62,13 +62,14 @@
{
GtkVBox vbox;
- /* Azimuth labels */
- GtkWidget *AzSat,*AzDelta,*AzLock,*AzSet,*AzRead;
+ /* Azimuth widgets */
+ GtkWidget *AzSat,*AzSet,*AzRead,*AzDevSel;
- /* Elevation labels */
- GtkWidget *ElSat,*ElDelta,*ElLock,*ElSet,*ElRead;
+ /* Elevation widgets */
+ GtkWidget *ElSat,*ElSet,*ElRead,*ElDevSel,*ElDev;
/* other widgets */
+ GtkWidget *DevSel;
/* satellites */
GSList *sats;
@@ -78,8 +79,9 @@
guint timerid; /*!< Timer ID */
gdouble tolerance; /*!< Error tolerance */
- gboolean tracking;
- gboolean busy;
+ gboolean tracking; /*!< Flag set when we are tracking a target. */
+ gboolean busy; /*!< Flag set when control algorithm is busy. */
+ gboolean engaged; /*!< Flag indicating that rotor device is engaged. */
};
struct _GtkRotCtrlClass
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-28 18:00:43
|
Revision: 77
http://gpredict.svn.sourceforge.net/gpredict/?rev=77&view=rev
Author: csete
Date: 2008-08-28 18:00:53 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
Fixed bug that prevented the knob value to be set to min/max.
Modified Paths:
--------------
trunk/src/gtk-rot-knob.c
Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c 2008-08-27 21:16:11 UTC (rev 76)
+++ trunk/src/gtk-rot-knob.c 2008-08-28 18:00:53 UTC (rev 77)
@@ -303,7 +303,11 @@
gtk_rot_knob_set_value (GtkRotKnob *knob, gfloat val)
{
/* set the new value */
- if ((val >= knob->min) && (val <= knob->max))
+ if (val <= knob->min)
+ knob->value = knob->min;
+ else if (val >= knob->max)
+ knob->value = knob->max;
+ else
knob->value = val;
/* update the display */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 21:16:03
|
Revision: 76
http://gpredict.svn.sourceforge.net/gpredict/?rev=76&view=rev
Author: csete
Date: 2008-08-27 21:16:11 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/NEWS
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2008-08-27 21:14:07 UTC (rev 75)
+++ trunk/NEWS 2008-08-27 21:16:11 UTC (rev 76)
@@ -1,11 +1,9 @@
Changes in version 1.0 (TBD):
-x New alarm manager: Notify user ... systray ...
-x Radio doppler tuning (TBD which rigs).
-x Antenna rotator control (TBD which rots).
+x Radio doppler tuning via hamlibs rigctld.
+x Antenna rotator control via hamlibs rotctld.
x New layout engine allowing any number of views per module.
-x Orbit Lab:
x SpaceView: New view show the satellites using a movable camera in space.
x SkyView:
x The satellite map can show the range circle of the ground station according to
@@ -25,8 +23,8 @@
- Fixed bug 1880815: Null pointer dereference causes crash on startup.
x Windows: New installer instead of ZIP distribution.
x Updated user manual as PDF and HTML (online).
-x New TechNote: Algo ref.
+
Changes in version 0.9.0 (2007-09-29):
- Save satellite pass predictions to text file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 21:13:57
|
Revision: 75
http://gpredict.svn.sourceforge.net/gpredict/?rev=75&view=rev
Author: csete
Date: 2008-08-27 21:14:07 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-27 21:12:37 UTC (rev 74)
+++ trunk/ChangeLog 2008-08-27 21:14:07 UTC (rev 75)
@@ -1,3 +1,23 @@
+2008-08-27; Alexandru Csete <oz...@gm...>
+
+ * src/radio-conf.[ch]:
+ Added separate fileds for port number and local oscillator ffrequency.
+ Added error handling.
+
+ * src/sat-pref-rig-editor.c:
+ * src/sat-pref-rig-data.h:
+ * src/sat-pref-rig.c:
+ Added fields for port number and LO frequency.
+
+ * src/rotor.conf.[ch]:
+ Added field for port number. Added error handling.
+
+ * src/sat-pref-rot-data.h:
+ * src/sat-pref-rot-editor.c:
+ * src/sat-pref-rot.c:
+ Added field for port number.
+
+
2008-08-22; Alexandru Csete <oz...@gm...>
* src/sat-pref-rig.c:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 21:12:29
|
Revision: 74
http://gpredict.svn.sourceforge.net/gpredict/?rev=74&view=rev
Author: csete
Date: 2008-08-27 21:12:37 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Added field for port number.
Modified Paths:
--------------
trunk/src/sat-pref-rot-data.h
trunk/src/sat-pref-rot-editor.c
trunk/src/sat-pref-rot.c
Modified: trunk/src/sat-pref-rot-data.h
===================================================================
--- trunk/src/sat-pref-rot-data.h 2008-08-27 21:10:00 UTC (rev 73)
+++ trunk/src/sat-pref-rot-data.h 2008-08-27 21:12:37 UTC (rev 74)
@@ -32,6 +32,7 @@
typedef enum {
ROT_LIST_COL_NAME = 0, /*!< File name. */
ROT_LIST_COL_HOST, /*!< Hostname */
+ ROT_LIST_COL_PORT, /*!< Port number */
ROT_LIST_COL_MINAZ, /*!< Lower Az limit. */
ROT_LIST_COL_MAXAZ, /*!< Upper Az limit. */
ROT_LIST_COL_MINEL, /*!< Lower El limit. */
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2008-08-27 21:10:00 UTC (rev 73)
+++ trunk/src/sat-pref-rot-editor.c 2008-08-27 21:12:37 UTC (rev 74)
@@ -52,7 +52,8 @@
/* private widgets */
static GtkWidget *dialog; /* dialog window */
static GtkWidget *name; /* Configuration name */
-static GtkWidget *host; /* rotor model, e.g. TS-2000 */
+static GtkWidget *host; /* host name or IP */
+static GtkWidget *port; /* port number */
static GtkWidget *minaz;
static GtkWidget *maxaz;
static GtkWidget *minel;
@@ -142,7 +143,7 @@
GtkWidget *label;
- table = gtk_table_new (4, 4, FALSE);
+ table = gtk_table_new (5, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
@@ -175,42 +176,54 @@
_("Enter the host and port where rogctld is running, e.g. 192.168.1.100:15123"));
gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
+ /* port */
+ label = gtk_label_new (_("Port"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+
+ port = gtk_spin_button_new_with_range (1024, 65535, 1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4533);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (port), 0);
+ gtk_widget_set_tooltip_text (port,
+ _("Enter the port number where rotctld is listening"));
+ gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 3, 2, 3);
+
/* Az and El limits */
label = gtk_label_new (_(" Min Az"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
minaz = gtk_spin_button_new_with_range (-40, 450, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (minaz), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (minaz), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), minaz, 1, 2, 2, 3);
+ gtk_table_attach_defaults (GTK_TABLE (table), minaz, 1, 2, 3, 4);
label = gtk_label_new (_(" Max Az"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 3, 4);
maxaz = gtk_spin_button_new_with_range (-40, 450, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), 360);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (maxaz), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (maxaz), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), maxaz, 3, 4, 2, 3);
+ gtk_table_attach_defaults (GTK_TABLE (table), maxaz, 3, 4, 3, 4);
label = gtk_label_new (_(" Min El"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
minel = gtk_spin_button_new_with_range (-10, 180, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel), 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (minel), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (minel), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), minel, 1, 2, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), minel, 1, 2, 4, 5);
label = gtk_label_new (_(" Max El"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 4, 5);
maxel = gtk_spin_button_new_with_range (-10, 180, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxel), 90);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (maxel), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (maxel), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), maxel, 3, 4, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), maxel, 3, 4, 4, 5);
if (conf->name != NULL)
update_widgets (conf);
@@ -234,6 +247,12 @@
if (conf->host)
gtk_entry_set_text (GTK_ENTRY (host), conf->host);
+ /* port */
+ if (conf->port > 1023)
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), conf->port);
+ else
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4533); /* hamlib default? */
+
/* az and el limits */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), conf->minaz);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), conf->maxaz);
@@ -255,6 +274,7 @@
{
gtk_entry_set_text (GTK_ENTRY (name), "");
gtk_entry_set_text (GTK_ENTRY (host), "");
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4533); /* hamlib default? */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), 360);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel), 0);
@@ -284,6 +304,9 @@
conf->host = g_strdup (gtk_entry_get_text (GTK_ENTRY (host)));
+ /* port */
+ conf->port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));
+
/* az and el ranges */
conf->minaz = gtk_spin_button_get_value (GTK_SPIN_BUTTON (minaz));
conf->maxaz = gtk_spin_button_get_value (GTK_SPIN_BUTTON (maxaz));
Modified: trunk/src/sat-pref-rot.c
===================================================================
--- trunk/src/sat-pref-rot.c 2008-08-27 21:10:00 UTC (rev 73)
+++ trunk/src/sat-pref-rot.c 2008-08-27 21:12:37 UTC (rev 74)
@@ -55,11 +55,6 @@
static void edit_cb (GtkWidget *button, gpointer data);
static void delete_cb (GtkWidget *button, gpointer data);
-static void render_rot_type (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column);
static void render_angle (GtkTreeViewColumn *col,
GtkCellRenderer *renderer,
GtkTreeModel *model,
@@ -125,7 +120,13 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
-
+ /* port */
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Port"), renderer,
+ "text", ROT_LIST_COL_PORT,
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
+
/* Az and el limits */
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Min Az"), renderer,
@@ -186,10 +187,11 @@
liststore = gtk_list_store_new (ROT_LIST_COL_NUM,
G_TYPE_STRING, // name
G_TYPE_STRING, // host
- G_TYPE_INT, // Min Az
- G_TYPE_INT, // Max Az
- G_TYPE_INT, // Min El
- G_TYPE_INT // Max El
+ G_TYPE_INT, // port
+ G_TYPE_DOUBLE, // Min Az
+ G_TYPE_DOUBLE, // Max Az
+ G_TYPE_DOUBLE, // Min El
+ G_TYPE_DOUBLE // Max El
);
/* open configuration directory */
@@ -214,6 +216,7 @@
gtk_list_store_set (liststore, &item,
ROT_LIST_COL_NAME, conf.name,
ROT_LIST_COL_HOST, conf.host,
+ ROT_LIST_COL_PORT, conf.port,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -324,6 +327,7 @@
rotor_conf_t conf = {
.name = NULL,
.host = NULL,
+ .port = 4533,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -366,6 +370,7 @@
gtk_tree_model_get (model, &iter,
ROT_LIST_COL_NAME, &conf.name,
ROT_LIST_COL_HOST, &conf.host,
+ ROT_LIST_COL_PORT, &conf.port,
ROT_LIST_COL_MINAZ, &conf.minaz,
ROT_LIST_COL_MAXAZ, &conf.maxaz,
ROT_LIST_COL_MINEL, &conf.minel,
@@ -405,6 +410,7 @@
rotor_conf_t conf = {
.name = NULL,
.host = NULL,
+ .port = 4533,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -421,6 +427,7 @@
gtk_list_store_set (liststore, &item,
ROT_LIST_COL_NAME, conf.name,
ROT_LIST_COL_HOST, conf.host,
+ ROT_LIST_COL_PORT, conf.port,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -453,6 +460,7 @@
rotor_conf_t conf = {
.name = NULL,
.host = NULL,
+ .port = 4533,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -480,6 +488,7 @@
gtk_tree_model_get (model, &iter,
ROT_LIST_COL_NAME, &conf.name,
ROT_LIST_COL_HOST, &conf.host,
+ ROT_LIST_COL_PORT, &conf.port,
ROT_LIST_COL_MINAZ, &conf.minaz,
ROT_LIST_COL_MAXAZ, &conf.maxaz,
ROT_LIST_COL_MINEL, &conf.minel,
@@ -510,6 +519,7 @@
gtk_list_store_set (GTK_LIST_STORE(model), &iter,
ROT_LIST_COL_NAME, conf.name,
ROT_LIST_COL_HOST, conf.host,
+ ROT_LIST_COL_PORT, conf.port,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -587,13 +597,13 @@
GtkTreeIter *iter,
gpointer column)
{
- gint number;
+ gdouble number;
guint coli = GPOINTER_TO_UINT (column);
gchar *text;
gtk_tree_model_get (model, iter, coli, &number, -1);
- text = g_strdup_printf ("%d\302\260", number);
+ text = g_strdup_printf ("%.0f\302\260", number);
g_object_set (renderer, "text", text, NULL);
g_free (text);
}
@@ -601,52 +611,5 @@
-/** \brief Render rotator type.
- * \param col Pointer to the tree view column.
- * \param renderer Pointer to the renderer.
- * \param model Pointer to the tree model.
- * \param iter Pointer to the tree iterator.
- * \param column The column number in the model.
- *
- * This function renders the rotator type onto the rotator list.
- * The rotator type is stored as enum; however, we want to display it
- * using some escriptive text, e.g. "AZ", "EL", and so on
- */
-static void render_rot_type (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
-{
- guint number;
- guint coli = GPOINTER_TO_UINT (column);
-
- gtk_tree_model_get (model, iter, coli, &number, -1);
-/* switch (number) {
- case ROTOR_TYPE_AZ:
- g_object_set (renderer, "text", "AZ", NULL);
- break;
-
- case ROTOR_TYPE_EL:
- g_object_set (renderer, "text", "EL", NULL);
- break;
-
- case ROTOR_TYPE_AZEL:
- g_object_set (renderer, "text", "AZ/EL", NULL);
- break;
-
- default:
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Invalid type: %d. Using AZ."),
- __FILE__, __FUNCTION__, number);
- g_object_set (renderer, "text", "AZ", NULL);
- break;
-
- }*/
-
-}
-
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 21:09:51
|
Revision: 73
http://gpredict.svn.sourceforge.net/gpredict/?rev=73&view=rev
Author: csete
Date: 2008-08-27 21:10:00 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Fixed yet another bug.
Modified Paths:
--------------
trunk/src/rotor-conf.c
Modified: trunk/src/rotor-conf.c
===================================================================
--- trunk/src/rotor-conf.c 2008-08-27 21:07:59 UTC (rev 72)
+++ trunk/src/rotor-conf.c 2008-08-27 21:10:00 UTC (rev 73)
@@ -98,7 +98,7 @@
return FALSE;
}
- conf->port = g_key_file_get_string (cfg, GROUP, KEY_PORT, &error);
+ conf->port = g_key_file_get_integer (cfg, GROUP, KEY_PORT, &error);
if (error != NULL) {
sat_log_log (SAT_LOG_LEVEL_ERROR,
_("%s: Error reading rotor conf from %s (%s)."),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 21:07:49
|
Revision: 72
http://gpredict.svn.sourceforge.net/gpredict/?rev=72&view=rev
Author: csete
Date: 2008-08-27 21:07:59 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Fixed bug.
Modified Paths:
--------------
trunk/src/rotor-conf.c
Modified: trunk/src/rotor-conf.c
===================================================================
--- trunk/src/rotor-conf.c 2008-08-27 20:52:34 UTC (rev 71)
+++ trunk/src/rotor-conf.c 2008-08-27 21:07:59 UTC (rev 72)
@@ -176,7 +176,7 @@
cfg = g_key_file_new();
g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host);
- g_key_file_set_integer (cfg, GROUP, KEY_HOST, conf->port);
+ g_key_file_set_integer (cfg, GROUP, KEY_PORT, conf->port);
g_key_file_set_double (cfg, GROUP, KEY_MINAZ, conf->minaz);
g_key_file_set_double (cfg, GROUP, KEY_MAXAZ, conf->maxaz);
g_key_file_set_double (cfg, GROUP, KEY_MINEL, conf->minel);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 20:52:25
|
Revision: 71
http://gpredict.svn.sourceforge.net/gpredict/?rev=71&view=rev
Author: csete
Date: 2008-08-27 20:52:34 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Added field for port number. Added error handling.
Modified Paths:
--------------
trunk/src/rotor-conf.c
trunk/src/rotor-conf.h
Modified: trunk/src/rotor-conf.c
===================================================================
--- trunk/src/rotor-conf.c 2008-08-27 20:40:34 UTC (rev 70)
+++ trunk/src/rotor-conf.c 2008-08-27 20:52:34 UTC (rev 71)
@@ -36,6 +36,7 @@
#define GROUP "Rotator"
#define KEY_HOST "Host"
+#define KEY_PORT "Port"
#define KEY_MINAZ "MinAz"
#define KEY_MAXAZ "MaxAz"
#define KEY_MINEL "MinEl"
@@ -55,10 +56,15 @@
GKeyFile *cfg = NULL;
gchar *confdir;
gchar *fname;
+ GError *error = NULL;
- if (conf->name == NULL)
+ if (conf->name == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: NULL configuration name!"),
+ __FUNCTION__);
return FALSE;
+ }
confdir = get_conf_dir();
fname = g_strconcat (confdir, G_DIR_SEPARATOR_S,
@@ -82,12 +88,66 @@
g_free (fname);
/* read parameters */
- conf->host = g_key_file_get_string (cfg, GROUP, KEY_HOST, NULL);
- conf->minaz = g_key_file_get_double (cfg, GROUP, KEY_MINAZ, NULL);
- conf->maxaz = g_key_file_get_double (cfg, GROUP, KEY_MAXAZ, NULL);
- conf->minel = g_key_file_get_double (cfg, GROUP, KEY_MINEL, NULL);
- conf->maxel = g_key_file_get_double (cfg, GROUP, KEY_MAXEL, NULL);
+ conf->host = g_key_file_get_string (cfg, GROUP, KEY_HOST, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading rotor conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+ conf->port = g_key_file_get_string (cfg, GROUP, KEY_PORT, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading rotor conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
+ conf->minaz = g_key_file_get_double (cfg, GROUP, KEY_MINAZ, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading rotor conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
+ conf->maxaz = g_key_file_get_double (cfg, GROUP, KEY_MAXAZ, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading rotor conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
+ conf->minel = g_key_file_get_double (cfg, GROUP, KEY_MINEL, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading rotor conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
+ conf->maxel = g_key_file_get_double (cfg, GROUP, KEY_MAXEL, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading rotor conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
g_key_file_free (cfg);
return TRUE;
@@ -115,11 +175,12 @@
/* create a config structure */
cfg = g_key_file_new();
- g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host);
- g_key_file_set_double (cfg, GROUP, KEY_MINAZ, conf->minaz);
- g_key_file_set_double (cfg, GROUP, KEY_MAXAZ, conf->maxaz);
- g_key_file_set_double (cfg, GROUP, KEY_MINEL, conf->minel);
- g_key_file_set_double (cfg, GROUP, KEY_MAXEL, conf->maxel);
+ g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host);
+ g_key_file_set_integer (cfg, GROUP, KEY_HOST, conf->port);
+ g_key_file_set_double (cfg, GROUP, KEY_MINAZ, conf->minaz);
+ g_key_file_set_double (cfg, GROUP, KEY_MAXAZ, conf->maxaz);
+ g_key_file_set_double (cfg, GROUP, KEY_MINEL, conf->minel);
+ g_key_file_set_double (cfg, GROUP, KEY_MAXEL, conf->maxel);
/* convert to text sdata */
data = g_key_file_to_data (cfg, &len, NULL);
Modified: trunk/src/rotor-conf.h
===================================================================
--- trunk/src/rotor-conf.h 2008-08-27 20:40:34 UTC (rev 70)
+++ trunk/src/rotor-conf.h 2008-08-27 20:52:34 UTC (rev 71)
@@ -38,7 +38,8 @@
/** \brief Rotator configuration. */
typedef struct {
gchar *name; /*!< Configuration file name, less .rot */
- gchar *host; /*!< hostname:port */
+ gchar *host; /*!< hostname */
+ gint port; /*!< port number */
gdouble minaz; /*!< Lower azimuth limit */
gdouble maxaz; /*!< Upper azimuth limit */
gdouble minel; /*!< Lower elevation limit */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 20:40:25
|
Revision: 70
http://gpredict.svn.sourceforge.net/gpredict/?rev=70&view=rev
Author: csete
Date: 2008-08-27 20:40:34 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Added fields for port number and LO frequency.
Modified Paths:
--------------
trunk/src/sat-pref-rig-data.h
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rig.c
Modified: trunk/src/sat-pref-rig-data.h
===================================================================
--- trunk/src/sat-pref-rig-data.h 2008-08-27 19:19:52 UTC (rev 69)
+++ trunk/src/sat-pref-rig-data.h 2008-08-27 20:40:34 UTC (rev 70)
@@ -31,7 +31,9 @@
/** \brief Coumn definitions for radio list. */
typedef enum {
RIG_LIST_COL_NAME = 0, /*!< File name. */
- RIG_LIST_COL_HOST, /*!< Hostname, e.g. localhost:12000 */
+ RIG_LIST_COL_HOST, /*!< Hostname, e.g. localhost */
+ RIG_LIST_COL_PORT, /*!< Port number */
+ RIG_LIST_COL_LO, /*!< Local oscillator freq */
RIG_LIST_COL_NUM /*!< The number of fields in the list. */
} rig_list_col_t;
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-08-27 19:19:52 UTC (rev 69)
+++ trunk/src/sat-pref-rig-editor.c 2008-08-27 20:40:34 UTC (rev 70)
@@ -53,6 +53,8 @@
static GtkWidget *dialog; /* dialog window */
static GtkWidget *name; /* config name */
static GtkWidget *host; /* host */
+static GtkWidget *port; /* port number */
+static GtkWidget *lo; /* local oscillator */
static GtkWidget *create_editor_widgets (radio_conf_t *conf);
@@ -139,7 +141,7 @@
- table = gtk_table_new (2, 4, FALSE);
+ table = gtk_table_new (4, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
@@ -172,7 +174,34 @@
_("Enter the host and port where rigctld is running, e.g. 192.168.1.100:15123"));
gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
+ /* port */
+ label = gtk_label_new (_("Port"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+ port = gtk_spin_button_new_with_range (1024, 65535, 1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4532);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (port), 0);
+ gtk_widget_set_tooltip_text (port,
+ _("Enter the port number where rigctld is listening"));
+ gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 3, 2, 3);
+
+ /* LO frequency */
+ label = gtk_label_new (_("LO"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+
+ lo = gtk_spin_button_new_with_range (-40000, 40000, 1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), 0);
+ gtk_spin_button_set_digits (GTK_SPIN_BUTTON (lo), 0);
+ gtk_widget_set_tooltip_text (lo,
+ _("Enter the frequency of the local oscillator, if any."));
+ gtk_table_attach_defaults (GTK_TABLE (table), lo, 1, 3, 3, 4);
+
+ label = gtk_label_new (_("MHz"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 3, 4);
+
if (conf->name != NULL)
update_widgets (conf);
@@ -191,10 +220,18 @@
/* configuration name */
gtk_entry_set_text (GTK_ENTRY (name), conf->name);
- /* host name and port */
+ /* host name */
if (conf->host)
gtk_entry_set_text (GTK_ENTRY (host), conf->host);
+ /* port */
+ if (conf->port > 1023)
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), conf->port);
+ else
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4532); /* hamlib default? */
+
+ /* lo in MHz */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), conf->lo / 1000000);
}
@@ -209,7 +246,8 @@
{
gtk_entry_set_text (GTK_ENTRY (name), "");
gtk_entry_set_text (GTK_ENTRY (host), "");
-
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (port), 4532); /* hamlib default? */
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (lo), 0);
}
@@ -235,7 +273,12 @@
conf->host = g_strdup (gtk_entry_get_text (GTK_ENTRY (host)));
-
+ /* port */
+ conf->port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (port));
+
+ /* lo freq */
+ conf->lo = 1000000*gtk_spin_button_get_value (GTK_SPIN_BUTTON (lo));
+
return TRUE;
}
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2008-08-27 19:19:52 UTC (rev 69)
+++ trunk/src/sat-pref-rig.c 2008-08-27 20:40:34 UTC (rev 70)
@@ -58,22 +58,13 @@
GtkTreeModel *model,
GtkTreeIter *iter,
gpointer column);
-static void render_civ (GtkTreeViewColumn *col,
+static void render_lo (GtkTreeViewColumn *col,
GtkCellRenderer *renderer,
GtkTreeModel *model,
GtkTreeIter *iter,
gpointer column);
-static void render_dtr_rts (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column);
-static void render_rig_type (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column);
+
/* global objects */
static GtkWidget *addbutton;
static GtkWidget *editbutton;
@@ -138,7 +129,24 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+ /* port */
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("Port"), renderer,
+ "text", RIG_LIST_COL_PORT,
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+ /* lo */
+ renderer = gtk_cell_renderer_text_new ();
+ column = gtk_tree_view_column_new_with_attributes (_("LO Freq. (MHz)"), renderer,
+ "text", RIG_LIST_COL_LO,
+ NULL);
+ gtk_tree_view_column_set_cell_data_func (column, renderer,
+ render_lo,
+ GUINT_TO_POINTER(RIG_LIST_COL_LO),
+ NULL);
+ gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
+
}
@@ -158,7 +166,9 @@
/* create a new list store */
liststore = gtk_list_store_new (RIG_LIST_COL_NUM,
G_TYPE_STRING, // name
- G_TYPE_STRING // model
+ G_TYPE_STRING, // host
+ G_TYPE_INT, // port
+ G_TYPE_DOUBLE // LO
);
/* open configuration directory */
@@ -183,6 +193,8 @@
gtk_list_store_set (liststore, &item,
RIG_LIST_COL_NAME, conf.name,
RIG_LIST_COL_HOST, conf.host,
+ RIG_LIST_COL_PORT, conf.port,
+ RIG_LIST_COL_LO, conf.lo,
-1);
sat_log_log (SAT_LOG_LEVEL_DEBUG,
@@ -290,6 +302,8 @@
radio_conf_t conf = {
.name = NULL,
.host = NULL,
+ .port = 4532,
+ .lo = 0.0,
};
@@ -328,6 +342,8 @@
gtk_tree_model_get (model, &iter,
RIG_LIST_COL_NAME, &conf.name,
RIG_LIST_COL_HOST, &conf.host,
+ RIG_LIST_COL_PORT, &conf.port,
+ RIG_LIST_COL_LO, &conf.lo,
-1);
radio_conf_save (&conf);
@@ -364,6 +380,8 @@
radio_conf_t conf = {
.name = NULL,
.host = NULL,
+ .port = 4532,
+ .lo = 0.0,
};
/* run rig conf editor */
@@ -376,6 +394,8 @@
gtk_list_store_set (liststore, &item,
RIG_LIST_COL_NAME, conf.name,
RIG_LIST_COL_HOST, conf.host,
+ RIG_LIST_COL_PORT, conf.port,
+ RIG_LIST_COL_LO, conf.lo,
-1);
g_free (conf.name);
@@ -404,6 +424,8 @@
radio_conf_t conf = {
.name = NULL,
.host = NULL,
+ .port = 4532,
+ .lo = 0.0,
};
@@ -427,6 +449,8 @@
gtk_tree_model_get (model, &iter,
RIG_LIST_COL_NAME, &conf.name,
RIG_LIST_COL_HOST, &conf.host,
+ RIG_LIST_COL_PORT, &conf.port,
+ RIG_LIST_COL_PORT, &conf.lo,
-1);
}
@@ -453,6 +477,8 @@
gtk_list_store_set (GTK_LIST_STORE(model), &iter,
RIG_LIST_COL_NAME, conf.name,
RIG_LIST_COL_HOST, conf.host,
+ RIG_LIST_COL_PORT, conf.port,
+ RIG_LIST_COL_LO, conf.lo,
-1);
}
@@ -543,138 +569,36 @@
}
-/** \brief Render CIV address.
+/** \brief Render Local Oscillator frequency.
* \param col Pointer to the tree view column.
* \param renderer Pointer to the renderer.
* \param model Pointer to the tree model.
* \param iter Pointer to the tree iterator.
* \param column The column number in the model.
*
- * This function is used to render the Icom CI-V address of the radio.
- * The CI-V adress is store as an integer and we want to display it as a
- * HEX number.
+ * This function is used to render the local oscillator frequency. We
+ * need a special renderer so that we can automatically render as MHz
+ * instead of Hz.
*/
-static void render_civ (GtkTreeViewColumn *col,
+static void render_lo (GtkTreeViewColumn *col,
GtkCellRenderer *renderer,
GtkTreeModel *model,
GtkTreeIter *iter,
gpointer column)
{
- guint number;
- gchar *buff;
- guint coli = GPOINTER_TO_UINT (column);
+ gdouble number;
+ gchar *buff;
+ guint coli = GPOINTER_TO_UINT (column);
gtk_tree_model_get (model, iter, coli, &number, -1);
- if (number > 0)
- buff = g_strdup_printf ("0x%X", number);
- else
- buff = g_strdup_printf (" ");
-
+ /* convert to MHz */
+ number /= 1000000.0;
+ buff = g_strdup_printf ("%.0f", number);
g_object_set (renderer, "text", buff, NULL);
g_free (buff);
}
-/** \brief Render DTR or RTS columns address.
- * \param col Pointer to the tree view column.
- * \param renderer Pointer to the renderer.
- * \param model Pointer to the tree model.
- * \param iter Pointer to the tree iterator.
- * \param column The column number in the model.
- *
- * This function renders the DTR and RTS line settings onto the radio list.
- * The DTR and RTS states are stored as enum; however, we want to display them
- * using some escriptive text, e.g. "ON", "OFF", "PTT", and so on
- */
-static void render_dtr_rts (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
-{
- guint number;
- guint coli = GPOINTER_TO_UINT (column);
-
- gtk_tree_model_get (model, iter, coli, &number, -1);
-/* switch (number) {
-
- case LINE_OFF:
- g_object_set (renderer, "text", "OFF", NULL);
- break;
-
- case LINE_ON:
- g_object_set (renderer, "text", "ON", NULL);
- break;
-
- case LINE_PTT:
- g_object_set (renderer, "text", "PTT", NULL);
- break;
-
- case LINE_CW:
- g_object_set (renderer, "text", "CW", NULL);
- break;
-
- default:
- g_object_set (renderer, "text", "UNDEF", NULL);
- break;
-
- }
- */
-}
-
-/** \brief Render radio type.
- * \param col Pointer to the tree view column.
- * \param renderer Pointer to the renderer.
- * \param model Pointer to the tree model.
- * \param iter Pointer to the tree iterator.
- * \param column The column number in the model.
- *
- * This function renders the radio type onto the radio list.
- * The radio type is stored as enum; however, we want to display it
- * using some escriptive text, e.g. "Received", "Full Duplex", and so on
- */
-static void render_rig_type (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer column)
-{
- guint number;
- guint coli = GPOINTER_TO_UINT (column);
-
- gtk_tree_model_get (model, iter, coli, &number, -1);
-
-/* switch (number) {
-
- case RADIO_TYPE_RX:
- g_object_set (renderer, "text", "RX", NULL);
- break;
-
- case RADIO_TYPE_TX:
- g_object_set (renderer, "text", "TX", NULL);
- break;
-
- case RADIO_TYPE_TRX:
- g_object_set (renderer, "text", "RX/TX", NULL);
- break;
-
- case RADIO_TYPE_FULL_DUP:
- g_object_set (renderer, "text", "FULL DUPL", NULL);
- break;
-
- default:
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s:%s: Invalid type: %d. Using RX."),
- __FILE__, __FUNCTION__, number);
- g_object_set (renderer, "text", "RX", NULL);
- break;
-
- }*/
-
-}
-
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 19:19:41
|
Revision: 69
http://gpredict.svn.sourceforge.net/gpredict/?rev=69&view=rev
Author: csete
Date: 2008-08-27 19:19:52 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Changed LO from MHz to Hz.
Modified Paths:
--------------
trunk/src/radio-conf.h
Modified: trunk/src/radio-conf.h
===================================================================
--- trunk/src/radio-conf.h 2008-08-27 19:17:51 UTC (rev 68)
+++ trunk/src/radio-conf.h 2008-08-27 19:19:52 UTC (rev 69)
@@ -39,7 +39,7 @@
gchar *name; /*!< Configuration file name, without .rig. */
gchar *host; /*!< hostname or IP */
gint port; /*!< port number */
- gdouble lo; /*!< local oscillator freq in MHz (using double for
+ gdouble lo; /*!< local oscillator freq in Hz (using double for
compatibility with rest of code) */
} radio_conf_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 19:17:44
|
Revision: 68
http://gpredict.svn.sourceforge.net/gpredict/?rev=68&view=rev
Author: csete
Date: 2008-08-27 19:17:51 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Added fields for port number and local oscillator offset.
Modified Paths:
--------------
trunk/src/radio-conf.c
trunk/src/radio-conf.h
Modified: trunk/src/radio-conf.c
===================================================================
--- trunk/src/radio-conf.c 2008-08-27 18:43:58 UTC (rev 67)
+++ trunk/src/radio-conf.c 2008-08-27 19:17:51 UTC (rev 68)
@@ -36,11 +36,15 @@
#define GROUP "Radio"
#define KEY_HOST "Host"
+#define KEY_PORT "Port"
+#define KEY_LO "LO"
/** \brief Read radio configuration.
* \param conf Pointer to a radio_conf_t structure where the data will be
* stored.
+ * \return TRUE if the configuration was read successfully, FALSe if an
+ * error has occurred.
*
* This function reads a radio configuration from a .rig file into conf.
* conf->name must contain the file name of the configuration (no path, just
@@ -48,13 +52,18 @@
*/
gboolean radio_conf_read (radio_conf_t *conf)
{
- GKeyFile *cfg = NULL;
- gchar *confdir;
- gchar *fname;
+ GKeyFile *cfg = NULL;
+ gchar *confdir;
+ gchar *fname;
+ GError *error = NULL;
- if (conf->name == NULL)
+ if (conf->name == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: NULL configuration name!"),
+ __FUNCTION__);
return FALSE;
+ }
confdir = get_conf_dir();
fname = g_strconcat (confdir, G_DIR_SEPARATOR_S,
@@ -78,10 +87,42 @@
g_free (fname);
/* read parameters */
- conf->host = g_key_file_get_string (cfg, GROUP, KEY_HOST, NULL);
+ conf->host = g_key_file_get_string (cfg, GROUP, KEY_HOST, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading radio conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+ conf->port = g_key_file_get_integer (cfg, GROUP, KEY_PORT, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading radio conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
+ conf->lo = g_key_file_get_double (cfg, GROUP, KEY_LO, &error);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error reading radio conf from %s (%s)."),
+ __FUNCTION__, conf->name, error->message);
+ g_clear_error (&error);
+ g_key_file_free (cfg);
+ return FALSE;
+ }
+
g_key_file_free (cfg);
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Read radio configuration %s"),
+ __FUNCTION__, conf->name);
+
return TRUE;
}
@@ -101,13 +142,19 @@
gchar *data;
gsize len;
- if (conf->name == NULL)
+ if (conf->name == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: NULL configuration name!"),
+ __FUNCTION__);
return;
+ }
/* create a config structure */
cfg = g_key_file_new();
g_key_file_set_string (cfg, GROUP, KEY_HOST, conf->host);
+ g_key_file_set_integer (cfg, GROUP, KEY_PORT, conf->port);
+ g_key_file_set_double (cfg, GROUP, KEY_LO, conf->lo);
/* convert to text sdata */
data = g_key_file_to_data (cfg, &len, NULL);
@@ -123,4 +170,8 @@
g_free (fname);
g_free (data);
g_key_file_free (cfg);
+
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Saved radio configuration %s"),
+ __FUNCTION__, conf->name);
}
Modified: trunk/src/radio-conf.h
===================================================================
--- trunk/src/radio-conf.h 2008-08-27 18:43:58 UTC (rev 67)
+++ trunk/src/radio-conf.h 2008-08-27 19:17:51 UTC (rev 68)
@@ -37,7 +37,10 @@
/** \brief Radio configuration. */
typedef struct {
gchar *name; /*!< Configuration file name, without .rig. */
- gchar *host; /*!< hostname:port */
+ gchar *host; /*!< hostname or IP */
+ gint port; /*!< port number */
+ gdouble lo; /*!< local oscillator freq in MHz (using double for
+ compatibility with rest of code) */
} radio_conf_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 18:43:51
|
Revision: 67
http://gpredict.svn.sourceforge.net/gpredict/?rev=67&view=rev
Author: csete
Date: 2008-08-27 18:43:58 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Deleting autogenerated file.
Removed Paths:
-------------
trunk/goocanv8/src/Makefile.in
Deleted: trunk/goocanv8/src/Makefile.in
===================================================================
--- trunk/goocanv8/src/Makefile.in 2008-08-27 18:42:25 UTC (rev 66)
+++ trunk/goocanv8/src/Makefile.in 2008-08-27 18:43:58 UTC (rev 67)
@@ -1,652 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src
-DIST_COMMON = $(libgoocanvasinclude_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libgoocanvas_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libgoocanvas_la_OBJECTS = goocanvasatk.lo goocanvasellipse.lo \
- goocanvasenumtypes.lo goocanvasgroup.lo goocanvasimage.lo \
- goocanvasitem.lo goocanvasitemmodel.lo goocanvasitemsimple.lo \
- goocanvasmarshal.lo goocanvaspolyline.lo goocanvaspath.lo \
- goocanvasrect.lo goocanvasstyle.lo goocanvastable.lo \
- goocanvastext.lo goocanvasutils.lo goocanvaswidget.lo \
- goocanvas.lo
-libgoocanvas_la_OBJECTS = $(am_libgoocanvas_la_OBJECTS)
-libgoocanvas_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libgoocanvas_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(libgoocanvas_la_SOURCES)
-DIST_SOURCES = $(libgoocanvas_la_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libgoocanvasincludedir)"
-libgoocanvasincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(libgoocanvasinclude_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_VERSION_INFO = @LT_VERSION_INFO@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-NMEDIT = @NMEDIT@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-REBUILD = @REBUILD@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = \
- -DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DG_LOG_DOMAIN=\"GooCanvas\" \
- @PACKAGE_CFLAGS@
-
-noinst_LTLIBRARIES = libgoocanvas.la
-libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
-@PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
-libtool_opts = \
- -version-info $(LT_VERSION_INFO) \
- -export-dynamic $(no_undefined) \
- -rpath $(libdir)
-
-libgoocanvas_la_LDFLAGS = $(libtool_opts)
-libgoocanvasincludedir = ./goocanvas-1.0
-libgoocanvas_public_headers = \
- goocanvasellipse.h \
- goocanvasgroup.h \
- goocanvasimage.h \
- goocanvasitem.h \
- goocanvasitemmodel.h \
- goocanvasitemsimple.h \
- goocanvaspolyline.h \
- goocanvaspath.h \
- goocanvasrect.h \
- goocanvasstyle.h \
- goocanvastable.h \
- goocanvastext.h \
- goocanvasutils.h \
- goocanvaswidget.h \
- goocanvas.h
-
-libgoocanvas_la_SOURCES = \
- goocanvasatk.h \
- goocanvasatk.c \
- goocanvasellipse.c \
- goocanvasenumtypes.c \
- goocanvasgroup.c \
- goocanvasimage.c \
- goocanvasitem.c \
- goocanvasitemmodel.c \
- goocanvasitemsimple.c \
- goocanvasmarshal.c \
- goocanvaspolyline.c \
- goocanvaspath.c \
- goocanvasprivate.h \
- goocanvasrect.c \
- goocanvasstyle.c \
- goocanvastable.c \
- goocanvastext.c \
- goocanvasutils.c \
- goocanvaswidget.c \
- goocanvas.c
-
-libgoocanvas_extra_sources = \
- goocanvasmarshal.list
-
-libgoocanvas_built_headers = \
- goocanvasenumtypes.h \
- goocanvasmarshal.h
-
-libgoocanvas_built_sources = \
- goocanvasenumtypes.c \
- goocanvasmarshal.c
-
-stamp_files = \
- stamp-goocanvasmarshal.h \
- stamp-goocanvasenumtypes.h
-
-libgoocanvasinclude_HEADERS = \
- $(libgoocanvas_public_headers) \
- $(libgoocanvas_built_headers)
-
-gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc
-CLEANFILES = $(gen_sources)
-BUILT_SOURCES = $(libgoocanvas_built_headers) $(libgoocanvas_built_sources)
-MAINTAINERCLEANFILES = $(BUILT_SOURCES) $(stamp_files)
-EXTRA_DIST = $(BUILT_SOURCES) $(libgoocanvas_extra_sources)
-all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libgoocanvas.la: $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_DEPENDENCIES)
- $(libgoocanvas_la_LINK) $(libgoocanvas_la_OBJECTS) $(libgoocanvas_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvas.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasatk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasellipse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasenumtypes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasgroup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasimage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasitem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasitemmodel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasitemsimple.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasmarshal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvaspath.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvaspolyline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasrect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasstyle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvastable.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvastext.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvasutils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/goocanvaswidget.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-libgoocanvasincludeHEADERS: $(libgoocanvasinclude_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(libgoocanvasincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgoocanvasincludedir)"
- @list='$(libgoocanvasinclude_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(libgoocanvasincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgoocanvasincludedir)/$$f'"; \
- $(libgoocanvasincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgoocanvasincludedir)/$$f"; \
- done
-
-uninstall-libgoocanvasincludeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(libgoocanvasinclude_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(libgoocanvasincludedir)/$$f'"; \
- rm -f "$(DESTDIR)$(libgoocanvasincludedir)/$$f"; \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(libgoocanvasincludedir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-libgoocanvasincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libgoocanvasincludeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am \
- install-libgoocanvasincludeHEADERS install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am \
- uninstall-libgoocanvasincludeHEADERS
-
-
-#
-# Most of the stuff below has been pinched from the GTK+ Makefile.am, as
-# it is tricky to get right and we know it works for GTK+.
-#
-
-# all autogenerated files need to be generated in the srcdir,
-# so old versions get remade and are not confused with newer
-# versions in the build dir. thus a development setup requires
-# srcdir to be writable, passing --disable-rebuilds to
-# ../configure will supress all autogeneration rules.
-goocanvasmarshal.h: stamp-goocanvasmarshal.h
- @true
-stamp-goocanvasmarshal.h: @REBUILD@ goocanvasmarshal.list
- $(GLIB_GENMARSHAL) --prefix=goo_canvas_marshal $(srcdir)/goocanvasmarshal.list --header >> xgen-gmlh \
- && (cmp -s xgen-gmlh goocanvasmarshal.h || cp xgen-gmlh goocanvasmarshal.h) \
- && rm -f xgen-gmlh \
- && echo timestamp > $(@F)
-goocanvasmarshal.c: @REBUILD@ goocanvasmarshal.list
- (echo "#include \"goocanvasmarshal.h\""; \
- $(GLIB_GENMARSHAL) --prefix=goo_canvas_marshal $(srcdir)/goocanvasmarshal.list --body) >> xgen-gmlc \
- && cp xgen-gmlc goocanvasmarshal.c \
- && rm -f xgen-gmlc
-
-goocanvasenumtypes.h: stamp-goocanvasenumtypes.h
- @true
-stamp-goocanvasenumtypes.h: @REBUILD@ $(goo_canvas_public_headers) Makefile
- (cd $(srcdir) && $(GLIB_MKENUMS) \
- --fhead "#ifndef __GOO_CANVAS_ENUM_TYPES_H__\n#define __GOO_CANVAS_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
- --fprod "/* Enumerations from \"@filename@\" */\n" \
- --vhead "GType @enum_name@_get_type (void);\n#define GOO_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n\n\n" \
- --ftail "G_END_DECLS\n\n#endif /* __GOO_CANVAS_ENUM_TYPES_H__ */" \
- $(libgoocanvas_public_headers)) >> xgen-gtbh \
- && (cmp -s xgen-gtbh goocanvasenumtypes.h || cp xgen-gtbh goocanvasenumtypes.h ) \
- && rm -f xgen-gtbh \
- && echo timestamp > $(@F)
-
-goocanvasenumtypes.c: @REBUILD@ $(goo_canvas_public_headers) Makefile
- (cd $(srcdir) && $(GLIB_MKENUMS) \
- --fhead "#include <goocanvas.h>\n" \
- --fhead "#include <glib-object.h>\n" \
- --fprod "\n/* Enumerations from \"@filename@\" */" \
- --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if( etype == 0 ) \n {\n static const G@Type@Value values[] = {" \
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values );\n }\n return etype;\n}\n" \
- $(libgoocanvas_public_headers)) > xgen-gtbc \
- && cp xgen-gtbc goocanvasenumtypes.c \
- && rm -f xgen-gtbc
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-27 18:42:15
|
Revision: 66
http://gpredict.svn.sourceforge.net/gpredict/?rev=66&view=rev
Author: csete
Date: 2008-08-27 18:42:25 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
Removing autogenerated files.
Removed Paths:
-------------
trunk/goocanv8/Makefile.in
trunk/goocanv8/aclocal.m4
trunk/goocanv8/config.guess
trunk/goocanv8/config.sub
trunk/goocanv8/configure
trunk/goocanv8/ltmain.sh
Deleted: trunk/goocanv8/Makefile.in
===================================================================
--- trunk/goocanv8/Makefile.in 2008-08-22 12:24:22 UTC (rev 65)
+++ trunk/goocanv8/Makefile.in 2008-08-27 18:42:25 UTC (rev 66)
@@ -1,668 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/goocanvas.pc.in $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
- depcomp install-sh ltmain.sh missing mkinstalldirs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = goocanvas.pc
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DSYMUTIL = @DSYMUTIL@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_VERSION_INFO = @LT_VERSION_INFO@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-NMEDIT = @NMEDIT@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-REBUILD = @REBUILD@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = src po
-
-# require automake 1.7
-AUTOMAKE_OPTIONS = 1.7
-
-# pkgconfigdir = $(libdir)/pkgconfig
-# pkgconfig_DATA = goocanvas.pc
-EXTRA_DIST = goocanvas.pc.in autogen.sh
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
- @:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f config.h stamp-h1
-goocanvas.pc: $(top_builddir)/config.status $(srcdir)/goocanvas.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- distdir=`$(am__cd) $(distdir) && pwd`; \
- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- (cd $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$top_distdir" \
- distdir="$$distdir/$$subdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- distdir) \
- || exit 1; \
- fi; \
- done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
- distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
- install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Deleted: trunk/goocanv8/aclocal.m4
===================================================================
--- trunk/goocanv8/aclocal.m4 2008-08-22 12:24:22 UTC (rev 65)
+++ trunk/goocanv8/aclocal.m4 2008-08-27 18:42:25 UTC (rev 66)
@@ -1,8140 +0,0 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
-#
-# This file is free software, distributed under the terms of the GNU
-# General Public License. As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
-# the same distribution terms as the rest of that program.
-#
-# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-#
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <dr...@cy...>, 1995, 1996
-#
-# Modified to never use included libintl.
-# Owen Taylor <ot...@re...>, 12/15/1998
-#
-# Major rework to remove unused code
-# Owen Taylor <ot...@re...>, 12/11/2002
-#
-# Added better handling of ALL_LINGUAS from GNU gettext version
-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
-#
-# Modified to require ngettext
-# Matthias Clasen <mc...@re...> 08/06/2004
-#
-# We need this here as well, since someone might use autoconf-2.5x
-# to configure GLib then an older version to configure a package
-# using AM_GLIB_GNU_GETTEXT
-AC_PREREQ(2.53)
-
-dnl
-dnl We go to great lengths to make sure that aclocal won't
-dnl try to pull in the installed version of these macros
-dnl when running aclocal in the glib directory.
-dnl
-m4_copy([AC_DEFUN],[glib_DEFUN])
-m4_copy([AC_REQUIRE],[glib_REQUIRE])
-dnl
-dnl At the end, if we're not within glib, we'll define the public
-dnl definitions in terms of our private definitions.
-dnl
-
-# GLIB_LC_MESSAGES
-#--------------------
-glib_DEFUN([GLIB_LC_MESSAGES],
- [AC_CHECK_HEADERS([locale.h])
- if test $ac_cv_header_locale_h = yes; then
- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
- if test $am_cv_val_LC_MESSAGES = yes; then
- AC_DEFINE(HAVE_LC_MESSAGES, 1,
- [Define if your <locale.h> file defines LC_MESSAGES.])
- fi
- fi])
-
-# GLIB_PATH_PROG_WITH_TEST
-#----------------------------
-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$]$1)
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# GLIB_WITH_NLS
-#-----------------
-glib_DEFUN([GLIB_WITH_NLS],
- dnl NLS is obligatory
- [USE_NLS=yes
- AC_SUBST(USE_NLS)
-
- gt_cv_have_gettext=no
-
- CATOBJEXT=NONE
- XGETTEXT=:
- INTLLIBS=
-
- AC_CHECK_HEADER(libintl.h,
- [gt_cv_func_dgettext_libintl="no"
- libintl_extra_libs=""
-
- #
- # First check in libc
- #
- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !ngettext ("","", 1)],
- gt_cv_func_ngettext_libc=yes,
- gt_cv_func_ngettext_libc=no)
- ])
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
- [AC_TRY_LINK([
-#include <libintl.h>
-],
- [return !dgettext ("","")],
- gt_cv_func_dgettext_libc=yes,
- gt_cv_func_dgettext_libc=no)
- ])
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- fi
-
- #
- # If we don't have everything we want, check in libintl
- #
- if test "$gt_cv_func_dgettext_libc" != "yes" \
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
- AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dgettext,
- gt_cv_func_dgettext_libintl=yes)])])
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
- AC_MSG_CHECKING([if -liconv is needed to use gettext])
- AC_MSG_RESULT([])
- AC_CHECK_LIB(intl, ngettext,
- [AC_CHECK_LIB(intl, dcgettext,
- [gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv],
- :,-liconv)],
- :,-liconv)
- fi
-
- #
- # If we found libintl, then check in it for bind_textdomain_codeset();
- # we'll prefer libc if neither have bind_textdomain_codeset(),
- # and both have dgettext and ngettext
- #
- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
- AC_CHECK_FUNCS(bind_textdomain_codeset)
- LIBS="$glib_save_LIBS"
-
- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
- gt_cv_func_dgettext_libc=no
- else
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- && test "$gt_cv_func_ngettext_libc" = "yes"; then
- gt_cv_func_dgettext_libintl=no
- fi
- fi
- fi
- fi
-
- if test "$gt_cv_func_dgettext_libc" = "yes" \
- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
- gt_cv_have_gettext=yes
- fi
-
- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
- INTLLIBS="-lintl $libintl_extra_libs"
- fi
-
- if test "$gt_cv_have_gettext" = "yes"; then
- AC_DEFINE(HAVE_GETTEXT,1,
- [Define if the GNU gettext() function is already present or preinstalled.])
- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
- AC_CHECK_FUNCS(dcgettext)
- MSGFMT_OPTS=
- AC_MSG_CHECKING([if msgfmt accepts -c])
- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: test 1.0\n"
-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
-"Last-Translator: test <fo...@ba...>\n"
-"Language-Team: C <LL...@li...>\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
- AC_SUBST(MSGFMT_OPTS)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr],
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share and
- dnl and CATOBJEXT=.gmo in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [CATOBJEXT=.mo
- DATADIRNAME=lib])
- ;;
- *)
- CATOBJEXT=.mo
- DATADIRNAME=lib
- ;;
- esac])
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
- gt_cv_have_gettext=no
- fi
- fi
- ])
-
- if test "$gt_cv_have_gettext" = "yes" ; then
- AC_DEFINE(ENABLE_NLS, 1,
- [always defined to indicate that i18n is enabled])
- fi
-
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is not GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- fi
-
- # We need to process the po/ directory.
- POSUB=po
-
- AC_OUTPUT_COMMANDS(
- [case "$CONFIG_FILES" in *po/Makefile.in*)
- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
- esac])
-
- dnl These rules are solely for the distribution goal. While doing this
- dnl we only have to keep exactly one list of the available catalogs
- dnl in configure.in.
- for lang in $ALL_LINGUAS; do
- GMOFILES="$GMOFILES $lang.gmo"
- POFILES="$POFILES $lang.po"
- done
-
- dnl Make all variables we use known to autoconf.
- AC_SUBST(CATALOGS)
- AC_SUBST(CATOBJEXT)
- AC_SUBST(DATADIRNAME)
- AC_SUBST(GMOFILES)
- AC_SUBST(INSTOBJEXT)
- AC_SUBST(INTLLIBS)
- AC_SUBST(PO_IN_DATADIR_TRUE)
- AC_SUBST(PO_IN_DATADIR_FALSE)
- AC_SUBST(POFILES)
- AC_SUBST(POSUB)
- ])
-
-# AM_GLIB_GNU_GETTEXT
-# -------------------
-# Do checks necessary for use of gettext. If a suitable implementation
-# of gettext is found in either in libintl or in the C library,
-# it will set INTLLIBS to the libraries needed for use of gettext
-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
-# on various variables needed by the Makefile.in.in installed by
-# glib-gettextize.
-dnl
-glib_DEFUN([GLIB_GNU_GETTEXT],
- [AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
-
- GLIB_LC_MESSAGES
- GLIB_WITH_NLS
-
- if test "$gt_cv_have_gettext" = "yes"; then
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
- AC_MSG_CHECKING(for catalogs to be installed)
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
- fi
- done
- LINGUAS=$NEW_LINGUAS
- AC_MSG_RESULT($LINGUAS)
- fi
-
- dnl Construct list of names of catalog files to be constructed.
- if test -n "$LINGUAS"; then
- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
- fi
- fi
-
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
- dnl Try to locate is.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
- fi
- AC_SUBST(MKINSTALLDIRS)
-
- dnl Generate list of files to be processed by xgettext which will
- dnl be included in po/Makefile.
- test -d po || mkdir po
- if test "x$srcdir" != "x."; then
- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
- posrcprefix="$srcdir/"
- else
- posrcprefix="../$srcdir/"
- fi
- else
- posrcprefix="../"
- fi
- rm -f po/POTFILES
- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
- < $srcdir/po/POTFILES.in > po/POTFILES
- ])
-
-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
-# -------------------------------
-# Define VARIABLE to the location where catalog files will
-# be installed by po/Makefile.
-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
-glib_save_prefix="$prefix"
-glib_save_exec_prefix="$exec_prefix"
-glib_save_datarootdir="$datarootdir"
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-datarootdir=`eval echo "${datarootdir}"`
-if test "x$CATOBJEXT" = "x.mo" ; then
- localedir=`eval echo "${libdir}/locale"`
-else
- localedir=`eval echo "${datadir}/locale"`
-fi
-prefix="$glib_save_prefix"
-exec_prefix="$glib_save_exec_prefix"
-datarootdir="$glib_save_datarootdir"
-AC_DEFINE_UNQUOTED($1, "$localedir",
- [Define the location where the catalogs will be installed])
-])
-
-dnl
-dnl Now the definitions that aclocal will find
-dnl
-ifdef(glib_configure_in,[],[
-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
-])dnl
-
-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
-#
-# Create a temporary file with TEST-FILE as its contents and pass the
-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
-# 0 and perform ACTION-IF-FAIL for any other exit status.
-AC_DEFUN([GLIB_RUN_PROG],
-[cat >conftest.foo <<_ACEOF
-$2
-_ACEOF
-if AC_RUN_LOG([$1 conftest.foo]); then
- m4_ifval([$3], [$3], [:])
-m4_ifvaln([$4], [else $4])dnl
-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
-fi])
-
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
- [],
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [AC_LIBTOOL_CXX],
- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- ])])
-dnl And a similar setup for Fortran 77 support
- AC_PROVIDE_IFELSE([AC_PROG_F77],
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [ifdef([AC_PROG_GCJ],
- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([A][M_PROG_GCJ],
- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
- # AIX sometimes has problems with the GCC collect2 program. For some
- # reason, if we set the COLLECT_NAMES environment variable, the problems
- # vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
- COLLECT_NAMES=
- export COLLECT_NAMES
- fi
- ;;
-esac
-
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
- if test "$file_magic_cmd" = '$MAGIC_CMD'; then
- AC_PATH_MAGIC
- fi
- ;;
-esac
-
-_LT_REQUIRED_DARWIN_CHECKS
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
- [AC_HELP_STRING([--with-pic],
- [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
- [pic_mode="$withval"],
- [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
-AC_DEFUN([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-])
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$rm conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-AC_DEFUN([_LT_LINKER_BOILERPLATE],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$rm -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# --------------------------
-# Check for some things on darwin
-AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
- case $host_os in
- rhapsody* | darwin*)
- AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
- AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-
- AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
- [lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
- # By default we will add the -single_module flag. You can override
- # by either setting the environment variable LT_MULTI_MODULE
- # non-empty at configure time, or by adding -multi_module to the
- # link flags.
- echo "int foo(void){return 1;}" > conftest.c
- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
- -dynamiclib ${wl}-single_module conftest.c
- if test -f libconftest.dylib; then
- lt_cv_apple_cc_single_mod=yes
- rm -rf libconftest.dylib*
- fi
- rm conftest.c
- fi])
- AC_CACHE_CHECK([for -exported_symbols_list linker flag],
- [lt_cv_ld_exported_symbols_list],
- [lt_cv_ld_exported_symbols_list=no
- save_LDFLAGS=$LDFLAGS
- echo "_main" > conftest.sym
- LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
- [lt_cv_ld_exported_symbols_list=yes],
- [lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
- ])
- case $host_os in
- rhapsody* | darwin1.[[0123]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
- darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- darwin*)
- # if running on 10.5 or later, the deployment target defaults
- # to the OS version, if on x86, and 10.4, the deployment
- # target defaults to 10.4. Don't you love it?
- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
- 10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- esac
- ;;
- esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
- _lt_dar_single_mod='$single_module'
- fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
- else
- _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
- fi
- if test "$DSYMUTIL" != ":"; then
- _lt_dsymutil="~$DSYMUTIL \$lib || :"
- else
- _lt_dsymutil=
- fi
- ;;
- esac
-])
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
- /Import File Strings/,/^$/ {
- /^0/ {
- s/^0 *\(.*\)$/\1/
- p
- }
- }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
- [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
- # Remove one level of quotation (which was required for Make).
- ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
- ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
- shift
-elif test "X[$]1" = X--fallback-echo; then
- # Avoid inline document here, it may be left over
- :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
- # Yippee, $echo works!
- :
-else
- # Restart under the correct shell.
- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
- # used as fallback echo
- shift
- cat <<EOF
-[$]*
-EOF
- exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
- if (echo_test_string=`eval $cmd`) 2>/dev/null &&
- echo_test_string=`eval $cmd` &&
- (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
- then
- break
- fi
- done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- :
-else
- # The Solaris, AIX, and Digital Unix default echo programs unquote
- # backslashes. This makes it impossible to quote backslashes using
- # echo "$something" | sed 's/\\/\\\\/g'
- #
- # So, first we look for a working echo in the user's PATH.
-
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for dir in $PATH /usr/ucb; do
- IFS="$lt_save_ifs"
- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$dir/echo"
- break
- fi
- done
- IFS="$lt_save_ifs"
-
- if test "X$echo" = Xecho; then
- # We didn't find a better echo, so look for alternatives.
- if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # This shell has a builtin print -r that does the trick.
- echo='print -r'
- elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
- test "X$CONFIG_SHELL" != X/bin/ksh; then
- # If we have ksh, try running configure again with it.
- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
- export ORIGINAL_CONFIG_SHELL
- CONFIG_SHELL=/bin/ksh
- export CONFIG_SHELL
- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
- else
- # Try using printf.
- echo='printf %s\n'
- if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
- echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- # Cool, printf works
- :
- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
- export CONFIG_SHELL
- SHELL="$CONFIG_SHELL"
- export SHELL
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
- test "X$echo_testing_string" = 'X\t' &&
- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
- test "X$echo_testing_string" = "X$echo_test_string"; then
- echo="$CONFIG_SHELL [$]0 --fallback-echo"
- else
- # maybe with a smaller string...
- prev=:
-
- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
- if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
- then
- break
- fi
- prev="$cmd"
- done
-
- if test "$prev" != 'sed 50q "[$]0"'; then
- echo_test_string=`eval $prev`
- export echo_test_string
- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
- else
- # Oops. We lost completely, so just stick with echo.
- echo=echo
- fi
- fi
- fi
- fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
- ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
- [AC_HELP_STRING([--disable-libtool-lock],
- [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.$ac_objext` in
- *ELF-32*)
- HPUX_IA64_MODE="32"
- ;;
- *ELF-64*)
- HPUX_IA64_MODE="64"
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -melf32bsmip"
- ;;
- *N32*)
- LD="${LD-ld} -melf32bmipn32"
- ;;
- *64-bit*)
- LD="${LD-ld} -melf64bmip"
- ;;
- esac
- else
- case `/usr/bin/file conftest.$ac_objext` in
- *32-bit*)
- LD="${LD-ld} -32"
- ;;
- *N32*)
- LD="${LD-ld} -n32"
- ;;
- *64-bit*)
- LD="${LD-ld} -64"
- ;;
- esac
- fi
- fi
- rm -rf conftest*
- ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|sparc*-*linux*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *32-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_i386_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
- ;;
- ppc64-*linux*|powerpc64-*linux*)
- LD="${LD-ld} -m elf32ppclinux"
- ;;
- s390x-*linux*)
- LD="${LD-ld} -m elf_s390"
- ;;
- sparc64-*linux*)
- LD="${LD-ld} -m elf32_sparc"
- ;;
- esac
- ;;
- *64-bit*)
- case $host in
- x86_64-*kfreebsd*-gnu)
- LD="${LD-ld} -m elf_x86_64_fbsd"
- ;;
- x86_64-*linux*)
- LD="${LD-ld} -m elf_x86_64"
- ;;
- ppc*-*linux*|powerpc*-*linux*)
- LD="${LD-ld} -m elf64ppc"
- ;;
- s390*-*linux*)
- LD="${LD-ld} -m elf64_s390"
- ;;
- sparc*-*linux*)
- LD="${LD-ld} -m elf64_sparc"
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
- [AC_LANG_PUSH(C)
- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
- AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
- fi
- ;;
-sparc*-*solaris*)
- # Find out which ABI we are using.
- echo 'int i;' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- case `/usr/bin/file conftest.o` in
- *64-bit*)
- case $lt_cv_prog_gnu_ld in
- yes*) LD="${LD-ld} -m elf64_sparc" ;;
- *)
- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
- LD="${LD-ld} -64"
- fi
- ;;
- esac
- ;;
- esac
- fi
- rm -rf conftest*
- ;;
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
- ;;
- ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
- [$2=no
- ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
- # Insert the option either (1) after the last *FLAGS variable, or
- # (2) before a word containing "conftest.", or (3) at the end.
- # Note that $ac_compile itself does not contain backslashes and begins
- # with a dollar sign (not a hyphen), so the echo should work correctly.
- # The option is referenced via a variable to avoid confusing sed.
- lt_compile=`echo "$ac_compile" | $SED \
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
- $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
- fi
- fi
- $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
- ifelse([$5], , :, [$5])
-else
- ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-# [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------...
[truncated message content] |
|
From: <cs...@us...> - 2008-08-22 12:24:14
|
Revision: 65
http://gpredict.svn.sourceforge.net/gpredict/?rev=65&view=rev
Author: csete
Date: 2008-08-22 12:24:22 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Updated.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-rot-ctrl.c
trunk/src/sat-pref-rot.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-08-22 09:38:44 UTC (rev 64)
+++ trunk/ChangeLog 2008-08-22 12:24:22 UTC (rev 65)
@@ -1,3 +1,14 @@
+2008-08-22; Alexandru Csete <oz...@gm...>
+
+ * src/sat-pref-rig.c:
+ * src/sat-pref-rig-editor.c:
+ * src/sat-pref-rig-data.h:
+ * src/sat-pref-rot.c:
+ * src/sat-pref-rot-editor.c:
+ * src/sat-pref-rot-data.h:
+ Removed unnecessary data fields.
+
+
2008-08-20; Alexandru Csete <oz...@gm...>
* configure.ac:
Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c 2008-08-22 09:38:44 UTC (rev 64)
+++ trunk/src/gtk-rot-ctrl.c 2008-08-22 12:24:22 UTC (rev 65)
@@ -240,6 +240,9 @@
frame = gtk_frame_new (_("Azimuth"));
+ ctrl->AzSet = gtk_rot_knob_new (0.0, 360.0, 180.0);
+ gtk_container_add (GTK_CONTAINER (frame), ctrl->AzSet);
+
return frame;
}
Modified: trunk/src/sat-pref-rot.c
===================================================================
--- trunk/src/sat-pref-rot.c 2008-08-22 09:38:44 UTC (rev 64)
+++ trunk/src/sat-pref-rot.c 2008-08-22 12:24:22 UTC (rev 65)
@@ -118,38 +118,14 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
- /* Model */
+ /* Host */
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Model"), renderer,
- "text", ROT_LIST_COL_MODEL,
+ column = gtk_tree_view_column_new_with_attributes (_("Host"), renderer,
+ "text", ROT_LIST_COL_HOST,
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
- /* Type */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Type"), renderer,
- "text", ROT_LIST_COL_TYPE,
- NULL);
- gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_rot_type,
- GUINT_TO_POINTER(ROT_LIST_COL_TYPE),
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
- /* Port */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Port"), renderer,
- "text", ROT_LIST_COL_PORT,
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
-
- /* Speed */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Speed"), renderer,
- "text", ROT_LIST_COL_SPEED,
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (rotlist), column, -1);
-
/* Az and el limits */
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("Min Az"), renderer,
@@ -209,11 +185,7 @@
/* create a new list store */
liststore = gtk_list_store_new (ROT_LIST_COL_NUM,
G_TYPE_STRING, // name
- G_TYPE_STRING, // model
- G_TYPE_INT, // hamlib id
- G_TYPE_INT, // radio type
- G_TYPE_STRING, // port
- G_TYPE_INT, // speed
+ G_TYPE_STRING, // host
G_TYPE_INT, // Min Az
G_TYPE_INT, // Max Az
G_TYPE_INT, // Min El
@@ -241,11 +213,7 @@
gtk_list_store_append (liststore, &item);
gtk_list_store_set (liststore, &item,
ROT_LIST_COL_NAME, conf.name,
- ROT_LIST_COL_MODEL, conf.model,
- ROT_LIST_COL_ID, conf.id,
- ROT_LIST_COL_TYPE, conf.type,
- ROT_LIST_COL_PORT, conf.port,
- ROT_LIST_COL_SPEED, conf.speed,
+ ROT_LIST_COL_HOST, conf.host,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -259,11 +227,9 @@
if (conf.name)
g_free (conf.name);
- if (conf.model)
- g_free (conf.model);
+ if (conf.host)
+ g_free (conf.host);
- if (conf.port)
- g_free (conf.port);
}
else {
/* there was an error */
@@ -357,11 +323,7 @@
rotor_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = ROTOR_TYPE_AZEL,
- .port = NULL,
- .speed = 0,
+ .host = NULL,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -403,11 +365,7 @@
/* store conf */
gtk_tree_model_get (model, &iter,
ROT_LIST_COL_NAME, &conf.name,
- ROT_LIST_COL_MODEL, &conf.model,
- ROT_LIST_COL_ID, &conf.id,
- ROT_LIST_COL_TYPE, &conf.type,
- ROT_LIST_COL_PORT, &conf.port,
- ROT_LIST_COL_SPEED, &conf.speed,
+ ROT_LIST_COL_HOST, &conf.host,
ROT_LIST_COL_MINAZ, &conf.minaz,
ROT_LIST_COL_MAXAZ, &conf.maxaz,
ROT_LIST_COL_MINEL, &conf.minel,
@@ -419,11 +377,9 @@
if (conf.name)
g_free (conf.name);
- if (conf.model)
- g_free (conf.model);
+ if (conf.host)
+ g_free (conf.host);
- if (conf.port)
- g_free (conf.port);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -448,12 +404,7 @@
rotor_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = ROTOR_TYPE_AZEL,
- .port = NULL,
- .speed = 0,
- .speed = 0,
+ .host = NULL,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -469,11 +420,7 @@
gtk_list_store_append (liststore, &item);
gtk_list_store_set (liststore, &item,
ROT_LIST_COL_NAME, conf.name,
- ROT_LIST_COL_MODEL, conf.model,
- ROT_LIST_COL_ID, conf.id,
- ROT_LIST_COL_TYPE, conf.type,
- ROT_LIST_COL_PORT, conf.port,
- ROT_LIST_COL_SPEED, conf.speed,
+ ROT_LIST_COL_HOST, conf.host,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -482,11 +429,9 @@
g_free (conf.name);
- if (conf.model != NULL)
- g_free (conf.model);
+ if (conf.host != NULL)
+ g_free (conf.host);
- if (conf.port != NULL)
- g_free (conf.port);
}
}
@@ -507,11 +452,7 @@
rotor_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = ROTOR_TYPE_AZEL,
- .port = NULL,
- .speed = 0,
+ .host = NULL,
.minaz = 0,
.maxaz = 360,
.minel = 0,
@@ -538,11 +479,7 @@
if (gtk_tree_selection_get_selected(selection, &selmod, &iter)) {
gtk_tree_model_get (model, &iter,
ROT_LIST_COL_NAME, &conf.name,
- ROT_LIST_COL_MODEL, &conf.model,
- ROT_LIST_COL_ID, &conf.id,
- ROT_LIST_COL_TYPE, &conf.type,
- ROT_LIST_COL_PORT, &conf.port,
- ROT_LIST_COL_SPEED, &conf.speed,
+ ROT_LIST_COL_HOST, &conf.host,
ROT_LIST_COL_MINAZ, &conf.minaz,
ROT_LIST_COL_MAXAZ, &conf.maxaz,
ROT_LIST_COL_MINEL, &conf.minel,
@@ -572,11 +509,7 @@
if (conf.name != NULL) {
gtk_list_store_set (GTK_LIST_STORE(model), &iter,
ROT_LIST_COL_NAME, conf.name,
- ROT_LIST_COL_MODEL, conf.model,
- ROT_LIST_COL_ID, conf.id,
- ROT_LIST_COL_TYPE, conf.type,
- ROT_LIST_COL_PORT, conf.port,
- ROT_LIST_COL_SPEED, conf.speed,
+ ROT_LIST_COL_HOST, conf.host,
ROT_LIST_COL_MINAZ, conf.minaz,
ROT_LIST_COL_MAXAZ, conf.maxaz,
ROT_LIST_COL_MINEL, conf.minel,
@@ -589,11 +522,9 @@
if (conf.name)
g_free (conf.name);
- if (conf.model != NULL)
- g_free (conf.model);
+ if (conf.host != NULL)
+ g_free (conf.host);
- if (conf.port != NULL)
- g_free (conf.port);
}
@@ -692,7 +623,7 @@
gtk_tree_model_get (model, iter, coli, &number, -1);
- switch (number) {
+/* switch (number) {
case ROTOR_TYPE_AZ:
g_object_set (renderer, "text", "AZ", NULL);
@@ -713,7 +644,7 @@
g_object_set (renderer, "text", "AZ", NULL);
break;
- }
+ }*/
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-22 09:38:34
|
Revision: 64
http://gpredict.svn.sourceforge.net/gpredict/?rev=64&view=rev
Author: csete
Date: 2008-08-22 09:38:44 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Improved tooltip text for host entry.
Modified Paths:
--------------
trunk/src/sat-pref-rig-editor.c
trunk/src/sat-pref-rot-editor.c
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-08-22 09:35:18 UTC (rev 63)
+++ trunk/src/sat-pref-rig-editor.c 2008-08-22 09:38:44 UTC (rev 64)
@@ -168,7 +168,8 @@
host = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (host), 50);
- gtk_widget_set_tooltip_text (host, _("Enter host:port"));
+ gtk_widget_set_tooltip_text (host,
+ _("Enter the host and port where rigctld is running, e.g. 192.168.1.100:15123"));
gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2008-08-22 09:35:18 UTC (rev 63)
+++ trunk/src/sat-pref-rot-editor.c 2008-08-22 09:38:44 UTC (rev 64)
@@ -171,7 +171,8 @@
host = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (host), 50);
- gtk_widget_set_tooltip_text (host, _("Enter hostname:port"));
+ gtk_widget_set_tooltip_text (host,
+ _("Enter the host and port where rogctld is running, e.g. 192.168.1.100:15123"));
gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
/* Az and El limits */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-22 09:35:12
|
Revision: 63
http://gpredict.svn.sourceforge.net/gpredict/?rev=63&view=rev
Author: csete
Date: 2008-08-22 09:35:18 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Minor fixes.
Modified Paths:
--------------
trunk/src/sat-pref-rot-editor.c
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2008-08-22 09:34:58 UTC (rev 62)
+++ trunk/src/sat-pref-rot-editor.c 2008-08-22 09:35:18 UTC (rev 63)
@@ -229,8 +229,9 @@
/* configuration name */
gtk_entry_set_text (GTK_ENTRY (name), conf->name);
- /* model */
-/* select_rot (conf->id);*/
+ /* host */
+ if (conf->host)
+ gtk_entry_set_text (GTK_ENTRY (host), conf->host);
/* az and el limits */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), conf->minaz);
@@ -252,6 +253,7 @@
clear_widgets ()
{
gtk_entry_set_text (GTK_ENTRY (name), "");
+ gtk_entry_set_text (GTK_ENTRY (host), "");
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), 360);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel), 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-22 09:34:48
|
Revision: 62
http://gpredict.svn.sourceforge.net/gpredict/?rev=62&view=rev
Author: csete
Date: 2008-08-22 09:34:58 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Removed unnecessary data fields.
Modified Paths:
--------------
trunk/src/sat-pref-rig-editor.c
Modified: trunk/src/sat-pref-rig-editor.c
===================================================================
--- trunk/src/sat-pref-rig-editor.c 2008-08-22 09:27:01 UTC (rev 61)
+++ trunk/src/sat-pref-rig-editor.c 2008-08-22 09:34:58 UTC (rev 62)
@@ -51,14 +51,8 @@
/* private widgets */
static GtkWidget *dialog; /* dialog window */
-static GtkWidget *name; /* Configuration name */
-static GtkWidget *model; /* radio model, e.g. TS-2000 */
-static GtkWidget *civ; /* Icom CI-V address */
-static GtkWidget *ext; /* Built-in extensions */
-static GtkWidget *type; /* radio type */
-static GtkWidget *port; /* port selector */
-static GtkWidget *speed; /* serial speed selector */
-static GtkWidget *dtr,*rts; /* DTR and RTS line states */
+static GtkWidget *name; /* config name */
+static GtkWidget *host; /* host */
static GtkWidget *create_editor_widgets (radio_conf_t *conf);
@@ -66,16 +60,6 @@
static void clear_widgets (void);
static gboolean apply_changes (radio_conf_t *conf);
static void name_changed (GtkWidget *widget, gpointer data);
-static GtkTreeModel *create_rig_model (void);
-static gint rig_list_add (const struct rig_caps *, void *);
-static gint rig_list_compare_mfg (gconstpointer, gconstpointer);
-static gint rig_list_compare_mod (gconstpointer, gconstpointer);
-static void is_rig_model (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer data);
-static void select_rig (guint rigid);
/** \brief Add or edit a radio configuration.
@@ -152,21 +136,18 @@
{
GtkWidget *table;
GtkWidget *label;
- GtkTreeModel *riglist;
- GtkCellRenderer *renderer;
- gchar *buff;
- guint i;
- table = gtk_table_new (5, 5, FALSE);
+
+ table = gtk_table_new (2, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
/* Config name */
label = gtk_label_new (_("Name"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 4, 0, 1);
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
name = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (name), 25);
@@ -180,150 +161,17 @@
*/
g_signal_connect (name, "changed", G_CALLBACK (name_changed), NULL);
- /* Model */
- label = gtk_label_new (_("Model"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ /* Host */
+ label = gtk_label_new (_("Host"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
-/* riglist = create_rig_model ();
- model = gtk_combo_box_new_with_model (riglist);
- g_object_unref (riglist);
- gtk_table_attach_defaults (GTK_TABLE (table), model, 1, 2, 1, 2);
-
- renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (model), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (model), renderer,
- "text", 0,
- NULL);
- gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (model),
- renderer,
- is_rig_model,
- NULL, NULL);
- gtk_widget_set_tooltip_text (model, _("Click to select a radio."));
- select_rig (1);
- */
- /* ICOM CI-V adress */
- label = gtk_label_new (_("ICOM CI-V"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 1, 2);
-
-#if 0
- civ = gtk_combo_box_new_text ();
- gtk_widget_set_tooltip_text (civ,
- _("Select ICOM CI-V address of the radio."));
-
- /* works, but pretty lame... */
- gtk_combo_box_append_text (GTK_COMBO_BOX (civ), _("Default"));
- for (i = 1; i < 0xF0; i++) {
- if (i < 0x10)
- buff = g_strdup_printf ("0x0%X", i);
- else
- buff = g_strdup_printf ("0x%X", i);
- gtk_combo_box_append_text (GTK_COMBO_BOX (civ), buff);
- g_free (buff);
- }
- gtk_combo_box_set_active (GTK_COMBO_BOX (civ), 0);
- gtk_table_attach_defaults (GTK_TABLE (table), civ, 4, 5, 1, 2);
-#endif
+ host = gtk_entry_new ();
+ gtk_entry_set_max_length (GTK_ENTRY (host), 50);
+ gtk_widget_set_tooltip_text (host, _("Enter host:port"));
+ gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
- /* Type */
- label = gtk_label_new (_("Type"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
-/* type = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Receiver"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Transmitter"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("RX + TX"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("Full Duplex"));
- gtk_combo_box_set_active (GTK_COMBO_BOX (type), 0);
- gtk_widget_set_tooltip_text (type,
- _("Select radio type. Consult the user manual, if unsure"));
- gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 2, 3);
-*/
- /* Enable built-in extensions */
-/* ext = gtk_check_button_new_with_label (_("Extended CAT"));
- gtk_widget_set_tooltip_text (ext,
- _("Enable built-in gpredict CAT extensions if they are "\
- "available. This allows the use of commands that are "\
- "not supported by hamlib, but are necessary for full "\
- "duplex operation with IC-910, FT-847, etc."));
- gtk_table_attach_defaults (GTK_TABLE (table), ext, 3, 5, 2, 3);
- */
-
- /* Port */
- label = gtk_label_new (_("Port"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
-
-/* port = gtk_combo_box_entry_new_text ();
- if (conf->port != NULL) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), conf->port);
- }
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS0");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS1");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS2");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB0");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB1");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB2");
- gtk_combo_box_set_active (GTK_COMBO_BOX (port), 0);
- gtk_widget_set_tooltip_text (port, _("Select or enter communication port"));
- gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 3, 4);
-*/
-
- /* DTR State */
- label = gtk_label_new (_("DTR Line"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 3, 4);
-
-/* dtr = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("Undefined"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("OFF"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("ON"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("PTT"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (dtr), _("CW"));
- gtk_combo_box_set_active (GTK_COMBO_BOX (dtr), 0);
- gtk_widget_set_tooltip_text (dtr, _("Select status and use of DTR line"));
- gtk_table_attach_defaults (GTK_TABLE (table), dtr, 4, 5, 3, 4);
- */
-
- /* Speed */
- label = gtk_label_new (_("Rate"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
-/* speed = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "300");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "1200");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "2400");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "4800");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "9600");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "19200");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "38400");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "57600");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "115200");
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4);
- gtk_widget_set_tooltip_text (speed, _("Select serial port speed"));
- gtk_table_attach_defaults (GTK_TABLE (table), speed, 1, 2, 4, 5);
-*/
- /* RTS State */
- label = gtk_label_new (_("RTS Line"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 4, 5);
-
-/* rts = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("Undefined"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("OFF"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("ON"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("PTT"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (rts), _("CW"));
- gtk_combo_box_set_active (GTK_COMBO_BOX (rts), 0);
- gtk_widget_set_tooltip_text (rts, _("Select status and use of RTS line"));
- gtk_table_attach_defaults (GTK_TABLE (table), rts, 4, 5, 4, 5);
-*/
- /* separator between port/speed and DTR/RTS */
- gtk_table_attach (GTK_TABLE (table), gtk_vseparator_new(), 2, 3, 1, 5,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 0);
-
if (conf->name != NULL)
update_widgets (conf);
@@ -342,61 +190,10 @@
/* configuration name */
gtk_entry_set_text (GTK_ENTRY (name), conf->name);
-#if 0
- /* model */
- select_rig (conf->id);
-
- /* type */
- gtk_combo_box_set_active (GTK_COMBO_BOX (type), conf->type);
-
- /* port */
- gtk_combo_box_prepend_text (GTK_COMBO_BOX (port), conf->port);
- gtk_combo_box_set_active (GTK_COMBO_BOX (port), 0);
+ /* host name and port */
+ if (conf->host)
+ gtk_entry_set_text (GTK_ENTRY (host), conf->host);
- /*serial speed */
- switch (conf->speed) {
- case 300:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 0);
- break;
- case 1200:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 1);
- break;
- case 2400:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 2);
- break;
- case 4800:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 3);
- break;
- case 9600:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4);
- break;
- case 19200:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 5);
- break;
- case 38400:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 6);
- break;
- case 57600:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 7);
- break;
- case 115200:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 8);
- break;
- default:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4);
- break;
- }
-
- /* CI-V */
- gtk_combo_box_set_active (GTK_COMBO_BOX (civ), conf->civ);
-
- /* Extension */
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ext), conf->ext);
-
- /* DTR and RTS lines */
- gtk_combo_box_set_active (GTK_COMBO_BOX (dtr), conf->dtr);
- gtk_combo_box_set_active (GTK_COMBO_BOX (rts), conf->rts);
-#endif
}
@@ -410,14 +207,8 @@
clear_widgets ()
{
gtk_entry_set_text (GTK_ENTRY (name), "");
-/* select_rig (1);
- gtk_combo_box_set_active (GTK_COMBO_BOX (type), 0);
- gtk_combo_box_set_active (GTK_COMBO_BOX (port), 0);
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4);
- gtk_combo_box_set_active (GTK_COMBO_BOX (civ), 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ext), FALSE);
- gtk_combo_box_set_active (GTK_COMBO_BOX (dtr), 0);
- gtk_combo_box_set_active (GTK_COMBO_BOX (rts), 0);*/
+ gtk_entry_set_text (GTK_ENTRY (host), "");
+
}
@@ -429,92 +220,21 @@
static gboolean
apply_changes (radio_conf_t *conf)
{
- GtkTreeIter iter1,iter2;
- GtkTreeModel *riglist;
- gchar *b1,*b2;
- guint id;
+
-
/* name */
if (conf->name)
g_free (conf->name);
conf->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (name)));
-#if 0
- /* model */
- if (conf->model)
- g_free (conf->model);
+ /* host */
+ if (conf->host)
+ g_free (conf->host);
- /* iter1 is needed to construct full model name */
- gtk_combo_box_get_active_iter (GTK_COMBO_BOX (model), &iter2);
- riglist = gtk_combo_box_get_model (GTK_COMBO_BOX (model));
- gtk_tree_model_iter_parent (riglist, &iter1, &iter2);
-
- /* build model string */
- gtk_tree_model_get (riglist, &iter1, 0, &b1, -1);
- gtk_tree_model_get (riglist, &iter2, 0, &b2, -1);
- conf->model = g_strconcat (b1, " ", b2, NULL);
- g_free (b1);
- g_free (b2);
-
- /* ID */
- gtk_tree_model_get (riglist, &iter2, 1, &id, -1);
- conf->id = id;
+ conf->host = g_strdup (gtk_entry_get_text (GTK_ENTRY (host)));
- /* radio type */
- conf->type = gtk_combo_box_get_active (GTK_COMBO_BOX (type));
-
- /* port / device */
- if (conf->port)
- g_free (conf->port);
-
- conf->port = gtk_combo_box_get_active_text (GTK_COMBO_BOX (port));
- /* CI-V */
- conf->civ = gtk_combo_box_get_active (GTK_COMBO_BOX (civ));
-
- /* Extensions */
- conf->ext = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ext));
-
- /* serial speed */
- switch (gtk_combo_box_get_active (GTK_COMBO_BOX (speed))) {
- case 0:
- conf->speed = 300;
- break;
- case 1:
- conf->speed = 1200;
- break;
- case 2:
- conf->speed = 2400;
- break;
- case 3:
- conf->speed = 4800;
- break;
- case 4:
- conf->speed = 9600;
- break;
- case 5:
- conf->speed = 19200;
- break;
- case 6:
- conf->speed = 38400;
- break;
- case 7:
- conf->speed = 57600;
- break;
- case 8:
- conf->speed = 115200;
- break;
- default:
- conf->speed = 9600;
- break;
- }
-
- /* DTR and RTS */
- conf->dtr = gtk_combo_box_get_active (GTK_COMBO_BOX (dtr));
- conf->rts = gtk_combo_box_get_active (GTK_COMBO_BOX (rts));
-#endif
return TRUE;
}
@@ -577,271 +297,4 @@
}
}
-#if 0
-/** \brief Radio info to be used when building the rig model */
-typedef struct {
- gint id; /*!< Model ID. */
- gchar *mfg; /*!< Manufacurer name (eg. KENWOOD). */
- gchar *model; /*!< Radio model (eg. TS-440). */
-} rig_info_t;
-
-/** \brief Build tree model containing radios.
- * \return A tree model where the radios are ordered according to
- * manufacturer.
- *
- */
-static GtkTreeModel *create_rig_model ()
-{
- GArray *array;
- rig_info_t *info;
- GtkTreeIter iter1; /* iter used for manufacturer */
- GtkTreeIter iter2; /* iter used for model */
- GtkTreeStore *store;
- gchar *buff;
- gint status;
- gint i;
-
-
- /* create araay containing rigs */
- array = g_array_new (FALSE, FALSE, sizeof (rig_info_t));
- rig_load_all_backends();
-
- /* fill list using rig_list_foreach */
- status = rig_list_foreach (rig_list_add, (void *) array);
-
- /* sort the array, first by model then by mfg */
- g_array_sort (array, rig_list_compare_mod);
- g_array_sort (array, rig_list_compare_mfg);
-
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d: Read %d distinct radios into array."),
- __FILE__, __LINE__, array->len);
-
- /* create a tree store with two cols (name and ID) */
- store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-
- /* add array contents to treestore */
- for (i = 0; i < array->len; i++) {
-
- /* get rig info struct */
- info = &g_array_index (array, rig_info_t, i);
-
- if (gtk_tree_store_iter_is_valid (store, &iter1)) {
- /* iter1 is valid, i.e. we already have a manufacturer */
- gtk_tree_model_get (GTK_TREE_MODEL (store), &iter1,
- 0, &buff,
- -1);
- if (g_ascii_strcasecmp (buff, info->mfg)) {
- /* mfg different, add new mfg */
- gtk_tree_store_append (store, &iter1, NULL);
- gtk_tree_store_set (store, &iter1, 0, info->mfg, -1);
- }
- /* else: mfg are identical; nothing to do */
- }
- else {
- /* iter1 is not valid, so add the first manufacturer */
- gtk_tree_store_append (store, &iter1, NULL);
- gtk_tree_store_set (store, &iter1, 0, info->mfg, -1);
- }
-
- /* iter1 points to the parent mfg; insert this rig */
- gtk_tree_store_append (store, &iter2, &iter1);
- gtk_tree_store_set (store, &iter2,
- 0, info->model,
- 1, info->id,
- -1);
-
- /* done with this model */
- g_free (info->mfg);
- g_free (info->model);
- }
-
- g_array_free (array,TRUE);
-
- return GTK_TREE_MODEL (store);
-}
-
-
-/** \brief Add new entry to list of radios.
- * \param caps Structure with the capablities of thecurrent radio.
- * \param array Pointer to the GArray into which the new entry should be
- * stored.
- * \return Always 1 to keep rig_list_foreach running.
- *
- * This function is called by the rig_list_foreach hamlib function for each
- * supported radio. It copies the relevant data into a grig_rig_info_t
- * structure and adds the new entry to the GArray containing the list of
- * supported radios.
- *
- * \sa rig_list_compare
- */
-static gint
-rig_list_add (const struct rig_caps *caps, void *array)
-{
- rig_info_t *info;
-
- /* create new entry */
- info = g_malloc (sizeof (rig_info_t));
-
- /* fill values */
- info->id = caps->rig_model;
- info->mfg = g_strdup (caps->mfg_name);
- info->model = g_strdup (caps->model_name);
-
- /* append new element to array */
- array = (void *) g_array_append_vals ((GArray *) array, info, 1);
-
- /* keep on running */
- return 1;
-}
-
-
-
-/** \brief Compare two rig info entries.
- * \param a Pointer to the first entry.
- * \param b Pointer to the second entry.
- * \return Negative value if a < b; zero if a = b; positive value if a > b.
- *
- * This function is used to compare two rig entries in the list of radios
- * when the list is sorted. It compares the manufacturer of the two radios.
- *
- * \sa rig_list_add
- */
-static gint
-rig_list_compare_mfg (gconstpointer a, gconstpointer b)
-{
- gchar *ida, *idb;
-
- ida = ((rig_info_t *) a)->mfg;
- idb = ((rig_info_t *) b)->mfg;
-
- if (g_ascii_strcasecmp(ida,idb) < 0) {
- return -1;
- }
- else if (g_ascii_strcasecmp(ida,idb) > 0) {
- return 1;
- }
- else {
- return 0;
- }
-
-}
-
-
-
-/** \brief Compare two rig info entries.
- * \param a Pointer to the first entry.
- * \param b Pointer to the second entry.
- * \return Negative value if a < b; zero if a = b; positive value if a > b.
- *
- * This function is used to compare two rig entries in the list of radios
- * when the list is sorted. It compares the model of the two radios.
- *
- * \sa rig_list_add
- */
-static gint
-rig_list_compare_mod (gconstpointer a, gconstpointer b)
-{
- gchar *ida, *idb;
-
- ida = ((rig_info_t *) a)->model;
- idb = ((rig_info_t *) b)->model;
-
- if (g_ascii_strcasecmp(ida,idb) < 0) {
- return -1;
- }
- else if (g_ascii_strcasecmp(ida,idb) > 0) {
- return 1;
- }
- else {
- return 0;
- }
-
-}
-
-
-/** \brief Set cell sensitivity.
- *
- * This function is used to disable the sensitive of manifacturer entries
- * as children. Otherwise, the manufacturer would appear as the first entry
- * in a submenu.
- * */
-static void
-is_rig_model (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer data)
-{
- gboolean sensitive;
-
- sensitive = !gtk_tree_model_iter_has_child (tree_model, iter);
-
- g_object_set (cell, "sensitive", sensitive, NULL);
-}
-
-
-/** \brief Select a radio in the combo box.
- * \param rigid The hamlib id of the radio.
- *
- * This function selects the specified radio in the combobox. This is done
- * by looping over all items in the tree model until a match is reached
- * (or there are no more items left).
- */
-static void
-select_rig (guint rigid)
-{
- GtkTreeIter iter1,iter2;
- GtkTreeModel *riglist;
- guint i,j,n,m;
- guint thisrig = 0;
-
-
- /* get the tree model */
- riglist = gtk_combo_box_get_model (GTK_COMBO_BOX (model));
-
- /* get the number of toplevel nodes */
- n = gtk_tree_model_iter_n_children (riglist, NULL);
- for (i = 0; i < n; i++) {
-
- /* get the i'th toplevel node */
- if (gtk_tree_model_iter_nth_child (riglist, &iter1, NULL, i)) {
-
- /* get the number of children */
- m = gtk_tree_model_iter_n_children (riglist, &iter1);
- for (j = 0; j < m; j++) {
-
- /* get the j'th child */
- if (gtk_tree_model_iter_nth_child (riglist, &iter2, &iter1, j)) {
-
- /* get ID of this model */
- gtk_tree_model_get (riglist, &iter2, 1, &thisrig, -1);
-
- if (thisrig == rigid) {
- /* select this rig and terminate loop */
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (model), &iter2);
- j = m;
- i = n;
- }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: NULL child node at index %d:%d"),
- __FILE__, __FUNCTION__, i, j);
-
- }
- }
-
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: NULL toplevel node at index %d"),
- __FILE__, __FUNCTION__, i);
- }
- }
-
-
-}
-
-#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-22 09:26:52
|
Revision: 61
http://gpredict.svn.sourceforge.net/gpredict/?rev=61&view=rev
Author: csete
Date: 2008-08-22 09:27:01 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Removed unnecessary data fields.
Modified Paths:
--------------
trunk/src/sat-pref-rot-editor.c
Modified: trunk/src/sat-pref-rot-editor.c
===================================================================
--- trunk/src/sat-pref-rot-editor.c 2008-08-22 09:03:45 UTC (rev 60)
+++ trunk/src/sat-pref-rot-editor.c 2008-08-22 09:27:01 UTC (rev 61)
@@ -52,10 +52,7 @@
/* private widgets */
static GtkWidget *dialog; /* dialog window */
static GtkWidget *name; /* Configuration name */
-static GtkWidget *model; /* rotor model, e.g. TS-2000 */
-static GtkWidget *type; /* rotor type */
-static GtkWidget *port; /* port selector */
-static GtkWidget *speed; /* serial speed selector */
+static GtkWidget *host; /* rotor model, e.g. TS-2000 */
static GtkWidget *minaz;
static GtkWidget *maxaz;
static GtkWidget *minel;
@@ -67,17 +64,6 @@
static void clear_widgets (void);
static gboolean apply_changes (rotor_conf_t *conf);
static void name_changed (GtkWidget *widget, gpointer data);
-static GtkTreeModel *create_rot_model (void);
-static gint rot_list_add (const struct rot_caps *, void *);
-static gint rot_list_compare_mfg (gconstpointer, gconstpointer);
-static gint rot_list_compare_mod (gconstpointer, gconstpointer);
-static void is_rot_model (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer data);
-static void select_rot (guint rotid);
-static void rot_type_changed (GtkComboBox *box, gpointer data);
/** \brief Add or edit a rotor configuration.
@@ -154,19 +140,17 @@
{
GtkWidget *table;
GtkWidget *label;
- GtkTreeModel *rotlist;
- GtkCellRenderer *renderer;
- table = gtk_table_new (5, 5, FALSE);
+ table = gtk_table_new (4, 4, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (table), 5);
gtk_table_set_col_spacings (GTK_TABLE (table), 5);
gtk_table_set_row_spacings (GTK_TABLE (table), 5);
/* Config name */
label = gtk_label_new (_("Name"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 4, 0, 1);
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1);
name = gtk_entry_new ();
gtk_entry_set_max_length (GTK_ENTRY (name), 25);
@@ -180,123 +164,52 @@
*/
g_signal_connect (name, "changed", G_CALLBACK (name_changed), NULL);
- /* Model */
- label = gtk_label_new (_("Model"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ /* Host */
+ label = gtk_label_new (_("Host"));
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2);
-
-/*
- rotlist = create_rot_model ();
- model = gtk_combo_box_new_with_model (rotlist);
- g_object_unref (rotlist);
- gtk_table_attach_defaults (GTK_TABLE (table), model, 1, 2, 1, 2);
- renderer = gtk_cell_renderer_text_new ();
- gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (model), renderer, TRUE);
- gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (model), renderer,
- "text", 0,
- NULL);
- gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (model),
- renderer,
- is_rot_model,
- NULL, NULL);
- gtk_widget_set_tooltip_text (model, _("Click to select a driver."));
- select_rot (1);
-*/
-
- /* Type */
- label = gtk_label_new (_("Type"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
- type = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("AZ"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("EL"));
- gtk_combo_box_append_text (GTK_COMBO_BOX (type), _("AZ / EL"));
- gtk_combo_box_set_active (GTK_COMBO_BOX (type), 2);
-/* g_signal_connect (G_OBJECT (type), "changed",
- G_CALLBACK (rot_type_changed), NULL);*/
- gtk_widget_set_tooltip_text (type,
- _("Select rotor type."));
- gtk_table_attach_defaults (GTK_TABLE (table), type, 1, 2, 2, 3);
-
- /* Port */
- label = gtk_label_new (_("Port"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
-
- port = gtk_combo_box_entry_new_text ();
- if (conf->port != NULL) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), conf->port);
- }
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS0");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS1");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyS2");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB0");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB1");
- gtk_combo_box_append_text (GTK_COMBO_BOX (port), "/dev/ttyUSB2");
- gtk_combo_box_set_active (GTK_COMBO_BOX (port), 0);
- gtk_widget_set_tooltip_text (port, _("Select or enter communication port"));
- gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 3, 4);
-
-
- /* Speed */
- label = gtk_label_new (_("Rate"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 4, 5);
-/* speed = gtk_combo_box_new_text ();
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "300");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "1200");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "2400");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "4800");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "9600");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "19200");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "38400");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "57600");
- gtk_combo_box_append_text (GTK_COMBO_BOX (speed), "115200");
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4);
- gtk_widget_set_tooltip_text (speed, _("Select serial port speed"));
- gtk_table_attach_defaults (GTK_TABLE (table), speed, 1, 2, 4, 5); */
-
- /* separator */
- gtk_table_attach (GTK_TABLE (table), gtk_vseparator_new(), 2, 3, 1, 5,
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 0);
-
+ host = gtk_entry_new ();
+ gtk_entry_set_max_length (GTK_ENTRY (host), 50);
+ gtk_widget_set_tooltip_text (host, _("Enter hostname:port"));
+ gtk_table_attach_defaults (GTK_TABLE (table), host, 1, 4, 1, 2);
+
/* Az and El limits */
label = gtk_label_new (_(" Min Az"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 1, 2);
- minaz = gtk_spin_button_new_with_range (-40, 40, 1);
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3);
+ minaz = gtk_spin_button_new_with_range (-40, 450, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (minaz), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (minaz), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), minaz, 4, 5, 1, 2);
+ gtk_table_attach_defaults (GTK_TABLE (table), minaz, 1, 2, 2, 3);
label = gtk_label_new (_(" Max Az"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 2, 3);
- maxaz = gtk_spin_button_new_with_range (360, 450, 1);
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 2, 3);
+ maxaz = gtk_spin_button_new_with_range (-40, 450, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), 360);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (maxaz), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (maxaz), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), maxaz, 4, 5, 2, 3);
+ gtk_table_attach_defaults (GTK_TABLE (table), maxaz, 3, 4, 2, 3);
label = gtk_label_new (_(" Min El"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 3, 4);
- minel = gtk_spin_button_new_with_range (-10, 40, 1);
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4);
+ minel = gtk_spin_button_new_with_range (-10, 180, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel), 0);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (minel), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (minel), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), minel, 4, 5, 3, 4);
+ gtk_table_attach_defaults (GTK_TABLE (table), minel, 1, 2, 3, 4);
label = gtk_label_new (_(" Max El"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_table_attach_defaults (GTK_TABLE (table), label, 3, 4, 4, 5);
- maxel = gtk_spin_button_new_with_range (90, 180, 1);
+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+ gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 3, 4);
+ maxel = gtk_spin_button_new_with_range (-10, 180, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxel), 90);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (maxel), TRUE);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (maxel), FALSE);
- gtk_table_attach_defaults (GTK_TABLE (table), maxel, 4, 5, 4, 5);
+ gtk_table_attach_defaults (GTK_TABLE (table), maxel, 3, 4, 3, 4);
if (conf->name != NULL)
update_widgets (conf);
@@ -325,47 +238,7 @@
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel), conf->minel);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxel), conf->maxel);
- /* type */
-/* gtk_combo_box_set_active (GTK_COMBO_BOX (type), conf->type-1);*/
-
- /* port */
-/* gtk_combo_box_prepend_text (GTK_COMBO_BOX (port), conf->port);
- gtk_combo_box_set_active (GTK_COMBO_BOX (port), 0);
-*/
- /*serial speed */
-/* switch (conf->speed) {
- case 300:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 0);
- break;
- case 1200:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 1);
- break;
- case 2400:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 2);
- break;
- case 4800:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 3);
- break;
- case 9600:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4);
- break;
- case 19200:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 5);
- break;
- case 38400:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 6);
- break;
- case 57600:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 7);
- break;
- case 115200:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 8);
- break;
- default:
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4);
- break;
- }
-*/
+
}
@@ -379,10 +252,6 @@
clear_widgets ()
{
gtk_entry_set_text (GTK_ENTRY (name), "");
-/* select_rot (1);
- gtk_combo_box_set_active (GTK_COMBO_BOX (type), 2);
- gtk_combo_box_set_active (GTK_COMBO_BOX (port), 0);
- gtk_combo_box_set_active (GTK_COMBO_BOX (speed), 4); */
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minaz), 0);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (maxaz), 360);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (minel), 0);
@@ -398,82 +267,20 @@
static gboolean
apply_changes (rotor_conf_t *conf)
{
- GtkTreeIter iter1,iter2;
- GtkTreeModel *rotlist;
- gchar *b1,*b2;
- guint id;
+
-
/* name */
if (conf->name)
g_free (conf->name);
conf->name = g_strdup (gtk_entry_get_text (GTK_ENTRY (name)));
- /* model */
-/* if (conf->model)
- g_free (conf->model);
-*/
- /* iter1 is needed to construct full model name */
-/* gtk_combo_box_get_active_iter (GTK_COMBO_BOX (model), &iter2);
- rotlist = gtk_combo_box_get_model (GTK_COMBO_BOX (model));
- gtk_tree_model_iter_parent (rotlist, &iter1, &iter2);
- */
- /* build model string */
-/* gtk_tree_model_get (rotlist, &iter1, 0, &b1, -1);
- gtk_tree_model_get (rotlist, &iter2, 0, &b2, -1);
- conf->model = g_strconcat (b1, " ", b2, NULL);
- g_free (b1);
- g_free (b2);
- */
- /* ID */
-/* gtk_tree_model_get (rotlist, &iter2, 1, &id, -1);
- conf->id = id;
-*/
- /* rotor type */
-/* conf->type = gtk_combo_box_get_active (GTK_COMBO_BOX (type))+1;*/
+ /* host */
+ if (conf->host)
+ g_free (conf->host);
- /* port / device */
-/* if (conf->port)
- g_free (conf->port);
-
- conf->port = gtk_combo_box_get_active_text (GTK_COMBO_BOX (port));
-*/
-
- /* serial speed */
-/* switch (gtk_combo_box_get_active (GTK_COMBO_BOX (speed))) {
- case 0:
- conf->speed = 300;
- break;
- case 1:
- conf->speed = 1200;
- break;
- case 2:
- conf->speed = 2400;
- break;
- case 3:
- conf->speed = 4800;
- break;
- case 4:
- conf->speed = 9600;
- break;
- case 5:
- conf->speed = 19200;
- break;
- case 6:
- conf->speed = 38400;
- break;
- case 7:
- conf->speed = 57600;
- break;
- case 8:
- conf->speed = 115200;
- break;
- default:
- conf->speed = 9600;
- break;
- }
- */
+ conf->host = g_strdup (gtk_entry_get_text (GTK_ENTRY (host)));
+
/* az and el ranges */
conf->minaz = gtk_spin_button_get_value (GTK_SPIN_BUTTON (minaz));
conf->maxaz = gtk_spin_button_get_value (GTK_SPIN_BUTTON (maxaz));
@@ -543,307 +350,3 @@
}
-#if 0
-/** \brief Rotor info to be used when building the rot model */
-typedef struct {
- gint id; /*!< Model ID. */
- gchar *mfg; /*!< Manufacurer name (eg. KENWOOD). */
- gchar *model; /*!< rotor model (eg. TS-440). */
-} rot_info_t;
-
-
-/** \brief Build tree model containing rotators.
- * \return A tree model where the rotator are ordered according to
- * manufacturer.
- *
- */
-static GtkTreeModel *create_rot_model ()
-{
- GArray *array;
- rot_info_t *info;
- GtkTreeIter iter1; /* iter used for manufacturer */
- GtkTreeIter iter2; /* iter used for model */
- GtkTreeStore *store;
- gchar *buff;
- gint status;
- gint i;
-
-
- /* create araay containing rots */
- array = g_array_new (FALSE, FALSE, sizeof (rot_info_t));
- rot_load_all_backends();
-
- /* fill list using rot_list_foreach */
- status = rot_list_foreach (rot_list_add, (void *) array);
-
- /* sort the array, first by model then by mfg */
- g_array_sort (array, rot_list_compare_mod);
- g_array_sort (array, rot_list_compare_mfg);
-
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s:%d: Read %d distinct rotators into array."),
- __FILE__, __LINE__, array->len);
-
- /* create a tree store with two cols (name and ID) */
- store = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_INT);
-
- /* add array contents to treestore */
- for (i = 0; i < array->len; i++) {
-
- /* get rotor info struct */
- info = &g_array_index (array, rot_info_t, i);
-
- if (gtk_tree_store_iter_is_valid (store, &iter1)) {
- /* iter1 is valid, i.e. we already have a manufacturer */
- gtk_tree_model_get (GTK_TREE_MODEL (store), &iter1,
- 0, &buff,
- -1);
- if (g_ascii_strcasecmp (buff, info->mfg)) {
- /* mfg different, add new mfg */
- gtk_tree_store_append (store, &iter1, NULL);
- gtk_tree_store_set (store, &iter1, 0, info->mfg, -1);
- }
- /* else: mfg are identical; nothing to do */
- }
- else {
- /* iter1 is not valid, so add the first manufacturer */
- gtk_tree_store_append (store, &iter1, NULL);
- gtk_tree_store_set (store, &iter1, 0, info->mfg, -1);
- }
-
- /* iter1 points to the parent mfg; insert this rot */
- gtk_tree_store_append (store, &iter2, &iter1);
- gtk_tree_store_set (store, &iter2,
- 0, info->model,
- 1, info->id,
- -1);
-
- /* done with this model */
- g_free (info->mfg);
- g_free (info->model);
- }
-
- g_array_free (array,TRUE);
-
- return GTK_TREE_MODEL (store);
-}
-
-
-/** \brief Add new entry to list of rotators.
- * \param caps Structure with the capablities of the current rotator.
- * \param array Pointer to the GArray into which the new entry should be
- * stored.
- * \return Always 1 to keep rot_list_foreach running.
- *
- * This function is called by the rot_list_foreach hamlib function for each
- * supported rotator. It copies the relevant data into a rot_info_t
- * structure and adds the new entry to the GArray containing the list of
- * supported rotators.
- *
- */
-static gint
-rot_list_add (const struct rot_caps *caps, void *array)
-{
- rot_info_t *info;
-
- /* create new entry */
- info = g_malloc (sizeof (rot_info_t));
-
- /* fill values */
- info->id = caps->rot_model;
- info->mfg = g_strdup (caps->mfg_name);
- info->model = g_strdup (caps->model_name);
-
- /* append new element to array */
- array = (void *) g_array_append_vals ((GArray *) array, info, 1);
-
- /* keep on running */
- return 1;
-}
-
-
-
-/** \brief Compare two rot info entries.
- * \param a Pointer to the first entry.
- * \param b Pointer to the second entry.
- * \return Negative value if a < b; zero if a = b; positive value if a > b.
- *
- * This function is used to compare two rot entries in the list of rotators
- * when the list is sorted. It compares the manufacturer of the two rotators.
- *
- */
-static gint
-rot_list_compare_mfg (gconstpointer a, gconstpointer b)
-{
- gchar *ida, *idb;
-
- ida = ((rot_info_t *) a)->mfg;
- idb = ((rot_info_t *) b)->mfg;
-
- if (g_ascii_strcasecmp(ida,idb) < 0) {
- return -1;
- }
- else if (g_ascii_strcasecmp(ida,idb) > 0) {
- return 1;
- }
- else {
- return 0;
- }
-
-}
-
-
-
-/** \brief Compare two rot info entries.
- * \param a Pointer to the first entry.
- * \param b Pointer to the second entry.
- * \return Negative value if a < b; zero if a = b; positive value if a > b.
- *
- * This function is used to compare two rot entries in the list of rotators
- * when the list is sorted. It compares the model of the two rotators
- *
- */
-static gint
-rot_list_compare_mod (gconstpointer a, gconstpointer b)
-{
- gchar *ida, *idb;
-
- ida = ((rot_info_t *) a)->model;
- idb = ((rot_info_t *) b)->model;
-
- if (g_ascii_strcasecmp(ida,idb) < 0) {
- return -1;
- }
- else if (g_ascii_strcasecmp(ida,idb) > 0) {
- return 1;
- }
- else {
- return 0;
- }
-
-}
-
-
-/** \brief Set cell sensitivity.
- *
- * This function is used to disable the sensitivity of manufacturer entries
- * as children. Otherwise, the manufacturer would appear as the first entry
- * in a submenu.
- * */
-static void
-is_rot_model (GtkCellLayout *cell_layout,
- GtkCellRenderer *cell,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
- gpointer data)
-{
- gboolean sensitive;
-
- sensitive = !gtk_tree_model_iter_has_child (tree_model, iter);
-
- g_object_set (cell, "sensitive", sensitive, NULL);
-}
-
-
-/** \brief Select a rotator in the combo box.
- * \param rotid The hamlib id of the rotator.
- *
- * This function selects the specified rotator in the combobox. This is done
- * by looping over all items in the tree model until a match is reached
- * (or there are no more items left).
- */
-static void
-select_rot (guint rotid)
-{
- GtkTreeIter iter1,iter2;
- GtkTreeModel *rotlist;
- guint i,j,n,m;
- guint thisrot = 0;
-
-
- /* get the tree model */
- rotlist = gtk_combo_box_get_model (GTK_COMBO_BOX (model));
-
- /* get the number of toplevel nodes */
- n = gtk_tree_model_iter_n_children (rotlist, NULL);
- for (i = 0; i < n; i++) {
-
- /* get the i'th toplevel node */
- if (gtk_tree_model_iter_nth_child (rotlist, &iter1, NULL, i)) {
-
- /* get the number of children */
- m = gtk_tree_model_iter_n_children (rotlist, &iter1);
- for (j = 0; j < m; j++) {
-
- /* get the j'th child */
- if (gtk_tree_model_iter_nth_child (rotlist, &iter2, &iter1, j)) {
-
- /* get ID of this model */
- gtk_tree_model_get (rotlist, &iter2, 1, &thisrot, -1);
-
- if (thisrot == rotid) {
- /* select this rot and terminate loop */
- gtk_combo_box_set_active_iter (GTK_COMBO_BOX (model), &iter2);
- j = m;
- i = n;
- }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: NULL child node at index %d:%d"),
- __FILE__, __FUNCTION__, i, j);
-
- }
- }
-
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s:%s: NULL toplevel node at index %d"),
- __FILE__, __FUNCTION__, i);
- }
- }
-
-
-}
-
-
-/** \brief Rotor type changed signal handler.
- * \param box The rotor type selector combo box.
- * \param data User data; always NULL.
- *
- * This function is called when the user a rotor type. The purpose of this
- * function is to enable/disable the Az and El range spin buttons depending
- * on whether we have an Az, El, or AzEl rotator.
- */
-static void rot_type_changed (GtkComboBox *box, gpointer data)
-{
- switch (gtk_combo_box_get_active (box)+1) {
- case ROTOR_TYPE_AZ:
- gtk_widget_set_sensitive (minaz, TRUE);
- gtk_widget_set_sensitive (maxaz, TRUE);
- gtk_widget_set_sensitive (minel, FALSE);
- gtk_widget_set_sensitive (maxel, FALSE);
- break;
-
- case ROTOR_TYPE_EL:
- gtk_widget_set_sensitive (minaz, FALSE);
- gtk_widget_set_sensitive (maxaz, FALSE);
- gtk_widget_set_sensitive (minel, TRUE);
- gtk_widget_set_sensitive (maxel, TRUE);
- break;
-
- case ROTOR_TYPE_AZEL:
- gtk_widget_set_sensitive (minaz, TRUE);
- gtk_widget_set_sensitive (maxaz, TRUE);
- gtk_widget_set_sensitive (minel, TRUE);
- gtk_widget_set_sensitive (maxel, TRUE);
-
- default:
- break;
-
- }
-}
-
-#endif
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-22 09:03:37
|
Revision: 60
http://gpredict.svn.sourceforge.net/gpredict/?rev=60&view=rev
Author: csete
Date: 2008-08-22 09:03:45 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Readded Az and El limit columns.
Modified Paths:
--------------
trunk/src/sat-pref-rot-data.h
Modified: trunk/src/sat-pref-rot-data.h
===================================================================
--- trunk/src/sat-pref-rot-data.h 2008-08-22 08:53:13 UTC (rev 59)
+++ trunk/src/sat-pref-rot-data.h 2008-08-22 09:03:45 UTC (rev 60)
@@ -32,6 +32,10 @@
typedef enum {
ROT_LIST_COL_NAME = 0, /*!< File name. */
ROT_LIST_COL_HOST, /*!< Hostname */
+ ROT_LIST_COL_MINAZ, /*!< Lower Az limit. */
+ ROT_LIST_COL_MAXAZ, /*!< Upper Az limit. */
+ ROT_LIST_COL_MINEL, /*!< Lower El limit. */
+ ROT_LIST_COL_MAXEL, /*!< Upper El limit. */
ROT_LIST_COL_NUM /*!< The number of fields in the list. */
} rotor_list_col_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cs...@us...> - 2008-08-22 08:53:05
|
Revision: 59
http://gpredict.svn.sourceforge.net/gpredict/?rev=59&view=rev
Author: csete
Date: 2008-08-22 08:53:13 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
Removed unnecessary columns.
Modified Paths:
--------------
trunk/src/sat-pref-rig.c
Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c 2008-08-22 08:46:10 UTC (rev 58)
+++ trunk/src/sat-pref-rig.c 2008-08-22 08:53:13 UTC (rev 59)
@@ -131,79 +131,14 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
- /* Model */
+ /* Host */
renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Model"), renderer,
- "text", RIG_LIST_COL_MODEL,
+ column = gtk_tree_view_column_new_with_attributes (_("Host"), renderer,
+ "text", RIG_LIST_COL_HOST,
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
- /* Type */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Type"), renderer,
- "text", RIG_LIST_COL_TYPE,
- NULL);
- gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_rig_type,
- GUINT_TO_POINTER(RIG_LIST_COL_TYPE),
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
- /* Port */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Port"), renderer,
- "text", RIG_LIST_COL_PORT,
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
-
- /* Speed */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Speed"), renderer,
- "text", RIG_LIST_COL_SPEED,
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
-
- /* Icom CI-V */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Icom CI-V"), renderer,
- "text", RIG_LIST_COL_CIV,
- NULL);
- gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_civ,
- GUINT_TO_POINTER(RIG_LIST_COL_CIV),
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
-
- /* Extensions */
- renderer = gtk_cell_renderer_toggle_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Ext"), renderer,
- "active", RIG_LIST_COL_EXT,
- NULL);
-
- gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
-
- /* DTR */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("DTR Line"), renderer,
- "text", RIG_LIST_COL_DTR,
- NULL);
- gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_dtr_rts,
- GUINT_TO_POINTER(RIG_LIST_COL_DTR),
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
-
- /* RTS */
- renderer = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("RTS Line"), renderer,
- "text", RIG_LIST_COL_RTS,
- NULL);
- gtk_tree_view_column_set_cell_data_func (column, renderer,
- render_dtr_rts,
- GUINT_TO_POINTER(RIG_LIST_COL_RTS),
- NULL);
- gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
-
}
@@ -223,15 +158,7 @@
/* create a new list store */
liststore = gtk_list_store_new (RIG_LIST_COL_NUM,
G_TYPE_STRING, // name
- G_TYPE_STRING, // model
- G_TYPE_INT, // hamlib id
- G_TYPE_INT, // radio type
- G_TYPE_STRING, // port
- G_TYPE_INT, // speed
- G_TYPE_INT, // Icom CI-V
- G_TYPE_BOOLEAN, // Extensions
- G_TYPE_INT, // DTR line
- G_TYPE_INT // RTS line
+ G_TYPE_STRING // model
);
/* open configuration directory */
@@ -255,15 +182,7 @@
gtk_list_store_append (liststore, &item);
gtk_list_store_set (liststore, &item,
RIG_LIST_COL_NAME, conf.name,
- RIG_LIST_COL_MODEL, conf.model,
- RIG_LIST_COL_ID, conf.id,
- RIG_LIST_COL_TYPE, conf.type,
- RIG_LIST_COL_PORT, conf.port,
- RIG_LIST_COL_SPEED, conf.speed,
- RIG_LIST_COL_CIV, conf.civ,
- RIG_LIST_COL_EXT, conf.ext,
- RIG_LIST_COL_DTR, conf.dtr,
- RIG_LIST_COL_RTS, conf.rts,
+ RIG_LIST_COL_HOST, conf.host,
-1);
sat_log_log (SAT_LOG_LEVEL_DEBUG,
@@ -273,11 +192,9 @@
if (conf.name)
g_free (conf.name);
- if (conf.model)
- g_free (conf.model);
+ if (conf.host)
+ g_free (conf.host);
- if (conf.port)
- g_free (conf.port);
}
else {
/* there was an error */
@@ -372,15 +289,7 @@
radio_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = RADIO_TYPE_RX,
- .port = NULL,
- .speed = 0,
- .civ = 0,
- .ext = FALSE,
- .dtr = LINE_UNDEF,
- .rts = LINE_UNDEF,
+ .host = NULL,
};
@@ -418,15 +327,7 @@
/* store conf */
gtk_tree_model_get (model, &iter,
RIG_LIST_COL_NAME, &conf.name,
- RIG_LIST_COL_MODEL, &conf.model,
- RIG_LIST_COL_ID, &conf.id,
- RIG_LIST_COL_TYPE, &conf.type,
- RIG_LIST_COL_PORT, &conf.port,
- RIG_LIST_COL_SPEED, &conf.speed,
- RIG_LIST_COL_CIV, &conf.civ,
- RIG_LIST_COL_EXT, &conf.ext,
- RIG_LIST_COL_DTR, &conf.dtr,
- RIG_LIST_COL_RTS, &conf.rts,
+ RIG_LIST_COL_HOST, &conf.host,
-1);
radio_conf_save (&conf);
@@ -434,11 +335,9 @@
if (conf.name)
g_free (conf.name);
- if (conf.model)
- g_free (conf.model);
+ if (conf.host)
+ g_free (conf.host);
- if (conf.port)
- g_free (conf.port);
}
else {
sat_log_log (SAT_LOG_LEVEL_ERROR,
@@ -464,15 +363,7 @@
radio_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = RADIO_TYPE_RX,
- .port = NULL,
- .speed = 0,
- .civ = 0,
- .ext = FALSE,
- .dtr = LINE_UNDEF,
- .rts = LINE_UNDEF,
+ .host = NULL,
};
/* run rig conf editor */
@@ -484,24 +375,14 @@
gtk_list_store_append (liststore, &item);
gtk_list_store_set (liststore, &item,
RIG_LIST_COL_NAME, conf.name,
- RIG_LIST_COL_MODEL, conf.model,
- RIG_LIST_COL_ID, conf.id,
- RIG_LIST_COL_TYPE, conf.type,
- RIG_LIST_COL_PORT, conf.port,
- RIG_LIST_COL_SPEED, conf.speed,
- RIG_LIST_COL_CIV, conf.civ,
- RIG_LIST_COL_EXT, conf.ext,
- RIG_LIST_COL_DTR, conf.dtr,
- RIG_LIST_COL_RTS, conf.rts,
+ RIG_LIST_COL_HOST, conf.host,
-1);
g_free (conf.name);
- if (conf.model != NULL)
- g_free (conf.model);
+ if (conf.host != NULL)
+ g_free (conf.host);
- if (conf.port != NULL)
- g_free (conf.port);
}
}
@@ -522,15 +403,7 @@
radio_conf_t conf = {
.name = NULL,
- .model = NULL,
- .id = 0,
- .type = RADIO_TYPE_RX,
- .port = NULL,
- .speed = 0,
- .civ = 0,
- .ext = FALSE,
- .dtr = LINE_UNDEF,
- .rts = LINE_UNDEF,
+ .host = NULL,
};
@@ -553,15 +426,7 @@
if (gtk_tree_selection_get_selected(selection, &selmod, &iter)) {
gtk_tree_model_get (model, &iter,
RIG_LIST_COL_NAME, &conf.name,
- RIG_LIST_COL_MODEL, &conf.model,
- RIG_LIST_COL_ID, &conf.id,
- RIG_LIST_COL_TYPE, &conf.type,
- RIG_LIST_COL_PORT, &conf.port,
- RIG_LIST_COL_SPEED, &conf.speed,
- RIG_LIST_COL_CIV, &conf.civ,
- RIG_LIST_COL_EXT, &conf.ext,
- RIG_LIST_COL_DTR, &conf.dtr,
- RIG_LIST_COL_RTS, &conf.rts,
+ RIG_LIST_COL_HOST, &conf.host,
-1);
}
@@ -587,15 +452,7 @@
if (conf.name != NULL) {
gtk_list_store_set (GTK_LIST_STORE(model), &iter,
RIG_LIST_COL_NAME, conf.name,
- RIG_LIST_COL_MODEL, conf.model,
- RIG_LIST_COL_ID, conf.id,
- RIG_LIST_COL_TYPE, conf.type,
- RIG_LIST_COL_PORT, conf.port,
- RIG_LIST_COL_SPEED, conf.speed,
- RIG_LIST_COL_CIV, conf.civ,
- RIG_LIST_COL_EXT, conf.ext,
- RIG_LIST_COL_DTR, conf.dtr,
- RIG_LIST_COL_RTS, conf.rts,
+ RIG_LIST_COL_HOST, conf.host,
-1);
}
@@ -604,11 +461,8 @@
if (conf.name)
g_free (conf.name);
- if (conf.model != NULL)
- g_free (conf.model);
-
- if (conf.port != NULL)
- g_free (conf.port);
+ if (conf.host != NULL)
+ g_free (conf.host);
}
@@ -744,7 +598,7 @@
gtk_tree_model_get (model, iter, coli, &number, -1);
- switch (number) {
+/* switch (number) {
case LINE_OFF:
g_object_set (renderer, "text", "OFF", NULL);
@@ -767,7 +621,7 @@
break;
}
-
+ */
}
@@ -793,7 +647,7 @@
gtk_tree_model_get (model, iter, coli, &number, -1);
- switch (number) {
+/* switch (number) {
case RADIO_TYPE_RX:
g_object_set (renderer, "text", "RX", NULL);
@@ -818,7 +672,7 @@
g_object_set (renderer, "text", "RX", NULL);
break;
- }
+ }*/
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
