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

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

Revision: 121
          http://gpredict.svn.sourceforge.net/gpredict/?rev=121&view=rev
Author:   csete
Date:     2008-09-17 18:10:05 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
Disable debug prints.

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

Modified: trunk/src/gtk-rig-ctrl.c
===================================================================
--- trunk/src/gtk-rig-ctrl.c	2008-09-17 18:08:24 UTC (rev 120)
+++ trunk/src/gtk-rig-ctrl.c	2008-09-17 18:10:05 UTC (rev 121)
@@ -731,6 +731,7 @@
         
         gtk_widget_set_sensitive (ctrl->DevSel, FALSE);
         ctrl->engaged = TRUE;
+        ctrl->wrops = 0;
     }
 }
 
@@ -784,6 +785,8 @@
                 sat_log_log (SAT_LOG_LEVEL_ERROR,
                              _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
                                __FUNCTION__, MAX_ERROR_COUNT);
+                
+                //g_print ("ERROR. WROPS = %d\n", ctrl->wrops);
             }
             else {
                 /* increment error counter */
@@ -792,6 +795,7 @@
         }
     }
     
+    //g_print ("       WROPS = %d\n", ctrl->wrops);
     
     ctrl->busy = FALSE;
     
@@ -871,6 +875,8 @@
     shutdown (sock, SHUT_RDWR);
     close (sock);
     
+    ctrl->wrops++;
+    
     return TRUE;
 }
 

Modified: trunk/src/gtk-rig-ctrl.h
===================================================================
--- trunk/src/gtk-rig-ctrl.h	2008-09-17 18:08:24 UTC (rev 120)
+++ trunk/src/gtk-rig-ctrl.h	2008-09-17 18:10:05 UTC (rev 121)
@@ -89,6 +89,10 @@
     gboolean busy;      /*!< Flag set when control algorithm is busy. */
     gboolean engaged;   /*!< Flag indicating that rig device is engaged. */
     gint     errcnt;    /*!< Error counter. */
+                        
+    /* debug related */
+    guint    wrops;
+    guint    rdops;
 };
 
 struct _GtkRigCtrlClass

Modified: trunk/src/gtk-rot-ctrl.c
===================================================================
--- trunk/src/gtk-rot-ctrl.c	2008-09-17 18:08:24 UTC (rev 120)
+++ trunk/src/gtk-rot-ctrl.c	2008-09-17 18:10:05 UTC (rev 121)
@@ -760,9 +760,11 @@
 {
     GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
     
-    if (gtk_toggle_button_get_active (button)) {
-        gtk_widget_set_sensitive (ctrl->DevSel, FALSE);
-        ctrl->engaged = TRUE;
+    if (!gtk_toggle_button_get_active (button)) {
+        gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
+        ctrl->engaged = FALSE;
+        gtk_label_set_text (GTK_LABEL (ctrl->AzRead), "---");
+        gtk_label_set_text (GTK_LABEL (ctrl->ElRead), "---");
     }
     else {
         if (ctrl->conf == NULL) {
@@ -772,11 +774,11 @@
                          __FUNCTION__);
             return;
         }
-        gtk_widget_set_sensitive (ctrl->DevSel, TRUE);
-        ctrl->engaged = FALSE;
+        gtk_widget_set_sensitive (ctrl->DevSel, FALSE);
+        ctrl->engaged = TRUE;
         
-        gtk_label_set_text (GTK_LABEL (ctrl->AzRead), "---");
-        gtk_label_set_text (GTK_LABEL (ctrl->ElRead), "---");
+        ctrl->wrops = 0;
+        ctrl->rdops = 0;
     }
 }
 
@@ -838,11 +840,15 @@
             text = g_strdup_printf ("%.2f\302\260", rotel);
             gtk_label_set_text (GTK_LABEL (ctrl->ElRead), text);
             g_free (text);
+            
+            gtk_polar_plot_set_rotor_pos (GTK_POLAR_PLOT (ctrl->plot), rotaz, rotel);
         }
         else {
             gtk_label_set_text (GTK_LABEL (ctrl->AzRead), _("ERROR"));
             gtk_label_set_text (GTK_LABEL (ctrl->ElRead), _("ERROR"));
             error = TRUE;
+        
+            gtk_polar_plot_set_rotor_pos (GTK_POLAR_PLOT (ctrl->plot), -1.0, -1.0);
         }
         
         /* if tolerance exceeded */
@@ -870,17 +876,30 @@
                              _("%s: MAX_ERROR_COUNT (%d) reached. Disengaging device!"),
                                __FUNCTION__, MAX_ERROR_COUNT);
                 ctrl->errcnt = 0;
+                //g_print ("ERROR. WROPS: %d   RDOPS: %d\n", ctrl->wrops, ctrl->rdops);
             }
             else {
                 /* increment error counter */
                 ctrl->errcnt++;
             }
         }
-        
-        /* TODO: update polar plot */
     }
+    else {
+        /* ensure rotor pos is not visible on plot */
+        gtk_polar_plot_set_rotor_pos (GTK_POLAR_PLOT (ctrl->plot), -1.0, -1.0);
+    }
     
     
+    /* update target object on polar plot */
+    if (ctrl->target != NULL) {
+        gtk_polar_plot_set_target_pos (GTK_POLAR_PLOT (ctrl->plot), ctrl->target->az, ctrl->target->el);
+    }
+    
+    /* update controller circle on polar plot */
+    gtk_polar_plot_set_ctrl_pos (GTK_POLAR_PLOT (ctrl->plot),
+                                 gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->AzSet)),
+                                 gtk_rot_knob_get_value (GTK_ROT_KNOB (ctrl->ElSet)));
+    
     ctrl->busy = FALSE;
     
     return TRUE;
@@ -997,6 +1016,9 @@
     shutdown (sock, SHUT_RDWR);
     close (sock);
 
+    ctrl->wrops++;
+    ctrl->rdops++;
+    
     return TRUE;
 }
 
@@ -1074,12 +1096,14 @@
                        __FILE__, __LINE__, written, size);
     }
     
-    g_print ("SZ:%d  WR:%d  AZ:%s  EL:%s  STR:%s", size, written, azstr, elstr, buff);
+    //g_print ("SZ:%d  WR:%d  AZ:%s  EL:%s  STR:%s", size, written, azstr, elstr, buff);
     
     g_free (buff);
     
     shutdown (sock, SHUT_RDWR);
     close (sock);
+    
+    ctrl->wrops++;
 
     return TRUE;
 }

Modified: trunk/src/gtk-rot-ctrl.h
===================================================================
--- trunk/src/gtk-rot-ctrl.h	2008-09-17 18:08:24 UTC (rev 120)
+++ trunk/src/gtk-rot-ctrl.h	2008-09-17 18:10:05 UTC (rev 121)
@@ -93,6 +93,10 @@
     gboolean engaged;   /*!< Flag indicating that rotor device is engaged. */
                         
     gint     errcnt;    /*!< Error counter. */
+    
+    /* debug related */
+    guint    wrops;
+    guint    rdops;
 };
 
 struct _GtkRotCtrlClass


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