Changeset 31560 for trunk/Ohana/src/kapa2/src/bDrawObjects.c

Timestamp:

May 23, 2011, 6:01:32 PM (15 years ago)

Author:

eugene

Message:

fix changing shape of points (force symmetry about center pixel, consistency of size for different point types; consistency of shapes between plotting devices)

File:

• trunk/Ohana/src/kapa2/src/bDrawObjects.c (modified) (15 diffs)

trunk/Ohana/src/kapa2/src/bDrawObjects.c

@@ -4 +4 @@
 # define DrawCircle(BUF,X1,Y1,R) (bDrawCircle (BUF, (X1), (Y1), (R)))
 # define DrawRectangle(BUF,X,Y,dX,dY) (bDrawRectOpen (BUF, (X-0.5*dX), (Y-0.5*dY), (X+0.5*dX), (Y+0.5*dY)))
-# define FillRectangle(BUF,X,Y,dX,dY) (bDrawRectFill (BUF, (X-0.5*dX), (Y-0.5*dY), (X+0.5*dX), (Y+0.5*dY)))
-# define FillTriangle(BUF,X1,Y1,X2,Y2,X3,Y3) (bDrawTriFill (BUF, (X1), (Y1), (X2), (Y2), (X3), (Y3)))
+# define FillRectangle(BUF,X,Y,dX,dY) (bDrawRectFill (BUF, (X-0.5*dX), (Y-0.5*dY), (X+0.5*dX+1), (Y+0.5*dY+1)))
+# define FillTriangle(BUF,X1,Y1,dX,dY) (bDrawTriFill (BUF, (X1), (Y1), (dX), (dY)))
 # define OpenTriangle(BUF,X1,Y1,X2,Y2,X3,Y3) (bDrawTriOpen (BUF, (X1), (Y1), (X2), (Y2), (X3), (Y3)))
 
@@ -260 +260 @@
   float *x, *y, *z;
   double mxi, mxj, myi, myj, bxi, bxj, byi, byj, bx, by;
-  double sx, sy, d, sx1, sy1, sx2, sy2;
+  int sx, sy, sx1, sy1, sx2, sy2, d, D;
 
   mxi = graph[0].axis[0].dfx / (object[0].x1 - object[0].x0);
@@ -288 +288 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          FillRectangle (buffer, sx, sy, 2*d*z[i], 2*d*z[i]);
+          D = d*z[i];
+          FillRectangle (buffer, sx, sy, 2*D, 2*D);
         }
       }
@@ -300 +301 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          DrawRectangle (buffer, sx, sy, 2*d*z[i], 2*d*z[i]);
+          D = d*z[i];
+          DrawRectangle (buffer, sx, sy, 2*D, 2*D);
         }
       }
@@ -312 +314 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          DrawLine (buffer, sx - d*z[i], sy, sx + d*z[i], sy);
-          DrawLine (buffer, sx, sy - d*z[i], sx, sy + d*z[i]);
+          D = d*z[i];
+          DrawLine (buffer, sx - D, sy, sx + D, sy);
+          DrawLine (buffer, sx, sy - D, sx, sy + D);
         }
       }
@@ -325 +328 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          DrawLine (buffer, sx + d*z[i], sy - d*z[i], sx - d*z[i], sy + d*z[i]);
-          DrawLine (buffer, sx - d*z[i], sy - d*z[i], sx + d*z[i], sy + d*z[i]);
+          D = d*z[i];
+          DrawLine (buffer, sx + D, sy - D, sx - D, sy + D);
+          DrawLine (buffer, sx - D, sy - D, sx + D, sy + D);
         }
       }
@@ -338 +342 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          FillTriangle (buffer, sx - d*z[i], sy - 0.58*d*z[i], sx + d*z[i], sy - 0.58*d*z[i], sx, sy + 1.15*d*z[i]);
+          D = d*z[i];
+          // FillTriangle (buffer, sx - D, sy - 0.58*D, sx + D, sy - 0.58*D, sx, sy + 1.15*D);
+          FillTriangle (buffer, sx, sy + 0.58*D, D, -1.73*D);
         }
       }
@@ -350 +356 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          OpenTriangle (buffer, sx - d*z[i], sy + 0.58*d*z[i], sx, sy - 1.15*d*z[i], sx + d*z[i], sy + 0.58*d*z[i]);
+          D = d*z[i];
+          OpenTriangle (buffer, sx - D, sy + 0.58*D, sx + D, sy + 0.58*D, sx, sy - 1.15*D);
         }
       }
