[Gpredict-svn] SF.net SVN: gpredict:[65] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict:[65] trunk
|
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.
|
