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

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

Revision: 31
          http://gpredict.svn.sourceforge.net/gpredict/?rev=31&view=rev
Author:   csete
Date:     2008-03-30 04:52:23 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
Added ranges and initial values.

Modified Paths:
--------------
    trunk/src/gtk-freq-ctrl.c
    trunk/src/gtk-freq-ctrl.h
    trunk/src/gtk-rot-ctrl.c
    trunk/src/gtk-rot-ctrl.h

Modified: trunk/src/gtk-freq-ctrl.c
===================================================================
--- trunk/src/gtk-freq-ctrl.c	2008-03-30 10:37:53 UTC (rev 30)
+++ trunk/src/gtk-freq-ctrl.c	2008-03-30 11:52:23 UTC (rev 31)
@@ -117,11 +117,12 @@
 
 
 /** \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 ()
+gtk_freq_ctrl_new (gdouble val)
 {
     GtkWidget *widget;
     GtkWidget *table;
@@ -129,8 +130,9 @@
 
 	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;

Modified: trunk/src/gtk-freq-ctrl.h
===================================================================
--- trunk/src/gtk-freq-ctrl.h	2008-03-30 10:37:53 UTC (rev 30)
+++ trunk/src/gtk-freq-ctrl.h	2008-03-30 11:52:23 UTC (rev 31)
@@ -72,7 +72,7 @@
 
 
 GtkType    gtk_freq_ctrl_get_type  (void);
-GtkWidget* gtk_freq_ctrl_new       (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);
 

Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c	2008-03-30 10:37:53 UTC (rev 30)
+++ trunk/src/gtk-rot-ctrl.c	2008-03-30 11:52:23 UTC (rev 31)
@@ -119,11 +119,12 @@
 /** \brief Create a new rotor control widget.
  * \param[in] min The lower limit in decimal degrees.
  * \param[in] max The upper limit in decimal degrees.
+ * \param[in] val The initial value of the control.
  * \return A new rotor control widget.
  * 
  */
 GtkWidget *
-gtk_rot_ctrl_new (gfloat min, gfloat max)
+gtk_rot_ctrl_new (gfloat min, gfloat max, gfloat val)
 {
     GtkWidget *widget;
     GtkWidget *table;
@@ -131,10 +132,16 @@
 
 	widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
 
+    GTK_ROT_CTRL(widget)->min = min;
+    GTK_ROT_CTRL(widget)->max = max;
+    GTK_ROT_CTRL(widget)->value = val;
+    
+    gtk_rot_ctrl_update (GTK_ROT_CTRL(widget));
 
-
 	gtk_widget_show_all (widget);
 
+    
+    
 	return widget;
 }
 
@@ -148,7 +155,8 @@
 gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val)
 {
     /* set the new value */
-    ctrl->value = val;
+    if ((val >= ctrl->min) && (val <= ctrl->max))
+        ctrl->value = val;
     
     /* update the display */
     gtk_rot_ctrl_update (ctrl);

Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h	2008-03-30 10:37:53 UTC (rev 30)
+++ trunk/src/gtk-rot-ctrl.h	2008-03-30 11:52:23 UTC (rev 31)
@@ -61,6 +61,8 @@
 {
 	GtkVBox vbox;
 	
+    gfloat min;
+    gfloat max;
     gfloat value;
 };
 
@@ -72,7 +74,7 @@
 
 
 GtkType    gtk_rot_ctrl_get_type  (void);
-GtkWidget* gtk_rot_ctrl_new       (gfloat min, gfloat max);
+GtkWidget* gtk_rot_ctrl_new       (gfloat min, gfloat max, gfloat val);
 void       gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val);
 gfloat     gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl);
 


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