mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-21 12:02:32 +00:00
d8be79f036
Sun Jan 11 00:24:21 GMT 1999 Austin Donnelly <austin@greenend.org.uk> Bit of a large checkin this - it's basically three things: 1 - GimpModules using gmodules to dynamically load and initialise modules at gimp start of day. 2 - Color selectors now register themselves with a color notebook. 3 - progress bars have been cleaned up a bit, so now have progress indictations on all transform tool and gradient fill operations. Not done bucket fill, but that seems to be the next candidate. New directories: * modules/: new directory for dynamically loadable modules. New files: * modules/.cvsignore * modules/Makefile.am * modules/colorsel_gtk.c: GTK color selector wrapped up as a color selector the gimp can use. * app/gimpprogress.[ch]: progress bars within gimp core, either as popups, or in the status bar. This is mainly code moved out of plug-in.c * app/color_notebook.[ch]: color selector notebook, implementing very similar interface to color_select.h so it can be used as a drop-in replacement for it. * libgimp/color_selector.h: API color selectors need to implement to become a page in the color_notebook. * libgimp/gimpmodule.h: API gimp modules need to implement to be initialised by gimp at start of day. Modified files: * Makefile.am: add modules/ to SUBDIRS * libgimp/Makefile.am: install gimpmodule.h and color_selector.h * app/gimprc.[ch]: recognise module-path variable. * gimprc.in: set module-path variable to something sensible (currently "${gimp_dir}/modules:${gimp_plugin_dir}/modules"). * app/Makefile.am: build color notebook and gimpprogress * app/app_procs.c: register internal GIMP color selector with color notebook. * app/asupsample.c: call progress function less frequently for better performance. * app/asupsample.h: progress_func_t typedef moved to gimpprogress.h * app/blend.c: make callbacks to a progress function * app/color_area.c: use a color notebook rather than a color selector * app/color_panel.c: ditto * app/color_select.c: export color selector interface for notebook * app/color_select.h: color_select_init() prototype * app/flip_tool.c: flip the image every time, rather than every second click. * app/interface.c: move progress bar stuff out to gimpprogress.c. Make the code actually work while we're at it. * app/interface.h: move prototypes for progress functions out to gimpprogress.h * app/plug_in.c: load and initialise modules (if possible). Move progress bar handling code out to gimpprogress.c * app/plug_in.h: keep only a gimp_progress * for each plugin, not a whole bunch of GtkWidgets. * app/scale_tool.c * app/rotate_tool.c * app/shear_tool.c * app/perspective_tool.c: progress bar during operation. De-sensitise the dialog to discourage the user from running two transforms in parallel. * app/transform_core.c: recalculate grid coords when bounding box changes. Only initialise the action area of the dialog once, to avoid multiple "ok" / "reset" buttons appearing. Undraw transform tool with correct matrix to get rid of handle remains on screen. Call a progress function as we apply the transform matrix. A few new i18n markups. Invalidate floating selection marching ants after applying matrix. * app/transform_core.h: transform_core_do() takes an optional progress callback argument (and data). * plug-ins/oilify/oilify.c: send progress bar updates after every pixel region, not only if they processed a multiple of 5 pixels (which was quite unlikely, and therefore gave a jerky progress indication).
529 lines
13 KiB
C
529 lines
13 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 <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <math.h>
|
|
#include "appenv.h"
|
|
#include "drawable.h"
|
|
#include "gdisplay.h"
|
|
#include "gimage_mask.h"
|
|
#include "info_dialog.h"
|
|
#include "palette.h"
|
|
#include "shear_tool.h"
|
|
#include "selection.h"
|
|
#include "tools.h"
|
|
#include "transform_core.h"
|
|
#include "transform_tool.h"
|
|
#include "undo.h"
|
|
|
|
#include "tile_manager_pvt.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
/* index into trans_info array */
|
|
#define HORZ_OR_VERT 0
|
|
#define XSHEAR 1
|
|
#define YSHEAR 2
|
|
|
|
/* types of shearing */
|
|
#define HORZ 1
|
|
#define VERT 2
|
|
|
|
/* the minimum movement before direction of shear can be determined (pixels) */
|
|
#define MIN_MOVE 5
|
|
|
|
/* variables local to this file */
|
|
static int direction_unknown;
|
|
static char xshear_buf [MAX_INFO_BUF];
|
|
static char yshear_buf [MAX_INFO_BUF];
|
|
|
|
/* forward function declarations */
|
|
static void * shear_tool_shear (GImage *, GimpDrawable *, GDisplay *, TileManager *, int, GimpMatrix);
|
|
static void * shear_tool_recalc (Tool *, void *);
|
|
static void shear_tool_motion (Tool *, void *);
|
|
static void shear_info_update (Tool *);
|
|
static Argument * shear_invoker (Argument *);
|
|
|
|
/* Info dialog callback funtions */
|
|
static void shear_x_mag_changed (GtkWidget *, gpointer);
|
|
static void shear_y_mag_changed (GtkWidget *, gpointer);
|
|
|
|
void *
|
|
shear_tool_transform (tool, gdisp_ptr, state)
|
|
Tool * tool;
|
|
gpointer gdisp_ptr;
|
|
int state;
|
|
{
|
|
TransformCore * transform_core;
|
|
GDisplay *gdisp;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
gdisp = (GDisplay *) gdisp_ptr;
|
|
|
|
switch (state)
|
|
{
|
|
case INIT :
|
|
if (!transform_info)
|
|
{
|
|
transform_info = info_dialog_new (_("Shear Information"));
|
|
info_dialog_add_field (transform_info, _("X Shear Magnitude: "), xshear_buf, shear_x_mag_changed, tool);
|
|
info_dialog_add_field (transform_info, _("Y Shear Magnitude: "), yshear_buf, shear_y_mag_changed, tool);
|
|
}
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), TRUE);
|
|
direction_unknown = 1;
|
|
transform_core->trans_info[HORZ_OR_VERT] = HORZ;
|
|
transform_core->trans_info[XSHEAR] = 0.0;
|
|
transform_core->trans_info[YSHEAR] = 0.0;
|
|
|
|
return NULL;
|
|
break;
|
|
|
|
case MOTION :
|
|
shear_tool_motion (tool, gdisp_ptr);
|
|
|
|
return (shear_tool_recalc (tool, gdisp_ptr));
|
|
break;
|
|
|
|
case RECALC :
|
|
return (shear_tool_recalc (tool, gdisp_ptr));
|
|
break;
|
|
|
|
case FINISH :
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), FALSE);
|
|
direction_unknown = 1;
|
|
return shear_tool_shear (gdisp->gimage, gimage_active_drawable (gdisp->gimage), gdisp,
|
|
transform_core->original, transform_tool_smoothing (),
|
|
transform_core->transform);
|
|
break;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
Tool *
|
|
tools_new_shear_tool ()
|
|
{
|
|
Tool * tool;
|
|
TransformCore * private;
|
|
|
|
tool = transform_core_new (SHEAR, INTERACTIVE);
|
|
|
|
private = tool->private;
|
|
|
|
/* set the rotation specific transformation attributes */
|
|
private->trans_func = shear_tool_transform;
|
|
|
|
/* assemble the transformation matrix */
|
|
gimp_matrix_identity (private->transform);
|
|
|
|
return tool;
|
|
}
|
|
|
|
|
|
void
|
|
tools_free_shear_tool (tool)
|
|
Tool * tool;
|
|
{
|
|
transform_core_free (tool);
|
|
}
|
|
|
|
static void
|
|
shear_info_update (tool)
|
|
Tool * tool;
|
|
{
|
|
TransformCore * transform_core;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
sprintf (xshear_buf, "%0.2f", transform_core->trans_info[XSHEAR]);
|
|
sprintf (yshear_buf, "%0.2f", transform_core->trans_info[YSHEAR]);
|
|
|
|
info_dialog_update (transform_info);
|
|
info_dialog_popup (transform_info);
|
|
}
|
|
|
|
static void
|
|
shear_x_mag_changed (GtkWidget *w,
|
|
gpointer data)
|
|
{
|
|
Tool * tool;
|
|
TransformCore * transform_core;
|
|
GDisplay * gdisp;
|
|
gchar *str;
|
|
int value;
|
|
|
|
tool = (Tool *)data;
|
|
|
|
if (tool)
|
|
{
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
str = g_strdup (gtk_entry_get_text (GTK_ENTRY (w)));
|
|
value = (int) atof(str);
|
|
|
|
if (value != transform_core->trans_info[XSHEAR])
|
|
{
|
|
draw_core_pause (transform_core->core, tool);
|
|
transform_core->trans_info[XSHEAR] = value;
|
|
shear_tool_recalc (tool, gdisp);
|
|
draw_core_resume (transform_core->core, tool);
|
|
}
|
|
|
|
g_free (str);
|
|
}
|
|
}
|
|
|
|
static void
|
|
shear_y_mag_changed (GtkWidget *w,
|
|
gpointer data)
|
|
{
|
|
Tool * tool;
|
|
TransformCore * transform_core;
|
|
GDisplay * gdisp;
|
|
gchar *str;
|
|
int value;
|
|
|
|
tool = (Tool *)data;
|
|
|
|
if (tool)
|
|
{
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
str = g_strdup (gtk_entry_get_text (GTK_ENTRY (w)));
|
|
value = (int) atof(str);
|
|
|
|
if (value != transform_core->trans_info[YSHEAR])
|
|
{
|
|
draw_core_pause (transform_core->core, tool);
|
|
transform_core->trans_info[YSHEAR] = value;
|
|
shear_tool_recalc (tool, gdisp);
|
|
draw_core_resume (transform_core->core, tool);
|
|
}
|
|
|
|
g_free (str);
|
|
}
|
|
}
|
|
|
|
static void
|
|
shear_tool_motion (tool, gdisp_ptr)
|
|
Tool * tool;
|
|
void * gdisp_ptr;
|
|
{
|
|
TransformCore * transform_core;
|
|
int diffx, diffy;
|
|
int 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 (direction_unknown)
|
|
{
|
|
if (abs(diffx) > MIN_MOVE || abs(diffy) > MIN_MOVE)
|
|
{
|
|
if (abs(diffx) > abs(diffy))
|
|
{
|
|
transform_core->trans_info[HORZ_OR_VERT] = HORZ;
|
|
transform_core->trans_info[VERT] = 0.0;
|
|
}
|
|
else
|
|
{
|
|
transform_core->trans_info[HORZ_OR_VERT] = VERT;
|
|
transform_core->trans_info[HORZ] = 0.0;
|
|
}
|
|
|
|
direction_unknown = 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 (!direction_unknown)
|
|
{
|
|
dir = transform_core->trans_info[HORZ_OR_VERT];
|
|
switch (transform_core->function)
|
|
{
|
|
case HANDLE_1 :
|
|
if (dir == HORZ)
|
|
transform_core->trans_info[XSHEAR] -= diffx;
|
|
else
|
|
transform_core->trans_info[YSHEAR] -= diffy;
|
|
break;
|
|
case HANDLE_2 :
|
|
if (dir == HORZ)
|
|
transform_core->trans_info[XSHEAR] -= diffx;
|
|
else
|
|
transform_core->trans_info[YSHEAR] += diffy;
|
|
break;
|
|
case HANDLE_3 :
|
|
if (dir == HORZ)
|
|
transform_core->trans_info[XSHEAR] += diffx;
|
|
else
|
|
transform_core->trans_info[YSHEAR] -= diffy;
|
|
break;
|
|
case HANDLE_4 :
|
|
if (dir == HORZ)
|
|
transform_core->trans_info[XSHEAR] += diffx;
|
|
else
|
|
transform_core->trans_info[YSHEAR] += diffy;
|
|
break;
|
|
default :
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static void *
|
|
shear_tool_recalc (tool, gdisp_ptr)
|
|
Tool * tool;
|
|
void * gdisp_ptr;
|
|
{
|
|
TransformCore * transform_core;
|
|
GDisplay * gdisp;
|
|
float width, height;
|
|
float cx, cy;
|
|
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
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_matrix_identity (transform_core->transform);
|
|
gimp_matrix_translate (transform_core->transform, -cx, -cy);
|
|
|
|
/* shear matrix */
|
|
if (transform_core->trans_info[HORZ_OR_VERT] == HORZ)
|
|
gimp_matrix_xshear (transform_core->transform,
|
|
(float) transform_core->trans_info [XSHEAR] / height);
|
|
else
|
|
gimp_matrix_yshear (transform_core->transform,
|
|
(float) transform_core->trans_info [YSHEAR] / width);
|
|
|
|
gimp_matrix_translate (transform_core->transform, +cx, +cy);
|
|
|
|
/* transform the bounding box */
|
|
transform_bounding_box (tool);
|
|
|
|
/* update the information dialog */
|
|
shear_info_update (tool);
|
|
|
|
return (void *) 1;
|
|
}
|
|
|
|
|
|
static void *
|
|
shear_tool_shear (gimage, drawable, gdisp, float_tiles, interpolation, matrix)
|
|
GImage *gimage;
|
|
GimpDrawable *drawable;
|
|
GDisplay *gdisp;
|
|
TileManager *float_tiles;
|
|
int interpolation;
|
|
GimpMatrix matrix;
|
|
{
|
|
void *ret;
|
|
gimp_progress *progress;
|
|
|
|
progress = progress_start (gdisp, _("Shearing..."), FALSE, NULL, NULL);
|
|
|
|
ret = transform_core_do (gimage, drawable, float_tiles,
|
|
interpolation, matrix,
|
|
progress? progress_update_and_flush:NULL, progress);
|
|
if (progress)
|
|
progress_end (progress);
|
|
|
|
return ret;
|
|
}
|
|
|
|
|
|
/* The shear procedure definition */
|
|
ProcArg shear_args[] =
|
|
{
|
|
{ PDB_DRAWABLE,
|
|
"drawable",
|
|
"the affected drawable"
|
|
},
|
|
{ PDB_INT32,
|
|
"interpolation",
|
|
"whether to use interpolation"
|
|
},
|
|
{ PDB_INT32,
|
|
"shear_type",
|
|
"Type of shear: { HORIZONTAL (0), VERTICAL (1) }"
|
|
},
|
|
{ PDB_FLOAT,
|
|
"magnitude",
|
|
"the magnitude of the shear"
|
|
}
|
|
};
|
|
|
|
ProcArg shear_out_args[] =
|
|
{
|
|
{ PDB_DRAWABLE,
|
|
"drawable",
|
|
"the sheard drawable"
|
|
}
|
|
};
|
|
|
|
ProcRecord shear_proc =
|
|
{
|
|
"gimp_shear",
|
|
"Shear the specified drawable about its center by the specified magnitude",
|
|
"This tool shears the specified drawable if no selection exists. If a selection exists, the portion of the drawable which lies under the selection is cut from the drawable and made into a floating selection which is then sheard by the specified amount. The interpolation parameter can be set to TRUE to indicate that either linear or cubic interpolation should be used to smooth the resulting sheard drawable. The return value is the ID of the sheard drawable. If there was no selection, this will be equal to the drawable ID supplied as input. Otherwise, this will be the newly created and sheard drawable. The shear type parameter indicates whether the shear will be applied horizontally or vertically. The magnitude can be either positive or negative and indicates the extent (in pixels) to shear by.",
|
|
"Spencer Kimball & Peter Mattis",
|
|
"Spencer Kimball & Peter Mattis",
|
|
"1995-1996",
|
|
PDB_INTERNAL,
|
|
|
|
/* Input arguments */
|
|
4,
|
|
shear_args,
|
|
|
|
/* Output arguments */
|
|
1,
|
|
shear_out_args,
|
|
|
|
/* Exec method */
|
|
{ { shear_invoker } },
|
|
};
|
|
|
|
|
|
static Argument *
|
|
shear_invoker (args)
|
|
Argument *args;
|
|
{
|
|
int success = TRUE;
|
|
GImage *gimage;
|
|
GimpDrawable *drawable;
|
|
int interpolation;
|
|
int shear_type;
|
|
double shear_magnitude;
|
|
int int_value;
|
|
TileManager *float_tiles;
|
|
TileManager *new_tiles;
|
|
GimpMatrix matrix;
|
|
int new_layer;
|
|
Layer *layer;
|
|
Argument *return_args;
|
|
|
|
drawable = NULL;
|
|
shear_type = HORZ;
|
|
layer = NULL;
|
|
|
|
/* the drawable */
|
|
if (success)
|
|
{
|
|
int_value = args[0].value.pdb_int;
|
|
drawable = drawable_get_ID (int_value);
|
|
if (drawable == NULL)
|
|
success = FALSE;
|
|
else
|
|
gimage = drawable_gimage (drawable);
|
|
}
|
|
/* interpolation */
|
|
if (success)
|
|
{
|
|
int_value = args[1].value.pdb_int;
|
|
interpolation = (int_value) ? TRUE : FALSE;
|
|
}
|
|
/* shear type */
|
|
if (success)
|
|
{
|
|
int_value = args[2].value.pdb_int;
|
|
switch (int_value)
|
|
{
|
|
case 0: shear_type = HORZ; break;
|
|
case 1: shear_type = VERT; break;
|
|
default: success = FALSE;
|
|
}
|
|
}
|
|
/* shear extents */
|
|
if (success)
|
|
{
|
|
shear_magnitude = args[3].value.pdb_float;
|
|
}
|
|
|
|
/* call the shear procedure */
|
|
if (success)
|
|
{
|
|
double cx, cy;
|
|
|
|
/* Start a transform undo group */
|
|
undo_push_group_start (gimage, TRANSFORM_CORE_UNDO);
|
|
|
|
/* Cut/Copy from the specified drawable */
|
|
float_tiles = transform_core_cut (gimage, drawable, &new_layer);
|
|
|
|
cx = float_tiles->x + float_tiles->width / 2.0;
|
|
cy = float_tiles->y + float_tiles->height / 2.0;
|
|
|
|
gimp_matrix_identity (matrix);
|
|
gimp_matrix_translate (matrix, -cx, -cy);
|
|
/* shear matrix */
|
|
if (shear_type == HORZ)
|
|
gimp_matrix_xshear (matrix, shear_magnitude / float_tiles->height);
|
|
else if (shear_type == VERT)
|
|
gimp_matrix_yshear (matrix, shear_magnitude / float_tiles->width);
|
|
gimp_matrix_translate (matrix, +cx, +cy);
|
|
|
|
/* shear the buffer */
|
|
new_tiles = shear_tool_shear (gimage, drawable, NULL, float_tiles, interpolation, matrix);
|
|
|
|
/* free the cut/copied buffer */
|
|
tile_manager_destroy (float_tiles);
|
|
|
|
if (new_tiles)
|
|
success = (layer = transform_core_paste (gimage, drawable, new_tiles, new_layer)) != NULL;
|
|
else
|
|
success = FALSE;
|
|
|
|
/* push the undo group end */
|
|
undo_push_group_end (gimage);
|
|
}
|
|
|
|
return_args = procedural_db_return_args (&shear_proc, success);
|
|
|
|
if (success)
|
|
return_args[1].value.pdb_int = drawable_ID (GIMP_DRAWABLE(layer));
|
|
|
|
return return_args;
|
|
}
|