@@ -362 +369 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          DrawLine (buffer, sx, sy, sx - d*z[i], sy + 0.58*d*z[i]);
-          DrawLine (buffer, sx, sy, sx + d*z[i], sy + 0.58*d*z[i]);
-          DrawLine (buffer, sx, sy, sx,          sy - 1.15*d*z[i]);
+          D = d*z[i];
+          DrawLine (buffer, sx, sy, sx - D, sy - 0.58*D);
+          DrawLine (buffer, sx, sy, sx + D, sy - 0.58*D);
+          DrawLine (buffer, sx, sy, sx,     sy + 1.15*D);
         }
       }
@@ -376 +384 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          DrawCircle (buffer, sx, sy, d*z[i]);
+          D = d*z[i];
+          DrawCircle (buffer, sx, sy, D);
         }
       }
@@ -388 +397 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          DrawLine (buffer, sx + 0.00*d*z[i], sy - 1.00*d*z[i], sx + 0.95*d*z[i], sy - 0.31*d*z[i]);
-          DrawLine (buffer, sx + 0.95*d*z[i], sy - 0.31*d*z[i], sx + 0.58*d*z[i], sy + 0.81*d*z[i]);
-          DrawLine (buffer, sx + 0.58*d*z[i], sy + 0.81*d*z[i], sx - 0.58*d*z[i], sy + 0.81*d*z[i]);
-          DrawLine (buffer, sx - 0.58*d*z[i], sy + 0.81*d*z[i], sx - 0.95*d*z[i], sy - 0.31*d*z[i]);
-          DrawLine (buffer, sx - 0.95*d*z[i], sy - 0.31*d*z[i], sx + 0.00*d*z[i], sy - 1.00*d*z[i]);
+          D = d*z[i];
+          DrawLine (buffer, sx + 0.00*D, sy - 1.00*D, sx + 0.95*D, sy - 0.31*D);
+          DrawLine (buffer, sx + 0.95*D, sy - 0.31*D, sx + 0.58*D, sy + 0.81*D);
+          DrawLine (buffer, sx + 0.58*D, sy + 0.81*D, sx - 0.58*D, sy + 0.81*D);
+          DrawLine (buffer, sx - 0.58*D, sy + 0.81*D, sx - 0.95*D, sy - 0.31*D);
+          DrawLine (buffer, sx - 0.95*D, sy - 0.31*D, sx + 0.00*D, sy - 1.00*D);
         }
       }
@@ -404 +414 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          DrawLine (buffer, sx -      d*z[i], sy,               sx - 0.50*d*z[i], sy + 0.87*d*z[i]);
-          DrawLine (buffer, sx - 0.50*d*z[i], sy + 0.87*d*z[i], sx + 0.50*d*z[i], sy + 0.87*d*z[i]);
-          DrawLine (buffer, sx + 0.50*d*z[i], sy + 0.87*d*z[i], sx +      d*z[i], sy);
-
-          DrawLine (buffer, sx +      d*z[i], sy,               sx + 0.50*d*z[i], sy - 0.87*d*z[i]);
-          DrawLine (buffer, sx + 0.50*d*z[i], sy - 0.87*d*z[i], sx - 0.50*d*z[i], sy - 0.87*d*z[i]);
-          DrawLine (buffer, sx - 0.50*d*z[i], sy - 0.87*d*z[i], sx -      d*z[i], sy);
+          D = d*z[i];
+          DrawLine (buffer, sx -      D, sy,          sx - 0.50*D, sy + 0.87*D);
+          DrawLine (buffer, sx - 0.50*D, sy + 0.87*D, sx + 0.50*D, sy + 0.87*D);
+          DrawLine (buffer, sx + 0.50*D, sy + 0.87*D, sx +      D, sy);
+          DrawLine (buffer, sx +      D, sy,          sx + 0.50*D, sy - 0.87*D);
+          DrawLine (buffer, sx + 0.50*D, sy - 0.87*D, sx - 0.50*D, sy - 0.87*D);
+          DrawLine (buffer, sx - 0.50*D, sy - 0.87*D, sx -      D, sy);
         }
       }
@@ -431 +441 @@
     }
   } else {
-    d = object[0].size * 0.5 * (graphic->dx + graphic->dy) * 0.003;
+    d = (int)(object[0].size * hypot((float)graphic->dx, (float)graphic->dy) * 0.003);
     x = object[0].x; y = object[0].y;
+
     if (object[0].ptype == 0) { /* filled box */
       for (i = 0; i < object[0].Npts; i++) {
@@ -457 +468 @@
       }
     }
-    if (object[0].ptype == 2) { /* cross */
+    if (object[0].ptype == 2) { /* cross : OK */
       for (i = 0; i < object[0].Npts; i++) {
         if (!(finite(x[i]) && finite(y[i]))) continue;
@@ -491 +502 @@
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
         {
-          FillTriangle (buffer, sx - d, sy - 0.58*d, sx + d, sy - 0.58*d, sx, sy + 1.15*d);
+          FillTriangle (buffer, sx, sy + 0.58*d, d, -1.73*d);
         }
       }