Mercurial > dwindows
changeset 1266:83b0ed8c8377
Fixed on GTK passing angles to cairo in degrees instead of radians.
Also fixed some incorrect values in the test program for the arc.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Tue, 25 Oct 2011 12:01:20 +0000 |
| parents | 4c980ddfd181 |
| children | 87e0969d13bc |
| files | dwtest.c gtk/dw.c gtk3/dw.c |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/dwtest.c Tue Oct 25 11:14:13 2011 +0000 +++ b/dwtest.c Tue Oct 25 12:01:20 2011 +0000 @@ -369,7 +369,7 @@ dw_color_foreground_set(DW_CLR_BLUE); dw_draw_polygon(window, pixmap, TRUE, 7, x, y); dw_color_foreground_set(DW_CLR_CYAN); - dw_draw_arc(window, pixmap, 0, width - 40, height - 40, width - 40, height - 20, width - 20, height - 40); + dw_draw_arc(window, pixmap, 0, width - 30, height - 30, width - 10, height - 30, width - 30, height - 10); if(image) { if(image_stretch)
--- a/gtk/dw.c Tue Oct 25 11:14:13 2011 +0000 +++ b/gtk/dw.c Tue Oct 25 12:01:20 2011 +0000 @@ -8087,8 +8087,8 @@ if(cr) { GdkColor *foreground = pthread_getspecific(_dw_fg_color_key); - double a1 = 180/M_PI * atan2((y1-yorigin), (x1-xorigin)); - double a2 = 180/M_PI * atan2((y2-yorigin), (x2-xorigin)); + double a1 = atan2((y1-yorigin), (x1-xorigin)); + double a2 = atan2((y2-yorigin), (x2-xorigin)); gdk_cairo_set_source_color (cr, foreground); cairo_set_line_width(cr, 1);
--- a/gtk3/dw.c Tue Oct 25 11:14:13 2011 +0000 +++ b/gtk3/dw.c Tue Oct 25 12:01:20 2011 +0000 @@ -6960,8 +6960,8 @@ double dx = xorigin - x1; double dy = yorigin - y1; double r = sqrt(dx*dx + dy*dy); - double a1 = 180/M_PI * atan2((y1-yorigin), (x1-xorigin)); - double a2 = 180/M_PI * atan2((y2-yorigin), (x2-xorigin)); + double a1 = atan2((y1-yorigin), (x1-xorigin)); + double a2 = atan2((y2-yorigin), (x2-xorigin)); gdk_cairo_set_source_color (cr, foreground); cairo_set_line_width(cr, 1);