gpredict-svn Mailing List for Gpredict
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
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: <aa...@us...> - 2011-12-26 16:41:37
|
Revision: 965 http://gpredict.svn.sourceforge.net/gpredict/?rev=965&view=rev Author: aa1vs Date: 2011-12-26 16:41:31 +0000 (Mon, 26 Dec 2011) Log Message: ----------- Update transponder database to include all satellites in AMSAT-US operational list. Modified Paths: -------------- trunk/ChangeLog trunk/data/trsp/27844.trsp trunk/data/trsp/28895.trsp trunk/data/trsp/33493.trsp Added Paths: ----------- trunk/data/trsp/25509.trsp trunk/data/trsp/29655.trsp trunk/data/trsp/37224.trsp trunk/data/trsp/37227.trsp trunk/data/trsp/37853.trsp trunk/data/trsp/37854.trsp trunk/data/trsp/37855.trsp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-12-26 15:53:21 UTC (rev 964) +++ trunk/ChangeLog 2011-12-26 16:41:31 UTC (rev 965) @@ -3,7 +3,19 @@ * data/trsp/32953.trsp Add transponder data for RS-30/Yubileiny. + * data/trsp/37854.trsp + * data/trsp/29655.trsp + * data/trsp/28895.trsp + * data/trsp/25509.trsp + * data/trsp/37227.trsp + * data/trsp/33493.trsp + * data/trsp/27844.trsp + * data/trsp/37853.trsp + * data/trsp/37855.trsp + * data/trsp/37224.trsp + Update transponder database to include all satellites in AMSAT-US operational list. + 2011-12-24 Charles Suprin <hamaa1vs at gmail.com> * src/compat.c Added: trunk/data/trsp/25509.trsp =================================================================== --- trunk/data/trsp/25509.trsp (rev 0) +++ trunk/data/trsp/25509.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -0,0 +1,7 @@ +[Mode V/A Inverting] +UP_HIGH=145915000 +DOWN_LOW=29420000 + +[Mode L/U Packet] +UP_HIGH=1266687000 +DOWN_LOW=437910000 Modified: trunk/data/trsp/27844.trsp =================================================================== --- trunk/data/trsp/27844.trsp 2011-12-26 15:53:21 UTC (rev 964) +++ trunk/data/trsp/27844.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -1,3 +1,7 @@ +[Mode U Beacon] +DOWN_LOW=437400000 +MODE=CW + [Mode U TLM] DOWN_LOW=436837500 MODE=CW Modified: trunk/data/trsp/28895.trsp =================================================================== --- trunk/data/trsp/28895.trsp 2011-12-26 15:53:21 UTC (rev 964) +++ trunk/data/trsp/28895.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -1,3 +1,7 @@ +[Mode U BEACON] +DOWN_LOW=437465000 +MODE=CW + [Mode U TLM] DOWN_LOW=437425000 MODE=CW Added: trunk/data/trsp/29655.trsp =================================================================== --- trunk/data/trsp/29655.trsp (rev 0) +++ trunk/data/trsp/29655.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -0,0 +1,3 @@ +[Mode TLM Beacon] +DOWN_LOW=4370750 +MODE=1k2 AFSK Modified: trunk/data/trsp/33493.trsp =================================================================== --- trunk/data/trsp/33493.trsp 2011-12-26 15:53:21 UTC (rev 964) +++ trunk/data/trsp/33493.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -2,6 +2,10 @@ DOWN_LOW=437250000 MODE=CW -[Mode U FM] +[Mode U FM 1200] DOWN_LOW=437425000 MODE=1k2 AFSK + +[Mode U FM 9600] +DOWN_LOW=437425000 +MODE=9k2 GMSK Added: trunk/data/trsp/37224.trsp =================================================================== --- trunk/data/trsp/37224.trsp (rev 0) +++ trunk/data/trsp/37224.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -0,0 +1,2 @@ +[Mode U Telemetry 1200 bps] +DOWN_LOW=43705000 Added: trunk/data/trsp/37227.trsp =================================================================== --- trunk/data/trsp/37227.trsp (rev 0) +++ trunk/data/trsp/37227.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -0,0 +1,21 @@ +[FO-69 Mode U Telemetry 1200 bps] +DOWN_LOW=437345000 + +[FO-69 Mode V/U Telemetry 1200 bps] +DOWN_LOW=437345000 +UP_HIGH=145980000 + +[FO-69 Mode V/U Telemetry 9600 bps] +DOWN_LOW=437345000 +UP_HIGH=145825000 + +[FO-70 Mode U Telemetry 1200 bps] +DOWN_LOW=145825000 + +[FO-70 Mode U/V Telemetry 1200 bps] +UP_LOW=432025000 +DOWN_HIGH=145825000 + +[FO-70 Mode U/V Telemetry 9600 bps] +UP_LOW=437345000 +DOWN_HIGH=145825000 Added: trunk/data/trsp/37853.trsp =================================================================== --- trunk/data/trsp/37853.trsp (rev 0) +++ trunk/data/trsp/37853.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -0,0 +1,2 @@ +[9600bps Beacon] +DOWN_LOW = 437345000 Added: trunk/data/trsp/37854.trsp =================================================================== --- trunk/data/trsp/37854.trsp (rev 0) +++ trunk/data/trsp/37854.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -0,0 +1,2 @@ +[CW Beacon] +DOWN_LOW = 437475000 Added: trunk/data/trsp/37855.trsp =================================================================== --- trunk/data/trsp/37855.trsp (rev 0) +++ trunk/data/trsp/37855.trsp 2011-12-26 16:41:31 UTC (rev 965) @@ -0,0 +1,5 @@ +[MCubed GMSK Beacon] +DOWN_LOW = 437485000 + +[Explorer 1 Prime Unit 2 Beacon] +DOWN_LOW = 437505000 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-12-26 15:53:27
|
Revision: 964 http://gpredict.svn.sourceforge.net/gpredict/?rev=964&view=rev Author: aa1vs Date: 2011-12-26 15:53:21 +0000 (Mon, 26 Dec 2011) Log Message: ----------- Add transponder data for RS-30/Yubileiny. Modified Paths: -------------- trunk/ChangeLog Added Paths: ----------- trunk/data/trsp/32953.trsp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-12-24 14:42:52 UTC (rev 963) +++ trunk/ChangeLog 2011-12-26 15:53:21 UTC (rev 964) @@ -1,3 +1,9 @@ +2011-12-26 Charles Suprin <hamaa1vs at gmail.com> + + * data/trsp/32953.trsp + Add transponder data for RS-30/Yubileiny. + + 2011-12-24 Charles Suprin <hamaa1vs at gmail.com> * src/compat.c Added: trunk/data/trsp/32953.trsp =================================================================== --- trunk/data/trsp/32953.trsp (rev 0) +++ trunk/data/trsp/32953.trsp 2011-12-26 15:53:21 UTC (rev 964) @@ -0,0 +1,5 @@ +[Telemetry Beacon 1 Beacon] +DOWN_LOW = 435215000 + +[Telemetry Beacon 2 Beacon] +DOWN_LOW = 435315000 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-12-24 14:42:59
|
Revision: 963 http://gpredict.svn.sourceforge.net/gpredict/?rev=963&view=rev Author: aa1vs Date: 2011-12-24 14:42:52 +0000 (Sat, 24 Dec 2011) Log Message: ----------- Honor XDG_CONFIG_HOME environment variable for configuration directory. (Bug 3463810) Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/compat.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-12-06 21:41:46 UTC (rev 962) +++ trunk/ChangeLog 2011-12-24 14:42:52 UTC (rev 963) @@ -1,3 +1,9 @@ +2011-12-24 Charles Suprin <hamaa1vs at gmail.com> + + * src/compat.c + Honor XDG_CONFIG_HOME environment variable for configuration directory. (Bug 3463810) + + 2011-12-06 Alexandru Csete <oz9aec at gmail.com> * src/about.c: Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2011-12-06 21:41:46 UTC (rev 962) +++ trunk/NEWS 2011-12-24 14:42:52 UTC (rev 963) @@ -24,8 +24,8 @@ - Fixed bug 3437555: Graphical Glitch Plotting Footprints near pole. - Fixed bug 3441490: Satellite Nickname Not escaped for PANGO. - Fixed bug 3451841: Typos. +- Fixed bug 3463810: XDG Base Directory Specification. - Changes in version 1.3 (1 Mar 2011) - Feature request 2873824: Flip Passes. Modified: trunk/src/compat.c =================================================================== --- trunk/src/compat.c 2011-12-06 21:41:46 UTC (rev 962) +++ trunk/src/compat.c 2011-12-24 14:42:52 UTC (rev 963) @@ -207,7 +207,7 @@ /** \brief Get user configuration directory. * - * Linux: $HOME/.config/Gpredict + * Linux: $HOME/.config/Gpredict or $XDG_CONFIG_HOME/Gpredict if $XDG_CONFIG_HOME is defined * Windows: C:\Documents and Settings\username\Gpredict * Mac OS X: /home/username/Library/Application Support/Gpredict * @@ -219,9 +219,8 @@ gchar *dir = NULL; #ifdef G_OS_UNIX - dir = g_strconcat (g_get_home_dir(), G_DIR_SEPARATOR_S, - ".config", G_DIR_SEPARATOR_S, - "Gpredict", NULL); + /* glib is kind enough to provide a function for this */ + dir = g_strconcat(g_get_user_config_dir (),G_DIR_SEPARATOR_S,"Gpredict",NULL); #endif #ifdef G_OS_WIN32 // FIXME: does this work? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2011-12-06 21:41:52
|
Revision: 962 http://gpredict.svn.sourceforge.net/gpredict/?rev=962&view=rev Author: csete Date: 2011-12-06 21:41:46 +0000 (Tue, 06 Dec 2011) Log Message: ----------- Typos (bug 3451841). Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/about.c trunk/src/gtk-sat-module.c trunk/src/sat-info.c trunk/src/sat-pass-dialogs.c trunk/src/sat-pref-qth.c trunk/src/sat-pref-rot-editor.c trunk/src/sat-pref-rot.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/ChangeLog 2011-12-06 21:41:46 UTC (rev 962) @@ -1,3 +1,16 @@ +2011-12-06 Alexandru Csete <oz9aec at gmail.com> + + * src/about.c: + * src/gtk-sat-module.c: + * src/gtk-sat-module.c: + * src/sat-info.c: + * src/sat-pass-dialogs.c: + * src/sat-pref-qth.c: + * src/sat-pref-rot.c: + * src/sat-pref-rot-editor.c: + Fix typos (bug 3451841). + + 2011-11-23 Charles Suprin <hamaa1vs at gmail.com> * src/gtk-event-list-popup.c @@ -10,7 +23,8 @@ * src/gtk-single-sat.c * src/sat-info.c * src/sgpsdp/sgp4sdp4.h - Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.) + Escape satellite nicknames and use them when in markup. + (Bug 3441490: Satellite Nickname Not escaped for PANGO.) 2011-11-22 Charles Suprin <hamaa1vs at gmail.com> @@ -22,13 +36,16 @@ 2011-11-21 Charles Suprin <hamaa1vs at gmail.com> * src/gtk-sat-map.c - Apply consistent checking of pole to eliminate disagreements. (Bug 3437555: Graphical Glitch Plotting Footprints near pole) + 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) + Bold entries for satellites above horizon. + (Feature Request 3169710: Highlight satellites within range in the list view) + * src/gtk-single-sat.c Eliminate segfault. Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/NEWS 2011-12-06 21:41:46 UTC (rev 962) @@ -23,7 +23,9 @@ - Fixed bug 3292729: Show next pass shows the current pass. - Fixed bug 3437555: Graphical Glitch Plotting Footprints near pole. - Fixed bug 3441490: Satellite Nickname Not escaped for PANGO. +- Fixed bug 3451841: Typos. + Changes in version 1.3 (1 Mar 2011) - Feature request 2873824: Flip Passes. Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/src/about.c 2011-12-06 21:41:46 UTC (rev 962) @@ -67,7 +67,7 @@ const gchar license[] = N_("Copyright (C) 2001-2011 Alexandru Csete OZ9AEC and contributors.\n"\ "Contact: oz9aec at gmail.com\n\n"\ "Gpredict is free software; you can redistribute it and "\ - "mofdify it under the terms of the GNU General Public License "\ + "modify it under the terms of the GNU General Public License "\ "as published by the Free Software Foundation; either version 2 "\ "of the License, or (at your option) any later version.\n\n"\ "This program is distributed free of charge in the hope that it will "\ Modified: trunk/src/gtk-sat-module.c =================================================================== --- trunk/src/gtk-sat-module.c 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/src/gtk-sat-module.c 2011-12-06 21:41:46 UTC (rev 962) @@ -1077,7 +1077,7 @@ name = g_strdup (module->name); sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Module %s recevied CLOSE signal."), + _("%s: Module %s received CLOSE signal."), __FUNCTION__, name); switch (module->state) { @@ -1212,7 +1212,7 @@ name = g_strdup (module->name); sat_log_log (SAT_LOG_LEVEL_DEBUG, - _("%s: Module %s recevied CONFIG signal."), + _("%s: Module %s received CONFIG signal."), __FUNCTION__, name); /* stop timeout */ Modified: trunk/src/sat-info.c =================================================================== --- trunk/src/sat-info.c 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/src/sat-info.c 2011-12-06 21:41:46 UTC (rev 962) @@ -155,7 +155,7 @@ g_free (str); /* international designator */ - label = gtk_label_new (_("Internation designator:")); + label = gtk_label_new (_("International designator:")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 3, 4); Modified: trunk/src/sat-pass-dialogs.c =================================================================== --- trunk/src/sat-pass-dialogs.c 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/src/sat-pass-dialogs.c 2011-12-06 21:41:46 UTC (rev 962) @@ -71,7 +71,7 @@ /** \brief Descriptive text for multi-pass list columns. */ const gchar *MULTI_PASS_COL_HINT[MULTI_PASS_COL_NUMBER] = { - N_("Aquisition of signal (AOS)"), + N_("Acquisition of signal (AOS)"), N_("Time of Closest Approach (TCA)"), N_("Loss of signal (LOS)"), N_("Duration of pass"), Modified: trunk/src/sat-pref-qth.c =================================================================== --- trunk/src/sat-pref-qth.c 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/src/sat-pref-qth.c 2011-12-06 21:41:46 UTC (rev 962) @@ -980,7 +980,7 @@ /* remove file */ if (g_remove (buff)) { sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s:%d: Failed top remove %s"), + _("%s:%d: Failed to remove %s"), __FILE__, __LINE__, filename); } else { Modified: trunk/src/sat-pref-rot-editor.c =================================================================== --- trunk/src/sat-pref-rot-editor.c 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/src/sat-pref-rot-editor.c 2011-12-06 21:41:46 UTC (rev 962) @@ -176,7 +176,7 @@ gtk_entry_set_max_length (GTK_ENTRY (host), 50); gtk_entry_set_text (GTK_ENTRY (host), "localhost"); gtk_widget_set_tooltip_text (host, - _("Enter the host where rigctld is running. "\ + _("Enter the host where rotctld is running. "\ "You can use both host name and IP address, "\ "e.g. 192.168.1.100\n\n"\ "If gpredict and rotctld are running on the "\ Modified: trunk/src/sat-pref-rot.c =================================================================== --- trunk/src/sat-pref-rot.c 2011-11-23 19:57:19 UTC (rev 961) +++ trunk/src/sat-pref-rot.c 2011-12-06 21:41:46 UTC (rev 962) @@ -690,7 +690,7 @@ break; default: - text = g_strdup_printf (_("Uknown (%d)"), number); + text = g_strdup_printf (_("Unknown (%d)"), number); break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2011-11-23 19:57:25
|
Revision: 961 http://gpredict.svn.sourceforge.net/gpredict/?rev=961&view=rev Author: csete Date: 2011-11-23 19:57:19 +0000 (Wed, 23 Nov 2011) Log Message: ----------- Bug 3441490: No need for keeping an escaped copy of nickname since we can fix escaping issues where they occur. Modified Paths: -------------- trunk/src/gtk-event-list-popup.c trunk/src/gtk-polar-view-popup.c trunk/src/gtk-polar-view.c trunk/src/gtk-sat-data.c trunk/src/gtk-sat-list-popup.c trunk/src/gtk-sat-map-popup.c trunk/src/gtk-sat-map.c trunk/src/gtk-single-sat.c trunk/src/sat-info.c trunk/src/sgpsdp/sgp4sdp4.h Modified: trunk/src/gtk-event-list-popup.c =================================================================== --- trunk/src/gtk-event-list-popup.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/gtk-event-list-popup.c 2011-11-23 19:57:19 UTC (rev 961) @@ -65,7 +65,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); + buff = g_markup_printf_escaped ("<b>%s</b>", sat->nickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); Modified: trunk/src/gtk-polar-view-popup.c =================================================================== --- trunk/src/gtk-polar-view-popup.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/gtk-polar-view-popup.c 2011-11-23 19:57:19 UTC (rev 961) @@ -82,7 +82,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); + buff = g_markup_printf_escaped ("<b>%s</b>", sat->nickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); Modified: trunk/src/gtk-polar-view.c =================================================================== --- trunk/src/gtk-polar-view.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/gtk-polar-view.c 2011-11-23 19:57:19 UTC (rev 961) @@ -884,13 +884,13 @@ g_object_set (obj->label,"text",sat->nickname,NULL); /* update tooltip */ - tooltip = g_strdup_printf("<big><b>%s</b>\n</big>"\ - "<tt>Az: %5.1f\302\260\n" \ - "El: %5.1f\302\260\n" \ - "%s</tt>", - sat->escapednickname, - sat->az, sat->el, - losstr); + tooltip = g_markup_printf_escaped("<big><b>%s</b>\n</big>"\ + "<tt>Az: %5.1f\302\260\n" \ + "El: %5.1f\302\260\n" \ + "%s</tt>", + sat->nickname, + sat->az, sat->el, + losstr); g_object_set (obj->marker, "x", x - MARKER_SIZE_HALF, @@ -977,12 +977,12 @@ SAT_CFG_INT_POLAR_SAT_COL); /* create tooltip */ - tooltip = g_strdup_printf("<big><b>%s</b>\n</big>" \ - "<tt>Az: %5.1f\302\260\n" \ - "El: %5.1f\302\260\n" \ - "</tt>", - sat->escapednickname, - sat->az, sat->el); + tooltip = g_markup_printf_escaped("<big><b>%s</b>\n</big>" \ + "<tt>Az: %5.1f\302\260\n" \ + "El: %5.1f\302\260\n" \ + "</tt>", + sat->nickname, + sat->az, sat->el); obj->marker = goo_canvas_rect_model_new (root, x - MARKER_SIZE_HALF, Modified: trunk/src/gtk-sat-data.c =================================================================== --- trunk/src/gtk-sat-data.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/gtk-sat-data.c 2011-11-23 19:57:19 UTC (rev 961) @@ -95,7 +95,6 @@ g_clear_error (&error); sat->nickname = g_strdup (sat->name); } - sat->escapednickname = g_markup_escape_text (sat->nickname, -1); sat->website = g_key_file_get_string (data, "Satellite", "WEBSITE", NULL); /* website may be NULL */ Modified: trunk/src/gtk-sat-list-popup.c =================================================================== --- trunk/src/gtk-sat-list-popup.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/gtk-sat-list-popup.c 2011-11-23 19:57:19 UTC (rev 961) @@ -66,7 +66,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); + buff = g_markup_printf_escaped ("<b>%s</b>", sat->nickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); Modified: trunk/src/gtk-sat-map-popup.c =================================================================== --- trunk/src/gtk-sat-map-popup.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/gtk-sat-map-popup.c 2011-11-23 19:57:19 UTC (rev 961) @@ -82,7 +82,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); + buff = g_markup_printf_escaped("<b>%s</b>", sat->nickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/gtk-sat-map.c 2011-11-23 19:57:19 UTC (rev 961) @@ -749,17 +749,17 @@ cs = g_strdup (":"); if (h > 0) - buff = g_strdup_printf (_("<span background=\"#%s\"> "\ - "Next: %s in %s%d:%s%d%s%d </span>"), - satmap->infobgd, - sat->escapednickname, - ch, h, cm, m, cs, s); + buff = g_markup_printf_escaped(_("<span background=\"#%s\"> "\ + "Next: %s in %s%d:%s%d%s%d </span>"), + satmap->infobgd, + sat->nickname, + ch, h, cm, m, cs, s); else - buff = g_strdup_printf (_("<span background=\"#%s\"> " \ - "Next: %s in %s%d%s%d </span>"), - satmap->infobgd, - sat->escapednickname, - cm, m, cs, s); + buff = g_markup_printf_escaped(_("<span background=\"#%s\"> " \ + "Next: %s in %s%d%s%d </span>"), + satmap->infobgd, + sat->nickname, + cm, m, cs, s); g_object_set (satmap->next, "text", buff, @@ -1905,14 +1905,14 @@ SAT_CFG_INT_MAP_SHADOW_ALPHA); /* create tooltip */ - tooltip = g_strdup_printf("<big><b>%s</b>\n</big>"\ - "<tt>Lon: %5.1f\302\260\n" \ - "Lat: %5.1f\302\260\n" \ - " Az: %5.1f\302\260\n" \ - " El: %5.1f\302\260</tt>", - sat->escapednickname, - sat->ssplon, sat->ssplat, - sat->az, sat->el); + tooltip = g_markup_printf_escaped("<big><b>%s</b>\n</big>"\ + "<tt>Lon: %5.1f\302\260\n" \ + "Lat: %5.1f\302\260\n" \ + " Az: %5.1f\302\260\n" \ + " El: %5.1f\302\260</tt>", + sat->nickname, + sat->ssplon, sat->ssplat, + sat->az, sat->el); /* create satellite marker and label + shadows. We create shadows first */ obj->shadowm = goo_canvas_rect_model_new (root, @@ -2097,16 +2097,16 @@ /* we update tooltips every time */ aosstr = aoslos_time_to_str(satmap, sat); - tooltip = g_strdup_printf("<big><b>%s</b>\n</big>"\ - "<tt>Lon: %5.1f\302\260\n" \ - "Lat: %5.1f\302\260\n" \ - " Az: %5.1f\302\260\n" \ - " El: %5.1f\302\260\n" \ - "%s</tt>", - sat->escapednickname, - sat->ssplon, sat->ssplat, - sat->az, sat->el, - aosstr); + tooltip = g_markup_printf_escaped("<big><b>%s</b>\n</big>"\ + "<tt>Lon: %5.1f\302\260\n" \ + "Lat: %5.1f\302\260\n" \ + " Az: %5.1f\302\260\n" \ + " El: %5.1f\302\260\n" \ + "%s</tt>", + sat->nickname, + sat->ssplon, sat->ssplat, + sat->az, sat->el, + aosstr); g_object_set (obj->marker, "tooltip", tooltip, NULL); g_object_set (obj->label, "tooltip", tooltip, NULL); g_free (tooltip); @@ -2310,12 +2310,12 @@ /* if satellite appears to be GEO don't attempt to show AOS/LOS */ if (isgeo) { if (sat->el > 0.0) { - text = g_strdup_printf ("<span background=\"#%s\"> %s: Always in range </span>", - satmap->infobgd, sat->escapednickname); + text = g_markup_printf_escaped("<span background=\"#%s\"> %s: Always in range </span>", + satmap->infobgd, sat->nickname); } else { - text = g_strdup_printf ("<span background=\"#%s\"> %s: Always out of range </span>", - satmap->infobgd, sat->escapednickname); + text = g_markup_printf_escaped("<span background=\"#%s\"> %s: Always out of range </span>", + satmap->infobgd, sat->nickname); } } else { @@ -2349,16 +2349,16 @@ cs = g_strdup (":"); if (h > 0) { - text = g_strdup_printf ("<span background=\"#%s\"> "\ - "%s %s in %s%d:%s%d%s%d </span>", - satmap->infobgd, sat->escapednickname, - alsstr, ch, h, cm, m, cs, s); + text = g_markup_printf_escaped("<span background=\"#%s\"> "\ + "%s %s in %s%d:%s%d%s%d </span>", + satmap->infobgd, sat->nickname, + alsstr, ch, h, cm, m, cs, s); } else { - text = g_strdup_printf ("<span background=\"#%s\"> "\ - "%s %s in %s%d%s%d </span>", - satmap->infobgd, sat->escapednickname, - alsstr, cm, m, cs, s); + text = g_markup_printf_escaped("<span background=\"#%s\"> "\ + "%s %s in %s%d%s%d </span>", + satmap->infobgd, sat->nickname, + alsstr, cm, m, cs, s); } g_free (ch); Modified: trunk/src/gtk-single-sat.c =================================================================== --- trunk/src/gtk-single-sat.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/gtk-single-sat.c 2011-11-23 19:57:19 UTC (rev 961) @@ -268,7 +268,7 @@ /* create header */ sat = SAT (g_slist_nth_data (GTK_SINGLE_SAT (widget)->sats, 0)); - title = g_strdup_printf ("<b>%s</b>", sat ? sat->escapednickname : "noname"); + title = g_markup_printf_escaped("<b>%s</b>", sat ? sat->nickname : "noname"); GTK_SINGLE_SAT (widget)->header = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (GTK_SINGLE_SAT (widget)->header), title); g_free (title); @@ -370,7 +370,7 @@ __FUNCTION__, catnum); return; } - title = g_strdup_printf ("<b>%s</b>", sat->escapednickname); + title = g_markup_printf_escaped("<b>%s</b>", sat->nickname); gtk_label_set_markup (GTK_LABEL (ssat->header), title); g_free (title); @@ -825,7 +825,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); + buff = g_markup_printf_escaped("<b>%s</b>", sat->nickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); @@ -921,7 +921,7 @@ sat = SAT (g_slist_nth_data (ssat->sats, i)); - title = g_strdup_printf ("<b>%s</b>", sat->escapednickname); + title = g_markup_printf_escaped("<b>%s</b>", sat->nickname); gtk_label_set_markup (GTK_LABEL (ssat->header), title); g_free (title); Modified: trunk/src/sat-info.c =================================================================== --- trunk/src/sat-info.c 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/sat-info.c 2011-11-23 19:57:19 UTC (rev 961) @@ -97,7 +97,7 @@ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1); label = gtk_label_new (NULL); - str = g_strdup_printf (_("<b>%s</b>"), sat->escapednickname); + str = g_markup_printf_escaped (_("<b>%s</b>"), sat->nickname); gtk_label_set_markup (GTK_LABEL (label), str); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); Modified: trunk/src/sgpsdp/sgp4sdp4.h =================================================================== --- trunk/src/sgpsdp/sgp4sdp4.h 2011-11-23 15:16:36 UTC (rev 960) +++ trunk/src/sgpsdp/sgp4sdp4.h 2011-11-23 19:57:19 UTC (rev 961) @@ -156,7 +156,6 @@ typedef struct { char *name; char *nickname; - char *escapednickname; char *website; tle_t tle; /*!< Keplerian elements */ int flags; /*!< Flags for algo ctrl */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-23 15:16:45
|
Revision: 960 http://gpredict.svn.sourceforge.net/gpredict/?rev=960&view=rev Author: aa1vs Date: 2011-11-23 15:16:36 +0000 (Wed, 23 Nov 2011) Log Message: ----------- Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.) Modified Paths: -------------- trunk/src/gtk-single-sat.c Modified: trunk/src/gtk-single-sat.c =================================================================== --- trunk/src/gtk-single-sat.c 2011-11-23 15:15:52 UTC (rev 959) +++ trunk/src/gtk-single-sat.c 2011-11-23 15:16:36 UTC (rev 960) @@ -268,8 +268,7 @@ /* create header */ sat = SAT (g_slist_nth_data (GTK_SINGLE_SAT (widget)->sats, 0)); - title = g_strdup_printf ("<b>%s</b>", sat ? sat->nickname : "noname"); - + title = g_strdup_printf ("<b>%s</b>", sat ? sat->escapednickname : "noname"); GTK_SINGLE_SAT (widget)->header = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (GTK_SINGLE_SAT (widget)->header), title); g_free (title); @@ -371,8 +370,7 @@ __FUNCTION__, catnum); return; } - - title = g_strdup_printf ("<b>%s</b>", sat->nickname); + title = g_strdup_printf ("<b>%s</b>", sat->escapednickname); gtk_label_set_markup (GTK_LABEL (ssat->header), title); g_free (title); @@ -827,7 +825,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->nickname); + buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); @@ -923,7 +921,7 @@ sat = SAT (g_slist_nth_data (ssat->sats, i)); - title = g_strdup_printf ("<b>%s</b>", sat->nickname); + title = g_strdup_printf ("<b>%s</b>", sat->escapednickname); gtk_label_set_markup (GTK_LABEL (ssat->header), title); g_free (title); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-23 15:15:58
|
Revision: 959 http://gpredict.svn.sourceforge.net/gpredict/?rev=959&view=rev Author: aa1vs Date: 2011-11-23 15:15:52 +0000 (Wed, 23 Nov 2011) Log Message: ----------- Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.) Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/gtk-event-list-popup.c trunk/src/gtk-polar-view-popup.c trunk/src/gtk-polar-view.c trunk/src/gtk-sat-data.c trunk/src/gtk-sat-list-popup.c trunk/src/gtk-sat-map-popup.c trunk/src/gtk-sat-map.c trunk/src/sat-info.c trunk/src/sgpsdp/sgp4sdp4.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/ChangeLog 2011-11-23 15:15:52 UTC (rev 959) @@ -1,5 +1,20 @@ -2011-11-21 Charles Suprin <hamaa1vs at gmail.com> +2011-11-23 Charles Suprin <hamaa1vs at gmail.com> + * src/gtk-event-list-popup.c + * src/gtk-sat-data.c + * src/gtk-sat-list-popup.c + * src/gtk-sat-map.c + * src/gtk-sat-map-popup.c + * src/gtk-polar-view.c + * src/gtk-polar-view-popup.c + * src/gtk-single-sat.c + * src/sat-info.c + * src/sgpsdp/sgp4sdp4.h + Escape satellite nicknames and use them when in markup. (Bug 3441490: Satellite Nickname Not escaped for PANGO.) + + +2011-11-22 Charles Suprin <hamaa1vs at gmail.com> + * src/gtk-sat-selector.c Apply compare function to all categories. Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/NEWS 2011-11-23 15:15:52 UTC (rev 959) @@ -22,6 +22,7 @@ - Fixed bug 3419879: gpredict doesn't change the satellite names on world map. - Fixed bug 3292729: Show next pass shows the current pass. - Fixed bug 3437555: Graphical Glitch Plotting Footprints near pole. +- Fixed bug 3441490: Satellite Nickname Not escaped for PANGO. Changes in version 1.3 (1 Mar 2011) Modified: trunk/src/gtk-event-list-popup.c =================================================================== --- trunk/src/gtk-event-list-popup.c 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/gtk-event-list-popup.c 2011-11-23 15:15:52 UTC (rev 959) @@ -65,7 +65,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->nickname); + buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); Modified: trunk/src/gtk-polar-view-popup.c =================================================================== --- trunk/src/gtk-polar-view-popup.c 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/gtk-polar-view-popup.c 2011-11-23 15:15:52 UTC (rev 959) @@ -73,16 +73,16 @@ gchar *buff; sat_obj_t *obj = NULL; gint *catnum; + - menu = gtk_menu_new (); /* first menu item is the satellite name, centered */ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->nickname); + buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); Modified: trunk/src/gtk-polar-view.c =================================================================== --- trunk/src/gtk-polar-view.c 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/gtk-polar-view.c 2011-11-23 15:15:52 UTC (rev 959) @@ -888,7 +888,7 @@ "<tt>Az: %5.1f\302\260\n" \ "El: %5.1f\302\260\n" \ "%s</tt>", - sat->nickname, + sat->escapednickname, sat->az, sat->el, losstr); @@ -981,7 +981,7 @@ "<tt>Az: %5.1f\302\260\n" \ "El: %5.1f\302\260\n" \ "</tt>", - sat->nickname, + sat->escapednickname, sat->az, sat->el); obj->marker = goo_canvas_rect_model_new (root, Modified: trunk/src/gtk-sat-data.c =================================================================== --- trunk/src/gtk-sat-data.c 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/gtk-sat-data.c 2011-11-23 15:15:52 UTC (rev 959) @@ -95,6 +95,8 @@ g_clear_error (&error); sat->nickname = g_strdup (sat->name); } + sat->escapednickname = g_markup_escape_text (sat->nickname, -1); + sat->website = g_key_file_get_string (data, "Satellite", "WEBSITE", NULL); /* website may be NULL */ /* get TLE data */ Modified: trunk/src/gtk-sat-list-popup.c =================================================================== --- trunk/src/gtk-sat-list-popup.c 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/gtk-sat-list-popup.c 2011-11-23 15:15:52 UTC (rev 959) @@ -66,7 +66,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->nickname); + buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); Modified: trunk/src/gtk-sat-map-popup.c =================================================================== --- trunk/src/gtk-sat-map-popup.c 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/gtk-sat-map-popup.c 2011-11-23 15:15:52 UTC (rev 959) @@ -82,7 +82,7 @@ menuitem = gtk_image_menu_item_new (); label = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.5, 0.5); - buff = g_strdup_printf ("<b>%s</b>", sat->nickname); + buff = g_strdup_printf ("<b>%s</b>", sat->escapednickname); gtk_label_set_markup (GTK_LABEL (label), buff); g_free (buff); gtk_container_add (GTK_CONTAINER (menuitem), label); Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/gtk-sat-map.c 2011-11-23 15:15:52 UTC (rev 959) @@ -752,13 +752,13 @@ buff = g_strdup_printf (_("<span background=\"#%s\"> "\ "Next: %s in %s%d:%s%d%s%d </span>"), satmap->infobgd, - sat->nickname, + sat->escapednickname, ch, h, cm, m, cs, s); else buff = g_strdup_printf (_("<span background=\"#%s\"> " \ "Next: %s in %s%d%s%d </span>"), satmap->infobgd, - sat->nickname, + sat->escapednickname, cm, m, cs, s); g_object_set (satmap->next, @@ -1831,7 +1831,7 @@ guint32 col,covcol,shadowcol; gfloat x,y; gchar *tooltip; - + (void) key; /* avoid unusued parameter compiler warning */ if (decayed(sat)) { @@ -1910,11 +1910,10 @@ "Lat: %5.1f\302\260\n" \ " Az: %5.1f\302\260\n" \ " El: %5.1f\302\260</tt>", - sat->nickname, + sat->escapednickname, sat->ssplon, sat->ssplat, sat->az, sat->el); - /* create satellite marker and label + shadows. We create shadows first */ obj->shadowm = goo_canvas_rect_model_new (root, x - MARKER_SIZE_HALF + 1, @@ -2104,7 +2103,7 @@ " Az: %5.1f\302\260\n" \ " El: %5.1f\302\260\n" \ "%s</tt>", - sat->nickname, + sat->escapednickname, sat->ssplon, sat->ssplat, sat->az, sat->el, aosstr); @@ -2312,11 +2311,11 @@ if (isgeo) { if (sat->el > 0.0) { text = g_strdup_printf ("<span background=\"#%s\"> %s: Always in range </span>", - satmap->infobgd, sat->nickname); + satmap->infobgd, sat->escapednickname); } else { text = g_strdup_printf ("<span background=\"#%s\"> %s: Always out of range </span>", - satmap->infobgd, sat->nickname); + satmap->infobgd, sat->escapednickname); } } else { @@ -2352,13 +2351,13 @@ if (h > 0) { text = g_strdup_printf ("<span background=\"#%s\"> "\ "%s %s in %s%d:%s%d%s%d </span>", - satmap->infobgd, sat->nickname, + satmap->infobgd, sat->escapednickname, alsstr, ch, h, cm, m, cs, s); } else { text = g_strdup_printf ("<span background=\"#%s\"> "\ "%s %s in %s%d%s%d </span>", - satmap->infobgd, sat->nickname, + satmap->infobgd, sat->escapednickname, alsstr, cm, m, cs, s); } Modified: trunk/src/sat-info.c =================================================================== --- trunk/src/sat-info.c 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/sat-info.c 2011-11-23 15:15:52 UTC (rev 959) @@ -97,7 +97,7 @@ gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1); label = gtk_label_new (NULL); - str = g_strdup_printf (_("<b>%s</b>"), sat->nickname); + str = g_strdup_printf (_("<b>%s</b>"), sat->escapednickname); gtk_label_set_markup (GTK_LABEL (label), str); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); Modified: trunk/src/sgpsdp/sgp4sdp4.h =================================================================== --- trunk/src/sgpsdp/sgp4sdp4.h 2011-11-22 02:18:59 UTC (rev 958) +++ trunk/src/sgpsdp/sgp4sdp4.h 2011-11-23 15:15:52 UTC (rev 959) @@ -156,6 +156,7 @@ typedef struct { char *name; char *nickname; + char *escapednickname; char *website; tle_t tle; /*!< Keplerian elements */ int flags; /*!< Flags for algo ctrl */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-22 02:19:05
|
Revision: 958 http://gpredict.svn.sourceforge.net/gpredict/?rev=958&view=rev Author: aa1vs Date: 2011-11-22 02:18:59 +0000 (Tue, 22 Nov 2011) Log Message: ----------- Apply compare function to all categories. Modified Paths: -------------- trunk/ChangeLog trunk/src/gtk-sat-selector.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-21 02:05:58 UTC (rev 957) +++ trunk/ChangeLog 2011-11-22 02:18:59 UTC (rev 958) @@ -1,5 +1,11 @@ 2011-11-21 Charles Suprin <hamaa1vs at gmail.com> + * src/gtk-sat-selector.c + Apply compare function to all categories. + + +2011-11-21 Charles Suprin <hamaa1vs at gmail.com> + * src/gtk-sat-map.c Apply consistent checking of pole to eliminate disagreements. (Bug 3437555: Graphical Glitch Plotting Footprints near pole) Modified: trunk/src/gtk-sat-selector.c =================================================================== --- trunk/src/gtk-sat-selector.c 2011-11-21 02:05:58 UTC (rev 957) +++ trunk/src/gtk-sat-selector.c 2011-11-22 02:18:59 UTC (rev 958) @@ -673,6 +673,11 @@ newmodel = GTK_TREE_MODEL (g_slist_nth_data (selector->models, sel)); /* We changed the GtkTreeModel so we need to reset the sort column ID */ + gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (newmodel), + GTK_SAT_SELECTOR_COL_NAME, + compare_func, + NULL, + NULL); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (newmodel), GTK_SAT_SELECTOR_COL_NAME, GTK_SORT_ASCENDING); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-21 02:06:04
|
Revision: 957 http://gpredict.svn.sourceforge.net/gpredict/?rev=957&view=rev Author: aa1vs Date: 2011-11-21 02:05:58 +0000 (Mon, 21 Nov 2011) Log Message: ----------- Eliminate segfault. Modified Paths: -------------- trunk/ChangeLog trunk/src/gtk-single-sat.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-21 01:46:18 UTC (rev 956) +++ trunk/ChangeLog 2011-11-21 02:05:58 UTC (rev 957) @@ -8,6 +8,10 @@ * 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) + * src/gtk-single-sat.c + Eliminate segfault. + + 2011-11-13 Charles Suprin <hamaa1vs at gmail.com> * src/gtk-sat-module-popup.c Modified: trunk/src/gtk-single-sat.c =================================================================== --- trunk/src/gtk-single-sat.c 2011-11-21 01:46:18 UTC (rev 956) +++ trunk/src/gtk-single-sat.c 2011-11-21 02:05:58 UTC (rev 957) @@ -200,7 +200,8 @@ { GtkSingleSat *ssat = GTK_SINGLE_SAT(object); sat_t *sat = SAT (g_slist_nth_data (ssat->sats, ssat->selected)); - g_key_file_set_integer (ssat->cfgdata,MOD_CFG_SINGLE_SAT_SECTION,MOD_CFG_SINGLE_SAT_SELECT,sat->tle.catnr); + if (sat !=NULL) + g_key_file_set_integer (ssat->cfgdata,MOD_CFG_SINGLE_SAT_SECTION,MOD_CFG_SINGLE_SAT_SELECT,sat->tle.catnr); (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <aa...@us...> - 2011-11-21 01:18:15
|
Revision: 955 http://gpredict.svn.sourceforge.net/gpredict/?rev=955&view=rev Author: aa1vs Date: 2011-11-21 01:18:09 +0000 (Mon, 21 Nov 2011) Log Message: ----------- Apply consistent checking of pole to eliminate disagreements. (Bug 3437555: Graphical Glitch Plotting Footprints near pole) Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/gtk-sat-map.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-13 13:56:43 UTC (rev 954) +++ trunk/ChangeLog 2011-11-21 01:18:09 UTC (rev 955) @@ -1,3 +1,8 @@ +2011-11-21 Charles Suprin <hamaa1vs at gmail.com> + + * src/gtk-sat-map.c + Apply consistent checking of pole to eliminate disagreements. (Bug 3437555: Graphical Glitch Plotting Footprints near pole) + 2011-11-13 Charles Suprin <hamaa1vs at gmail.com> * src/gtk-sat-module-popup.c Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2011-11-13 13:56:43 UTC (rev 954) +++ trunk/NEWS 2011-11-21 01:18:09 UTC (rev 955) @@ -20,6 +20,7 @@ - Fixed bug 3417553: Gpredict crashes - Fixed bug 3419879: gpredict doesn't change the satellite names on world map. - Fixed bug 3292729: Show next pass shows the current pass. +- Fixed bug 3437555: Graphical Glitch Plotting Footprints near pole. Changes in version 1.3 (1 Mar 2011) Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2011-11-13 13:56:43 UTC (rev 954) +++ trunk/src/gtk-sat-map.c 2011-11-21 01:18:09 UTC (rev 955) @@ -96,6 +96,8 @@ static GooCanvasItemModel* create_canvas_model (GtkSatMap *satmap); static gdouble arccos (gdouble, gdouble); static gboolean pole_is_covered (sat_t *sat); +static gboolean north_pole_is_covered (sat_t *sat); +static gboolean south_pole_is_covered (sat_t *sat); static gboolean mirror_lon (sat_t *sat, gdouble rangelon, gdouble *mlon); static guint calculate_footprint (GtkSatMap *satmap, sat_t *sat); static void split_points (GtkSatMap *satmap, sat_t *sat, gdouble sspx); @@ -1268,26 +1270,47 @@ static gboolean pole_is_covered (sat_t *sat) { - int ret1,ret2; - gdouble qrb1, qrb2, az1, az2; + if (north_pole_is_covered(sat) ||south_pole_is_covered(sat)) + return TRUE; + else + return FALSE; +} +/** \brief Check whether the footprint covers the North pole. */ +static gboolean +north_pole_is_covered (sat_t *sat) +{ + int ret1; + gdouble qrb1, az1; + ret1 = qrb (sat->ssplon, sat->ssplat, 0.0, 90.0, &qrb1, &az1); if (ret1 != RIG_OK) { sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Bad data measuring distance to North Pole %f %f."), __FUNCTION__, sat->ssplon, sat->ssplat); } - ret2 = qrb (sat->ssplon, sat->ssplat, 0.0, -90.0, &qrb2, &az2); - if (ret2 != RIG_OK) { + if (qrb1 <= 0.5*sat->footprint) { + return TRUE; + } + return FALSE; +} + +/** \brief Check whether the footprint covers the South pole. */ +static gboolean +south_pole_is_covered (sat_t *sat) +{ + int ret1; + gdouble qrb1, az1; + + ret1 = qrb (sat->ssplon, sat->ssplat, 0.0, -90.0, &qrb1, &az1); + if (ret1 != RIG_OK) { sat_log_log (SAT_LOG_LEVEL_ERROR, _("%s: Bad data measuring distance to South Pole %f %f."), __FUNCTION__, sat->ssplon, sat->ssplat); } - - - if ((qrb1 <= 0.5*sat->footprint) || (qrb2 <= 0.5*sat->footprint)) + if (qrb1 <= 0.5*sat->footprint) { return TRUE; - + } return FALSE; } @@ -1384,10 +1407,10 @@ num = cos (beta) - (sin (ssplat) * sin (rangelat)); dem = cos (ssplat) * cos (rangelat); - if (azi == 0 && (beta > pio2 - ssplat)) + if (azi == 0 && north_pole_is_covered(sat)) rangelon = ssplon + pi; - else if (azi == 180 && (beta > pio2 + ssplat)) + else if (azi == 180 && south_pole_is_covered(sat)) rangelon = ssplon + pi; else if (fabs (num / dem) > 1.0) @@ -1433,9 +1456,8 @@ sort_points_x (satmap, sat, points1, 360); numrc = 1; + } - } - /* pole not covered but range circle has been warped => split points */ else if (warped == TRUE) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-13 13:56:51
|
Revision: 954 http://gpredict.svn.sourceforge.net/gpredict/?rev=954&view=rev Author: aa1vs Date: 2011-11-13 13:56:43 +0000 (Sun, 13 Nov 2011) Log Message: ----------- Eliminate compiler warnings. Modified Paths: -------------- trunk/ChangeLog trunk/src/gtk-azel-plot.c trunk/src/gtk-event-list.c trunk/src/gtk-freq-knob.c trunk/src/gtk-polar-plot.c trunk/src/gtk-polar-view.c trunk/src/gtk-rig-ctrl.c trunk/src/gtk-rot-ctrl.c trunk/src/gtk-rot-knob.c trunk/src/gtk-sat-list-col-sel.c trunk/src/gtk-sat-list.c trunk/src/gtk-sat-map.c trunk/src/gtk-sat-module-popup.c trunk/src/gtk-sat-module.c trunk/src/gtk-sat-selector.c trunk/src/gtk-single-sat.c trunk/src/gtk-sky-glance.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/ChangeLog 2011-11-13 13:56:43 UTC (rev 954) @@ -1,3 +1,24 @@ +2011-11-13 Charles Suprin <hamaa1vs at gmail.com> + + * src/gtk-sat-module-popup.c + * src/gtk-rot-knob.c + * src/gtk-sky-glance.c + * src/gtk-rig-ctrl.c + * src/gtk-sat-list.c + * src/gtk-sat-module.c + * src/gtk-sat-list-col-sel.c + * src/gtk-sat-selector.c + * src/gtk-single-sat.c + * src/gtk-polar-plot.c + * src/gtk-event-list.c + * src/gtk-sat-map.c + * src/gtk-freq-knob.c + * src/gtk-rot-ctrl.c + * src/gtk-azel-plot.c + * src/gtk-polar-view.c + Eliminate compiler warnings. + + 2011-11-12 Charles Suprin <hamaa1vs at gmail.com> * doc/um/gpredict-user-manual.odt Modified: trunk/src/gtk-azel-plot.c =================================================================== --- trunk/src/gtk-azel-plot.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-azel-plot.c 2011-11-13 13:56:43 UTC (rev 954) @@ -114,18 +114,18 @@ static void gtk_azel_plot_class_init (GtkAzelPlotClass *class) { - GObjectClass *gobject_class; - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GObjectClass *gobject_class;*/ + GtkObjectClass *object_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*gobject_class = G_OBJECT_CLASS (class);*/ + object_class = (GtkObjectClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ + + parent_class = g_type_class_peek_parent (class); - parent_class = g_type_class_peek_parent (class); - object_class->destroy = gtk_azel_plot_destroy; //widget_class->size_allocate = gtk_azel_plot_size_allocate; } Modified: trunk/src/gtk-event-list.c =================================================================== --- trunk/src/gtk-event-list.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-event-list.c 2011-11-13 13:56:43 UTC (rev 954) @@ -187,15 +187,15 @@ static void gtk_event_list_class_init (GtkEventListClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); Modified: trunk/src/gtk-freq-knob.c =================================================================== --- trunk/src/gtk-freq-knob.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-freq-knob.c 2011-11-13 13:56:43 UTC (rev 954) @@ -107,16 +107,16 @@ static void gtk_freq_knob_class_init (GtkFreqKnobClass *class) { - GObjectClass *gobject_class; - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GObjectClass *gobject_class;*/ + GtkObjectClass *object_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ + + /*gobject_class = G_OBJECT_CLASS (class);*/ + object_class = (GtkObjectClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ - gobject_class = G_OBJECT_CLASS (class); - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; - parent_class = g_type_class_peek_parent (class); object_class->destroy = gtk_freq_knob_destroy; Modified: trunk/src/gtk-polar-plot.c =================================================================== --- trunk/src/gtk-polar-plot.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-polar-plot.c 2011-11-13 13:56:43 UTC (rev 954) @@ -125,15 +125,15 @@ static void gtk_polar_plot_class_init (GtkPolarPlotClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); Modified: trunk/src/gtk-polar-view.c =================================================================== --- trunk/src/gtk-polar-view.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-polar-view.c 2011-11-13 13:56:43 UTC (rev 954) @@ -134,15 +134,15 @@ static void gtk_polar_view_class_init (GtkPolarViewClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); Modified: trunk/src/gtk-rig-ctrl.c =================================================================== --- trunk/src/gtk-rig-ctrl.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-rig-ctrl.c 2011-11-13 13:56:43 UTC (rev 954) @@ -180,15 +180,15 @@ static void gtk_rig_ctrl_class_init (GtkRigCtrlClass *class) { - GObjectClass *gobject_class; + //GObjectClass *gobject_class; GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + //GtkWidgetClass *widget_class; + //GtkContainerClass *container_class; - gobject_class = G_OBJECT_CLASS (class); + //gobject_class = G_OBJECT_CLASS (class); object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + //widget_class = (GtkWidgetClass*) class; + //container_class = (GtkContainerClass*) class; parent_class = g_type_class_peek_parent (class); @@ -2871,7 +2871,11 @@ gint written; /*shutdown the rigctld connect*/ written = send(*sock, "q\x0a", 2, 0); - + if (written != 2) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s:%s: Sent 2 bytes but sent %d."), + __FILE__, __FUNCTION__, written); + } #ifndef WIN32 shutdown (*sock, SHUT_RDWR); close (*sock); Modified: trunk/src/gtk-rot-ctrl.c =================================================================== --- trunk/src/gtk-rot-ctrl.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-rot-ctrl.c 2011-11-13 13:56:43 UTC (rev 954) @@ -143,15 +143,15 @@ static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class) { - GObjectClass *gobject_class; + //GObjectClass *gobject_class; GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + //GtkWidgetClass *widget_class; + //GtkContainerClass *container_class; - gobject_class = G_OBJECT_CLASS (class); + //gobject_class = G_OBJECT_CLASS (class); object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + //widget_class = (GtkWidgetClass*) class; + //container_class = (GtkContainerClass*) class; parent_class = g_type_class_peek_parent (class); @@ -1354,7 +1354,11 @@ gint written; /*shutdown the rigctld connect*/ written = send(*sock, "q\x0a", 2, 0); - + if (written != 2) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s:%s: Sent 2 bytes but sent %d."), + __FILE__, __FUNCTION__, written); + } #ifndef WIN32 shutdown (*sock, SHUT_RDWR); close (*sock); Modified: trunk/src/gtk-rot-knob.c =================================================================== --- trunk/src/gtk-rot-knob.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-rot-knob.c 2011-11-13 13:56:43 UTC (rev 954) @@ -95,16 +95,16 @@ static void gtk_rot_knob_class_init (GtkRotKnobClass *class) { - GObjectClass *gobject_class; - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; - - gobject_class = G_OBJECT_CLASS (class); - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; - + /*GObjectClass *gobject_class;*/ + GtkObjectClass *object_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ + + /*gobject_class = G_OBJECT_CLASS (class);*/ + object_class = (GtkObjectClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ + parent_class = g_type_class_peek_parent (class); object_class->destroy = gtk_rot_knob_destroy; Modified: trunk/src/gtk-sat-list-col-sel.c =================================================================== --- trunk/src/gtk-sat-list-col-sel.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-sat-list-col-sel.c 2011-11-13 13:56:43 UTC (rev 954) @@ -93,16 +93,16 @@ static void gtk_sat_list_col_sel_class_init (GtkSatListColSelClass *class) { - GObjectClass *gobject_class; - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GObjectClass *gobject_class;*/ + GtkObjectClass *object_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ + + /*gobject_class = G_OBJECT_CLASS (class);*/ + object_class = (GtkObjectClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ - gobject_class = G_OBJECT_CLASS (class); - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; - parent_class = g_type_class_peek_parent (class); object_class->destroy = gtk_sat_list_col_sel_destroy; Modified: trunk/src/gtk-sat-list.c =================================================================== --- trunk/src/gtk-sat-list.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-sat-list.c 2011-11-13 13:56:43 UTC (rev 954) @@ -261,15 +261,15 @@ static void gtk_sat_list_class_init (GtkSatListClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-sat-map.c 2011-11-13 13:56:43 UTC (rev 954) @@ -152,15 +152,15 @@ static void gtk_sat_map_class_init (GtkSatMapClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); @@ -1272,8 +1272,19 @@ gdouble qrb1, qrb2, az1, az2; ret1 = qrb (sat->ssplon, sat->ssplat, 0.0, 90.0, &qrb1, &az1); + if (ret1 != RIG_OK) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Bad data measuring distance to North Pole %f %f."), + __FUNCTION__, sat->ssplon, sat->ssplat); + } ret2 = qrb (sat->ssplon, sat->ssplat, 0.0, -90.0, &qrb2, &az2); - + if (ret2 != RIG_OK) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Bad data measuring distance to South Pole %f %f."), + __FUNCTION__, sat->ssplon, sat->ssplat); + } + + if ((qrb1 <= 0.5*sat->footprint) || (qrb2 <= 0.5*sat->footprint)) return TRUE; Modified: trunk/src/gtk-sat-module-popup.c =================================================================== --- trunk/src/gtk-sat-module-popup.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-sat-module-popup.c 2011-11-13 13:56:43 UTC (rev 954) @@ -65,7 +65,7 @@ static void destroy_rigctrl (GtkWidget *window, gpointer data); static void destroy_skg (GtkWidget *window, gpointer data); static gint window_delete (GtkWidget *widget, GdkEvent *event, gpointer data); -static sat_nickname_compare (sat_t *a, sat_t *b); +static gint sat_nickname_compare (const sat_t *a, const sat_t *b); /** \brief Create and run GtkSatModule popup menu. @@ -158,7 +158,7 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), satsubmenu); sats = g_hash_table_get_values(module->satellites); - sats = g_list_sort(sats , sat_nickname_compare ); + sats = g_list_sort(sats , (GCompareFunc) sat_nickname_compare ); n = g_list_length(sats); for (i = 0; i < n; i++) { @@ -1233,6 +1233,6 @@ return FALSE; } -static sat_nickname_compare (sat_t *a, sat_t *b) { - gpredict_strcmp(a->nickname, b->nickname); +static gint sat_nickname_compare (const sat_t *a, const sat_t *b) { + return gpredict_strcmp(a->nickname, b->nickname); } Modified: trunk/src/gtk-sat-module.c =================================================================== --- trunk/src/gtk-sat-module.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-sat-module.c 2011-11-13 13:56:43 UTC (rev 954) @@ -137,15 +137,15 @@ static void gtk_sat_module_class_init (GtkSatModuleClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); @@ -842,9 +842,10 @@ qth_small_save(mod->qth,&(mod->qth_event)); } /* update satellite data */ - g_hash_table_foreach (mod->satellites, - gtk_sat_module_update_sat, - module); + if (mod->satellites != NULL) + g_hash_table_foreach (mod->satellites, + gtk_sat_module_update_sat, + module); /* update children */ for (i = 0; i < mod->nviews; i++) { @@ -854,9 +855,10 @@ /* update satellite data (it may have got out of sync during child updates) */ - g_hash_table_foreach (mod->satellites, - gtk_sat_module_update_sat, - module); + if (mod->satellites != NULL) + g_hash_table_foreach (mod->satellites, + gtk_sat_module_update_sat, + module); /* send notice to radio and rotator controller */ if (mod->rigctrl) @@ -954,10 +956,6 @@ sat_t *sat; GtkSatModule *module; gdouble daynum; - double age; - obs_set_t obs_set = {0,0,0,0}; - geodetic_t sat_geodetic = {0,0,0,0}; - geodetic_t obs_geodetic = {0,0,0,0}; gdouble maxdt; (void) key; /* prevent unused parameter compiler warning */ Modified: trunk/src/gtk-sat-selector.c =================================================================== --- trunk/src/gtk-sat-selector.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-sat-selector.c 2011-11-13 13:56:43 UTC (rev 954) @@ -156,15 +156,15 @@ static void gtk_sat_selector_class_init (GtkSatSelectorClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); Modified: trunk/src/gtk-single-sat.c =================================================================== --- trunk/src/gtk-single-sat.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-single-sat.c 2011-11-13 13:56:43 UTC (rev 954) @@ -155,15 +155,15 @@ static void gtk_single_sat_class_init (GtkSingleSatClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); Modified: trunk/src/gtk-sky-glance.c =================================================================== --- trunk/src/gtk-sky-glance.c 2011-11-13 01:28:10 UTC (rev 953) +++ trunk/src/gtk-sky-glance.c 2011-11-13 13:56:43 UTC (rev 954) @@ -146,15 +146,15 @@ static void gtk_sky_glance_class_init (GtkSkyGlanceClass *class) { - GObjectClass *gobject_class; + /*GObjectClass *gobject_class;*/ GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkContainerClass *container_class; + /*GtkWidgetClass *widget_class;*/ + /*GtkContainerClass *container_class;*/ - gobject_class = G_OBJECT_CLASS (class); + /*gobject_class = G_OBJECT_CLASS (class);*/ object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - container_class = (GtkContainerClass*) class; + /*widget_class = (GtkWidgetClass*) class;*/ + /*container_class = (GtkContainerClass*) class;*/ parent_class = g_type_class_peek_parent (class); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-13 01:28:16
|
Revision: 953 http://gpredict.svn.sourceforge.net/gpredict/?rev=953&view=rev Author: aa1vs Date: 2011-11-13 01:28:10 +0000 (Sun, 13 Nov 2011) Log Message: ----------- Eliminate duplicate code in polar view and the popup. Modified Paths: -------------- trunk/ChangeLog trunk/src/gtk-polar-view-popup.c trunk/src/gtk-polar-view.c trunk/src/gtk-polar-view.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-12 19:49:28 UTC (rev 952) +++ trunk/ChangeLog 2011-11-13 01:28:10 UTC (rev 953) @@ -15,7 +15,12 @@ * src/gtk-sat-map.c Add comments. + * src/gtk-polar-view.c + * src/gtk-polar-view.h + * src/gtk-polar-view-popup.c + Eliminate duplicate code in polar view and the popup. + 2011-11-05 Charles Suprin <hamaa1vs at gmail.com> * src/gtk-polar-view.c Modified: trunk/src/gtk-polar-view-popup.c =================================================================== --- trunk/src/gtk-polar-view-popup.c 2011-11-12 19:49:28 UTC (rev 952) +++ trunk/src/gtk-polar-view-popup.c 2011-11-13 01:28:10 UTC (rev 953) @@ -49,7 +49,6 @@ static void track_toggled (GtkCheckMenuItem *item, gpointer data); /* static void target_toggled (GtkCheckMenuItem *item, gpointer data); */ -static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y); /** \brief Show satellite popup menu. @@ -161,15 +160,6 @@ sat_obj_t *obj = NULL; sat_t *sat; /* qth_t *qth; Unused */ - gint idx; - guint i; - GooCanvasItemModel *root; - pass_detail_t *detail; - guint num; - GooCanvasPoints *points; - gfloat x,y; - guint32 col; - guint tres,ttidx; gint *catnum; @@ -189,8 +179,6 @@ obj->showtrack = !obj->showtrack; gtk_check_menu_item_set_active (item, obj->showtrack); - root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); - catnum = g_new0 (gint, 1); *catnum = sat->tle.catnr; @@ -205,69 +193,7 @@ g_hash_table_remove (pv->showtracks_off, catnum); - - /* create points */ - num = g_slist_length (obj->pass->details); - if (num == 0) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s:%d: Pass has no details."), - __FILE__, __LINE__); - return; - } - - /* time resolution for time ticks; we need - 3 additional points to AOS and LOS ticks. - */ - tres = (num-2) / (TRACK_TICK_NUM-1); - - points = goo_canvas_points_new (num); - - /* first point should be (aos_az,0.0) */ - azel_to_xy (pv, obj->pass->aos_az, 0.0, &x, &y); - points->coords[0] = (double) x; - points->coords[1] = (double) y; - obj->trtick[0] = create_time_tick (pv, obj->pass->aos, x, y); - - ttidx = 1; - - for (i = 1; i < num-1; i++) { - detail = PASS_DETAIL(g_slist_nth_data (obj->pass->details, i)); - if (detail->el >=0.0) - azel_to_xy (pv, detail->az, detail->el, &x, &y); - points->coords[2*i] = (double) x; - points->coords[2*i+1] = (double) y; - - if (!(i % tres)) { - /* create a time tick */ - if (ttidx<TRACK_TICK_NUM) - obj->trtick[ttidx] = create_time_tick (pv, detail->time, x, y); - ttidx++; - } - } - - /* last point should be (los_az, 0.0) */ - azel_to_xy (pv, obj->pass->los_az, 0.0, &x, &y); - points->coords[2*(num-1)] = (double) x; - points->coords[2*(num-1)+1] = (double) y; - - /* create poly-line */ - col = mod_cfg_get_int (pv->cfgdata, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_TRACK_COL, - SAT_CFG_INT_POLAR_TRACK_COL); - - obj->track = goo_canvas_polyline_model_new (root, FALSE, 0, - "points", points, - "line-width", 1.0, - "stroke-color-rgba", col, - "line-cap", CAIRO_LINE_CAP_SQUARE, - "line-join", CAIRO_LINE_JOIN_MITER, - NULL); - goo_canvas_points_unref (points); - - /* put track on the bottom of the sack */ - goo_canvas_item_model_lower (obj->track, NULL); - + gtk_polar_view_create_track (pv, obj, sat); } else { /* add it to the hide */ @@ -277,20 +203,9 @@ /* remove it from the show */ g_hash_table_remove (pv->showtracks_on, catnum); - /* delete sky track */ - idx = goo_canvas_item_model_find_child (root, obj->track); - if (idx != -1) { - goo_canvas_item_model_remove_child (root, idx); - } - - for (i = 0; i < TRACK_TICK_NUM; i++) { - idx = goo_canvas_item_model_find_child (root, obj->trtick[i]); - - if (idx != -1) { - goo_canvas_item_model_remove_child (root, idx); - } - } + /* delete sky track */ + gtk_polar_view_delete_track (pv, obj, sat); } } @@ -324,43 +239,3 @@ gtk_check_menu_item_set_active (item, obj->istarget); } #endif - - -static GooCanvasItemModel * - create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y) -{ - GooCanvasItemModel *item; - gchar buff[7]; - GtkAnchorType anchor; - GooCanvasItemModel *root; - guint32 col; - - root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); - - col = mod_cfg_get_int (pv->cfgdata, - MOD_CFG_POLAR_SECTION, - MOD_CFG_POLAR_TRACK_COL, - SAT_CFG_INT_POLAR_TRACK_COL); - - daynum_to_str (buff, 8, "%H:%M", time); - - if (x > pv->cx) { - anchor = GTK_ANCHOR_EAST; - x -= 5; - } - else { - anchor = GTK_ANCHOR_WEST; - x += 5; - } - - item = goo_canvas_text_model_new (root, buff, - (gdouble) x, (gdouble) y, - -1, anchor, - "font", "Sans 7", - "fill-color-rgba", col, - NULL); - - goo_canvas_item_model_lower (item, NULL); - - return item; -} Modified: trunk/src/gtk-polar-view.c =================================================================== --- trunk/src/gtk-polar-view.c 2011-11-12 19:49:28 UTC (rev 952) +++ trunk/src/gtk-polar-view.c 2011-11-13 01:28:10 UTC (rev 953) @@ -68,7 +68,6 @@ gpointer data); static void update_sat (gpointer key, gpointer value, gpointer data); static void update_track (gpointer key, gpointer value, gpointer data); -static void create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat); static void correct_pole_coor (GtkPolarView *polv, polar_view_pole_t pole, gfloat *x, gfloat *y, GtkAnchorType *anch); static gboolean on_motion_notify (GooCanvasItem *item, @@ -94,7 +93,12 @@ static gchar *los_time_to_str (GtkPolarView *polv, sat_t *sat); static void gtk_polar_view_store_showtracks (GtkPolarView *pv); static void gtk_polar_view_load_showtracks (GtkPolarView *pv); +static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y); +static void azel_to_xy (GtkPolarView *p, gdouble az, gdouble el, gfloat *x, gfloat *y); +static void xy_to_azel (GtkPolarView *p, gfloat x, gfloat y, gfloat *az, gfloat *el); + + static GtkVBoxClass *parent_class = NULL; @@ -833,17 +837,9 @@ /* remove sky track */ if (obj->showtrack) { - idx = goo_canvas_item_model_find_child (root, obj->track); - if (idx != -1) - goo_canvas_item_model_remove_child (root, idx); + gtk_polar_view_delete_track(polv,obj,sat); + } - for (i = 0; i < TRACK_TICK_NUM; i++) { - idx = goo_canvas_item_model_find_child (root, obj->trtick[i]); - if (idx != -1) - goo_canvas_item_model_remove_child (root, idx); - } - } - /* free pass info */ free_pass (obj->pass); obj->pass=NULL; @@ -946,7 +942,7 @@ /* Finally, create the sky track if necessary */ if (obj->showtrack) - create_track (polv, obj, sat); + gtk_polar_view_create_track (polv, obj, sat); } } @@ -1033,7 +1029,7 @@ /* Finally, create the sky track if necessary */ if (obj->showtrack) - create_track (polv, obj, sat); + gtk_polar_view_create_track (polv, obj, sat); } else { /* obj == NULL */ @@ -1128,7 +1124,6 @@ } -/**** FIXME: DUPLICATE from gtk-polar-view-popup.c - needed by create_track ******/ static GooCanvasItemModel *create_time_tick (GtkPolarView *pv, gdouble time, gfloat x, gfloat y) { GooCanvasItemModel *item; @@ -1175,7 +1170,7 @@ * Note: This function is only used when the the satellite comes within range * and the ALWAYS_SHOW_SKY_TRACK option is TRUE. */ -static void create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat) +void gtk_polar_view_create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat) { guint i; GooCanvasItemModel *root; @@ -1277,12 +1272,29 @@ } +void gtk_polar_view_delete_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat) +{ + gint idx,i; + GooCanvasItemModel *root; + + root = goo_canvas_get_root_item_model (GOO_CANVAS (pv->canvas)); + idx = goo_canvas_item_model_find_child (root, obj->track); + + if (idx != -1) { + goo_canvas_item_model_remove_child (root, idx); + } + + for (i = 0; i < TRACK_TICK_NUM; i++) { + idx = goo_canvas_item_model_find_child (root, obj->trtick[i]); + + if (idx != -1) { + goo_canvas_item_model_remove_child (root, idx); + } + } +} - - - /** \brief Convert Az/El to canvas based XY coordinates. */ -void +static void azel_to_xy (GtkPolarView *p, gdouble az, gdouble el, gfloat *x, gfloat *y) { gdouble rel; @@ -1328,7 +1340,7 @@ /** \brief Convert canvas based coordinates to Az/El. */ -void +static void xy_to_azel (GtkPolarView *p, gfloat x, gfloat y, gfloat *az, gfloat *el) { gfloat rel; Modified: trunk/src/gtk-polar-view.h =================================================================== --- trunk/src/gtk-polar-view.h 2011-11-12 19:49:28 UTC (rev 952) +++ trunk/src/gtk-polar-view.h 2011-11-13 01:28:10 UTC (rev 953) @@ -152,12 +152,12 @@ void gtk_polar_view_update (GtkWidget *widget); void gtk_polar_view_reconf (GtkWidget *widget, GKeyFile *cfgdat); -void azel_to_xy (GtkPolarView *p, gdouble az, gdouble el, gfloat *x, gfloat *y); -void xy_to_azel (GtkPolarView *p, gfloat x, gfloat y, gfloat *az, gfloat *el); - void gtk_polar_view_reload_sats (GtkWidget *polv, GHashTable *sats); void gtk_polar_view_select_sat (GtkWidget *widget, gint catnum); +void gtk_polar_view_create_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat); +void gtk_polar_view_delete_track (GtkPolarView *pv, sat_obj_t *obj, sat_t *sat); + #ifdef __cplusplus } #endif /* __cplusplus */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-12 19:49:34
|
Revision: 952 http://gpredict.svn.sourceforge.net/gpredict/?rev=952&view=rev Author: aa1vs Date: 2011-11-12 19:49:28 +0000 (Sat, 12 Nov 2011) Log Message: ----------- Change decision of two versus three line tle's to do simpler checks first. Modified Paths: -------------- trunk/ChangeLog trunk/src/tle-update.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-12 18:15:03 UTC (rev 951) +++ trunk/ChangeLog 2011-11-12 19:49:28 UTC (rev 952) @@ -6,7 +6,10 @@ * src/gtk-sat-module-popup.c Sort satellite list in popup. + * src/tle-update.c + Change decision of two versus three line tle's to do simpler checks first. + 2011-11-06 Charles Suprin <hamaa1vs at gmail.com> * src/gtk-sat-map.c Modified: trunk/src/tle-update.c =================================================================== --- trunk/src/tle-update.c 2011-11-12 18:15:03 UTC (rev 951) +++ trunk/src/tle-update.c 2011-11-12 19:49:28 UTC (rev 952) @@ -922,7 +922,10 @@ /* third is that neither of these is true and we are consuming either text at the top of the file or a text file that happens to be in the update directory */ - if (Checksum_Good(tle_working[1]) && (tle_working[1][0]=='1')) { + if ((tle_working[1][0] == '1') && + (tle_working[2][0] == '2') && + Checksum_Good(tle_working[1]) && + Checksum_Good(tle_working[2])) { sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s:%s: Processing a three line TLE"), __FILE__, __FUNCTION__); @@ -934,7 +937,10 @@ /* we consumed three lines so we need three lines */ linesneeded = 3; - } else if (Checksum_Good(tle_working[0]) && (tle_working[0][0]=='1')) { + } else if ((tle_working[0][0] == '1') && + (tle_working[1][0] == '2') && + Checksum_Good(tle_working[0]) && + Checksum_Good(tle_working[1])) { sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s:%s: Processing a bare two line TLE"), __FILE__, __FUNCTION__); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-12 18:15:09
|
Revision: 951 http://gpredict.svn.sourceforge.net/gpredict/?rev=951&view=rev Author: aa1vs Date: 2011-11-12 18:15:03 +0000 (Sat, 12 Nov 2011) Log Message: ----------- Sort satellite list in popup. Modified Paths: -------------- trunk/ChangeLog trunk/src/gtk-sat-module-popup.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-12 17:50:10 UTC (rev 950) +++ trunk/ChangeLog 2011-11-12 18:15:03 UTC (rev 951) @@ -3,7 +3,10 @@ * doc/um/gpredict-user-manual.odt Update user manual for GPSD and other features. + * src/gtk-sat-module-popup.c + Sort satellite list in popup. + 2011-11-06 Charles Suprin <hamaa1vs at gmail.com> * src/gtk-sat-map.c Modified: trunk/src/gtk-sat-module-popup.c =================================================================== --- trunk/src/gtk-sat-module-popup.c 2011-11-12 17:50:10 UTC (rev 950) +++ trunk/src/gtk-sat-module-popup.c 2011-11-12 18:15:03 UTC (rev 951) @@ -65,9 +65,9 @@ static void destroy_rigctrl (GtkWidget *window, gpointer data); static void destroy_skg (GtkWidget *window, gpointer data); static gint window_delete (GtkWidget *widget, GdkEvent *event, gpointer data); +static sat_nickname_compare (sat_t *a, sat_t *b); - /** \brief Create and run GtkSatModule popup menu. * \param module The module that should have the popup menu attached to it. * @@ -157,7 +157,9 @@ satsubmenu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), satsubmenu); - sats = g_hash_table_get_values(module->satellites); // FIXME: sort list + sats = g_hash_table_get_values(module->satellites); + sats = g_list_sort(sats , sat_nickname_compare ); + n = g_list_length(sats); for (i = 0; i < n; i++) { sat = SAT(g_list_nth_data(sats, i)); @@ -1230,3 +1232,7 @@ /* continue to handle event normally */ return FALSE; } + +static sat_nickname_compare (sat_t *a, sat_t *b) { + gpredict_strcmp(a->nickname, b->nickname); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-12 17:50:16
|
Revision: 950 http://gpredict.svn.sourceforge.net/gpredict/?rev=950&view=rev Author: aa1vs Date: 2011-11-12 17:50:10 +0000 (Sat, 12 Nov 2011) Log Message: ----------- Update user manual for GPSD and other features. Modified Paths: -------------- trunk/ChangeLog trunk/doc/um/gpredict-user-manual.odt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-12 17:46:29 UTC (rev 949) +++ trunk/ChangeLog 2011-11-12 17:50:10 UTC (rev 950) @@ -1,3 +1,9 @@ +2011-11-12 Charles Suprin <hamaa1vs at gmail.com> + + * doc/um/gpredict-user-manual.odt + Update user manual for GPSD and other features. + + 2011-11-06 Charles Suprin <hamaa1vs at gmail.com> * src/gtk-sat-map.c Modified: trunk/doc/um/gpredict-user-manual.odt =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-12 17:46:35
|
Revision: 949 http://gpredict.svn.sourceforge.net/gpredict/?rev=949&view=rev Author: aa1vs Date: 2011-11-12 17:46:29 +0000 (Sat, 12 Nov 2011) Log Message: ----------- Update ChangeLog. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-11-06 13:39:57 UTC (rev 948) +++ trunk/ChangeLog 2011-11-12 17:46:29 UTC (rev 949) @@ -1,3 +1,15 @@ +2011-11-06 Charles Suprin <hamaa1vs at gmail.com> + + * src/gtk-sat-map.c + Add comments. + + +2011-11-05 Charles Suprin <hamaa1vs at gmail.com> + + * src/gtk-polar-view.c + Remove memory leak. + + 2011-11-03 Charles Suprin <hamaa1vs at gmail.com> * src/qth-data.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-06 13:40:03
|
Revision: 948 http://gpredict.svn.sourceforge.net/gpredict/?rev=948&view=rev Author: aa1vs Date: 2011-11-06 13:39:57 +0000 (Sun, 06 Nov 2011) Log Message: ----------- Add comments. Modified Paths: -------------- trunk/src/gtk-sat-map.c Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2011-11-05 22:25:25 UTC (rev 947) +++ trunk/src/gtk-sat-map.c 2011-11-06 13:39:57 UTC (rev 948) @@ -2607,6 +2607,7 @@ satmap->showtracks); } +/** \brief save the satellites that we should not show ground tracks */ static void gtk_sat_map_store_showtracks (GtkSatMap *satmap) { mod_cfg_set_integer_list_boolean(satmap->cfgdata, @@ -2614,7 +2615,7 @@ MOD_CFG_MAP_SECTION, MOD_CFG_MAP_SHOWTRACKS); } - +/** \brief save the satellites that we should not highlight coverage */ static void gtk_sat_map_store_hidecovs (GtkSatMap *satmap) { mod_cfg_set_integer_list_boolean(satmap->cfgdata, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cs...@us...> - 2011-11-05 22:25:31
|
Revision: 947 http://gpredict.svn.sourceforge.net/gpredict/?rev=947&view=rev Author: csete Date: 2011-11-05 22:25:25 +0000 (Sat, 05 Nov 2011) Log Message: ----------- Revert rev. 946: QRA is not generally useful. Modified Paths: -------------- trunk/src/gtk-sat-map.c Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2011-11-05 20:39:30 UTC (rev 946) +++ trunk/src/gtk-sat-map.c 2011-11-05 22:25:25 UTC (rev 947) @@ -401,10 +401,9 @@ Note: I used pango markup to set the background color, I didn't find any other obvious ways to get the text height in pixels to draw rectangle. */ - buff = g_strdup_printf ("<span background=\"#%s\"> %s \302\267 %s %s</span>", + buff = g_strdup_printf ("<span background=\"#%s\"> %s \302\267 %s </span>", satmap->infobgd, satmap->qth->name, - satmap->qth->qra, satmap->qth->loc); g_object_set (satmap->locnam, "text", buff, NULL); g_free (buff); @@ -641,15 +640,6 @@ if (satmap->resize) update_map_size (satmap); - /* update the location name */ - /* mainly for qra field */ - buff = g_strdup_printf ("<span background=\"#%s\"> %s \302\267 %s %s</span>", - satmap->infobgd, - satmap->qth->name, - satmap->qth->qra, - satmap->qth->loc); - g_object_set (satmap->locnam, "text", buff, NULL); - g_free (buff); /* check if qth has moved significantly if so move it*/ lonlat_to_xy (satmap, satmap->qth->lon, satmap->qth->lat, &x, &y); g_object_get (satmap->qthmark, @@ -1283,18 +1273,7 @@ ret1 = qrb (sat->ssplon, sat->ssplat, 0.0, 90.0, &qrb1, &az1); ret2 = qrb (sat->ssplon, sat->ssplat, 0.0, -90.0, &qrb2, &az2); - - if (ret1 !=RIG_OK){ - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: Invalid lat lon pair for %d."), - __FUNCTION__, sat->tle.catnr); - } - if (ret2 !=RIG_OK){ - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: Invalid lat lon pair for %d."), - __FUNCTION__, sat->tle.catnr); - } - + if ((qrb1 <= 0.5*sat->footprint) || (qrb2 <= 0.5*sat->footprint)) return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-05 20:39:36
|
Revision: 946 http://gpredict.svn.sourceforge.net/gpredict/?rev=946&view=rev Author: aa1vs Date: 2011-11-05 20:39:30 +0000 (Sat, 05 Nov 2011) Log Message: ----------- Add QRA to satmap display and clear up compiler warnings. Modified Paths: -------------- trunk/src/gtk-sat-map.c Modified: trunk/src/gtk-sat-map.c =================================================================== --- trunk/src/gtk-sat-map.c 2011-11-05 20:35:09 UTC (rev 945) +++ trunk/src/gtk-sat-map.c 2011-11-05 20:39:30 UTC (rev 946) @@ -401,9 +401,10 @@ Note: I used pango markup to set the background color, I didn't find any other obvious ways to get the text height in pixels to draw rectangle. */ - buff = g_strdup_printf ("<span background=\"#%s\"> %s \302\267 %s </span>", + buff = g_strdup_printf ("<span background=\"#%s\"> %s \302\267 %s %s</span>", satmap->infobgd, satmap->qth->name, + satmap->qth->qra, satmap->qth->loc); g_object_set (satmap->locnam, "text", buff, NULL); g_free (buff); @@ -640,6 +641,15 @@ if (satmap->resize) update_map_size (satmap); + /* update the location name */ + /* mainly for qra field */ + buff = g_strdup_printf ("<span background=\"#%s\"> %s \302\267 %s %s</span>", + satmap->infobgd, + satmap->qth->name, + satmap->qth->qra, + satmap->qth->loc); + g_object_set (satmap->locnam, "text", buff, NULL); + g_free (buff); /* check if qth has moved significantly if so move it*/ lonlat_to_xy (satmap, satmap->qth->lon, satmap->qth->lat, &x, &y); g_object_get (satmap->qthmark, @@ -1273,7 +1283,18 @@ ret1 = qrb (sat->ssplon, sat->ssplat, 0.0, 90.0, &qrb1, &az1); ret2 = qrb (sat->ssplon, sat->ssplat, 0.0, -90.0, &qrb2, &az2); - + + if (ret1 !=RIG_OK){ + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Invalid lat lon pair for %d."), + __FUNCTION__, sat->tle.catnr); + } + if (ret2 !=RIG_OK){ + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Invalid lat lon pair for %d."), + __FUNCTION__, sat->tle.catnr); + } + if ((qrb1 <= 0.5*sat->footprint) || (qrb2 <= 0.5*sat->footprint)) return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-05 20:35:16
|
Revision: 945 http://gpredict.svn.sourceforge.net/gpredict/?rev=945&view=rev Author: aa1vs Date: 2011-11-05 20:35:09 +0000 (Sat, 05 Nov 2011) Log Message: ----------- Remove memory leak. Modified Paths: -------------- trunk/src/gtk-polar-view.c Modified: trunk/src/gtk-polar-view.c =================================================================== --- trunk/src/gtk-polar-view.c 2011-11-03 12:27:21 UTC (rev 944) +++ trunk/src/gtk-polar-view.c 2011-11-05 20:35:09 UTC (rev 945) @@ -845,7 +845,7 @@ } /* free pass info */ - //free_pass (obj->pass); + free_pass (obj->pass); obj->pass=NULL; /* if this was the selected satellite we need to @@ -855,7 +855,7 @@ g_object_set (polv->sel, "text", "", NULL); } - // g_free (obj); + g_free (obj); /* remove sat object from hash table */ g_hash_table_remove (polv->obj, catnum); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-11-03 12:27:27
|
Revision: 944 http://gpredict.svn.sourceforge.net/gpredict/?rev=944&view=rev Author: aa1vs Date: 2011-11-03 12:27:21 +0000 (Thu, 03 Nov 2011) Log Message: ----------- Maintain Maidenhead grid (length 4 characters) for qth in qra field. Modified Paths: -------------- trunk/ChangeLog trunk/src/qth-data.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-10-29 21:46:55 UTC (rev 943) +++ trunk/ChangeLog 2011-11-03 12:27:21 UTC (rev 944) @@ -1,3 +1,9 @@ +2011-11-03 Charles Suprin <hamaa1vs at gmail.com> + + * src/qth-data.c + Maintain Maidenhead grid (length 4 characters) for qth in qra field. + + 2011-10-29 Charles Suprin <hamaa1vs at gmail.com> * data/trsp/37841.trsp Modified: trunk/src/qth-data.c =================================================================== --- trunk/src/qth-data.c 2011-10-29 21:46:55 UTC (rev 943) +++ trunk/src/qth-data.c 2011-11-03 12:27:21 UTC (rev 944) @@ -258,6 +258,13 @@ g_clear_error (&error); } + /* set QRA based on data */ + if (longlat2locator (qth->lon, qth->lat, qth->qra,2) != RIG_OK) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Could not set QRA for %s at %f, %f."), + __FUNCTION__, qth->name, qth->lon, qth->lat); + } + qth_validate(qth); /* Now, send debug message and return */ @@ -539,6 +546,14 @@ } /* check that data is valid */ qth_validate(qth); + + /* update qra */ + if (longlat2locator (qth->lon, qth->lat, qth->qra,2) != RIG_OK) { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Could not set QRA for %s at %f, %f."), + __FUNCTION__, qth->name, qth->lon, qth->lat); + } + return retval; } @@ -671,6 +686,7 @@ qth->gpsd_server=NULL; qth->gpsd_update=0.0; qth->gpsd_connected=0.0; + qth->qra = g_strdup ("AA00"); } /** \brief Load safe values into the qth_t data structure This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-10-29 21:47:01
|
Revision: 943 http://gpredict.svn.sourceforge.net/gpredict/?rev=943&view=rev Author: aa1vs Date: 2011-10-29 21:46:55 +0000 (Sat, 29 Oct 2011) Log Message: ----------- Add current pass menuitem to popups. (Bug 3292729: Show next pass shows the current pass.) Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/src/gtk-event-list-popup.c trunk/src/gtk-polar-view-popup.c trunk/src/gtk-sat-list-popup.c trunk/src/gtk-sat-map-popup.c trunk/src/gtk-single-sat.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-10-29 11:28:58 UTC (rev 942) +++ trunk/ChangeLog 2011-10-29 21:46:55 UTC (rev 943) @@ -1,5 +1,22 @@ -2011-10-27 Charles Suprin <hamaa1vs at gmail.com> +2011-10-29 Charles Suprin <hamaa1vs at gmail.com> + * data/trsp/37841.trsp + Move SRVMU to correct catalog number. + + * data/trsp/37841.trsp + Add transponder data for JUGNU. + + * src/gtk-event-list-popup.c + * src/gtk-sat-list-popup.c + * src/gtk-sat-map-popup.c + * src/gtk-polar-view-popup.c + * src/gtk-single-sat.c + * NEWS + Add current pass menuitem to popups. (Bug 3292729: Show next pass shows the current pass.) + + +2011-10-28 Charles Suprin <hamaa1vs at gmail.com> + * src/gtk-sat-popup-common.c * src/gtk-sat-popup-common.h * src/gtk-sat-map-popup.c Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2011-10-29 11:28:58 UTC (rev 942) +++ trunk/NEWS 2011-10-29 21:46:55 UTC (rev 943) @@ -19,6 +19,7 @@ - Fixed bug 3416451: No ground track for new satellites. - Fixed bug 3417553: Gpredict crashes - Fixed bug 3419879: gpredict doesn't change the satellite names on world map. +- Fixed bug 3292729: Show next pass shows the current pass. Changes in version 1.3 (1 Mar 2011) Modified: trunk/src/gtk-event-list-popup.c =================================================================== --- trunk/src/gtk-event-list-popup.c 2011-10-29 11:28:58 UTC (rev 942) +++ trunk/src/gtk-event-list-popup.c 2011-10-29 21:46:55 UTC (rev 943) @@ -86,32 +86,10 @@ menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* next pass and predict passes */ - menuitem = gtk_image_menu_item_new_with_label (_("Show next pass")); - image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp)); - g_signal_connect (menuitem, "activate", - G_CALLBACK (show_next_pass_cb), - list); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + /* add the menu items for current,next, and future passes. */ + add_pass_menu_items(menu,sat,qth,&list->tstamp,GTK_WIDGET(list)); - menuitem = gtk_image_menu_item_new_with_label (_("Future passes")); - image = gtk_image_new_from_stock (GTK_STOCK_INDEX, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp)); - g_signal_connect (menuitem, "activate", - G_CALLBACK (show_future_passes_cb), - list); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - gtk_widget_show_all (menu); /* Note: event can be NULL here when called from view_onPopupMenu; Modified: trunk/src/gtk-polar-view-popup.c =================================================================== --- trunk/src/gtk-polar-view-popup.c 2011-10-29 11:28:58 UTC (rev 942) +++ trunk/src/gtk-polar-view-popup.c 2011-10-29 21:46:55 UTC (rev 943) @@ -100,26 +100,10 @@ /* separator */ menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + + /* add the menu items for current,next, and future passes. */ + add_pass_menu_items(menu,sat,qth,&pview->tstamp,GTK_WIDGET(pview)); - /* next pass and predict passes */ - menuitem = gtk_image_menu_item_new_with_label (_("Show next pass")); - image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(pview->tstamp)); - g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), pview); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - - menuitem = gtk_image_menu_item_new_with_label (_("Future passes")); - image = gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(pview->tstamp)); - g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), pview); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* separator */ menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); Modified: trunk/src/gtk-sat-list-popup.c =================================================================== --- trunk/src/gtk-sat-list-popup.c 2011-10-29 11:28:58 UTC (rev 942) +++ trunk/src/gtk-sat-list-popup.c 2011-10-29 21:46:55 UTC (rev 943) @@ -87,32 +87,9 @@ menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* next pass and predict passes */ - menuitem = gtk_image_menu_item_new_with_label (_("Show next pass")); - image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp)); - g_signal_connect (menuitem, "activate", - G_CALLBACK (show_next_pass_cb), - list); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - - menuitem = gtk_image_menu_item_new_with_label (_("Future passes")); - image = gtk_image_new_from_stock (GTK_STOCK_INDEX, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp)); - g_signal_connect (menuitem, "activate", - G_CALLBACK (show_future_passes_cb), - list); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + /* add the menu items for current,next, and future passes. */ + add_pass_menu_items(menu,sat,qth,&list->tstamp,GTK_WIDGET(list)); - gtk_widget_show_all (menu); /* Note: event can be NULL here when called from view_onPopupMenu; Modified: trunk/src/gtk-sat-map-popup.c =================================================================== --- trunk/src/gtk-sat-map-popup.c 2011-10-29 11:28:58 UTC (rev 942) +++ trunk/src/gtk-sat-map-popup.c 2011-10-29 21:46:55 UTC (rev 943) @@ -99,38 +99,10 @@ /* separator */ menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); -#if 1 + + /* add the menu items for current,next, and future passes. */ add_pass_menu_items(menu,sat,qth,&satmap->tstamp,GTK_WIDGET(satmap)); -#else - /* next pass and predict passes */ - if (sat->el > 0.0) { - menuitem = gtk_image_menu_item_new_with_label (_("Show current pass")); - image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp)); - g_signal_connect (menuitem, "activate", G_CALLBACK (show_current_pass_cb), satmap); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - } - menuitem = gtk_image_menu_item_new_with_label (_("Show next pass")); - image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp)); - g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), satmap); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - - menuitem = gtk_image_menu_item_new_with_label (_("Future passes")); - image = gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp)); - g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), satmap); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); -#endif + /* separator */ menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); Modified: trunk/src/gtk-single-sat.c =================================================================== --- trunk/src/gtk-single-sat.c 2011-10-29 11:28:58 UTC (rev 942) +++ trunk/src/gtk-single-sat.c 2011-10-29 21:46:55 UTC (rev 943) @@ -847,36 +847,8 @@ menuitem = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - /* Show next pass */ - menuitem = gtk_image_menu_item_new_with_label (_("Show next pass")); - image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", single_sat->qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(single_sat->tstamp)); -/* g_signal_connect (menuitem, "activate", - G_CALLBACK (show_next_pass), - gtk_widget_get_toplevel (button));*/ - g_signal_connect (menuitem, "activate", - G_CALLBACK (show_next_pass_cb), data); - - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); - - /* Show future passes */ - menuitem = gtk_image_menu_item_new_with_label (_("Future passes")); - image = gtk_image_new_from_stock (GTK_STOCK_INDEX, - GTK_ICON_SIZE_MENU); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); - g_object_set_data (G_OBJECT (menuitem), "sat", sat); - g_object_set_data (G_OBJECT (menuitem), "qth", single_sat->qth); - g_object_set_data (G_OBJECT (menuitem), "tstamp", &(single_sat->tstamp)); -/* g_signal_connect (menuitem, "activate", - G_CALLBACK (show_future_passes), - gtk_widget_get_toplevel (button));*/ - g_signal_connect (menuitem, "activate", - G_CALLBACK (show_future_passes_cb), data); - gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem); + /* add the menu items for current,next, and future passes. */ + add_pass_menu_items(menu,sat,single_sat->qth,&single_sat->tstamp,data); /* separator */ // menuitem = gtk_separator_menu_item_new (); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-10-29 11:29:04
|
Revision: 942 http://gpredict.svn.sourceforge.net/gpredict/?rev=942&view=rev Author: aa1vs Date: 2011-10-29 11:28:58 +0000 (Sat, 29 Oct 2011) Log Message: ----------- Add transponder data for JUGNU Added Paths: ----------- trunk/data/trsp/37839.trsp Added: trunk/data/trsp/37839.trsp =================================================================== --- trunk/data/trsp/37839.trsp (rev 0) +++ trunk/data/trsp/37839.trsp 2011-10-29 11:28:58 UTC (rev 942) @@ -0,0 +1,5 @@ +[CW Beacon] +DOWN_LOW = 437275000 + +[Payload] +DOWN_LOW = 437505000 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <aa...@us...> - 2011-10-29 11:23:10
|
Revision: 941 http://gpredict.svn.sourceforge.net/gpredict/?rev=941&view=rev Author: aa1vs Date: 2011-10-29 11:23:04 +0000 (Sat, 29 Oct 2011) Log Message: ----------- Move SRVMU to correct catalog number. Added Paths: ----------- trunk/data/trsp/37841.trsp Removed Paths: ------------- trunk/data/trsp/37839.trsp Deleted: trunk/data/trsp/37839.trsp =================================================================== --- trunk/data/trsp/37839.trsp 2011-10-29 02:17:34 UTC (rev 940) +++ trunk/data/trsp/37839.trsp 2011-10-29 11:23:04 UTC (rev 941) @@ -1,2 +0,0 @@ -[CW Beacon] -DOWN_LOW = 437425000 Copied: trunk/data/trsp/37841.trsp (from rev 938, trunk/data/trsp/37839.trsp) =================================================================== --- trunk/data/trsp/37841.trsp (rev 0) +++ trunk/data/trsp/37841.trsp 2011-10-29 11:23:04 UTC (rev 941) @@ -0,0 +1,2 @@ +[CW Beacon] +DOWN_LOW = 437425000 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |