Changeset 27839 for branches/simmosaic_branches/Ohana/src/kapa2/src/DrawObjects.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/kapa2/src/DrawObjects.c (modified) (28 diffs)

branches/simmosaic_branches/Ohana/src/kapa2/src/DrawObjects.c

@@ -1 +1 @@
 # include "Ximage.h"
+
 # define DrawLine(X1,Y1,X2,Y2) (XDrawLine (graphic->display, graphic->window, graphic->gc, (int)(X1+0.5), (int)(Y1+0.5), (int)(X2+0.5), (int)(Y2+0.5)))
 # define DrawRectangle(X1,Y1,X2,Y2) (XDrawRectangle (graphic->display, graphic->window, graphic->gc, (int)(X1+0.5), (int)(Y1+0.5), (int)(X2+0.5), (int)(Y2+0.5)))
@@ -10 +11 @@
 
 static Graphic *graphic;
-
-void ClipLine (double x0, double y0, double x1, double y1, double X0, double Y0, double X1, double Y1);
 
 /* draw all objects for this Graph */
@@ -40 +39 @@
   /* set line type */
   switch (object[0].ltype) {
-  case 0:
-    XSetLineAttributes (graphic->display, graphic->gc, lweight, LineSolid, CapNotLast, JoinMiter);
-    break;
-  case 1:
-    XSetDashes (graphic->display, graphic->gc, 100, dash, 2);
-    XSetLineAttributes (graphic->display, graphic->gc, lweight, LineOnOffDash, CapNotLast, JoinMiter);
-    break;
-  case 2:
-    XSetDashes (graphic->display, graphic->gc, 10, dot, 2);
-    XSetLineAttributes (graphic->display, graphic->gc, lweight, LineOnOffDash, CapNotLast, JoinMiter);
-    break;
-  default:
-    XSetLineAttributes (graphic->display, graphic->gc, lweight, LineSolid, CapNotLast, JoinMiter);
-    break;
+    case 0:
+      XSetLineAttributes (graphic->display, graphic->gc, lweight, LineSolid, CapNotLast, JoinMiter);
+      break;
+    case 1:
+      XSetDashes (graphic->display, graphic->gc, 100, dash, 2);
+      XSetLineAttributes (graphic->display, graphic->gc, lweight, LineOnOffDash, CapNotLast, JoinMiter);
+      break;
+    case 2:
+      XSetDashes (graphic->display, graphic->gc, 10, dot, 2);
+      XSetLineAttributes (graphic->display, graphic->gc, lweight, LineOnOffDash, CapNotLast, JoinMiter);
+      break;
+    default:
+      XSetLineAttributes (graphic->display, graphic->gc, lweight, LineSolid, CapNotLast, JoinMiter);
+      break;
   }
 
@@ -59 +58 @@
 
   switch (object[0].style) {
-  case CONNECT: 
-    DrawConnect (graph, object);
-    break;
-  case HISTOGRAM:
-    DrawHistogram (graph, object);
-    break;
-  case POINTS:
-    DrawPoints (graph, object);
-    break;
+    case CONNECT: 
+      DrawConnect (graph, object);
+      break;
+    case HISTOGRAM:
+      DrawHistogram (graph, object);
+      break;
+    case POINTS:
+      DrawPoints (graph, object);
+      break;
   }
     
@@ -181 +180 @@
 
 /******/
+/* simplify the code abit by finding triplets, watch out for a histogram of 2 points */
 void DrawHistogram (KapaGraphWidget *graph, Gobjects *object) {
 
@@ -186 +186 @@
   float *x, *y;
   double mxi, mxj, myi, myj, bxi, bxj, byi, byj, bx, by;
-  double sx0, sy0, sx1, sy1, sxa;
+  double sx0, sy0, sx1, sy1, sxa, sya, sxo, syo;
   double X0, X1, Y0, Y1;
 
@@ -211 +211 @@
   for (i = 0; (i < object[0].Npts) && !(finite(x[i]) && finite(y[i])); i++);
   if (i >= object[0].Npts) return;
+
+  /* first valid data point */
   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);
+  
+  /* find the second valid datapoint */
+  for (i++; (i < object[0].Npts) && !(finite(x[i]) && finite(y[i])); i++);
+  if (i >= object[0].Npts) return;
+
+  /* second valid data point */
+  sx1 = x[i]*mxi + y[i]*mxj + bx;
+  sy1 = x[i]*myi + y[i]*myj + by;
+  sx1 = MIN (MAX (sx1, X0), X1);
+  sy1 = MAX (MIN (sy1, Y0), Y1);
+  
+  /* connect first point to second point */
+  sxa = sx0 - 0.5*(sx1 - sx0);
+  sya = MAX (sy0, Y0);
+  DrawLine (sx0, sy0, sxa, sy0);
+  DrawLine (sxa, sy0, sxa, sya);
+  
+  /* draw segment equal distance behind first point and down to x-axis */
+  sxa = 0.5*(sx0 + sx1);
+  DrawLine (sx0, sy0, sxa, sy0);
+  DrawLine (sxa, sy0, sxa, sy1);
+  DrawLine (sxa, sy1, sx1, sy1);
+  sx0 = sx1;
+  sy0 = sy1;
+  
+  /* continue with rest of points */
+  sxo = syo = 0;
+  for (i++; i < object[0].Npts; i++) {
+    if (!(finite(x[i]) && finite(y[i]))) continue;
+    sx1 = x[i]*mxi + y[i]*mxj + bx;
+    sy1 = x[i]*myi + y[i]*myj + by;
+    sx1 = MIN (MAX (sx1, X0), X1);
+    sy1 = MAX (MIN (sy1, Y0), Y1);
+    sxa = 0.5*(sx0 + sx1);
+    DrawLine (sx0, sy0, sxa, sy0);
+    DrawLine (sxa, sy0, sxa, sy1);
+    DrawLine (sxa, sy1, sx1, sy1);
+    sxo = sx0; syo = sy0;
+    sx0 = sx1; sy0 = sy1;
+  }
+  
+  /* draw segment equal distance after last point and down to x-axis */
+  sxa = sx1 + 0.5*(sx1 - sxo);
+  sya = MAX (sy1, Y0);
+  DrawLine (sx1, sy1, sxa, sy1);
+  DrawLine (sxa, sy1, sxa, sya);
+}
+
+# if (0)
+void FillHistogram (KapaGraphWidget *graph, Gobjects *object) {
+
+  int i;
+  float *x, *y;
+  double mxi, mxj, myi, myj, bxi, bxj, byi, byj, bx, by;
+  double sx0, sy0, sx1, sy1, sxa, sya, sxo, syo;
+  double X0, X1, Y0, Y1;
+
+  mxi = graph[0].axis[0].dfx / (object[0].x1 - object[0].x0);
+  mxj = graph[0].axis[1].dfx / (object[0].y1 - object[0].y0);
+  myi = graph[0].axis[0].dfy / (object[0].x1 - object[0].x0);
+  myj = graph[0].axis[1].dfy / (object[0].y1 - object[0].y0);
+  
+  bxi  =  graph[0].axis[0].fx - object[0].x0*graph[0].axis[0].dfx/(object[0].x1 - object[0].x0);
+  bxj  =  -object[0].y0*graph[0].axis[1].dfx/(object[0].y1 - object[0].y0);
+  byi  =  -object[0].x0*graph[0].axis[0].dfy/(object[0].x1 - object[0].x0);
+  byj  =  graph[0].axis[1].fy - object[0].y0*graph[0].axis[1].dfy/(object[0].y1 - object[0].y0);
+  
+  bx = bxi + bxj;
+  by = byi + byj;
+  
+  X0 = graph[0].axis[0].fx;
+  X1 = graph[0].axis[0].fx + graph[0].axis[0].dfx;
+  Y0 = graph[0].axis[1].fy;
+  Y1 = graph[0].axis[1].fy + graph[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;
+
+  /* first valid data point */
+  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);
+  
+  /* find the second valid datapoint */
+  for (i++; (i < object[0].Npts) && !(finite(x[i]) && finite(y[i])); i++);
+  if (i >= object[0].Npts) return;
+
+  /* second valid data point */
+  sx1 = x[i]*mxi + y[i]*mxj + bx;
+  sy1 = x[i]*myi + y[i]*myj + by;
+  sx1 = MIN (MAX (sx1, X0), X1);
+  sy1 = MAX (MIN (sy1, Y0), Y1);
+  
+  /* connect first point to second point */
+  sxa = sx0 - 0.5*(sx1 - sx0);
+  sya = MAX (sy0, Y0);
+  DrawLine (sx0, sy0, sxa, sy0);
+  DrawLine (sxa, sy0, sxa, sya);
+  
+  /* draw segment equal distance behind first point and down to x-axis */
+  sxa = 0.5*(sx0 + sx1);
+  DrawLine (sx0, sy0, sxa, sy0);
+  DrawLine (sxa, sy0, sxa, sy1);
+  DrawLine (sxa, sy1, sx1, sy1);
+  sx0 = sx1;
+  sy0 = sy1;
   
   /* continue with rest of points */
@@ -227 +338 @@
     DrawLine (sxa, sy0, sxa, sy1);
     DrawLine (sxa, sy1, sx1, sy1);
+    sxo = sx0; syo = sy0;
     sx0 = sx1; sy0 = sy1;
   }
+  
+  /* draw segment equal distance after last point and down to x-axis */
+  sxa = sx1 + 0.5*(sx1 - sxo);
+  sya = MAX (sy1, Y0);
+  DrawLine (sx1, sy1, sxa, sy1);
+  DrawLine (sxa, sy1, sxa, sya);
 }
+# endif
 
 /******/
@@ -263 +382 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            FillRectangle (sx - d*z[i], sy - d*z[i], 2*d*z[i], 2*d*z[i]);
-          }
+        {
+          FillRectangle (sx - d*z[i], sy - d*z[i], 2*d*z[i], 2*d*z[i]);
+        }
       }
     }
@@ -275 +394 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawRectangle (sx - d*z[i], sy - d*z[i], 2*d*z[i], 2*d*z[i]);
-          }
+        {
+          DrawRectangle (sx - d*z[i], sy - d*z[i], 2*d*z[i], 2*d*z[i]);
+        }
       }
     }
@@ -287 +406 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawLine (sx - d*z[i], sy, sx + d*z[i] + 1, sy);
-            DrawLine (sx, sy - d*z[i], sx, sy + d*z[i] + 1);
-          }
+        {
+          DrawLine (sx - d*z[i], sy, sx + d*z[i] + 1, sy);
+          DrawLine (sx, sy - d*z[i], sx, sy + d*z[i] + 1);
+        }
       }
     }
@@ -300 +419 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawLine (sx + d*z[i] + 1, sy - d*z[i] - 1, sx - d*z[i], sy + d*z[i]);
-            DrawLine (sx - d*z[i], sy - d*z[i], sx + d*z[i] + 1, sy + d*z[i] + 1);
-          }
+        {
+          DrawLine (sx + d*z[i] + 1, sy - d*z[i] - 1, sx - d*z[i], sy + d*z[i]);
+          DrawLine (sx - d*z[i], sy - d*z[i], sx + d*z[i] + 1, sy + d*z[i] + 1);
+        }
       }
     }
@@ -314 +433 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            points[0].x = sx - d*z[i];  points[0].y = sy + 0.58*d*z[i];  
-            points[1].x = sx + d*z[i];  points[1].y = sy + 0.58*d*z[i];  
-            points[2].x = sx;           points[2].y = sy - 1.15*d*z[i];  
-            points[3].x = sx - d*z[i];  points[3].y = sy + 0.58*d*z[i];  
-            XFillPolygon (graphic->display, graphic->window, graphic->gc, points, 4, Convex, CoordModeOrigin);
-          }
+        {
+          points[0].x = sx - d*z[i];  points[0].y = sy + 0.58*d*z[i];  
+          points[1].x = sx + d*z[i];  points[1].y = sy + 0.58*d*z[i];  
+          points[2].x = sx;           points[2].y = sy - 1.15*d*z[i];  
+          points[3].x = sx - d*z[i];  points[3].y = sy + 0.58*d*z[i];  
+          XFillPolygon (graphic->display, graphic->window, graphic->gc, points, 4, Convex, CoordModeOrigin);
+        }
       }
     }
