Changeset 25179

Timestamp:

Aug 24, 2009, 8:43:52 AM (17 years ago)

Author:

eugene

Message:

angle of ellipse was inconsistent with definition of position angle

Location:

branches/eam_branches/20090715/Ohana/src/kapa2/src

Files:

• PSOverlay.c (modified) (1 diff)
• PaintOverlay.c (modified) (1 diff)
• bDrawOverlay.c (modified) (1 diff)

branches/eam_branches/20090715/Ohana/src/kapa2/src/PSOverlay.c

@@ -85 +85 @@
           # define DT 0.1
           for (t = DT; t < 2*M_PI + DT; t+=DT) {
-            x1 = X + pX*dX*cos(t)*cs - pX*dY*sin(t)*sn;
-            y1 = Y + pY*dX*cos(t)*sn + pY*dY*sin(t)*cs;
+            x1 = X + pX*dX*cos(t)*cs + pX*dY*sin(t)*sn;
+            y1 = Y - pY*dX*cos(t)*sn + pY*dY*sin(t)*cs;
             fprintf (f, " %6.1f %6.1f %6.1f %6.1f L\n", x0 + extra, y0 + extra, x1 + extra, y1 + extra);
             x0 = x1;

branches/eam_branches/20090715/Ohana/src/kapa2/src/PaintOverlay.c

@@ -77 +77 @@
           # define DT 0.1
           for (t = DT; t < 2*M_PI + DT; t+=DT) {
-            x1 = X + pX*dx*cos(t)*cs + pX*dy*sin(t)*sn;
-            y1 = Y - pY*dx*cos(t)*sn + pY*dy*sin(t)*cs;
+            x1 = X + pX*dx*cos(t)*cs - pX*dy*sin(t)*sn;
+            y1 = Y + pY*dx*cos(t)*sn + pY*dy*sin(t)*cs;
             XDrawLine (graphic[0].display, graphic[0].window, graphic[0].gc, x0, y0, x1, y1);
             x0 = x1;

branches/eam_branches/20090715/Ohana/src/kapa2/src/bDrawOverlay.c

@@ -86 +86 @@
           # define DT 0.1
           for (t = DT; t < 2*M_PI + DT; t+=DT) {
-            x1 = X + pX*dx*cos(t)*cs + pX*dy*sin(t)*sn;
-            y1 = Y - pY*dx*cos(t)*sn + pY*dy*sin(t)*cs;
+            x1 = X + pX*dx*cos(t)*cs - pX*dy*sin(t)*sn;
+            y1 = Y + pY*dx*cos(t)*sn + pY*dy*sin(t)*cs;
             bDrawLine (x0, y0, x1, y1);
             x0 = x1;