callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the hue angle behave mathematically correct. Fixes bug #141922

Browse Source 
2006-05-07  Simon Budig  <simon@gimp.org>

	* modules/colorsel_triangle.c: Make the hue angle behave
	mathematically correct. Fixes bug #141922

	* plug-ins/script-fu/scripts/circuit.scm: Fix multi line description.

	* docs/Wilber.svg: Add xmlns attribute to the svg element, so
	firefox renders it when reading it from disk.
This commit is contained in:
Simon Budig
2006-05-07 20:47:10 +00:00
committed by Simon Budig
parent ab1153cb71
commit e6c52afb6e
4 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-05-07 Simon Budig <simon@gimp.org>
* modules/colorsel_triangle.c: Make the hue angle behave
mathematically correct. Fixes bug #141922
* plug-ins/script-fu/scripts/circuit.scm: Fix multi line description.
* docs/Wilber.svg: Add xmlns attribute to the svg element, so
firefox renders it when reading it from disk.
2006-05-07 Michael Natterer <mitch@gimp.org> 2006-05-07 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-scale.c (gimp_display_shell_scale): * app/display/gimpdisplayshell-scale.c (gimp_display_shell_scale):

3
docs/Wilber.svg
View File

@ -1,5 +1,6 @@
<?xml version="1.0" standalone="yes"?> <?xml version="1.0" standalone="yes"?>
<svg width="160mm" height="120mm" viewBox="0 0 77 60"> <svg width="160mm" height="120mm" viewBox="0 0 77 60"
xmlns="http://www.w3.org/2000/svg">
<g> <g>
<g> <g>
<path id="head" <path id="head"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

40
modules/colorsel_triangle.c
View File

