Changeset 15620 for trunk/Ohana/src/kapa2

Timestamp:

Nov 15, 2007, 9:29:21 AM (19 years ago)

Author:

eugene

Message:

support for rotated ellipses in kapa overlays

Location:

trunk/Ohana/src/kapa2/src

Files:

• LoadOverlay.c (modified) (1 diff)
• PSOverlay.c (modified) (1 diff)
• PaintOverlay.c (modified) (4 diffs)
• bDrawOverlay.c (modified) (1 diff)

trunk/Ohana/src/kapa2/src/LoadOverlay.c

@@ -75 +75 @@
   j = image[0].overlay[overnum].Nobjects;
   for (i = 0; i < Noverlay; i++, j++) {
-    image[0].overlay[overnum].objects[j].x = overlay[i].x;
-    image[0].overlay[overnum].objects[j].y = overlay[i].y;
-    image[0].overlay[overnum].objects[j].dx = overlay[i].dx;
-    image[0].overlay[overnum].objects[j].dy = overlay[i].dy;
-    image[0].overlay[overnum].objects[j].type = overlay[i].type;
-    image[0].overlay[overnum].objects[j].text = NULL;
+    image[0].overlay[overnum].objects[j].x     = overlay[i].x;
+    image[0].overlay[overnum].objects[j].y     = overlay[i].y;
+    image[0].overlay[overnum].objects[j].dx    = overlay[i].dx;
+    image[0].overlay[overnum].objects[j].dy    = overlay[i].dy;
+    image[0].overlay[overnum].objects[j].angle = overlay[i].angle;
+    image[0].overlay[overnum].objects[j].type  = overlay[i].type;
+    image[0].overlay[overnum].objects[j].text  = NULL;
   }
 

trunk/Ohana/src/kapa2/src/PSOverlay.c

@@ -58 +58 @@
           break;
         }
+        // XXX add in the rotated ellipse version (rotate in PS space)
         fprintf (f, " %6.1f %6.1f %6.1f C\n", X, Y, fabs(dX + extra));
         break;

trunk/Ohana/src/kapa2/src/PaintOverlay.c

@@ -5 +5 @@
   int i;
   int dX, dY, dx, dy;
-  int X, Y, Xmin, Ymin, Xmax, Ymax, Xrange, Yrange;
-  double expand, X0, Y0;
+  int x, y, X, Y, Xmin, Ymin, Xmax, Ymax, Xrange, Yrange;
+  double t, expand, X0, Y0;
  
   XSetForeground (graphic[0].display, graphic[0].gc, image[0].overlay[N].color);
@@ -43 +43 @@
     switch (image[0].overlay[N].objects[i].type) {
       case KII_OVERLAY_LINE:
+        // the angle makes no sense for a line...
         XDrawLine (graphic[0].display, graphic[0].window, graphic[0].gc, X, Y, (X+dX), (Y+dY));
         break;
       case KII_OVERLAY_TEXT:
+        // XXX currently we ignore the rectangle angle
         XDrawString (graphic[0].display, graphic[0].window, graphic[0].gc, X, Y, image[0].overlay[N].objects[i].text, strlen(image[0].overlay[N].objects[i].text));
         break;
@@ -51 +53 @@
         dx = MAX (abs(dX),2) / 2;
         dy = MAX (abs(dY),2) / 2;
+        // XXX currently we ignore the rectangle angle
         XDrawRectangle (graphic[0].display, graphic[0].window, graphic[0].gc, (X - dx), (Y - dy), 2*dx, 2*dy);
         break;
@@ -56 +59 @@
         dx = MAX (abs(dX),2);
         dy = MAX (abs(dY),2);
-        XDrawArc (graphic[0].display, graphic[0].window, graphic[0].gc, (X - dx), (Y - dy), 2*dx, 2*dy, 0, 23040);
+        if (image[0].overlay[N].objects[i].angle == 0.0) {
+          XDrawArc (graphic[0].display, graphic[0].window, graphic[0].gc, (X - dx), (Y - dy), 2*dx, 2*dy, 0, 23040);
+        } else {
+          // very stupid rotate ellipse drawing:
+          double angle = image[0].overlay[N].objects[i].angle * RAD_DEG;
+          double cs = cos(angle);
+          double sn = sin(angle);
+          // XXX dt should be based on the size of the ellipse...
+          for (t = 0; t < 2*M_PI; t+=0.05) {
+            x = X + dx*cos(t)*cs + dy*sin(t)*sn;
+            y = Y - dx*cos(t)*sn + dy*sin(t)*cs;
+            XDrawPoint (graphic[0].display, graphic[0].window, graphic[0].gc, x, y);
+          }
+        }
         break;
       default:

trunk/Ohana/src/kapa2/src/bDrawOverlay.c

@@ -72 +72 @@
         dx = MAX (abs(dX),2);
         dy = MAX (abs(dY),2);
-        bDrawArc (X, Y, dx, dy, 0, 360);
+        if (image[0].overlay[N].objects[i].angle == 0.0) {
+          bDrawArc (X, Y, dx, dy, 0, 360);
+        } else {
+          // very stupid rotate ellipse drawing:
+          double x, y, t;
+          double angle = image[0].overlay[N].objects[i].angle * RAD_DEG;
+          double cs = cos(angle);
+          double sn = sin(angle);
+          // XXX dt should be based on the size of the ellipse...
+          for (t = 0; t < 2*M_PI; t+=0.05) {
+            x = X + dx*cos(t)*cs + dy*sin(t)*sn;
+            y = Y - dx*cos(t)*sn + dy*sin(t)*cs;
+            bDrawPoint (x, y);
+          }
+        }
         break;
       default: