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

Timestamp:

May 18, 2007, 10:10:41 AM (19 years ago)

Author:

eugene

Message:

image/graph metadata stored/retrieved from kapa

File:

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

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

@@ -4 +4 @@
 
   char string[20], key[20], *name;
-  int i, N, kapa, IsImage;
+  int i, N, kapa;
   double X, Y, R, D, Z;
   void *oldsignal;
@@ -10 +10 @@
   Buffer *buf;
 
-  /* need to be able to specify graph vs image coords
-  if ((N = get_argument (argc, argv, "-g"))) {
-    remove_argument (N, &argc, argv);
-    SetImageDevice (FALSE);
-  }  
-  if ((N = get_argument (argc, argv, "-i"))) {
-    remove_argument (N, &argc, argv);
-    SetImageDevice (TRUE);
-  }  
-  */
+  // XXX need to be able to specify graph vs image coords
+  // currently, if only one exists, that frame will be used
+  // if both exist, defaults to ??
+  // if ((N = get_argument (argc, argv, "-g"))) {
+  // if ((N = get_argument (argc, argv, "-i"))) {
 
   name = NULL;
@@ -39 +34 @@
   
   buf = NULL;
-  if (IsImage) buf = SelectBuffer (GetImageName(), OLDBUFFER, FALSE);
+  // if (IsImage) buf = SelectBuffer (GetImageName(), OLDBUFFER, FALSE);
+  // XXX this stuff will go away with 32bit image data
   
   KiiCursorOn (kapa);
@@ -47 +43 @@
   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);
 
@@ -55 +53 @@
     set_str_variable ("KEY", key);
     
-    if (IsImage) {
-      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);
+    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);