@ -261,16 +261,16 @@ colorsel_triangle_update_preview (ColorselTriangle *triangle)
hue = (gdouble) selector->hsv.h * 2 * G_PI; hue = (gdouble) selector->hsv.h * 2 * G_PI;
/* Colored point (value = 1, saturation = 1) */ /* Colored point (value = 1, saturation = 1) */
hx = RINT (sin (hue) * triangle->triangleradius); hx = RINT (cos (hue) * triangle->triangleradius);
hy = RINT (cos (hue) * triangle->triangleradius); hy = RINT (sin (hue) * triangle->triangleradius);
/* Black point (value = 0, saturation not important) */ /* Black point (value = 0, saturation not important) */
sx = RINT (sin (hue - 2 * G_PI / 3) * triangle->triangleradius); sx = RINT (cos (hue + 2 * G_PI / 3) * triangle->triangleradius);
sy = RINT (cos (hue - 2 * G_PI / 3) * triangle->triangleradius); sy = RINT (sin (hue + 2 * G_PI / 3) * triangle->triangleradius);
/* White point (value = 1, saturation = 0) */ /* White point (value = 1, saturation = 0) */
vx = RINT (sin (hue + 2 * G_PI / 3) * triangle->triangleradius); vx = RINT (cos (hue - 2 * G_PI / 3) * triangle->triangleradius);
vy = RINT (cos (hue + 2 * G_PI / 3) * triangle->triangleradius); vy = RINT (sin (hue - 2 * G_PI / 3) * triangle->triangleradius);
hue = selector->hsv.h * 360.0; hue = selector->hsv.h * 360.0;
@ -286,7 +286,7 @@ colorsel_triangle_update_preview (ColorselTriangle *triangle)
{ {
if (r2 > SQR (triangle->triangleradius)) if (r2 > SQR (triangle->triangleradius))
{ {
atn = atan2 (x, y); atn = atan2 (y, x);
if (atn < 0) if (atn < 0)
atn = atn + 2 * G_PI; atn = atn + 2 * G_PI;
@ -310,16 +310,16 @@ colorsel_triangle_update_preview (ColorselTriangle *triangle)
/* marker in outer ring */ /* marker in outer ring */
x0 = RINT (sin (hue * G_PI / 180) * x0 = RINT (cos (hue * G_PI / 180) *
((gdouble) (triangle->wheelradius - ((gdouble) (triangle->wheelradius -
triangle->triangleradius + 1) / 2 + triangle->triangleradius + 1) / 2 +
triangle->triangleradius)); triangle->triangleradius));
y0 = RINT (cos (hue * G_PI / 180) * y0 = RINT (sin (hue * G_PI / 180) *
((gdouble) (triangle->wheelradius - ((gdouble) (triangle->wheelradius -
triangle->triangleradius + 1) / 2 + triangle->triangleradius + 1) / 2 +
triangle->triangleradius)); triangle->triangleradius));
atn = atan2 (x0, y0); atn = atan2 (y0, x0);
if (atn < 0) if (atn < 0)
atn = atn + 2 * G_PI; atn = atn + 2 * G_PI;
@ -341,7 +341,7 @@ colorsel_triangle_update_preview (ColorselTriangle *triangle)
} }
else else
{ {
atn = atan2 (x, y); atn = atan2 (y, x);
if (atn < 0) if (atn < 0)
atn = atn + 2 * G_PI; atn = atn + 2 * G_PI;
@ -382,7 +382,7 @@ colorsel_triangle_update_preview (ColorselTriangle *triangle)
{ {
if (SQR (x) + SQR (y) > SQR (triangle->triangleradius)) if (SQR (x) + SQR (y) > SQR (triangle->triangleradius))
{ {
atn = atan2 (x, y); atn = atan2 (y, x);
if (atn < 0) if (atn < 0)
atn = atn + 2 * G_PI; atn = atn + 2 * G_PI;
@ -497,7 +497,7 @@ colorsel_triangle_event (GtkWidget *widget,
x = event->button.x - (width - 1) / 2 - 1; x = event->button.x - (width - 1) / 2 - 1;
y = - event->button.y + (height - 1) / 2 + 1; y = - event->button.y + (height - 1) / 2 + 1;
r = sqrt ((gdouble) (SQR (x) + SQR (y))); r = sqrt ((gdouble) (SQR (x) + SQR (y)));
angle = ((gint) RINT (atan2 (x, y) / G_PI * 180) + 360 ) % 360; angle = ((gint) RINT (atan2 (y, x) / G_PI * 180) + 360 ) % 360;
if ( /* r <= triangle->wheelradius && */ r > triangle->triangleradius) if ( /* r <= triangle->wheelradius && */ r > triangle->triangleradius)
triangle->mode = 1; /* Dragging in the Ring */ triangle->mode = 1; /* Dragging in the Ring */
@ -513,7 +513,7 @@ colorsel_triangle_event (GtkWidget *widget,
x = x - (width - 1) / 2 - 1; x = x - (width - 1) / 2 - 1;
y = - y + (height - 1) / 2 + 1; y = - y + (height - 1) / 2 + 1;
r = sqrt ((gdouble) (SQR (x) + SQR (y))); r = sqrt ((gdouble) (SQR (x) + SQR (y)));
angle = ((gint) RINT (atan2 (x, y) / G_PI * 180) + 360 ) % 360; angle = ((gint) RINT (atan2 (y, x) / G_PI * 180) + 360 ) % 360;
break; break;
case GDK_BUTTON_RELEASE: case GDK_BUTTON_RELEASE:
@ -542,12 +542,12 @@ colorsel_triangle_event (GtkWidget *widget,
{ {
hue = selector->hsv.h * 2 * G_PI; hue = selector->hsv.h * 2 * G_PI;
hx = sin (hue) * triangle->triangleradius; hx = cos (hue) * triangle->triangleradius;
hy = cos (hue) * triangle->triangleradius; hy = sin (hue) * triangle->triangleradius;
sx = sin (hue - 2 * G_PI / 3) * triangle->triangleradius; sx = cos (hue + 2 * G_PI / 3) * triangle->triangleradius;
sy = cos (hue - 2 * G_PI / 3) * triangle->triangleradius; sy = sin (hue + 2 * G_PI / 3) * triangle->triangleradius;
vx = sin (hue + 2 * G_PI / 3) * triangle->triangleradius; vx = cos (hue - 2 * G_PI / 3) * triangle->triangleradius;
vy = cos (hue + 2 * G_PI / 3) * triangle->triangleradius; vy = sin (hue - 2 * G_PI / 3) * triangle->triangleradius;
hue = selector->hsv.h * 360.0; hue = selector->hsv.h * 360.0;

3
plug-ins/script-fu/scripts/circuit.scm
View File

@ -128,8 +128,7 @@
(script-fu-register "script-fu-circuit" (script-fu-register "script-fu-circuit"
_"_Circuit..." _"_Circuit..."
"Fills the current selection with something that looks "Fills the current selection with something that looks vaguely like a circuit board."
vaguely like a circuit board."
"Adrian Likins <adrian@gimp.org>" "Adrian Likins <adrian@gimp.org>"
"Adrian Likins" "Adrian Likins"
"10/17/97" "10/17/97"