[Gpredict-svn] SF.net SVN: gpredict:[128] trunk/src

[<cs...@us...>]

Revision: 128
          http://gpredict.svn.sourceforge.net/gpredict/?rev=128&view=rev
Author:   csete
Date:     2008-09-17 21:02:29 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
Got rid og rdv and GtkMet dependency.

Modified Paths:
--------------
    trunk/src/gtk-sat-module.c
    trunk/src/menubar.c

Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c	2008-09-17 20:30:05 UTC (rev 127)
+++ trunk/src/gtk-sat-module.c	2008-09-17 21:02:29 UTC (rev 128)
@@ -63,7 +63,6 @@
 #include "gtk-sat-map.h"
 #include "gtk-polar-view.h"
 #include "gtk-single-sat.h"
-#include "gtk-met.h"
 #include "gtk-rig-ctrl.h"
 #include "gtk-rot-ctrl.h"
 
@@ -509,13 +508,6 @@
 								   0);
 		break;
 
-	case GTK_SAT_MOD_VIEW_MET:
-		view = gtk_met_new (module->cfgdata,
-							module->satellites,
-							module->qth);
-							
-		break;
-
 	default:
 		sat_log_log (SAT_LOG_LEVEL_BUG,
 					 _("%s:%d: Invalid child type (%d)\nUsing GtkSatList..."),
@@ -924,11 +916,6 @@
 		gtk_single_sat_update (child);
 	}
 
-	else if (IS_GTK_MET(child)) {
-		GTK_MET (child)->tstamp = tstamp;
-		gtk_met_update (child);
-	}
-
 	else {
 		sat_log_log (SAT_LOG_LEVEL_BUG,
 					 _("%f:%d: Unknown child type"),
@@ -1002,18 +989,8 @@
 	 */
 	/* check that we have a GtkMet child */
 	/**** FIXME: GtkMet may not be child 2.... */
-	if ((sat->tle.catnr == 99122) &&
-		(IS_GTK_MET (module->child_2) &&
-		 (module->tmgCdnum - GTK_MET (module->child_2)->launch) < 0.002778)) {
+	if G_UNLIKELY(FALSE) {
 
-		sat->ssplat = 28.51;
-		sat->ssplon = -80.55;
-		sat->alt = 0.0;
-		sat->footprint = 500.0;
-		sat->phase = 0.0;
-		sat->orbit = 0;
-		sat->range = obs_set.range;
-		sat->range_rate = 0.0;
 	}
 	else {
 
@@ -1572,9 +1549,6 @@
 	else if (IS_GTK_SAT_LIST (widget)) {
 	}
 
-	else if (IS_GTK_MET (widget)) {
-		gtk_met_reload_sats (widget, module->satellites);
-	}
 
 	else {
 		sat_log_log (SAT_LOG_LEVEL_BUG,

Modified: trunk/src/menubar.c
===================================================================
--- trunk/src/menubar.c	2008-09-17 20:30:05 UTC (rev 127)
+++ trunk/src/menubar.c	2008-09-17 21:02:29 UTC (rev 128)
@@ -50,7 +50,6 @@
 #include "gpredict-help.h"
 #include "tle-update.h"
 #include "compat.h"
-#include "rdv.h"
 #include "menubar.h"
 #include "config-keys.h"
 #ifdef HAVE_CONFIG_H
@@ -66,7 +65,6 @@
 static void   menubar_open_mod_cb  (GtkWidget *widget, gpointer data);
 static void   menubar_message_log  (GtkWidget *widget, gpointer data);
 static void   menubar_app_exit_cb  (GtkWidget *widget, gpointer data);
-static void   menubar_rdv_cb       (GtkWidget *widget, gpointer data);
 static void   menubar_freq_edit_cb (GtkWidget *widget, gpointer data);
 static void   menubar_pref_cb      (GtkWidget *widget, gpointer data);
 static void   menubar_tle_net_cb   (GtkWidget *widget, gpointer data);
@@ -127,8 +125,6 @@
 	  G_CALLBACK (menubar_window_cb)},
 	{ "Predict", GTK_STOCK_DND_MULTIPLE, N_("Advanced Predict"), NULL,
 	  N_("Open advanced pass predictor"), G_CALLBACK (menubar_predict_cb)},
-	{ "Rdv", NULL, N_("_Space Shuttle Tool"), NULL,
-	  N_("Open the space shuttle tool window"), G_CALLBACK (menubar_rdv_cb)},
 
 	/* Help menu */
 	{ "GettingStarted", GTK_STOCK_EXECUTE, N_("Getting Started"), NULL,
@@ -172,8 +168,6 @@
 "      <menu action='ToolsMenu'>"
 "         <menuitem action='Window'/>"
 "         <menuitem action='Predict'/>"
-"         <separator/>"
-"         <menuitem action='Rdv'/>"
 /* "         <separator/>" */
 /* "         <menuitem action='Lab'/>" */
 "      </menu>"
@@ -740,13 +734,7 @@
 
 
 
-static void
-menubar_rdv_cb (GtkWidget *widget, gpointer data)
-{
-	rdv_open ();
-}
 
-
 static void
 menubar_window_cb (GtkWidget *widget, gpointer data)
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.