@@ -330 +449 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawLine (sx - d*z[i], sy + 0.58*d*z[i], sx + d*z[i], sy + 0.58*d*z[i]);
-            DrawLine (sx + d*z[i], sy + 0.58*d*z[i], sx,          sy - 1.15*d*z[i]);
-            DrawLine (sx,          sy - 1.15*d*z[i], sx - d*z[i], sy + 0.58*d*z[i]);
-          }
+        {
+          DrawLine (sx - d*z[i], sy + 0.58*d*z[i], sx + d*z[i], sy + 0.58*d*z[i]);
+          DrawLine (sx + d*z[i], sy + 0.58*d*z[i], sx,          sy - 1.15*d*z[i]);
+          DrawLine (sx,          sy - 1.15*d*z[i], sx - d*z[i], sy + 0.58*d*z[i]);
+        }
       }
     }
@@ -344 +463 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawLine (sx, sy, sx - d*z[i], sy + 0.58*d*z[i]);
-            DrawLine (sx, sy, sx + d*z[i], sy + 0.58*d*z[i]);
-            DrawLine (sx, sy, sx,          sy - 1.15*d*z[i]);
-          }
+        {
+          DrawLine (sx, sy, sx - d*z[i], sy + 0.58*d*z[i]);
+          DrawLine (sx, sy, sx + d*z[i], sy + 0.58*d*z[i]);
+          DrawLine (sx, sy, sx,          sy - 1.15*d*z[i]);
+        }
       }
     }
@@ -358 +477 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawCircle (sx, sy, d*z[i]);
-          }
+        {
+          DrawCircle (sx, sy, d*z[i]);
+        }
+      }
+    }
+    if (object[0].ptype == 8) { /* pentagon */
+      for (i = 0; i < object[0].Npts; i++) {
+        if (!(finite(x[i]) && finite(y[i]))) continue;
+        sx = x[i]*mxi + y[i]*mxj + bx;
+        sy = x[i]*myi + y[i]*myj + by;
+        if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
+            (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
+        {
+          DrawLine (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 (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 (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 (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 (sx - 0.95*d*z[i], sy - 0.31*d*z[i], sx + 0.00*d*z[i], sy - 1.00*d*z[i]);
+        }
+      }
+    }
+    if (object[0].ptype == 9) { /* hexagon */
+      for (i = 0; i < object[0].Npts; i++) {
+        if (!(finite(x[i]) && finite(y[i]))) continue;
+        sx = x[i]*mxi + y[i]*mxj + bx;
+        sy = x[i]*myi + y[i]*myj + by;
+        if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
+            (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
+        {
+          DrawLine (sx -      d*z[i], sy,               sx - 0.50*d*z[i], sy + 0.87*d*z[i]);
+          DrawLine (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 (sx + 0.50*d*z[i], sy + 0.87*d*z[i], sx +      d*z[i], sy);
+
+          DrawLine (sx +      d*z[i], sy,               sx + 0.50*d*z[i], sy - 0.87*d*z[i]);
+          DrawLine (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 (sx - 0.50*d*z[i], sy - 0.87*d*z[i], sx -      d*z[i], sy);
+        }
       }
     }
@@ -386 +539 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            FillRectangle (sx - d, sy - d, 2*d, 2*d);
-          }
+        {
+          FillRectangle (sx - d, sy - d, 2*d, 2*d);
+        }
       }
     }
@@ -398 +551 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawRectangle (sx - d, sy - d, 2*d, 2*d);
-          }
+        {
+          DrawRectangle (sx - d, sy - d, 2*d, 2*d);
+        }
       }
     }
@@ -410 +563 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawLine (sx - d, sy, sx + d + 1, sy);
-            DrawLine (sx, sy - d, sx, sy + d + 1);
-          }
+        {
+          DrawLine (sx - d, sy, sx + d + 1, sy);
+          DrawLine (sx, sy - d, sx, sy + d + 1);
+        }
       }
     }
@@ -423 +576 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            /* XDrawLine is a little funny, this is needed to fix endpost errors */
-            DrawLine (sx + d + 1, sy - d - 1, sx - d, sy + d);
-            DrawLine (sx - d, sy - d, sx + d + 1, sy + d + 1);
-          }
+        {
+          /* XDrawLine is a little funny, this is needed to fix endpost errors */
+          DrawLine (sx + d + 1, sy - d - 1, sx - d, sy + d);
+          DrawLine (sx - d, sy - d, sx + d + 1, sy + d + 1);
+        }
       }
     }
@@ -438 +591 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            points[0].x = sx - d;  points[0].y = sy + 0.58*d;  
-            points[1].x = sx + d;  points[1].y = sy + 0.58*d;  
-            points[2].x = sx;      points[2].y = sy - 1.15*d;  
-            points[3].x = sx - d;  points[3].y = sy + 0.58*d;  
-            XFillPolygon (graphic->display, graphic->window, graphic->gc, points, 4, Convex, CoordModeOrigin);
-          }
+        {
+          points[0].x = sx - d;  points[0].y = sy + 0.58*d;  
+          points[1].x = sx + d;  points[1].y = sy + 0.58*d;  
+          points[2].x = sx;      points[2].y = sy - 1.15*d;  
+          points[3].x = sx - d;  points[3].y = sy + 0.58*d;  
+          XFillPolygon (graphic->display, graphic->window, graphic->gc, points, 4, Convex, CoordModeOrigin);
+        }
       }
     }
@@ -454 +607 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawLine (sx - d, sy + 0.58*d, sx + d, sy + 0.58*d);
-            DrawLine (sx + d, sy + 0.58*d, sx,     sy - 1.15*d);
-            DrawLine (sx,     sy - 1.15*d, sx - d, sy + 0.58*d);
-          }
+        {
+          DrawLine (sx - d, sy + 0.58*d, sx + d, sy + 0.58*d);
+          DrawLine (sx + d, sy + 0.58*d, sx,     sy - 1.15*d);
+          DrawLine (sx,     sy - 1.15*d, sx - d, sy + 0.58*d);
+        }
       }
     }
@@ -468 +621 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawLine (sx, sy, sx - d, sy + 0.58*d);
-            DrawLine (sx, sy, sx + d, sy + 0.58*d);
-            DrawLine (sx, sy, sx,     sy - 1.15*d);
-          }
+        {
+          DrawLine (sx, sy, sx - d, sy + 0.58*d);
+          DrawLine (sx, sy, sx + d, sy + 0.58*d);
+          DrawLine (sx, sy, sx,     sy - 1.15*d);
+        }
       }
     }
