Commit e2b83b28 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app/tools/gimpdrawtool.[ch] app/tools/gimpperspectiveclonetool.c compare

2007-03-30  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpdrawtool.[ch]
	* app/tools/gimpperspectiveclonetool.c
	* app/tools/gimptransformtool.c: compare squared distances.

svn path=/trunk/; revision=22198
parent 0c62eb29
2007-03-30 Sven Neumann <sven@gimp.org>
* app/tools/gimpdrawtool.[ch]
* app/tools/gimpperspectiveclonetool.c
* app/tools/gimptransformtool.c: compare squared distances.
2007-03-30 Sven Neumann <sven@gimp.org>
* app/tools/gimprectangletool.c (gimp_rectangle_tool_draw_guides):
......@@ -365,6 +365,9 @@ gimp_draw_tool_set_transform (GimpDrawTool *draw_tool,
* @x2: end point X in image coordinates
* @y2: end point Y in image coordinates
*
* If you just need to compare distances, consider to use
* gimp_draw_tool_calc_distance_square() instead.
*
* Returns: the distance between the given points in display coordinates
**/
gdouble
......@@ -374,6 +377,34 @@ gimp_draw_tool_calc_distance (GimpDrawTool *draw_tool,
gdouble y1,
gdouble x2,
gdouble y2)
{
return sqrt (gimp_draw_tool_calc_distance_square (draw_tool, display,
x1, y1, x2, y2));
}
/**
* gimp_draw_tool_calc_distance_square:
* @draw_tool: a #GimpDrawTool
* @display: a #GimpDisplay
* @x1: start point X in image coordinates
* @y1: start point Y in image coordinates
* @x2: end point X in image coordinates
* @y2: end point Y in image coordinates
*
* This function is more effective than gimp_draw_tool_calc_distance()
* as it doesn't perform a sqrt(). Use this if you just need to compare
* distances.
*
* Returns: the square of the distance between the given points in
display coordinates
**/
gdouble
gimp_draw_tool_calc_distance_square (GimpDrawTool *draw_tool,
GimpDisplay *display,
gdouble x1,
gdouble y1,
gdouble x2,
gdouble y2)
{
GimpDisplayShell *shell;
gdouble tx1, ty1;
......@@ -387,7 +418,7 @@ gimp_draw_tool_calc_distance (GimpDrawTool *draw_tool,
gimp_display_shell_transform_xy_f (shell, x1, y1, &tx1, &ty1, FALSE);
gimp_display_shell_transform_xy_f (shell, x2, y2, &tx2, &ty2, FALSE);
return sqrt (SQR (tx2 - tx1) + SQR (ty2 - ty1));
return SQR (tx2 - tx1) + SQR (ty2 - ty1);
}
/**
......@@ -414,19 +445,8 @@ gimp_draw_tool_in_radius (GimpDrawTool *draw_tool,
gdouble y2,
gint radius)
{
GimpDisplayShell *shell;
gdouble tx1, ty1;
gdouble tx2, ty2;
g_return_val_if_fail (GIMP_IS_DRAW_TOOL (draw_tool), FALSE);
g_return_val_if_fail (GIMP_IS_DISPLAY (display), FALSE);
shell = GIMP_DISPLAY_SHELL (display->shell);
gimp_display_shell_transform_xy_f (shell, x1, y1, &tx1, &ty1, FALSE);
gimp_display_shell_transform_xy_f (shell, x2, y2, &tx2, &ty2, FALSE);
return (SQR (tx2 - tx1) + SQR (ty2 - ty1)) < SQR (radius);
return (gimp_draw_tool_calc_distance_square (draw_tool, display,
x1, y1, x2, y2) < SQR (radius));
}
/**
......
......@@ -92,6 +92,12 @@ gdouble gimp_draw_tool_calc_distance (GimpDrawTool *draw_tool,
gdouble y1,
gdouble x2,
gdouble y2);
gdouble gimp_draw_tool_calc_distance_square (GimpDrawTool *draw_tool,
GimpDisplay *display,
gdouble x1,
gdouble y1,
gdouble x2,
gdouble y2);
gboolean gimp_draw_tool_in_radius (GimpDrawTool *draw_tool,
GimpDisplay *display,
gdouble x1,
......
......@@ -586,36 +586,37 @@ gimp_perspective_clone_tool_oper_update (GimpTool *tool,
gdouble closest_dist;
gdouble dist;
closest_dist = gimp_draw_tool_calc_distance (draw_tool, display,
coords->x, coords->y,
clone_tool->tx1,
clone_tool->ty1);
dist = gimp_draw_tool_calc_distance_square (draw_tool, display,
coords->x, coords->y,
clone_tool->tx1,
clone_tool->ty1);
closest_dist = dist;
clone_tool->function = TRANSFORM_HANDLE_NW;
dist = gimp_draw_tool_calc_distance (draw_tool, display,
coords->x, coords->y,
clone_tool->tx2,
clone_tool->ty2);
dist = gimp_draw_tool_calc_distance_square (draw_tool, display,
coords->x, coords->y,
clone_tool->tx2,
clone_tool->ty2);
if (dist < closest_dist)
{
closest_dist = dist;
clone_tool->function = TRANSFORM_HANDLE_NE;
}
dist = gimp_draw_tool_calc_distance (draw_tool, display,
coords->x, coords->y,
clone_tool->tx3,
clone_tool->ty3);
dist = gimp_draw_tool_calc_distance_square (draw_tool, display,
coords->x, coords->y,
clone_tool->tx3,
clone_tool->ty3);
if (dist < closest_dist)
{
closest_dist = dist;
clone_tool->function = TRANSFORM_HANDLE_SW;
}
dist = gimp_draw_tool_calc_distance (draw_tool, display,
coords->x, coords->y,
clone_tool->tx4,
clone_tool->ty4);
dist = gimp_draw_tool_calc_distance_square (draw_tool, display,
coords->x, coords->y,
clone_tool->tx4,
clone_tool->ty4);
if (dist < closest_dist)
{
closest_dist = dist;
......
......@@ -559,32 +559,33 @@ gimp_transform_tool_oper_update (GimpTool *tool,
gdouble closest_dist;
gdouble dist;
closest_dist = gimp_draw_tool_calc_distance (draw_tool, display,
coords->x, coords->y,
tr_tool->tx1, tr_tool->ty1);
dist = gimp_draw_tool_calc_distance_square (draw_tool, display,
coords->x, coords->y,
tr_tool->tx1, tr_tool->ty1);
closest_dist = dist;
tr_tool->function = TRANSFORM_HANDLE_NW;
dist = gimp_draw_tool_calc_distance (draw_tool, display,
coords->x, coords->y,
tr_tool->tx2, tr_tool->ty2);
dist = gimp_draw_tool_calc_distance_square (draw_tool, display,
coords->x, coords->y,
tr_tool->tx2, tr_tool->ty2);
if (dist < closest_dist)
{
closest_dist = dist;
tr_tool->function = TRANSFORM_HANDLE_NE;
}
dist = gimp_draw_tool_calc_distance (draw_tool, display,
coords->x, coords->y,
tr_tool->tx3, tr_tool->ty3);
dist = gimp_draw_tool_calc_distance_square (draw_tool, display,
coords->x, coords->y,
tr_tool->tx3, tr_tool->ty3);
if (dist < closest_dist)
{
closest_dist = dist;
tr_tool->function = TRANSFORM_HANDLE_SW;
}
dist = gimp_draw_tool_calc_distance (draw_tool, display,
coords->x, coords->y,
tr_tool->tx4, tr_tool->ty4);
dist = gimp_draw_tool_calc_distance_square (draw_tool, display,
coords->x, coords->y,
tr_tool->tx4, tr_tool->ty4);
if (dist < closest_dist)
{
closest_dist = dist;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment