Changeset 13465 for branches/kapa-mods-2007-05/Ohana/src/opihi/cmd.data/cursor.c

Timestamp:

May 21, 2007, 6:29:09 PM (19 years ago)

Author:

eugene

Message:

fixed cursor functions

File:

• branches/kapa-mods-2007-05/Ohana/src/opihi/cmd.data/cursor.c (modified) (4 diffs)

branches/kapa-mods-2007-05/Ohana/src/opihi/cmd.data/cursor.c

@@ -7 +7 @@
   double X, Y, R, D, Z;
   void *oldsignal;
-  Graphdata graphmode;
-  Buffer *buf;
 
   // XXX need to be able to specify graph vs image coords
@@ -22 +20 @@
     remove_argument (N, &argc, argv);
   }
-  if (!GetGraph (&graphmode, &kapa, name)) return (FALSE);
+  if (!GetGraphData (NULL, &kapa, name)) return (FALSE);
   FREE (name);
 
@@ -33 +31 @@
   }
   
-  buf = NULL;
-  // if (IsImage) buf = SelectBuffer (GetImageName(), OLDBUFFER, FALSE);
-  // XXX this stuff will go away with 32bit image data
-  
   KiiCursorOn (kapa);
   
   oldsignal = signal (SIGINT, handle_interrupt);
   interrupt = FALSE;
-  Z = -1.0;
+
   for (i = 0; ((i < N) || (N == 0)) && !interrupt; i++) {
 
-    // XXX have kapa return x,y,z,ra,dec for all options
-    KiiCursorRead (kapa, &X, &Y, key);
+    KiiCursorRead (kapa, &X, &Y, &Z, &R, &D, key);
 
     sprintf (string, "X%s", key);
@@ -51 +44 @@
     sprintf (string, "Y%s", key);
     set_variable (string, Y);
+    sprintf (string, "Z%s", key);
+    set_variable (string, Z);
+    sprintf (string, "R%s", key);
+    set_variable (string, R);
+    sprintf (string, "D%s", key);
+    set_variable (string, D);
+
     set_str_variable ("KEY", key);
     
-    if (buf != NULL) { 
-      Z = gfits_get_matrix_value (&buf[0].matrix, (int) X, (int) Y);
-      // gprint (GP_LOG, "%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);
-      gprint (GP_LOG, "%s %f %f\n", key, X, Y);
-    }
+    gprint (GP_LOG, "%s %f %f %f %f %f\n", key, X, Y, Z, R, D);
+
     if (!strcasecmp (key, "Q")) break;
   }