@@ -482 +635 @@
         if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
             (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
-          {
-            DrawCircle (sx, sy, d);
-          }
+        {
+          DrawCircle (sx, sy, d);
+        }
+      }
+    }
+    if (object[0].ptype == 8) { /* pentagon */
+      for (i = 0; i < object[0].Npts; i++) {
+        if (!(finite(x[i]) && finite(y[i]))) continue;
+        sx = x[i]*mxi + y[i]*mxj + bx;
+        sy = x[i]*myi + y[i]*myj + by;
+        if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
+            (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
+        {
+          DrawLine (sx + 0.00*d, sy - 1.00*d, sx + 0.95*d, sy - 0.31*d);
+          DrawLine (sx + 0.95*d, sy - 0.31*d, sx + 0.58*d, sy + 0.81*d);
+          DrawLine (sx + 0.58*d, sy + 0.81*d, sx - 0.58*d, sy + 0.81*d);
+          DrawLine (sx - 0.58*d, sy + 0.81*d, sx - 0.95*d, sy - 0.31*d);
+          DrawLine (sx - 0.95*d, sy - 0.31*d, sx + 0.00*d, sy - 1.00*d);
+        }
+      }
+    }
+    if (object[0].ptype == 9) { /* pentagon */
+      for (i = 0; i < object[0].Npts; i++) {
+        if (!(finite(x[i]) && finite(y[i]))) continue;
+        sx = x[i]*mxi + y[i]*mxj + bx;
+        sy = x[i]*myi + y[i]*myj + by;
+        if ((sx > graph[0].axis[0].fx) && (sx < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
+            (sy < graph[0].axis[1].fy) && (sy > graph[0].axis[1].fy + graph[0].axis[1].dfy))
+        {
+          DrawLine (sx - 1.00*d, sy + 0.00*d, sx - 0.50*d, sy + 0.87*d);
+          DrawLine (sx - 0.50*d, sy + 0.87*d, sx + 0.50*d, sy + 0.87*d);
+          DrawLine (sx + 0.50*d, sy + 0.87*d, sx + 1.00*d, sy + 0.00*d);
+          DrawLine (sx + 1.00*d, sy + 0.00*d, sx + 0.50*d, sy - 0.87*d);
+          DrawLine (sx + 0.50*d, sy - 0.87*d, sx - 0.50*d, sy - 0.87*d);
+          DrawLine (sx - 0.50*d, sy - 0.87*d, sx - 1.00*d, sy + 0.00*d);
+        }
       }
     }
@@ -534 +720 @@
         ((sx1 > graph[0].axis[0].fx) && (sx1 < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
          (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy))) 
-      {
-        DrawLine (sx0, sy0, sx1, sy1);
-        if (bar) {
-          sx10 = sy1 - sz;
-          sx11 = sy1 + sz;
-          DrawLine (sx1, sx10, sx1, sx11);
-        }
-      }
+    {
+      DrawLine (sx0, sy0, sx1, sy1);
+      if (bar) {
+        sx10 = sy1 - sz;
+        sx11 = sy1 + sz;
+        DrawLine (sx1, sx10, sx1, sx11);
+      }
+    }
     if (!(finite(x[i]) && finite(y[i]) && finite(dxm[i]))) continue;
     sx0 = x[i]*mxi + y[i]*mxj + bx;
@@ -551 +737 @@
         ((sx1 > graph[0].axis[0].fx) && (sx1 < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
          (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
-      {
-        DrawLine (sx0, sy0, sx1, sy1);
-        if (bar) {
-          sx10 = sy1 - sz;
-          sx11 = sy1 + sz;
-          DrawLine (sx1, sx10, sx1, sx11);
-        }
-      }
+    {
+      DrawLine (sx0, sy0, sx1, sy1);
+      if (bar) {
+        sx10 = sy1 - sz;
+        sx11 = sy1 + sz;
+        DrawLine (sx1, sx10, sx1, sx11);
+      }
+    }
   }
 }
@@ -596 +782 @@
         ((sx1 > graph[0].axis[0].fx) && (sx1 < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
          (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
-      {
-        DrawLine (sx0, sy0, sx1, sy1);
-        if (bar) {
-          sx10 = sx1 - sz;
-          sx11 = sx1 + sz;
-          DrawLine (sx10, sy1, sx11, sy1);
-        }
-      }
+    {
+      DrawLine (sx0, sy0, sx1, sy1);
+      if (bar) {
+        sx10 = sx1 - sz;
+        sx11 = sx1 + sz;
+        DrawLine (sx10, sy1, sx11, sy1);
+      }
+    }
     if (!(finite(x[i]) && finite(y[i]) && finite(dym[i]))) continue;
     sx0 = x[i]*mxi + y[i]*mxj + bx;
@@ -613 +799 @@
         ((sx1 > graph[0].axis[0].fx) && (sx1 < graph[0].axis[0].fx + graph[0].axis[0].dfx) &&
          (sy1 < graph[0].axis[1].fy) && (sy1 > graph[0].axis[1].fy + graph[0].axis[1].dfy)))
-      {
-        DrawLine (sx0, sy0, sx1, sy1);
-        if (bar) {
-          sx10 = sx1 - sz;
-          sx11 = sx1 + sz;
-          DrawLine (sx10, sy1, sx11, sy1);
-        }
-      }
+    {
+      DrawLine (sx0, sy0, sx1, sy1);
+      if (bar) {
+        sx10 = sx1 - sz;
+        sx11 = sx1 + sz;
+        DrawLine (sx10, sy1, sx11, sy1);
+      }
+    }
   }
 }