Changeset 20857 for branches/eam_branch_20081124/Ohana/src/opihi/dvo/avextract.c

Timestamp:

Nov 30, 2008, 7:45:21 AM (18 years ago)

Author:

eugene

Message:

modify functions to use both int and flt vectors

File:

• branches/eam_branch_20081124/Ohana/src/opihi/dvo/avextract.c (modified) (4 diffs)

branches/eam_branch_20081124/Ohana/src/opihi/dvo/avextract.c

@@ -7 +7 @@
   int Nsecfilt, mode, VERBOSE;
   char **cstack, name[1024];
-  float *values;
+  dbValue *values;
   void *Signal;
 
@@ -117 +117 @@
       if (!dbBooleanCond (stack, Nstack, values)) continue;
       for (n = 0; n < Nreturn; n++) {
-        vec[n][0].elements.Flt[Npts] = values[n];
+        if (vec[n][0].type == OPIHI_FLT) {
+          vec[n][0].elements.Flt[Npts] = values[n].Flt;
+        } else {
+          vec[n][0].elements.Int[Npts] = values[n].Int;
+        }
       }
       Npts++;
@@ -136 +140 @@
   }
 
+  free (values);
   dbFreeFields (fields, Nfields);
   dbFreeStack (stack, Nstack);
@@ -144 +149 @@
 
  escape:
+  free (values);
   dbFreeFields (fields, Nfields);
   dbFreeStack (stack, Nstack);