Changeset 13479 for trunk/Ohana/src/opihi/cmd.astro/gauss.c

Timestamp:

May 22, 2007, 12:23:09 PM (19 years ago)

Author:

eugene

Message:

upgrading to kapa 2.0 API, upgrades to dvo user interface

File:

• trunk/Ohana/src/opihi/cmd.astro/gauss.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.astro/gauss.c

@@ -5 +5 @@
   char key[20];
   int i, N, Npix, Nborder, Nspot;
-  double X, Y, Z, max;
-  int Ximage, Nimage;
+  double X, Y, Z, ZP, RA, DEC, max;
+  int kapa;
+  char *name;
   Buffer *buf;
+  KapaImageData data;
 
-  Nimage = -1;
+  name = NULL;
   if ((N = get_argument (argc, argv, "-n"))) {
     remove_argument (N, &argc, argv);
-    Nimage = atof (argv[N]);
+    name = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
   }
-  if (!GetImage (&Ximage, &Nimage)) return (FALSE);
+  if (!GetImageData (&data, &kapa, name)) return (FALSE);
+  FREE (name);
 
   Nborder = 3;
@@ -37 +40 @@
   }
   
-  if (Ximage < 1) {
+  if (kapa < 1) {
     gprint (GP_ERR, "no active TV\n");
     return (FALSE);
@@ -48 +51 @@
   }
 
-  if ((buf = SelectBuffer (GetImageName(), OLDBUFFER, TRUE)) == NULL) return (FALSE);
+  if ((buf = SelectBuffer (data.name, OLDBUFFER, TRUE)) == NULL) return (FALSE);
 
-  KiiCursorOn (Ximage);
+  KiiCursorOn (kapa);
 
   for (i = 0; (i < Nspot) || (Nspot == 0); i++) {
-    KiiCursorRead (Ximage, &X, &Y, key);
+    KiiCursorRead (kapa, &X, &Y, &ZP, &RA, &DEC, key);
     if (!strcasecmp (key, "Q")) break;
     Z = get_aperture_stats (&buf[0].matrix, (int)(X+0.5), (int)(Y+0.5), Npix, Nborder, max);
   }
-  KiiCursorOff (Ximage);
+  KiiCursorOff (kapa);
   return (TRUE);
 }