Changeset 5850 for trunk/Ohana/src/opihi/cmd.astro

Timestamp:

Dec 27, 2005, 3:21:40 PM (21 years ago)

Author:

eugene

Message:

substantial work to move kii/kapa call into libkapa

Location:

trunk/Ohana/src/opihi/cmd.astro

Files:

• gauss.c (modified) (1 diff)
• region.c (modified) (3 diffs)

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

@@ -54 +54 @@
   for (i = 0; (i < Nspot) || (Nspot == 0); i++) {
     KiiCursorRead (Ximage, &X, &Y, key);
-
     if (!strcasecmp (key, "Q")) break;
-
     Z = get_aperture_stats (&buf[0].matrix, (int)(X+0.5), (int)(Y+0.5), Npix, Nborder, max);
   }

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

@@ -3 +3 @@
 int region (int argc, char **argv) {
   
-  char buffer[65], string[256];
+  char string[256];
   double Ra, Dec, Radius;
   double dx, dy;
@@ -60 +60 @@
   
   /* ask kapa for coordinate limits, so get the right aspect ratio */
-  SendGraphCommand (Xgraph, 4, "LIMS"); 
-  read (Xgraph, buffer, 30); 
-  sscanf (buffer, "%*s %lf %lf", &dx, &dy); 
+  KiiSendCommand (Xgraph, 4, "LIMS"); 
+  KiiScanMessage (Xgraph, "%lf %lf", &dx, &dy); 
   dx = fabs (dx);
   dy = fabs (dy); 
@@ -102 +101 @@
   graphmode.coords.cdelt1 = graphmode.coords.cdelt2 = 1.0;
 
-  SendGraphCommand (Xgraph, 4, "ERAS");
-  SendGraphCommand (Xgraph, 4, "SLIM"); 
-  SendGraphMessage (Xgraph, "%f %f %f %f", graphmode.xmin, graphmode.xmax, graphmode.ymin, graphmode.ymax);
+  KapaClear (Xgraph, FALSE);
+  KapaSetLimits (Xgraph, &graphmode);
 
+  /* drop this? */
   sprintf (string, "%8.4f %8.4f (%f)", Ra, Dec, Radius);
-  SendLabel (string, Xgraph, 2);
+  KapaSendLabel (Xgraph, string, 2);
 
   SetGraph (graphmode);
-
   return (TRUE);
-
 }