mirror of https://github.com/GNOME/gimp.git
app/tools/Makefile.am added gimp_tool_motion_constrain(),
2004-08-22 Sven Neumann <sven@gimp.org> * app/tools/Makefile.am * app/tools/tools-utils.[ch]: added gimp_tool_motion_constrain(), * app/paint/gimppaintcore.[ch]: removed gimp_paint_core_constrain(). * app/tools/gimppainttool.c: changed accordingly. * app/tools/gimpblendtool.[ch]: use gimp_tool_motion_constrain() instead of duplicating that functionality. * app/tools/gimpmeasuretool.c: use gimp_tool_motion_constrain() instead of implementing completely different constraints.
This commit is contained in:
Sven Neumann
Sven Neumann
parent
e86dff66da
commit
0c2d88e992
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
2004-08-22 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/tools/Makefile.am
|
||||
* app/tools/tools-utils.[ch]: added gimp_tool_motion_constrain(),
|
||||
|
||||
* app/paint/gimppaintcore.[ch]: removed gimp_paint_core_constrain().
|
||||
|
||||
* app/tools/gimppainttool.c: changed accordingly.
|
||||
|
||||
* app/tools/gimpblendtool.[ch]: use gimp_tool_motion_constrain()
|
||||
instead of duplicating that functionality.
|
||||
|
||||
* app/tools/gimpmeasuretool.c: use gimp_tool_motion_constrain()
|
||||
instead of implementing completely different constraints.
|
||||
|
||||
2004-08-22 Simon Budig <simon@gimp.org>
|
||||
|
||||
* app/vectors/gimpbezierstroke.c: Implemented the ellipse basic
|
||||
|
|
|
|||
|
|
@ -452,67 +452,6 @@ gimp_paint_core_cleanup (GimpPaintCore *core)
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_paint_core_constrain_helper:
|
||||
* @dx: the (fixed) delta-x
|
||||
* @dy: a suggested delta-y
|
||||
*
|
||||
* Returns an adjusted dy' near dy such that the slope (dx,dy') is a
|
||||
* multiple of 15 degrees.
|
||||
**/
|
||||
static gdouble
|
||||
gimp_paint_core_constrain_helper (gdouble dx,
|
||||
gdouble dy)
|
||||
{
|
||||
static gdouble slope[4] = { 0, 0.26795, 0.57735, 1 };
|
||||
static gdouble divider[3] = { 0.13165, 0.41421, 0.76732 };
|
||||
gint i;
|
||||
|
||||
if (dy < 0)
|
||||
return - gimp_paint_core_constrain_helper (dx,-dy);
|
||||
dx = fabs (dx);
|
||||
for (i = 0; i < 3; i ++)
|
||||
if (dy < dx * divider[i])
|
||||
break;
|
||||
dy = dx * slope[i];
|
||||
return dy;
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_paint_core_constrain:
|
||||
* @core: the #GimpPaintCore.
|
||||
*
|
||||
* Restricts the (core->last_coords, core->cur_coords) vector to 15
|
||||
* degree steps, possibly changing core->cur_coords.
|
||||
**/
|
||||
void
|
||||
gimp_paint_core_constrain (GimpPaintCore *core)
|
||||
{
|
||||
gdouble dx, dy;
|
||||
|
||||
g_return_if_fail (GIMP_IS_PAINT_CORE (core));
|
||||
|
||||
dx = core->cur_coords.x - core->last_coords.x;
|
||||
dy = core->cur_coords.y - core->last_coords.y;
|
||||
|
||||
/* This algorithm changes only one of dx and dy, and does not try
|
||||
* to constrain the resulting dx and dy to integers. This gives
|
||||
* at least two benefits:
|
||||
* 1. gimp_paint_core_constrain is idempotent, even if followed by
|
||||
* a rounding operation.
|
||||
* 2. For any two lines with the same starting-point and ideal
|
||||
* 15-degree direction, the points plotted by
|
||||
* gimp_paint_core_interpolate for the shorter line will always
|
||||
* be a superset of those plotted for the longer line.
|
||||
*/
|
||||
if (fabs (dx) > fabs (dy))
|
||||
core->cur_coords.y = (core->last_coords.y +
|
||||
gimp_paint_core_constrain_helper (dx,dy));
|
||||
else
|
||||
core->cur_coords.x = (core->last_coords.x +
|
||||
gimp_paint_core_constrain_helper (dy,dx));
|
||||
}
|
||||
|
||||
void
|
||||
gimp_paint_core_interpolate (GimpPaintCore *core,
|
||||
GimpDrawable *drawable,
|
||||
|
|
|
|||
|
|
@ -117,8 +117,6 @@ void gimp_paint_core_cancel (GimpPaintCore *core,
|
|||
GimpDrawable *drawable);
|
||||
void gimp_paint_core_cleanup (GimpPaintCore *core);
|
||||
|
||||
void gimp_paint_core_constrain (GimpPaintCore *core);
|
||||
|
||||
void gimp_paint_core_interpolate (GimpPaintCore *core,
|
||||
GimpDrawable *drawable,
|
||||
GimpPaintOptions *paint_options,
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ libapptools_a_sources = \
|
|||
tools-types.h \
|
||||
gimp-tools.c \
|
||||
gimp-tools.h \
|
||||
tools-utils.c \
|
||||
tools-utils.h \
|
||||
tool_manager.c \
|
||||
tool_manager.h \
|
||||
\
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@
|
|||
#include "gimpblendoptions.h"
|
||||
#include "gimpblendtool.h"
|
||||
#include "gimptoolcontrol.h"
|
||||
#include "tools-utils.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
||||
|
|
@ -297,33 +298,8 @@ gimp_blend_tool_motion (GimpTool *tool,
|
|||
/* Restrict to multiples of 15 degrees if ctrl is pressed */
|
||||
if (state & GDK_CONTROL_MASK)
|
||||
{
|
||||
gint tangens2[6] = { 34, 106, 196, 334, 618, 1944 };
|
||||
gint cosinus[7] = { 256, 247, 222, 181, 128, 66, 0 };
|
||||
gint dx, dy, i, radius, frac;
|
||||
|
||||
dx = blend_tool->endx - blend_tool->startx;
|
||||
dy = blend_tool->endy - blend_tool->starty;
|
||||
|
||||
if (dy)
|
||||
{
|
||||
radius = sqrt (SQR (dx) + SQR (dy));
|
||||
frac = abs ((dx << 8) / dy);
|
||||
|
||||
for (i = 0; i < 6; i++)
|
||||
{
|
||||
if (frac < tangens2[i])
|
||||
break;
|
||||
}
|
||||
|
||||
dx = dx > 0 ?
|
||||
(cosinus[6-i] * radius) >> 8 : - ((cosinus[6-i] * radius) >> 8);
|
||||
|
||||
dy = dy > 0 ?
|
||||
(cosinus[i] * radius) >> 8 : - ((cosinus[i] * radius) >> 8);
|
||||
}
|
||||
|
||||
blend_tool->endx = blend_tool->startx + dx;
|
||||
blend_tool->endy = blend_tool->starty + dy;
|
||||
gimp_tool_motion_constrain (blend_tool->startx, blend_tool->starty,
|
||||
&blend_tool->endx, &blend_tool->endy);
|
||||
}
|
||||
|
||||
gimp_tool_pop_status (tool);
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ struct _GimpBlendTool
|
|||
{
|
||||
GimpDrawTool parent_instance;
|
||||
|
||||
gint startx; /* starting x coord */
|
||||
gint starty; /* starting y coord */
|
||||
gint endx; /* ending x coord */
|
||||
gint endy; /* ending y coord */
|
||||
gdouble startx; /* starting x coord */
|
||||
gdouble starty; /* starting y coord */
|
||||
gdouble endx; /* ending x coord */
|
||||
gdouble endy; /* ending y coord */
|
||||
};
|
||||
|
||||
struct _GimpBlendToolClass
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
#include "gimpcolorpickertool.h"
|
||||
#include "gimppainttool.h"
|
||||
#include "gimptoolcontrol.h"
|
||||
#include "tools-utils.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
||||
|
|
@ -358,7 +359,8 @@ gimp_paint_tool_round_line (GimpPaintCore *core,
|
|||
|
||||
/* Restrict to multiples of 15 degrees if ctrl is pressed */
|
||||
if (state & GDK_CONTROL_MASK)
|
||||
gimp_paint_core_constrain (core);
|
||||
gimp_tool_motion_constrain (core->last_coords.x, core->last_coords.y,
|
||||
&core->cur_coords.x, &core->cur_coords.y);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
#include "gimpmeasureoptions.h"
|
||||
#include "gimpmeasuretool.h"
|
||||
#include "gimptoolcontrol.h"
|
||||
#include "tools-utils.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
||||
|
|
@ -450,29 +451,15 @@ gimp_measure_tool_motion (GimpTool *tool,
|
|||
mtool->x[i] = ROUND (coords->x);
|
||||
mtool->y[i] = ROUND (coords->y);
|
||||
|
||||
/* restrict to horizontal/vertical movements if modifiers are pressed */
|
||||
if (state & GDK_MOD1_MASK)
|
||||
if (state & GDK_CONTROL_MASK)
|
||||
{
|
||||
if (state & GDK_CONTROL_MASK)
|
||||
{
|
||||
dx = mtool->x[i] - mtool->x[0];
|
||||
dy = mtool->y[i] - mtool->y[0];
|
||||
gdouble x = mtool->x[i];
|
||||
gdouble y = mtool->y[i];
|
||||
|
||||
mtool->x[i] = mtool->x[0] + (dx > 0 ?
|
||||
MAX (abs (dx), abs (dy)) :
|
||||
- MAX (abs (dx), abs (dy)));
|
||||
mtool->y[i] = mtool->y[0] + (dy > 0 ?
|
||||
MAX (abs (dx), abs (dy)) :
|
||||
- MAX (abs (dx), abs (dy)));
|
||||
}
|
||||
else
|
||||
{
|
||||
mtool->x[i] = mtool->x[0];
|
||||
}
|
||||
}
|
||||
else if (state & GDK_CONTROL_MASK)
|
||||
{
|
||||
mtool->y[i] = mtool->y[0];
|
||||
gimp_tool_motion_constrain (mtool->x[0], mtool->y[0], &x, &y);
|
||||
|
||||
mtool->x[i] = ROUND (x);
|
||||
mtool->y[i] = ROUND (y);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@
|
|||
#include "gimpcolorpickertool.h"
|
||||
#include "gimppainttool.h"
|
||||
#include "gimptoolcontrol.h"
|
||||
#include "tools-utils.h"
|
||||
|
||||
#include "gimp-intl.h"
|
||||
|
||||
|
|
@ -358,7 +359,8 @@ gimp_paint_tool_round_line (GimpPaintCore *core,
|
|||
|
||||
/* Restrict to multiples of 15 degrees if ctrl is pressed */
|
||||
if (state & GDK_CONTROL_MASK)
|
||||
gimp_paint_core_constrain (core);
|
||||
gimp_tool_motion_constrain (core->last_coords.x, core->last_coords.y,
|
||||
&core->cur_coords.x, &core->cur_coords.y);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -0,0 +1,93 @@
|
|||
/* The GIMP -- an image manipulation program
|
||||
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
#include "libgimpmath/gimpmath.h"
|
||||
|
||||
#include "tool-utils.h"
|
||||
|
||||
|
||||
/**
|
||||
* gimp_tool_motion_constrain_helper:
|
||||
* @dx: the (fixed) delta-x
|
||||
* @dy: a suggested delta-y
|
||||
*
|
||||
* Returns an adjusted dy' near dy such that the slope (dx,dy')
|
||||
* is a multiple of 15 degrees.
|
||||
**/
|
||||
static gdouble
|
||||
gimp_tool_motion_constrain_helper (gdouble dx,
|
||||
gdouble dy)
|
||||
{
|
||||
static const gdouble slope[4] = { 0, 0.26795, 0.57735, 1 };
|
||||
static const gdouble divider[3] = { 0.13165, 0.41421, 0.76732 };
|
||||
gint i;
|
||||
|
||||
if (dy < 0)
|
||||
return - gimp_tool_motion_constrain_helper (dx, -dy);
|
||||
|
||||
dx = fabs (dx);
|
||||
|
||||
for (i = 0; i < 3; i ++)
|
||||
if (dy < dx * divider[i])
|
||||
break;
|
||||
|
||||
dy = dx * slope[i];
|
||||
|
||||
return dy;
|
||||
}
|
||||
|
||||
/**
|
||||
* gimp_tool_motion_constrain:
|
||||
* @start_x:
|
||||
* @start_y:
|
||||
* @end_x:
|
||||
* @end_y:
|
||||
*
|
||||
* Restricts the motion vector to 15 degree steps by changing the end
|
||||
* point (if necessary).
|
||||
**/
|
||||
void
|
||||
gimp_tool_motion_constrain (gdouble start_x,
|
||||
gdouble start_y,
|
||||
gdouble *end_x,
|
||||
gdouble *end_y)
|
||||
{
|
||||
gdouble dx = *end_x - start_x;
|
||||
gdouble dy = *end_y - start_y;
|
||||
|
||||
/* This algorithm changes only one of dx and dy, and does not try
|
||||
* to constrain the resulting dx and dy to integers. This gives
|
||||
* at least two benefits:
|
||||
* 1. gimp_tool_motion_constrain is idempotent, even if followed by
|
||||
* a rounding operation.
|
||||
* 2. For any two lines with the same starting-point and ideal
|
||||
* 15-degree direction, the points plotted by
|
||||
* gimp_paint_core_interpolate for the shorter line will always
|
||||
* be a superset of those plotted for the longer line.
|
||||
*/
|
||||
|
||||
if (fabs (dx) > fabs (dy))
|
||||
*end_y = (start_y + gimp_tool_motion_constrain_helper (dx, dy));
|
||||
else
|
||||
*end_x = (start_x + gimp_tool_motion_constrain_helper (dy, dx));
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
/* The GIMP -- an image manipulation program
|
||||
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __TOOLS_UTILS_H__
|
||||
#define __TOOLS_UTILS_H__
|
||||
|
||||
|
||||
void gimp_tool_motion_constrain (gdouble start_x,
|
||||
gdouble start_y,
|
||||
gdouble *end_x,
|
||||
gdouble *end_y);
|
||||
|
||||
|
||||
#endif /* __TOOLS_UTILS_H__ */
|
||||
|
|
@ -7,11 +7,12 @@
|
|||
* Some code here is based on code from librsvg that was originally
|
||||
* written by Raph Levien <raph@artofcode.com> for Gill.
|
||||
*
|
||||
* This SVG path importer implements a subset of SVG that is sufficient
|
||||
* to parse path elements and to apply all defined transformations as
|
||||
* described by the SVG specification: http://www.w3.org/TR/SVG/.
|
||||
* It must handle the SVG files exported by GIMP but it is also supposed
|
||||
* to be able to extract paths from foreign SVG documents.
|
||||
* This SVG path importer implements a subset of SVG that is
|
||||
* sufficient to parse path elements and basic shapes and to apply
|
||||
* transformations as described by the SVG specification:
|
||||
* http://www.w3.org/TR/SVG/. It must handle the SVG files exported
|
||||
* by GIMP but it is also supposed to be able to extract paths and
|
||||
* shapes from foreign SVG documents.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
|
|||
Loading…
Reference in New Issue