[Gpredict-svn] SF.net SVN: gpredict: [48] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
From: <cs...@us...> - 2008-05-01 14:05:06
|
Revision: 48 http://gpredict.svn.sourceforge.net/gpredict/?rev=48&view=rev Author: csete Date: 2008-05-01 07:04:46 -0700 (Thu, 01 May 2008) Log Message: ----------- Renamed gtk-freq-ctrl to gtk-freq-knob. Modified Paths: -------------- trunk/ChangeLog trunk/src/Makefile.am trunk/win32/Makefile Added Paths: ----------- trunk/src/gtk-freq-knob.c trunk/src/gtk-freq-knob.h Removed Paths: ------------- trunk/src/gtk-freq-ctrl.c trunk/src/gtk-freq-ctrl.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-05-01 14:01:17 UTC (rev 47) +++ trunk/ChangeLog 2008-05-01 14:04:46 UTC (rev 48) @@ -1,3 +1,12 @@ +2008-05-01; Alexandru Csete <oz...@gm...> + + * src/gtk-rot-knob.[ch]: + New files, previously gtk-rot-ctrl. + + * src/gtk-freq-knob.[ch]: + New files, previously gtk-freq-ctrl. + + 2008-04-30; Alexandru Csete <oz...@gm...> * src/predict-tools.c: Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2008-05-01 14:01:17 UTC (rev 47) +++ trunk/src/Makefile.am 2008-05-01 14:04:46 UTC (rev 48) @@ -35,7 +35,7 @@ gpredict-url-hook.c gpredict-url-hook.h \ gpredict-utils.c gpredict-utils.h \ gtk-azel-plot.c gtk-azel-plot.h \ - gtk-freq-ctrl.c gtk-freq-ctrl.h \ + gtk-freq-knob.c gtk-freq-knob.h \ gtk-met.c gtk-met.h \ gtk-polar-plot.c gtk-polar-plot.h \ gtk-polar-view.c gtk-polar-view.h \ Deleted: trunk/src/gtk-freq-ctrl.c =================================================================== --- trunk/src/gtk-freq-ctrl.c 2008-05-01 14:01:17 UTC (rev 47) +++ trunk/src/gtk-freq-ctrl.c 2008-05-01 14:04:46 UTC (rev 48) @@ -1,181 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* - Gpredict: Real-time satellite tracking and orbit prediction program - - Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC. - - Authors: Alexandru Csete <oz...@gm...> - - Comments, questions and bugreports should be submitted via - http://sourceforge.net/projects/groundstation/ - More details can be found at the project home page: - - http://groundstation.sourceforge.net/ - - This program is free software; you can redistribute it and/or 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. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, visit http://www.fsf.org/ -*/ -/** \brief FREQ control. - * - * More info... - * - * \bug This should be a generic widget, not just frequency specific - * - */ -#include <gtk/gtk.h> -#include <glib/gi18n.h> -#include "gtk-freq-ctrl.h" -#ifdef HAVE_CONFIG_H -# include <build-config.h> -#endif - - - -static void gtk_freq_ctrl_class_init (GtkFreqCtrlClass *class); -static void gtk_freq_ctrl_init (GtkFreqCtrl *list); -static void gtk_freq_ctrl_destroy (GtkObject *object); - -static void gtk_freq_ctrl_update (GtkFreqCtrl *ctrl); - - -static GtkHBoxClass *parent_class = NULL; - - -GType -gtk_freq_ctrl_get_type () -{ - static GType gtk_freq_ctrl_type = 0; - - if (!gtk_freq_ctrl_type) { - - static const GTypeInfo gtk_freq_ctrl_info = { - sizeof (GtkFreqCtrlClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) gtk_freq_ctrl_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (GtkFreqCtrl), - 5, /* n_preallocs */ - (GInstanceInitFunc) gtk_freq_ctrl_init, - }; - - gtk_freq_ctrl_type = g_type_register_static (GTK_TYPE_VBOX, - "GtkFreqCtrl", - >k_freq_ctrl_info, - 0); - } - - return gtk_freq_ctrl_type; -} - - -static void -gtk_freq_ctrl_class_init (GtkFreqCtrlClass *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_freq_ctrl_destroy; - -} - - - -static void -gtk_freq_ctrl_init (GtkFreqCtrl *ctrl) -{ - - -} - -static void -gtk_freq_ctrl_destroy (GtkObject *object) -{ - (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); -} - - - -/** \brief Create a new Frequency control widget. - * \param[in] val The initial value of the control. - * \return A new frequency control widget. - * - */ -GtkWidget * -gtk_freq_ctrl_new (gdouble val) -{ - GtkWidget *widget; - GtkWidget *table; - - - widget = g_object_new (GTK_TYPE_FREQ_CTRL, NULL); - - GTK_FREQ_CTRL(widget)->value = val; - gtk_freq_ctrl_update (GTK_FREQ_CTRL(widget)); - - gtk_widget_show_all (widget); - - return widget; -} - - -/** \brief Set the value of the frequency control widget. - * \param[in] ctrl THe frequency control widget. - * \param[in] val The new value. - * - */ -void -gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val) -{ - /* set the new value */ - ctrl->value = val; - - /* update the display */ - gtk_freq_ctrl_update (ctrl); -} - - -/** \brief Get the current value of the frequency control widget. - * \param[in] ctrl The frequency control widget. - * \return The current value. - * - * Hint: For reading the value you can also access ctrl->value. - * - */ -gdouble -gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl) -{ - return ctrl->value; -} - - - -/** \brief Update frequency display widget. - * \param[in] ctrl The frequency control widget. - * - */ -static void -gtk_freq_ctrl_update (GtkFreqCtrl *ctrl) -{ - -} Deleted: trunk/src/gtk-freq-ctrl.h =================================================================== --- trunk/src/gtk-freq-ctrl.h 2008-05-01 14:01:17 UTC (rev 47) +++ trunk/src/gtk-freq-ctrl.h 2008-05-01 14:04:46 UTC (rev 48) @@ -1,86 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* - Gpredict: Real-time satellite tracking and orbit prediction program - - Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC. - - Authors: Alexandru Csete <oz...@gm...> - - Comments, questions and bugreports should be submitted via - http://sourceforge.net/projects/groundstation/ - More details can be found at the project home page: - - http://groundstation.sourceforge.net/ - - This program is free software; you can redistribute it and/or 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. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, visit http://www.fsf.org/ -*/ -#ifndef __GTK_FREQ_CTRL_H__ -#define __GTK_FREQ_CTRL_H__ 1 - -#include <glib.h> -#include <glib/gi18n.h> -#include <gtk/gtk.h> - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - - - -#define GTK_TYPE_FREQ_CTRL (gtk_freq_ctrl_get_type ()) -#define GTK_FREQ_CTRL(obj) GTK_CHECK_CAST (obj,\ - gtk_freq_ctrl_get_type (),\ - GtkFreqCtrl) - -#define GTK_FREQ_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\ - gtk_freq_ctrl_get_type (),\ - GtkFreqCtrlClass) - -#define IS_GTK_FREQ_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_freq_ctrl_get_type ()) - - -typedef struct _gtk_freq_ctrl GtkFreqCtrl; -typedef struct _GtkFreqCtrlClass GtkFreqCtrlClass; - - - -struct _gtk_freq_ctrl -{ - GtkVBox vbox; - - gdouble value; -}; - -struct _GtkFreqCtrlClass -{ - GtkVBoxClass parent_class; -}; - - - -GtkType gtk_freq_ctrl_get_type (void); -GtkWidget* gtk_freq_ctrl_new (gdouble val); -void gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val); -gdouble gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl); - - - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* __GTK_FREQ_CTRL_H__ */ Copied: trunk/src/gtk-freq-knob.c (from rev 40, trunk/src/gtk-freq-ctrl.c) =================================================================== --- trunk/src/gtk-freq-knob.c (rev 0) +++ trunk/src/gtk-freq-knob.c 2008-05-01 14:04:46 UTC (rev 48) @@ -0,0 +1,181 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + Gpredict: Real-time satellite tracking and orbit prediction program + + Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC. + + Authors: Alexandru Csete <oz...@gm...> + + Comments, questions and bugreports should be submitted via + http://sourceforge.net/projects/groundstation/ + More details can be found at the project home page: + + http://groundstation.sourceforge.net/ + + This program is free software; you can redistribute it and/or 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, visit http://www.fsf.org/ +*/ +/** \brief FREQ control. + * + * More info... + * + * \bug This should be a generic widget, not just frequency specific + * + */ +#include <gtk/gtk.h> +#include <glib/gi18n.h> +#include "gtk-freq-ctrl.h" +#ifdef HAVE_CONFIG_H +# include <build-config.h> +#endif + + + +static void gtk_freq_ctrl_class_init (GtkFreqCtrlClass *class); +static void gtk_freq_ctrl_init (GtkFreqCtrl *list); +static void gtk_freq_ctrl_destroy (GtkObject *object); + +static void gtk_freq_ctrl_update (GtkFreqCtrl *ctrl); + + +static GtkHBoxClass *parent_class = NULL; + + +GType +gtk_freq_ctrl_get_type () +{ + static GType gtk_freq_ctrl_type = 0; + + if (!gtk_freq_ctrl_type) { + + static const GTypeInfo gtk_freq_ctrl_info = { + sizeof (GtkFreqCtrlClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) gtk_freq_ctrl_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GtkFreqCtrl), + 5, /* n_preallocs */ + (GInstanceInitFunc) gtk_freq_ctrl_init, + }; + + gtk_freq_ctrl_type = g_type_register_static (GTK_TYPE_VBOX, + "GtkFreqCtrl", + >k_freq_ctrl_info, + 0); + } + + return gtk_freq_ctrl_type; +} + + +static void +gtk_freq_ctrl_class_init (GtkFreqCtrlClass *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_freq_ctrl_destroy; + +} + + + +static void +gtk_freq_ctrl_init (GtkFreqCtrl *ctrl) +{ + + +} + +static void +gtk_freq_ctrl_destroy (GtkObject *object) +{ + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); +} + + + +/** \brief Create a new Frequency control widget. + * \param[in] val The initial value of the control. + * \return A new frequency control widget. + * + */ +GtkWidget * +gtk_freq_ctrl_new (gdouble val) +{ + GtkWidget *widget; + GtkWidget *table; + + + widget = g_object_new (GTK_TYPE_FREQ_CTRL, NULL); + + GTK_FREQ_CTRL(widget)->value = val; + gtk_freq_ctrl_update (GTK_FREQ_CTRL(widget)); + + gtk_widget_show_all (widget); + + return widget; +} + + +/** \brief Set the value of the frequency control widget. + * \param[in] ctrl THe frequency control widget. + * \param[in] val The new value. + * + */ +void +gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val) +{ + /* set the new value */ + ctrl->value = val; + + /* update the display */ + gtk_freq_ctrl_update (ctrl); +} + + +/** \brief Get the current value of the frequency control widget. + * \param[in] ctrl The frequency control widget. + * \return The current value. + * + * Hint: For reading the value you can also access ctrl->value. + * + */ +gdouble +gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl) +{ + return ctrl->value; +} + + + +/** \brief Update frequency display widget. + * \param[in] ctrl The frequency control widget. + * + */ +static void +gtk_freq_ctrl_update (GtkFreqCtrl *ctrl) +{ + +} Copied: trunk/src/gtk-freq-knob.h (from rev 40, trunk/src/gtk-freq-ctrl.h) =================================================================== --- trunk/src/gtk-freq-knob.h (rev 0) +++ trunk/src/gtk-freq-knob.h 2008-05-01 14:04:46 UTC (rev 48) @@ -0,0 +1,86 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* + Gpredict: Real-time satellite tracking and orbit prediction program + + Copyright (C) 2001-2007 Alexandru Csete, OZ9AEC. + + Authors: Alexandru Csete <oz...@gm...> + + Comments, questions and bugreports should be submitted via + http://sourceforge.net/projects/groundstation/ + More details can be found at the project home page: + + http://groundstation.sourceforge.net/ + + This program is free software; you can redistribute it and/or 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. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, visit http://www.fsf.org/ +*/ +#ifndef __GTK_FREQ_CTRL_H__ +#define __GTK_FREQ_CTRL_H__ 1 + +#include <glib.h> +#include <glib/gi18n.h> +#include <gtk/gtk.h> + + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + + + +#define GTK_TYPE_FREQ_CTRL (gtk_freq_ctrl_get_type ()) +#define GTK_FREQ_CTRL(obj) GTK_CHECK_CAST (obj,\ + gtk_freq_ctrl_get_type (),\ + GtkFreqCtrl) + +#define GTK_FREQ_CTRL_CLASS(klass) GTK_CHECK_CLASS_CAST (klass,\ + gtk_freq_ctrl_get_type (),\ + GtkFreqCtrlClass) + +#define IS_GTK_FREQ_CTRL(obj) GTK_CHECK_TYPE (obj, gtk_freq_ctrl_get_type ()) + + +typedef struct _gtk_freq_ctrl GtkFreqCtrl; +typedef struct _GtkFreqCtrlClass GtkFreqCtrlClass; + + + +struct _gtk_freq_ctrl +{ + GtkVBox vbox; + + gdouble value; +}; + +struct _GtkFreqCtrlClass +{ + GtkVBoxClass parent_class; +}; + + + +GtkType gtk_freq_ctrl_get_type (void); +GtkWidget* gtk_freq_ctrl_new (gdouble val); +void gtk_freq_ctrl_set_value (GtkFreqCtrl *ctrl, gdouble val); +gdouble gtk_freq_ctrl_get_value (GtkFreqCtrl *ctrl); + + + + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __GTK_FREQ_CTRL_H__ */ Modified: trunk/win32/Makefile =================================================================== --- trunk/win32/Makefile 2008-05-01 14:01:17 UTC (rev 47) +++ trunk/win32/Makefile 2008-05-01 14:04:46 UTC (rev 48) @@ -86,7 +86,7 @@ gpredict-url-hook.c \ gpredict-utils.c \ gtk-azel-plot.c \ - gtk-freq-ctrl.c \ + gtk-freq-knob.c \ gtk-polar-plot.c \ gtk-polar-view.c \ gtk-polar-view-popup.c \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |