mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 12:32:37 +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).
520 lines
14 KiB
C
520 lines
14 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 "rotate_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"
|
|
|
|
#ifndef M_PI
|
|
#define M_PI 3.14159265358979323846
|
|
#endif /* M_PI */
|
|
|
|
/* index into trans_info array */
|
|
#define ANGLE 0
|
|
#define REAL_ANGLE 1
|
|
#define CENTER_X 2
|
|
#define CENTER_Y 3
|
|
|
|
#define EPSILON 0.018 /* ~ 1 degree */
|
|
#define FIFTEEN_DEG (M_PI / 12.0)
|
|
|
|
/* variables local to this file */
|
|
static char angle_buf [MAX_INFO_BUF];
|
|
static char center_x_buf [MAX_INFO_BUF];
|
|
static char center_y_buf [MAX_INFO_BUF];
|
|
|
|
/* forward function declarations */
|
|
static void * rotate_tool_rotate (GImage *, GimpDrawable *, GDisplay *, double, TileManager *, int, GimpMatrix);
|
|
static void * rotate_tool_recalc (Tool *, void *);
|
|
static void rotate_tool_motion (Tool *, void *);
|
|
static void rotate_info_update (Tool *);
|
|
static Argument * rotate_invoker (Argument *);
|
|
|
|
/* callback functions for the info dialog entries */
|
|
static void rotate_angle_changed (GtkWidget *entry, gpointer data);
|
|
static void rotate_center_x_changed (GtkWidget *entry, gpointer data);
|
|
static void rotate_center_y_changed (GtkWidget *entry, gpointer data);
|
|
|
|
|
|
void *
|
|
rotate_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 (_("Rotation Information"));
|
|
info_dialog_add_field (transform_info, _("Angle: "), angle_buf, (GtkSignalFunc) rotate_angle_changed, tool);
|
|
info_dialog_add_field (transform_info, _("Center X: "), center_x_buf, (GtkSignalFunc) rotate_center_x_changed, tool);
|
|
info_dialog_add_field (transform_info, _("Center Y: "), center_y_buf, (GtkSignalFunc) rotate_center_y_changed, tool);
|
|
}
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), TRUE);
|
|
|
|
transform_core->trans_info[ANGLE] = 0.0;
|
|
transform_core->trans_info[REAL_ANGLE] = 0.0;
|
|
transform_core->trans_info[CENTER_X] =
|
|
(transform_core->x1 + transform_core->x2) / 2;
|
|
transform_core->trans_info[CENTER_Y] =
|
|
(transform_core->y1 + transform_core->y2) / 2;
|
|
|
|
return NULL;
|
|
break;
|
|
|
|
case MOTION :
|
|
rotate_tool_motion (tool, gdisp_ptr);
|
|
|
|
return (rotate_tool_recalc (tool, gdisp_ptr));
|
|
break;
|
|
|
|
case RECALC :
|
|
return (rotate_tool_recalc (tool, gdisp_ptr));
|
|
break;
|
|
|
|
case FINISH :
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), FALSE);
|
|
return rotate_tool_rotate (gdisp->gimage, gimage_active_drawable (gdisp->gimage), gdisp,
|
|
transform_core->trans_info[ANGLE], transform_core->original,
|
|
transform_tool_smoothing (), transform_core->transform);
|
|
break;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
Tool *
|
|
tools_new_rotate_tool ()
|
|
{
|
|
Tool * tool;
|
|
TransformCore * private;
|
|
|
|
tool = transform_core_new (ROTATE, INTERACTIVE);
|
|
|
|
private = tool->private;
|
|
|
|
/* set the rotation specific transformation attributes */
|
|
private->trans_func = rotate_tool_transform;
|
|
private->trans_info[ANGLE] = 0.0;
|
|
private->trans_info[REAL_ANGLE] = 0.0;
|
|
private->trans_info[CENTER_X] = (private->x1 + private->x2) / 2;
|
|
private->trans_info[CENTER_Y] = (private->y1 + private->y2) / 2;
|
|
|
|
/* assemble the transformation matrix */
|
|
gimp_matrix_identity (private->transform);
|
|
|
|
return tool;
|
|
}
|
|
|
|
void
|
|
tools_free_rotate_tool (tool)
|
|
Tool * tool;
|
|
{
|
|
transform_core_free (tool);
|
|
}
|
|
|
|
static void
|
|
rotate_info_update (tool)
|
|
Tool * tool;
|
|
{
|
|
TransformCore * transform_core;
|
|
double angle;
|
|
int cx, cy;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
angle = (transform_core->trans_info[ANGLE] * 180.0) / M_PI;
|
|
cx = transform_core->cx;
|
|
cy = transform_core->cy;
|
|
|
|
sprintf (angle_buf, "%0.2f", angle);
|
|
sprintf (center_x_buf, "%d", cx);
|
|
sprintf (center_y_buf, "%d", cy);
|
|
|
|
info_dialog_update (transform_info);
|
|
info_dialog_popup (transform_info);
|
|
}
|
|
|
|
static void
|
|
rotate_angle_changed (GtkWidget *w,
|
|
gpointer data)
|
|
{
|
|
Tool * tool;
|
|
GDisplay * gdisp;
|
|
TransformCore * transform_core;
|
|
gchar *str;
|
|
double 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 = (atof(str) * M_PI) / 180.0;
|
|
|
|
if (value != transform_core->trans_info[ANGLE])
|
|
{
|
|
draw_core_pause (transform_core->core, tool);
|
|
transform_core->trans_info[ANGLE] = value;
|
|
rotate_tool_recalc (tool, gdisp);
|
|
draw_core_resume (transform_core->core, tool);
|
|
}
|
|
|
|
g_free (str);
|
|
}
|
|
}
|
|
|
|
static void
|
|
rotate_center_x_changed (GtkWidget *w,
|
|
gpointer data)
|
|
{
|
|
Tool * tool;
|
|
GDisplay * gdisp;
|
|
TransformCore * transform_core;
|
|
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->cx)
|
|
{
|
|
draw_core_pause (transform_core->core, tool);
|
|
transform_core->cx = value;
|
|
rotate_tool_recalc (tool, gdisp);
|
|
draw_core_resume (transform_core->core, tool);
|
|
}
|
|
|
|
g_free (str);
|
|
}
|
|
}
|
|
|
|
static void
|
|
rotate_center_y_changed (GtkWidget *w,
|
|
gpointer data)
|
|
{
|
|
Tool * tool;
|
|
GDisplay * gdisp;
|
|
TransformCore * transform_core;
|
|
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->cy)
|
|
{
|
|
draw_core_pause (transform_core->core, tool);
|
|
transform_core->cy = value;
|
|
rotate_tool_recalc (tool, gdisp);
|
|
draw_core_resume (transform_core->core, tool);
|
|
}
|
|
|
|
g_free (str);
|
|
}
|
|
}
|
|
|
|
static void
|
|
rotate_tool_motion (tool, gdisp_ptr)
|
|
Tool * tool;
|
|
void * gdisp_ptr;
|
|
{
|
|
TransformCore * transform_core;
|
|
double angle1, angle2, angle;
|
|
double cx, cy;
|
|
double x1, y1, x2, y2;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
if (transform_core->function == HANDLE_CENTER)
|
|
{
|
|
transform_core->cx = transform_core->curx;
|
|
transform_core->cy = transform_core->cury;
|
|
|
|
return;
|
|
}
|
|
|
|
cx = transform_core->cx;
|
|
cy = transform_core->cy;
|
|
|
|
x1 = transform_core->curx - cx;
|
|
x2 = transform_core->lastx - cx;
|
|
y1 = cy - transform_core->cury;
|
|
y2 = cy - transform_core->lasty;
|
|
|
|
/* find the first angle */
|
|
angle1 = atan2 (y1, x1);
|
|
|
|
/* find the angle */
|
|
angle2 = atan2 (y2, x2);
|
|
|
|
angle = angle2 - angle1;
|
|
|
|
if (angle > M_PI || angle < -M_PI)
|
|
angle = angle2 - ((angle1 < 0) ? 2*M_PI + angle1 : angle1 - 2*M_PI);
|
|
|
|
/* increment the transform tool's angle */
|
|
transform_core->trans_info[REAL_ANGLE] += angle;
|
|
|
|
/* limit the angle to between 0 and 360 degrees */
|
|
if (transform_core->trans_info[REAL_ANGLE] < - M_PI)
|
|
transform_core->trans_info[REAL_ANGLE] = 2 * M_PI - transform_core->trans_info[REAL_ANGLE];
|
|
else if (transform_core->trans_info[REAL_ANGLE] > M_PI)
|
|
transform_core->trans_info[REAL_ANGLE] = transform_core->trans_info[REAL_ANGLE] - 2 * M_PI;
|
|
|
|
/* constrain the angle to 15-degree multiples if ctrl is held down */
|
|
|
|
if (transform_core->state & ControlMask)
|
|
transform_core->trans_info[ANGLE] = FIFTEEN_DEG * (int) ((transform_core->trans_info[REAL_ANGLE] +
|
|
FIFTEEN_DEG / 2.0) /
|
|
FIFTEEN_DEG);
|
|
else
|
|
transform_core->trans_info[ANGLE] = transform_core->trans_info[REAL_ANGLE];
|
|
}
|
|
|
|
static void *
|
|
rotate_tool_recalc (tool, gdisp_ptr)
|
|
Tool * tool;
|
|
void * gdisp_ptr;
|
|
{
|
|
TransformCore * transform_core;
|
|
GDisplay * gdisp;
|
|
double cx, cy;
|
|
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
cx = transform_core->cx;
|
|
cy = transform_core->cy;
|
|
|
|
/* assemble the transformation matrix */
|
|
gimp_matrix_identity (transform_core->transform);
|
|
gimp_matrix_translate (transform_core->transform, -cx, -cy);
|
|
gimp_matrix_rotate (transform_core->transform, transform_core->trans_info[ANGLE]);
|
|
gimp_matrix_translate (transform_core->transform, +cx, +cy);
|
|
|
|
/* transform the bounding box */
|
|
transform_bounding_box (tool);
|
|
|
|
/* update the information dialog */
|
|
rotate_info_update (tool);
|
|
|
|
return (void *) 1;
|
|
}
|
|
|
|
|
|
/* This procedure returns a valid pointer to a new selection if the
|
|
* requested angle is a multiple of 90 degrees...
|
|
*/
|
|
|
|
static void *
|
|
rotate_tool_rotate (gimage, drawable, gdisp, angle, float_tiles, interpolation, matrix)
|
|
GImage *gimage;
|
|
GimpDrawable *drawable;
|
|
GDisplay *gdisp;
|
|
double angle;
|
|
TileManager *float_tiles;
|
|
int interpolation;
|
|
GimpMatrix matrix;
|
|
{
|
|
void *ret;
|
|
gimp_progress *progress;
|
|
|
|
progress = progress_start (gdisp, _("Rotating..."), 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 rotate procedure definition */
|
|
ProcArg rotate_args[] =
|
|
{
|
|
{ PDB_DRAWABLE,
|
|
"drawable",
|
|
"the affected drawable"
|
|
},
|
|
{ PDB_INT32,
|
|
"interpolation",
|
|
"whether to use interpolation"
|
|
},
|
|
{ PDB_FLOAT,
|
|
"angle",
|
|
"the angle of rotation (radians)",
|
|
}
|
|
};
|
|
|
|
ProcArg rotate_out_args[] =
|
|
{
|
|
{ PDB_DRAWABLE,
|
|
"drawable",
|
|
"the rotated drawable"
|
|
}
|
|
};
|
|
|
|
ProcRecord rotate_proc =
|
|
{
|
|
"gimp_rotate",
|
|
"Rotate the specified drawable about its center through the specified angle",
|
|
"This tool rotates 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 rotated 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 rotated drawable. The return value is the ID of the rotated 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 rotated drawable.",
|
|
"Spencer Kimball & Peter Mattis",
|
|
"Spencer Kimball & Peter Mattis",
|
|
"1995-1996",
|
|
PDB_INTERNAL,
|
|
|
|
/* Input arguments */
|
|
3,
|
|
rotate_args,
|
|
|
|
/* Output arguments */
|
|
1,
|
|
rotate_out_args,
|
|
|
|
/* Exec method */
|
|
{ { rotate_invoker } },
|
|
};
|
|
|
|
|
|
static Argument *
|
|
rotate_invoker (args)
|
|
Argument *args;
|
|
{
|
|
int success = TRUE;
|
|
GImage *gimage;
|
|
GimpDrawable *drawable;
|
|
int interpolation;
|
|
double angle;
|
|
int int_value;
|
|
TileManager *float_tiles;
|
|
TileManager *new_tiles;
|
|
GimpMatrix matrix;
|
|
int new_layer;
|
|
Layer *layer;
|
|
Argument *return_args;
|
|
|
|
drawable = NULL;
|
|
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;
|
|
}
|
|
/* angle of rotation */
|
|
if (success)
|
|
angle = args[2].value.pdb_float;
|
|
|
|
/* call the rotate 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;
|
|
|
|
/* assemble the transformation matrix */
|
|
gimp_matrix_identity (matrix);
|
|
gimp_matrix_translate (matrix, -cx, -cy);
|
|
gimp_matrix_rotate (matrix, angle);
|
|
gimp_matrix_translate (matrix, +cx, +cy);
|
|
|
|
/* rotate the buffer */
|
|
new_tiles = rotate_tool_rotate (gimage, drawable, NULL, angle, 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 (&rotate_proc, success);
|
|
|
|
if (success)
|
|
return_args[1].value.pdb_int = drawable_ID (GIMP_DRAWABLE(layer));
|
|
|
|
return return_args;
|
|
}
|