Changeset 13479 for trunk/Ohana/src/kapa2/src/CSaveOverlay.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/kapa2/src/CSaveOverlay.c (modified) (4 diffs)

trunk/Ohana/src/kapa2/src/CSaveOverlay.c

@@ -1 +1 @@
 # include "Ximage.h"
 
-int CSaveOverlay () {
+int CSaveOverlay (int sock) {
 
-  char filename[256];
+  char filename[256], *type;
   int i, N;
   double ra, dec, ra1, dec1, x1, y1, dra, ddec;
@@ -10 +10 @@
   KapaImageWidget *image;
 
+  KiiScanMessage (sock, "%*s %d %s", &N, filename);
+  
   section = GetActiveSection();
   image   = section->image;
+  if (image == NULL) return (TRUE);
 
-  KiiScanMessage (sock, "%*s %d %s", &N, filename);
-  
   f = fopen (filename, "w");
   if (f == NULL) {
@@ -22 +23 @@
 
   for (i = 0; i < image[0].overlay[N].Nobjects; i++) {
-    if (!strcmp (image[0].overlay[N].objects[i].type, "LINE")) {
+    if (image[0].overlay[N].objects[i].type == KII_OVERLAY_LINE) {
       XY_to_RD (&ra, &dec, image[0].overlay[N].objects[i].x, image[0].overlay[N].objects[i].y, &image[0].coords);
       x1 = image[0].overlay[N].objects[i].x + image[0].overlay[N].objects[i].dx;
@@ -40 +41 @@
       dra = cos (dec*RAD_DEG) * fabs (ra1 - ra);
     }
-    fprintf (f, "%s %lf %lf %lf %lf\n", image[0].overlay[N].objects[i].type, ra, dec, dra, ddec);
+    type = KiiOverlayTypeByNumber (image[0].overlay[N].objects[i].type);
+    if (type == NULL) continue;
+    fprintf (f, "%s %lf %lf %lf %lf\n", type, ra, dec, dra, ddec);
    }
   fclose (f);