Changeset 20936 for trunk/Ohana/src/opihi/dvo/imbox.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/dvo/imbox.c (modified) (3 diffs)

trunk/Ohana/src/opihi/dvo/imbox.c

@@ -36 +36 @@
   
   /* project this image to screen display coords */
-  ALLOCATE (Xvec.elements, float, 8);
-  ALLOCATE (Yvec.elements, float, 8);
+  SetVector (&Xvec, OPIHI_FLT, 8);
+  SetVector (&Yvec, OPIHI_FLT, 8);
 
   while (gfits_fread_header (f, &header)) {
@@ -82 +82 @@
         while (r > Rmid) r-= 360.0;
       }
-      status |= fRD_to_XY (&Xvec.elements[2*j], &Yvec.elements[2*j], r, d, &graphmode.coords);
+      status |= RD_to_XY (&Xvec.elements.Flt[2*j], &Yvec.elements.Flt[2*j], r, d, &graphmode.coords);
       if (j > 0) {
-        Xvec.elements[2*j - 1] = Xvec.elements[2*j];
-        Yvec.elements[2*j - 1] = Yvec.elements[2*j];
+        Xvec.elements.Flt[2*j - 1] = Xvec.elements.Flt[2*j];
+        Yvec.elements.Flt[2*j - 1] = Yvec.elements.Flt[2*j];
       }
     }
-    Xvec.elements[7] = Xvec.elements[0];
-    Yvec.elements[7] = Yvec.elements[0];
+    Xvec.elements.Flt[7] = Xvec.elements.Flt[0];
+    Yvec.elements.Flt[7] = Yvec.elements.Flt[0];
     InPic = FALSE;
     for (j = 0; j < 8; j+=2) {
-      if ((Xvec.elements[j] >= graphmode.xmin) && 
-          (Xvec.elements[j] <= graphmode.xmax) && 
-          (Yvec.elements[j] >= graphmode.ymin) && 
-          (Yvec.elements[j] <= graphmode.ymax))
+      if ((Xvec.elements.Flt[j] >= graphmode.xmin) && 
+          (Xvec.elements.Flt[j] <= graphmode.xmax) && 
+          (Yvec.elements.Flt[j] >= graphmode.ymin) && 
+          (Yvec.elements.Flt[j] <= graphmode.ymax))
         InPic = TRUE;
     }
 
-    Xvec.Nelements = Xvec.Nelements = 8;
+    Xvec.Nelements = Yvec.Nelements = 8;
     if (InPic) {
       graphmode.style = 2; /* points */
       graphmode.ptype = 100; /* connect pairs of points */
       graphmode.etype = 0;
-      PlotVectorPair (kapa, 8, Xvec.elements, Yvec.elements, &graphmode);
+      PlotVectorPair (kapa, &Xvec, &Yvec, &graphmode);
     }
   skip:
@@ -112 +112 @@
   }
   fclose (f);
-  free (Xvec.elements);
-  free (Yvec.elements);
+  free (Xvec.elements.Flt);
+  free (Yvec.elements.Flt);
   return (TRUE);