[Gpredict-svn] SF.net SVN: gpredict:[908] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
|
From: <aa...@us...> - 2011-09-25 13:27:25
|
Revision: 908
http://gpredict.svn.sourceforge.net/gpredict/?rev=908&view=rev
Author: aa1vs
Date: 2011-09-25 13:27:19 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
Update sort routines to include catalog number to handle ties in name.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/gtk-sat-selector.c
trunk/src/mod-cfg.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-09-25 13:04:53 UTC (rev 907)
+++ trunk/ChangeLog 2011-09-25 13:27:19 UTC (rev 908)
@@ -4,7 +4,12 @@
* src/tle-update.c
Fix bugs in tle-update for two line tle's at end of file.
+ * ChangeLog
+ * src/gtk-sat-selector.c
+ * src/mod-cfg.c
+ Update sort routines to include catalog number to handle ties in name.
+
2011-09-22 Charles Suprin <hamaa1vs at gmail.com>
* ChangeLog
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-09-25 13:04:53 UTC (rev 907)
+++ trunk/src/gtk-sat-selector.c 2011-09-25 13:27:19 UTC (rev 908)
@@ -612,6 +612,7 @@
gpointer userdata)
{
gchar *sat1,*sat2;
+ gint catnr1, catnr2;
gint ret = 0;
(void) userdata; /* avoid unused parameter compiler warning */
@@ -620,6 +621,19 @@
gtk_tree_model_get(model, b, GTK_SAT_SELECTOR_COL_NAME, &sat2, -1);
ret = gpredict_strcmp (sat1, sat2);
+
+ if (ret == 0){
+ gtk_tree_model_get(model, a, GTK_SAT_SELECTOR_COL_CATNUM, &catnr1, -1);
+ gtk_tree_model_get(model, b, GTK_SAT_SELECTOR_COL_CATNUM, &catnr2, -1);
+ if (catnr1 < catnr2)
+ ret = -1;
+ else if (catnr1 > catnr2)
+ ret = 1;
+ else
+ /* never supposed to happen */
+ ret=0;
+ }
+
g_free (sat1);
g_free (sat2);
Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c 2011-09-25 13:04:53 UTC (rev 907)
+++ trunk/src/mod-cfg.c 2011-09-25 13:27:19 UTC (rev 908)
@@ -1100,6 +1100,7 @@
gpointer userdata)
{
gchar *sat1,*sat2;
+ gint catnr1,catnr2;
gint ret = 0;
(void) userdata; /* avoid unused parameter compiler warning */
@@ -1108,7 +1109,20 @@
gtk_tree_model_get(model, b, GTK_SAT_SELECTOR_COL_NAME, &sat2, -1);
ret = gpredict_strcmp (sat1, sat2);
+
+ if (ret == 0){
+ gtk_tree_model_get(model, a, GTK_SAT_SELECTOR_COL_CATNUM, &catnr1, -1);
+ gtk_tree_model_get(model, b, GTK_SAT_SELECTOR_COL_CATNUM, &catnr2, -1);
+ if (catnr1 < catnr2)
+ ret = -1;
+ else if (catnr1 > catnr2)
+ ret = 1;
+ else
+ /* never supposed to happen */
+ ret=0;
+ }
+
g_free (sat1);
g_free (sat2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|