Changeset 20936 for trunk/Ohana/src/opihi/cmd.astro/cplot.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/cmd.astro/cplot.c (modified) (5 diffs)

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

@@ -4 +4 @@
   
   int i, kapa, Npts, status, leftside;
-  float *x, *y, *r, *d, Rmin, Rmax, Rmid;
+  opihi_flt *x, *y, *r, *d, Rmin, Rmax, Rmid;
   Vector Xvec, Yvec, *xvec, *yvec;
   Graphdata graphmode;
@@ -23 +23 @@
   if ((yvec = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return (FALSE);
 
+  REQUIRE_VECTOR_FLT (xvec, FALSE); 
+  REQUIRE_VECTOR_FLT (yvec, FALSE); 
+
   if (xvec[0].Nelements != yvec[0].Nelements) {
     gprint (GP_ERR, "vectors are not the same length\n");
@@ -28 +31 @@
   }
 
-  ALLOCATE (Xvec.elements, float, xvec[0].Nelements);
-  ALLOCATE (Yvec.elements, float, xvec[0].Nelements);
-    
-  Xvec.Nelements = xvec[0].Nelements;
-  Yvec.Nelements = xvec[0].Nelements;
+  SetVector (&Xvec, OPIHI_FLT, xvec[0].Nelements);
+  SetVector (&Yvec, OPIHI_FLT, xvec[0].Nelements);
   
-  r = xvec[0].elements;
-  d = yvec[0].elements;
-  x = Xvec.elements;
-  y = Yvec.elements;
+  r = xvec[0].elements.Flt;
+  d = yvec[0].elements.Flt;
+  x = Xvec.elements.Flt;
+  y = Yvec.elements.Flt;
   
   Npts = 0;
   for (i = 0; i < Xvec.Nelements; i++, r++, d++) {
-      *r = ohana_normalize_angle (*r);
+    *r = ohana_normalize_angle (*r);
     while (*r < Rmin) *r += 360.0;
     while (*r > Rmax) *r -= 360.0;
@@ -51 +51 @@
       if (!leftside && (r[0] < Rmid - 90)) { r[0] += 360.0; }
     }
-    status = fRD_to_XY (x, y, *r, *d, &graphmode.coords);
+    status = RD_to_XY (x, y, *r, *d, &graphmode.coords);
 
     // if we fail on one of the points, drop the corresponding pair
@@ -77 +77 @@
 
   graphmode.etype = 0;
-  PlotVectorPair (kapa, Npts, Xvec.elements, Yvec.elements, &graphmode);
+  PlotVectorPair (kapa, &Xvec, &Yvec, &graphmode);
   
-  free (Xvec.elements);
-  free (Yvec.elements);
+  free (Xvec.elements.Ptr);
+  free (Yvec.elements.Ptr);
     
   return (TRUE);