Changeset 20936 for trunk/Ohana/src/opihi/dvo/showtile.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/showtile.c (modified) (4 diffs)

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

@@ -22 +22 @@
   N = 0;
   NPTS = 200;
-  ALLOCATE (Xvec.elements, float, NPTS);
-  ALLOCATE (Yvec.elements, float, NPTS);
+  SetVector (&Xvec, OPIHI_FLT, NPTS);
+  SetVector (&Yvec, OPIHI_FLT, NPTS);
 
   /* starting position */
@@ -49 +49 @@
       for (i = 0; i < 4; i++) {
         fXY_to_RD (&R, &D, dr[i], dd[i], &coords);
-        status |= fRD_to_XY (&Xvec.elements[N+2*i], &Yvec.elements[N+2*i], R, D, &graphmode.coords);
+        status |= RD_to_XY (&Xvec.elements.Flt[N+2*i], &Yvec.elements.Flt[N+2*i], R, D, &graphmode.coords);
         if (i > 0) {
-          Xvec.elements[N+2*i - 1] = Xvec.elements[N+2*i];
-          Yvec.elements[N+2*i - 1] = Yvec.elements[N+2*i];
+          Xvec.elements.Flt[N+2*i - 1] = Xvec.elements.Flt[N+2*i];
+          Yvec.elements.Flt[N+2*i - 1] = Yvec.elements.Flt[N+2*i];
         }
         if (i == 1) {
@@ -59 +59 @@
         }
       }
-      Xvec.elements[N+7] = Xvec.elements[N];
-      Yvec.elements[N+7] = Yvec.elements[N];
+      Xvec.elements.Flt[N+7] = Xvec.elements.Flt[N];
+      Yvec.elements.Flt[N+7] = Yvec.elements.Flt[N];
 
       /* check if any corner is in plotting region */
       InPic = FALSE;
       for (i = 0; i < 8; i+=2) {
-        if ((Xvec.elements[N+i] >= graphmode.xmin) && 
-            (Xvec.elements[N+i] <= graphmode.xmax) && 
-            (Yvec.elements[N+i] >= graphmode.ymin) && 
-            (Yvec.elements[N+i] <= graphmode.ymax))
+        if ((Xvec.elements.Flt[N+i] >= graphmode.xmin) && 
+            (Xvec.elements.Flt[N+i] <= graphmode.xmax) && 
+            (Yvec.elements.Flt[N+i] >= graphmode.ymin) && 
+            (Yvec.elements.Flt[N+i] <= graphmode.ymax))
           InPic = TRUE;
       }
@@ -75 +75 @@
       if (N > NPTS - 1) {  /* this is OK because NPTS is made always a multiple of 8 */
         NPTS += 200;
-        REALLOCATE (Xvec.elements, float, NPTS);
-        REALLOCATE (Yvec.elements, float, NPTS);
+        REALLOCATE (Xvec.elements.Flt, opihi_flt, NPTS);
+        REALLOCATE (Yvec.elements.Flt, opihi_flt, NPTS);
       }
     }
   }
   
-  Xvec.Nelements = Xvec.Nelements = N;
+  Xvec.Nelements = Yvec.Nelements = N;
   if (N > 0) {
     graphmode.style = 2; /* points */
     graphmode.ptype = 100; /* connect pairs of points */
     graphmode.etype = 0;
-    PlotVectorPair (kapa, N, Xvec.elements, Yvec.elements, &graphmode);
+    PlotVectorPair (kapa, &Xvec, &Yvec, &graphmode);
   }
 
-  free (Xvec.elements);
-  free (Yvec.elements);
+  free (Xvec.elements.Flt);
+  free (Yvec.elements.Flt);
   return (TRUE);