Changeset 20857 for branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/vzload.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/cmd.data/vzload.c (modified) (1 diff)

branches/eam_branch_20081124/Ohana/src/opihi/cmd.data/vzload.c

@@ -58 +58 @@
 
   for (i = N = 0; i < Noverlay; i++) {
-    size = MIN (MAX_OUTPUT_SIZE, (vecz[0].elements.Flt[i] - min) / range);
+    float z = (vecz[0].type == OPIHI_FLT) ? vecz[0].elements.Flt[i] : vecz[0].elements.Int[i];
+    size = MIN (MAX_OUTPUT_SIZE, (z - min) / range);
     if (size < 0.1) continue;
 
     overlay[N].type = type;
     overlay[N].text = NULL;
-    overlay[N].x = vecx[0].elements.Flt[i]+0.5;
-    overlay[N].y = vecy[0].elements.Flt[i]+0.5;
+    overlay[N].x = (vecx[0].type == OPIHI_FLT) ? vecx[0].elements.Flt[i] : vecx[0].elements.Int[i];
+    overlay[N].y = (vecy[0].type == OPIHI_FLT) ? vecy[0].elements.Flt[i] : vecy[0].elements.Int[i];
+
+    overlay[N].x += 0.5;
+    overlay[N].y += 0.5;
+
     overlay[N].angle = 0.0;