Changeset 5846 for trunk/Ohana/src/opihi/cmd.data/cursor.c

Timestamp:

Dec 27, 2005, 5:06:32 AM (21 years ago)

Author:

eugene

Message:

converting to use libkapa commands instead of raw graph commands

File:

• trunk/Ohana/src/opihi/cmd.data/cursor.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/cursor.c

@@ -3 +3 @@
 int cursor (int argc, char **argv) {
 
-  char buffer[40], string[20], key[20], keyname[20];
+  char string[20], key[20];
   int i, N, Nsource, Source, IsImage;
   double X, Y, R, D, Z;
@@ -42 +42 @@
   if (IsImage) buf = SelectBuffer (GetImageName(), OLDBUFFER, FALSE);
   
-  sprintf (string, "CURS");
-  write (Source, string, 4); /* ask Source to look for the keystrokes */
+  KiiCursorOn (Source);
   
   oldsignal = signal (SIGINT, handle_interrupt);
@@ -49 +48 @@
   Z = -1.0;
   for (i = 0; ((i < N) || (N == 0)) && !interrupt; i++) {
-    bzero (buffer, 40);
-    read (Source, buffer, 40);
-    buffer[39] = 0;
-    sscanf (buffer, "%s %lf %lf", key, &X, &Y);
-    if (ispunct(key[0])) {
-      strcpy (keyname, "_");
-    } else {
-      strcpy (keyname, key);
-    }
-    sprintf (string, "X%s", keyname);
+    KiiCursorRead (Source, &X, &Y, key);
+
+    sprintf (string, "X%s", key);
     set_variable (string, X);
-    sprintf (string, "Y%s", keyname);
+    sprintf (string, "Y%s", key);
     set_variable (string, Y);
     set_str_variable ("KEY", key);
     
-    if (IsImage && (buf != NULL)) 
-      Z = fits_get_matrix_value (&buf[0].matrix, (int)X, (int)Y);
-
-    if (!IsImage) {
-      XY_to_RD (&R, &D, X, Y, &graphmode.coords);
-      sprintf (string, "R%s", keyname);
-      set_variable (string, R);
-      sprintf (string, "D%s", keyname);
-      set_variable (string, D);
-    }
-
-    /* I still don't like this, but I have to decide which to print... */
     if (IsImage) {
+      if (buf != NULL) { 
+        Z = fits_get_matrix_value (&buf[0].matrix, (int) X, (int) Y);
+      }
       fprintf (GetOutfile(), "%s %f %f  %f\n", key, X, Y, Z);
     } else {
+      XY_to_RD (&R, &D, X, Y, &graphmode.coords);
+      sprintf (string, "R%s", key);
+      set_variable (string, R);
+      sprintf (string, "D%s", key);
+      set_variable (string, D);
       fprintf (GetOutfile(), "%s %f %f\n", key, X, Y);
     }
-
-    if (!strcasecmp (key, "Q")) {
-      signal (SIGINT, (void *) oldsignal);
-      write (Source, "NCUR", 4); /* ask Source to stop looking for the keystrokes */
-      return (TRUE);
-    }
-
+    if (!strcasecmp (key, "Q")) break;
   }
 
   signal (SIGINT, oldsignal);
-  write (Source, "NCUR", 4); /* ask Source to look for the keystrokes */
+  KiiCursorOff (Source);
   return (TRUE);
-      
 }