Changeset 5846 for trunk/Ohana/src/opihi/cmd.data/point.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/point.c (modified) (3 diffs)

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

@@ -3 +3 @@
 int point (int argc, char **argv) {
   
-  int N, n, ISCEL, ISPIX;
+  int N, celestial, pixscale;
   int Ximage, Nimage;
-  double x, y, dx, dy, x1, y1;
-  double dra, ddec, ra1, dec1, ra, dec;
+  double ra, dec, dra, ddec;
+  double x1, y1, ra1, dec1;
   Coords coords;
   Buffer *buf;
+  KiiOverlay overlay;
 
   Nimage = -1;
@@ -18 +19 @@
   if (!GetImage (&Ximage, &Nimage)) return (FALSE);
   
-  ISCEL = FALSE;
+  celestial = FALSE;
   if ((N = get_argument (argc, argv, "-c"))) {
     remove_argument (N, &argc, argv);
-    ISCEL = TRUE;
+    celestial = TRUE;
   }
   
-  ISPIX = FALSE;
-  if ((N = get_argument (argc, argv, "-p"))) {
+  pixscale = FALSE;
+  if ((N = get_argument (argc, argv, "-pixscale"))) {
     remove_argument (N, &argc, argv);
-    ISPIX = TRUE;
+    pixscale = TRUE;
   }
 
@@ -35 +36 @@
   }
   
-  if (!SelectOverlay (argv[1], &n)) 
-    return (FALSE);
-
-  if (ISCEL) {
+  if (celestial) {
     if ((buf = SelectBuffer (GetImageName(), OLDBUFFER, TRUE)) == NULL) return (FALSE);
     GetCoords (&coords, &buf[0].header);
   }
 
-  ra = atof(argv[3]);
-  dec = atof(argv[4]);
-  dra = atof(argv[5]);
-  ddec = atof(argv[6]);
-  if (ISCEL) {
-    RD_to_XY (&x, &y, ra, dec, &coords);
-    if (!ISPIX) {
+  if (celestial) {
+    ra   = atof(argv[3]);
+    dec  = atof(argv[4]);
+    dra  = atof(argv[5]);
+    ddec = atof(argv[6]);
+
+    fRD_to_XY (&overlay.x, &overlay.y, ra, dec, &coords);
+    if (pixscale) {
+      overlay.dx = atof(argv[5]);
+      overlay.dy = atof(argv[6]);
+    } else {
       ra1 = ra + dra;
       dec1 = dec + ddec;
       RD_to_XY (&x1, &y1, ra1, dec1, &coords);
-      dx = x1 - x;
-      dy = y1 - y;
-    } else {
-      dx = atof(argv[5]);
-      dy = atof(argv[6]);
+      overlay.dx = x1 - overlay.x;
+      overlay.dy = y1 - overlay.y;
     }
   }
   else {
-    x = ra;
-    y = dec;
-    dx = dra;
-    dy = ddec;
+    overlay.x  = atof(argv[3]);
+    overlay.y  = atof(argv[4]);
+    overlay.dx = atof(argv[5]);
+    overlay.dy = atof(argv[6]);
   }
-
-  SendGraphCommand (Ximage, 4, "LOAD");
-  SendGraphCommand (Ximage, 16, "OVERLAY %6d ", n);
-  SendGraphCommand (Ximage, 16, "NLINES %7d ", 1);
-  SendGraphCommand (Ximage, 128, "%15s %20.10f %20.10f %20.10f %20.10f ", argv[2], x, y, dx, dy);
-  SendGraphCommand (Ximage, 16, "DONE");
+  overlay.type = KiiOverlayTypeByName (argv[2]);
+  KiiLoadOverlay (Ximage, &overlay, 1, argv[1]);
   return (TRUE);
 }
-