[Gpredict-svn] SF.net SVN: gpredict:[956] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict:[956] trunk
|
From: <aa...@us...> - 2011-11-21 01:46:25
|
Revision: 956
http://gpredict.svn.sourceforge.net/gpredict/?rev=956&view=rev
Author: aa1vs
Date: 2011-11-21 01:46:18 +0000 (Mon, 21 Nov 2011)
Log Message:
-----------
Bold entries for satellites above horizon. (Feature Request 3169710: Highlight satellites within range in the list view)
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/src/gtk-event-list.c
trunk/src/gtk-event-list.h
trunk/src/gtk-sat-list.c
trunk/src/gtk-sat-list.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2011-11-21 01:18:09 UTC (rev 955)
+++ trunk/ChangeLog 2011-11-21 01:46:18 UTC (rev 956)
@@ -3,6 +3,11 @@
* src/gtk-sat-map.c
Apply consistent checking of pole to eliminate disagreements. (Bug 3437555: Graphical Glitch Plotting Footprints near pole)
+ * src/gtk-sat-list.c
+ * src/gtk-sat-list.h
+ * src/gtk-event-list.c
+ * src/gtk-event-list.c
+ Bold entries for satellites above horizon. (Feature Request 3169710: Highlight satellites within range in the list view)
2011-11-13 Charles Suprin <hamaa1vs at gmail.com>
* src/gtk-sat-module-popup.c
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2011-11-21 01:18:09 UTC (rev 955)
+++ trunk/NEWS 2011-11-21 01:46:18 UTC (rev 956)
@@ -5,6 +5,7 @@
- Feature request 2130926: Change frequency using mouse wheel. Also for rotator controller.
- Feature request 3322786: Show More Information in Edit Module Sat Selection.
- Feature request 3314813: Resolves Requested TLE files from Celestrak.
+- Feature Request 3169710: Highlight satellites within range in the list view.
- Applied and extended patch 3237220: natural sort for sat list in module config
- Improve handling of decayed satellites.
- Fixed bug 3250344: Win32 build not working with hamlib.
Modified: trunk/src/gtk-event-list.c
===================================================================
--- trunk/src/gtk-event-list.c 2011-11-21 01:18:09 UTC (rev 955)
+++ trunk/src/gtk-event-list.c 2011-11-21 01:46:18 UTC (rev 956)
@@ -59,7 +59,9 @@
N_("Az"),
N_("El"),
N_("Event"),
- N_("AOS/LOS")
+ N_("AOS/LOS"),
+ N_("Decayed"), /*should never be seen*/
+ N_("BOLD") /*should never be seen*/
};
@@ -304,6 +306,7 @@
column = gtk_tree_view_column_new_with_attributes (_(EVENT_LIST_COL_TITLE[i]),
renderer,
"text", i,
+ "weight", EVENT_LIST_COL_BOLD,
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (evlist->treeview),
@@ -382,7 +385,8 @@
G_TYPE_DOUBLE, // el
G_TYPE_BOOLEAN, // TRUE if AOS, FALSE if LOS
G_TYPE_DOUBLE, // time
- G_TYPE_BOOLEAN); // decayed
+ G_TYPE_BOOLEAN, // decayed
+ G_TYPE_INT); // bold for storing weight
/* add each satellite from hash table */
g_hash_table_foreach (sats, event_list_add_satellites, liststore);
@@ -531,6 +535,7 @@
EVENT_LIST_COL_EVT, (sat->el >= 0) ? TRUE : FALSE,
EVENT_LIST_COL_TIME, number,
EVENT_LIST_COL_DECAY, !decayed(sat),
+ EVENT_LIST_COL_BOLD,(sat->el>0.0)?PANGO_WEIGHT_BOLD:PANGO_WEIGHT_NORMAL,
-1);
}
Modified: trunk/src/gtk-event-list.h
===================================================================
--- trunk/src/gtk-event-list.h 2011-11-21 01:18:09 UTC (rev 955)
+++ trunk/src/gtk-event-list.h 2011-11-21 01:46:18 UTC (rev 956)
@@ -92,7 +92,8 @@
EVENT_LIST_COL_EL, /*!< Satellite Elevation. */
EVENT_LIST_COL_EVT, /*!< Next event (AOS or LOS). */
EVENT_LIST_COL_TIME, /*!< Time countdown. */
- EVENT_LIST_COL_DECAY, /*!< Whether satellite is decayed or not. */
+ EVENT_LIST_COL_DECAY, /*!< Whether satellite is decayed or not. */
+ EVENT_LIST_COL_BOLD, /*!< Stores weight for rendering text. */
EVENT_LIST_COL_NUMBER
} event_list_col_t;
Modified: trunk/src/gtk-sat-list.c
===================================================================
--- trunk/src/gtk-sat-list.c 2011-11-21 01:18:09 UTC (rev 955)
+++ trunk/src/gtk-sat-list.c 2011-11-21 01:46:18 UTC (rev 956)
@@ -77,7 +77,9 @@
N_("MA"),
N_("Phase"),
N_("Orbit"),
- N_("Vis")
+ N_("Vis"),
+ N_("Decay"),
+ N_("BOLD") /*should never be seen*/
};
@@ -412,6 +414,7 @@
column = gtk_tree_view_column_new_with_attributes (_(SAT_LIST_COL_TITLE[i]),
renderer,
"text", i,
+ "weight",SAT_LIST_COL_BOLD,
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (GTK_SAT_LIST (widget)->treeview),
column, -1);
@@ -517,9 +520,11 @@
G_TYPE_DOUBLE, // delay
G_TYPE_DOUBLE, // mean anomaly
G_TYPE_DOUBLE, // phase
- G_TYPE_LONG, // orbit
+ G_TYPE_LONG, // orbit
G_TYPE_STRING, // visibility
- G_TYPE_BOOLEAN); // decay
+ G_TYPE_BOOLEAN, // decay
+ G_TYPE_INT // weight/bold
+ );
g_hash_table_foreach (sats, sat_list_add_satellites, liststore);
@@ -681,6 +686,7 @@
SAT_LIST_COL_PHASE, sat->phase,
SAT_LIST_COL_ORBIT, sat->orbit,
SAT_LIST_COL_DECAY, !decayed(sat),
+ SAT_LIST_COL_BOLD,(sat->el>0.0)?PANGO_WEIGHT_BOLD:PANGO_WEIGHT_NORMAL,
-1);
/* doppler shift @ 100 MHz */
Modified: trunk/src/gtk-sat-list.h
===================================================================
--- trunk/src/gtk-sat-list.h 2011-11-21 01:18:09 UTC (rev 955)
+++ trunk/src/gtk-sat-list.h 2011-11-21 01:46:18 UTC (rev 956)
@@ -113,6 +113,7 @@
SAT_LIST_COL_ORBIT, /*!< Orbit Number. */
SAT_LIST_COL_VISIBILITY, /*!< Visibility. */
SAT_LIST_COL_DECAY, /*!< Whether the satellite is decayed or not. */
+ SAT_LIST_COL_BOLD, /*!< Used to render the satellites above the horizon bold. */
SAT_LIST_COL_NUMBER
} sat_list_col_t;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
