2001-02-24 Michael Natterer <mitch@gimp.org> * TODO.xml: updated. * app/appenums.h * app/apptypes.h: prefixed the cursor stuff with "Gimp", added the new stock tool cursor enum. Removed the old ToolType enum. * app/cursorutil.[ch] * app/gdisplay.[ch]: removed the old ToolType enum and prefixed the functions with "gimp_". Also stripped all "toggle cursor" stuff from the cursor code, so the new API is easier and not depending on the tool system. All existing tool cursors can be used via the new stock tool cursor enum, so no tool has to fiddle around with bitmap cursors. There will be an cursorutil function for registering stock tool cursor types on the fly. * app/disp_callbacks.c * app/scroll.[ch]: moved the display scrollbar callbacks from scroll.[ch] to disp_callbacks.c. Removed some crap from scroll.h * app/tools/tool.[ch]: removed the BitmapCursor pointers from the tool class struct and add cursor and toggle cursor IDs to the GimpTool struct. Work in progress. * app/dialog_handler.c * app/tools/bezier_select.c * app/tools/blend.c * app/tools/bucket_fill.c * app/tools/by_color_select.c * app/tools/clone.c * app/tools/color_picker.c * app/tools/convolve.c * app/tools/crop.c * app/tools/dodgeburn.c * app/tools/edit_selection.c * app/tools/ellipse_select.c * app/tools/flip_tool.c * app/tools/free_select.c * app/tools/fuzzy_select.c * app/tools/ink.c * app/tools/iscissors.c * app/tools/magnify.c * app/tools/measure.c * app/tools/move.c * app/tools/paint_core.[ch] * app/tools/perspective_tool.c * app/tools/rect_select.c * app/tools/rotate_tool.c * app/tools/scale_tool.c * app/tools/shear_tool.c * app/tools/text_tool.c * app/tools/transform_core.[ch]: changed accordingly. Did this "blind" for most tools because they don't compile. The changes are minimal, so there should be no conflicts.
376 lines
9.5 KiB
C
376 lines
9.5 KiB
C
/* 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 <stdlib.h>
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpmath/gimpmath.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "apptypes.h"
|
|
|
|
#include "draw_core.h"
|
|
#include "drawable.h"
|
|
#include "gdisplay.h"
|
|
#include "gimage_mask.h"
|
|
#include "gimpimage.h"
|
|
#include "gimpprogress.h"
|
|
#include "info_dialog.h"
|
|
#include "shear_tool.h"
|
|
#include "selection.h"
|
|
#include "tile_manager.h"
|
|
#include "undo.h"
|
|
|
|
#include "tools.h"
|
|
#include "tool_options.h"
|
|
#include "transform_core.h"
|
|
#include "transform_tool.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
/* index into trans_info array */
|
|
#define HORZ_OR_VERT 0
|
|
#define XSHEAR 1
|
|
#define YSHEAR 2
|
|
|
|
/* the minimum movement before direction of shear can be determined (pixels) */
|
|
#define MIN_MOVE 5
|
|
|
|
|
|
/* forward function declarations */
|
|
static TileManager * shear_tool_transform (Tool *tool,
|
|
GDisplay *gdisp,
|
|
TransformState state);
|
|
|
|
static void shear_tool_recalc (Tool *tool,
|
|
GDisplay *gdisp);
|
|
static void shear_tool_motion (Tool *tool,
|
|
GDisplay *gdisp);
|
|
static void shear_info_update (Tool *tool);
|
|
|
|
static void shear_x_mag_changed (GtkWidget *widget,
|
|
gpointer data);
|
|
static void shear_y_mag_changed (GtkWidget *widget,
|
|
gpointer data);
|
|
|
|
|
|
/* variables local to this file */
|
|
static gdouble xshear_val;
|
|
static gdouble yshear_val;
|
|
|
|
|
|
static TileManager *
|
|
shear_tool_transform (Tool *tool,
|
|
GDisplay *gdisp,
|
|
TransformState state)
|
|
{
|
|
TransformCore *transform_core;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
switch (state)
|
|
{
|
|
case TRANSFORM_INIT:
|
|
if (!transform_info)
|
|
{
|
|
transform_info = info_dialog_new (_("Shear Information"),
|
|
gimp_standard_help_func,
|
|
"tools/transform_shear.html");
|
|
|
|
info_dialog_add_spinbutton (transform_info,
|
|
_("Shear Magnitude X:"),
|
|
&xshear_val,
|
|
-65536, 65536, 1, 15, 1, 1, 0,
|
|
shear_x_mag_changed, tool);
|
|
|
|
info_dialog_add_spinbutton (transform_info,
|
|
_("Y:"),
|
|
&yshear_val,
|
|
-65536, 65536, 1, 15, 1, 1, 0,
|
|
shear_y_mag_changed, tool);
|
|
}
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), TRUE);
|
|
transform_core->trans_info[HORZ_OR_VERT] = ORIENTATION_UNKNOWN;
|
|
transform_core->trans_info[XSHEAR] = 0.0;
|
|
transform_core->trans_info[YSHEAR] = 0.0;
|
|
|
|
return NULL;
|
|
break;
|
|
|
|
case TRANSFORM_MOTION:
|
|
shear_tool_motion (tool, gdisp);
|
|
shear_tool_recalc (tool, gdisp);
|
|
break;
|
|
|
|
case TRANSFORM_RECALC:
|
|
shear_tool_recalc (tool, gdisp);
|
|
break;
|
|
|
|
case TRANSFORM_FINISH:
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), FALSE);
|
|
return shear_tool_shear (gdisp->gimage,
|
|
gimp_image_active_drawable (gdisp->gimage),
|
|
gdisp,
|
|
transform_core->original,
|
|
transform_tool_smoothing (),
|
|
transform_core->transform);
|
|
break;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
Tool *
|
|
tools_new_shear_tool (void)
|
|
{
|
|
Tool *tool;
|
|
TransformCore *private;
|
|
|
|
tool = transform_core_new (SHEAR, TRUE);
|
|
|
|
tool->tool_cursor = GIMP_SHEAR_TOOL_CURSOR;
|
|
|
|
private = tool->private;
|
|
|
|
/* set the rotation specific transformation attributes */
|
|
private->trans_func = shear_tool_transform;
|
|
|
|
/* assemble the transformation matrix */
|
|
gimp_matrix3_identity (private->transform);
|
|
|
|
return tool;
|
|
}
|
|
|
|
void
|
|
tools_free_shear_tool (Tool *tool)
|
|
{
|
|
transform_core_free (tool);
|
|
}
|
|
|
|
static void
|
|
shear_info_update (Tool *tool)
|
|
{
|
|
TransformCore *transform_core;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
xshear_val = transform_core->trans_info[XSHEAR];
|
|
yshear_val = transform_core->trans_info[YSHEAR];
|
|
|
|
info_dialog_update (transform_info);
|
|
info_dialog_popup (transform_info);
|
|
}
|
|
|
|
static void
|
|
shear_x_mag_changed (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
Tool *tool;
|
|
TransformCore *transform_core;
|
|
gint value;
|
|
|
|
tool = (Tool *) data;
|
|
|
|
if (tool)
|
|
{
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
value = GTK_ADJUSTMENT (widget)->value;
|
|
|
|
if (value != transform_core->trans_info[XSHEAR])
|
|
{
|
|
draw_core_pause (transform_core->core, tool);
|
|
transform_core->trans_info[XSHEAR] = value;
|
|
shear_tool_recalc (tool, tool->gdisp);
|
|
draw_core_resume (transform_core->core, tool);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
shear_y_mag_changed (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
Tool *tool;
|
|
TransformCore *transform_core;
|
|
gint value;
|
|
|
|
tool = (Tool *) data;
|
|
|
|
if (tool)
|
|
{
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
value = GTK_ADJUSTMENT (widget)->value;
|
|
|
|
if (value != transform_core->trans_info[YSHEAR])
|
|
{
|
|
draw_core_pause (transform_core->core, tool);
|
|
transform_core->trans_info[YSHEAR] = value;
|
|
shear_tool_recalc (tool, tool->gdisp);
|
|
draw_core_resume (transform_core->core, tool);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
shear_tool_motion (Tool *tool,
|
|
GDisplay *gdisp)
|
|
{
|
|
TransformCore *transform_core;
|
|
gint diffx, diffy;
|
|
gint dir;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
diffx = transform_core->curx - transform_core->lastx;
|
|
diffy = transform_core->cury - transform_core->lasty;
|
|
|
|
/* If we haven't yet decided on which way to control shearing
|
|
* decide using the maximum differential
|
|
*/
|
|
|
|
if (transform_core->trans_info[HORZ_OR_VERT] == ORIENTATION_UNKNOWN)
|
|
{
|
|
if (abs (diffx) > MIN_MOVE || abs (diffy) > MIN_MOVE)
|
|
{
|
|
if (abs (diffx) > abs (diffy))
|
|
{
|
|
transform_core->trans_info[HORZ_OR_VERT] = ORIENTATION_HORIZONTAL;
|
|
transform_core->trans_info[ORIENTATION_VERTICAL] = 0.0;
|
|
}
|
|
else
|
|
{
|
|
transform_core->trans_info[HORZ_OR_VERT] = ORIENTATION_VERTICAL;
|
|
transform_core->trans_info[ORIENTATION_HORIZONTAL] = 0.0;
|
|
}
|
|
}
|
|
/* set the current coords to the last ones */
|
|
else
|
|
{
|
|
transform_core->curx = transform_core->lastx;
|
|
transform_core->cury = transform_core->lasty;
|
|
}
|
|
}
|
|
|
|
/* if the direction is known, keep track of the magnitude */
|
|
if (transform_core->trans_info[HORZ_OR_VERT] != ORIENTATION_UNKNOWN)
|
|
{
|
|
dir = transform_core->trans_info[HORZ_OR_VERT];
|
|
switch (transform_core->function)
|
|
{
|
|
case TRANSFORM_HANDLE_1:
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
|
transform_core->trans_info[XSHEAR] -= diffx;
|
|
else
|
|
transform_core->trans_info[YSHEAR] -= diffy;
|
|
break;
|
|
case TRANSFORM_HANDLE_2:
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
|
transform_core->trans_info[XSHEAR] -= diffx;
|
|
else
|
|
transform_core->trans_info[YSHEAR] += diffy;
|
|
break;
|
|
case TRANSFORM_HANDLE_3:
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
|
transform_core->trans_info[XSHEAR] += diffx;
|
|
else
|
|
transform_core->trans_info[YSHEAR] -= diffy;
|
|
break;
|
|
case TRANSFORM_HANDLE_4:
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
|
transform_core->trans_info[XSHEAR] += diffx;
|
|
else
|
|
transform_core->trans_info[YSHEAR] += diffy;
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
shear_tool_recalc (Tool *tool,
|
|
GDisplay *gdisp)
|
|
{
|
|
TransformCore *transform_core;
|
|
gfloat width, height;
|
|
gfloat cx, cy;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
cx = (transform_core->x1 + transform_core->x2) / 2.0;
|
|
cy = (transform_core->y1 + transform_core->y2) / 2.0;
|
|
|
|
width = transform_core->x2 - transform_core->x1;
|
|
height = transform_core->y2 - transform_core->y1;
|
|
|
|
if (width == 0)
|
|
width = 1;
|
|
if (height == 0)
|
|
height = 1;
|
|
|
|
/* assemble the transformation matrix */
|
|
gimp_matrix3_identity (transform_core->transform);
|
|
gimp_matrix3_translate (transform_core->transform, -cx, -cy);
|
|
|
|
/* shear matrix */
|
|
if (transform_core->trans_info[HORZ_OR_VERT] == ORIENTATION_HORIZONTAL)
|
|
gimp_matrix3_xshear (transform_core->transform,
|
|
(float) transform_core->trans_info [XSHEAR] / height);
|
|
else
|
|
gimp_matrix3_yshear (transform_core->transform,
|
|
(float) transform_core->trans_info [YSHEAR] / width);
|
|
|
|
gimp_matrix3_translate (transform_core->transform, +cx, +cy);
|
|
|
|
/* transform the bounding box */
|
|
transform_core_transform_bounding_box (tool);
|
|
|
|
/* update the information dialog */
|
|
shear_info_update (tool);
|
|
}
|
|
|
|
TileManager *
|
|
shear_tool_shear (GimpImage *gimage,
|
|
GimpDrawable *drawable,
|
|
GDisplay *gdisp,
|
|
TileManager *float_tiles,
|
|
gboolean interpolation,
|
|
GimpMatrix3 matrix)
|
|
{
|
|
GimpProgress *progress;
|
|
TileManager *ret;
|
|
|
|
progress = progress_start (gdisp, _("Shearing..."), FALSE, NULL, NULL);
|
|
|
|
ret = transform_core_do (gimage, drawable, float_tiles,
|
|
interpolation, matrix,
|
|
progress ? progress_update_and_flush :
|
|
(GimpProgressFunc) NULL,
|
|
progress);
|
|
|
|
if (progress)
|
|
progress_end (progress);
|
|
|
|
return ret;
|
|
}
|