Changeset 9845

Timestamp:

Nov 3, 2006, 7:25:12 AM (20 years ago)

Author:

eugene

Message:

fixed error in histogram for NaN/Inf

Location:

trunk/Ohana/src/kapa/graph

Files:

• DrawObjects.c (modified) (2 diffs)
• PSObjects.c (modified) (1 diff)
• bDrawObjects.c (modified) (1 diff)

trunk/Ohana/src/kapa/graph/DrawObjects.c

@@ -202 +202 @@
   Y1 = layout[0].axis[1].fy + layout[0].axis[1].dfy;
 
+  /* find the first valid datapoint */
   x = object[0].x; y = object[0].y;
   for (i = 0; (i < object[0].Npts) && !(finite(x[i]) && finite(y[i])); i++);
@@ -210 +211 @@
   sy0 = MAX (MIN (sy0, Y0), Y1);
   
+  /* continue with rest of points */
   for (i++; i < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]))) continue;

trunk/Ohana/src/kapa/graph/PSObjects.c

@@ -259 +259 @@
   Y1 = layout[0].axis[1].fy + layout[0].axis[1].dfy;
 
+  /* find the first valid datapoint */
   x = object[0].x; y = object[0].y;
   for (i = 0; (i < object[0].Npts) && !(finite(x[i]) && finite(y[i])); i++);
   if (i >= object[0].Npts) return;
-  sx0 = x[0]*mxi + y[0]*mxj + bx;
-  sy0 = x[0]*myi + y[0]*myj + by;
+  sx0 = x[i]*mxi + y[i]*mxj + bx;
+  sy0 = x[i]*myi + y[i]*myj + by;
   sx0 = MIN (MAX (sx0, X0), X1);
   sy0 = MAX (MIN (sy0, Y0), Y1);
   
+  /* continue with rest of points */
   for (i++; i < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]))) continue;

trunk/Ohana/src/kapa/graph/bDrawObjects.c

@@ -170 +170 @@
   Y1 = layout[0].axis[1].fy + layout[0].axis[1].dfy;
 
+  /* find the first valid datapoint */
   x = object[0].x; y = object[0].y;
   for (i = 0; (i < object[0].Npts) && !(finite(x[i]) && finite(y[i])); i++);
   if (i >= object[0].Npts) return;
-  sx0 = x[0]*mxi + y[0]*mxj + bx;
-  sy0 = x[0]*myi + y[0]*myj + by;
+  sx0 = x[i]*mxi + y[i]*mxj + bx;
+  sy0 = x[i]*myi + y[i]*myj + by;
   sx0 = MIN (MAX (sx0, X0), X1);
   sy0 = MAX (MIN (sy0, Y0), Y1);
   
+  /* continue with rest of points */
   for (i++; i < object[0].Npts; i++) {
     if (!(finite(x[i]) && finite(y[i]))) continue;