1997-11-25 06:05:25 +08:00
|
|
|
/* 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
|
1998-04-13 13:44:11 +08:00
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
1997-11-25 06:05:25 +08:00
|
|
|
*/
|
2000-12-17 05:37:03 +08:00
|
|
|
|
app/appenv.h New file. Includes <math.h>. Move G_PI, RINT(), ROUND() etc
1999-09-01 Tor Lillqvist <tml@iki.fi>
* app/appenv.h
* libgimp/gimpmath.h: New file. Includes <math.h>. Move G_PI,
RINT(), ROUND() etc from app/appenv.h here, so plug-ins can
use them, too. Remove some commented-out old stuff in appenv.h.
* libgimp/gimp.h: Include gimpmath.h.
* libgimp/gimp.c (gimp_main): Win32: Don't install signal
handlers, we can't do anything useful in the handler ourselves
anyway (it would be nice to print out a backtrace, but that seems
pretty hard to do, even if not impossible). Let Windows inform the
user about the crash. If the plug-in was compiled with MSVC, and
the user also has it, she is offered a chance to start the
debugger automatically anyway.
* app/*several*.c: Include gimpmath.h for G_PI etc. Don't include
<math.h>, as gimpmath.h includes it.
* plug-ins/*/*many*.c: Include config.h. Don't include <math.h>.
Remove all the duplicated definitions of G_PI and rint(). Use
RINT() instead of rint().
* app/app_procs.[ch]: app_exit() takes a gboolean.
* app/batch.c
* app/commands.c
* app/interface.c: Call app_exit() with FALSE or TRUE.
* app/main.c (on_error): Call gimp_fatal_error. (main): Don't
install any signal handler on Win32 here, either.
* app/errors.c (gimp_fatal_error, gimp_terminate): Win32: Format
the message and call MessageBox with it. g_on_error_query doesn't
do anything useful on Win32, and printf'ing a message to stdout or
stderr doesn't do anything, either, in a windowing application.
1999-09-02 04:30:56 +08:00
|
|
|
#include "config.h"
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
#include <gtk/gtk.h>
|
2000-12-17 05:37:03 +08:00
|
|
|
|
2001-01-24 07:56:18 +08:00
|
|
|
#include "libgimpmath/gimpmath.h"
|
2001-01-25 06:36:18 +08:00
|
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
2001-01-24 07:56:18 +08:00
|
|
|
|
2001-05-10 06:34:59 +08:00
|
|
|
#include "tools-types.h"
|
2000-12-17 05:37:03 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
#include "paint-funcs/paint-funcs.h"
|
2001-05-09 10:32:03 +08:00
|
|
|
|
|
|
|
#include "core/gimpimage.h"
|
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
#include "gui/info-dialog.h"
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
#include "gdisplay.h"
|
2001-04-25 02:43:31 +08:00
|
|
|
#include "gdisplay_ops.h"
|
2000-12-29 23:22:01 +08:00
|
|
|
#include "gimpprogress.h"
|
2001-01-23 21:01:48 +08:00
|
|
|
#include "undo.h"
|
2001-04-25 02:43:31 +08:00
|
|
|
#include "path_transform.h"
|
2001-01-23 21:01:48 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
#include "gimprotatetool.h"
|
|
|
|
#include "tool_manager.h"
|
2000-12-29 23:22:01 +08:00
|
|
|
#include "tool_options.h"
|
2001-04-29 04:14:32 +08:00
|
|
|
#include "transform_options.h"
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
2001-05-14 08:04:29 +08:00
|
|
|
#define WANT_ROTATE_BITS
|
|
|
|
#include "icons.h"
|
2001-04-25 02:43:31 +08:00
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
/* index into trans_info array */
|
1999-06-26 19:16:47 +08:00
|
|
|
#define ANGLE 0
|
|
|
|
#define REAL_ANGLE 1
|
|
|
|
#define CENTER_X 2
|
|
|
|
#define CENTER_Y 3
|
1998-08-14 04:19:09 +08:00
|
|
|
|
1999-06-26 19:16:47 +08:00
|
|
|
#define EPSILON 0.018 /* ~ 1 degree */
|
1999-08-05 07:22:29 +08:00
|
|
|
#define FIFTEEN_DEG (G_PI / 12.0)
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2000-12-31 12:07:42 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
/* local function declarations */
|
|
|
|
static void gimp_rotate_tool_class_init (GimpRotateToolClass *klass);
|
|
|
|
static void gimp_rotate_tool_init (GimpRotateTool *rotate_tool);
|
|
|
|
|
|
|
|
static void gimp_rotate_tool_destroy (GtkObject *object);
|
|
|
|
|
|
|
|
static TileManager * gimp_rotate_tool_transform (GimpTransformTool *transform_tool,
|
|
|
|
GDisplay *gdisp,
|
|
|
|
TransformState state);
|
2000-12-31 12:07:42 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
static void rotate_tool_recalc (GimpTool *tool,
|
|
|
|
GDisplay *gdisp);
|
|
|
|
static void rotate_tool_motion (GimpTool *tool,
|
|
|
|
GDisplay *gdisp);
|
|
|
|
static void rotate_info_update (GimpTool *tool);
|
2000-12-31 12:07:42 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
static void rotate_angle_changed (GtkWidget *entry,
|
|
|
|
gpointer data);
|
|
|
|
static void rotate_center_changed (GtkWidget *entry,
|
|
|
|
gpointer data);
|
2000-12-31 12:07:42 +08:00
|
|
|
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
/* variables local to this file */
|
1999-06-26 19:16:47 +08:00
|
|
|
static gdouble angle_val;
|
|
|
|
static gdouble center_vals[2];
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
/* needed for size update */
|
2000-12-31 12:07:42 +08:00
|
|
|
static GtkWidget *sizeentry = NULL;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
static GimpTransformToolClass *parent_class = NULL;
|
|
|
|
|
2001-04-29 04:14:32 +08:00
|
|
|
static TransformOptions *rotate_options = NULL;
|
2001-04-25 02:43:31 +08:00
|
|
|
|
|
|
|
/* public functions */
|
|
|
|
|
|
|
|
void
|
|
|
|
gimp_rotate_tool_register (void)
|
|
|
|
{
|
|
|
|
tool_manager_register_tool (GIMP_TYPE_ROTATE_TOOL,
|
|
|
|
FALSE,
|
|
|
|
"gimp:rotate_tool",
|
|
|
|
_("Rotate Tool"),
|
|
|
|
_("Rotate the layer or selection"),
|
|
|
|
N_("/Tools/Transform Tools/Rotate"), "<shift>R",
|
|
|
|
NULL, "tools/rotate.html",
|
|
|
|
(const gchar **) rotate_bits);
|
|
|
|
}
|
|
|
|
|
|
|
|
GtkType
|
|
|
|
gimp_rotate_tool_get_type (void)
|
|
|
|
{
|
|
|
|
static GtkType tool_type = 0;
|
|
|
|
|
|
|
|
if (! tool_type)
|
|
|
|
{
|
|
|
|
GtkTypeInfo tool_info =
|
|
|
|
{
|
|
|
|
"GimpRotateTool",
|
|
|
|
sizeof (GimpRotateTool),
|
|
|
|
sizeof (GimpRotateToolClass),
|
|
|
|
(GtkClassInitFunc) gimp_rotate_tool_class_init,
|
|
|
|
(GtkObjectInitFunc) gimp_rotate_tool_init,
|
|
|
|
/* reserved_1 */ NULL,
|
|
|
|
/* reserved_2 */ NULL,
|
|
|
|
(GtkClassInitFunc) NULL,
|
|
|
|
};
|
|
|
|
|
|
|
|
tool_type = gtk_type_unique (GIMP_TYPE_TRANSFORM_TOOL, &tool_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
return tool_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
TileManager *
|
|
|
|
gimp_rotate_tool_rotate (GimpImage *gimage,
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
GDisplay *gdisp,
|
|
|
|
gdouble angle,
|
|
|
|
TileManager *float_tiles,
|
|
|
|
gboolean interpolation,
|
|
|
|
GimpMatrix3 matrix)
|
|
|
|
{
|
|
|
|
GimpProgress *progress;
|
|
|
|
TileManager *ret;
|
|
|
|
|
|
|
|
progress = progress_start (gdisp, _("Rotating..."), FALSE, NULL, NULL);
|
|
|
|
|
|
|
|
ret = gimp_transform_tool_do (gimage, drawable, float_tiles,
|
|
|
|
interpolation, matrix,
|
|
|
|
progress ? progress_update_and_flush :
|
|
|
|
(GimpProgressFunc) NULL,
|
|
|
|
progress);
|
|
|
|
|
|
|
|
if (progress)
|
|
|
|
progress_end (progress);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* private function definitions */
|
|
|
|
|
|
|
|
static void
|
|
|
|
gimp_rotate_tool_class_init (GimpRotateToolClass *klass)
|
|
|
|
{
|
|
|
|
GtkObjectClass *object_class;
|
|
|
|
GimpTransformToolClass *trans_class;
|
|
|
|
|
|
|
|
object_class = (GtkObjectClass *) klass;
|
|
|
|
trans_class = (GimpTransformToolClass *) klass;
|
|
|
|
|
|
|
|
parent_class = gtk_type_class (GIMP_TYPE_TRANSFORM_TOOL);
|
|
|
|
|
|
|
|
object_class->destroy = gimp_rotate_tool_destroy;
|
|
|
|
|
|
|
|
trans_class->transform = gimp_rotate_tool_transform;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gimp_rotate_tool_init (GimpRotateTool *rotate_tool)
|
|
|
|
{
|
|
|
|
GimpTool *tool;
|
|
|
|
GimpTransformTool *tr_tool;
|
|
|
|
|
|
|
|
tool = GIMP_TOOL (rotate_tool);
|
|
|
|
tr_tool = GIMP_TRANSFORM_TOOL (rotate_tool);
|
|
|
|
|
2001-04-29 04:14:32 +08:00
|
|
|
if (! rotate_options)
|
|
|
|
{
|
|
|
|
rotate_options = transform_options_new (GIMP_TYPE_ROTATE_TOOL,
|
|
|
|
transform_options_reset);
|
|
|
|
|
|
|
|
tool_manager_register_tool_options (GIMP_TYPE_ROTATE_TOOL,
|
|
|
|
(ToolOptions *) rotate_options);
|
|
|
|
}
|
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
tool->tool_cursor = GIMP_ROTATE_TOOL_CURSOR;
|
|
|
|
|
|
|
|
tr_tool->trans_info[ANGLE] = 0.0;
|
|
|
|
tr_tool->trans_info[REAL_ANGLE] = 0.0;
|
|
|
|
tr_tool->trans_info[CENTER_X] = 0.0;
|
|
|
|
tr_tool->trans_info[CENTER_Y] = 0.0;
|
|
|
|
|
|
|
|
/* assemble the transformation matrix */
|
|
|
|
gimp_matrix3_identity (tr_tool->transform);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
gimp_rotate_tool_destroy (GtkObject *object)
|
|
|
|
{
|
|
|
|
if (GTK_OBJECT_CLASS (parent_class)->destroy)
|
|
|
|
GTK_OBJECT_CLASS (parent_class)->destroy (object);
|
|
|
|
}
|
1998-08-15 21:34:54 +08:00
|
|
|
|
2000-12-31 12:07:42 +08:00
|
|
|
static TileManager *
|
2001-04-25 02:43:31 +08:00
|
|
|
gimp_rotate_tool_transform (GimpTransformTool *transform_tool,
|
|
|
|
GDisplay *gdisp,
|
|
|
|
TransformState state)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
GimpTool *tool;
|
1999-04-03 03:46:59 +08:00
|
|
|
GtkWidget *widget;
|
|
|
|
GtkWidget *spinbutton2;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
tool = GIMP_TOOL (transform_tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
switch (state)
|
|
|
|
{
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_INIT:
|
1999-06-01 05:46:43 +08:00
|
|
|
angle_val = 0.0;
|
2001-04-25 02:43:31 +08:00
|
|
|
center_vals[0] = transform_tool->cx;
|
|
|
|
center_vals[1] = transform_tool->cy;
|
1999-06-01 05:46:43 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
if (!transform_info)
|
|
|
|
{
|
1999-09-28 01:58:10 +08:00
|
|
|
transform_info = info_dialog_new (_("Rotation Information"),
|
2000-01-05 19:18:38 +08:00
|
|
|
gimp_standard_help_func,
|
|
|
|
"tools/transform_rotate.html");
|
1999-04-03 03:46:59 +08:00
|
|
|
|
|
|
|
widget =
|
|
|
|
info_dialog_add_spinbutton (transform_info, _("Angle:"),
|
|
|
|
&angle_val,
|
|
|
|
-180, 180, 1, 15, 1, 1, 2,
|
|
|
|
(GtkSignalFunc) rotate_angle_changed,
|
|
|
|
tool);
|
|
|
|
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (widget), TRUE);
|
|
|
|
|
1999-07-09 22:51:01 +08:00
|
|
|
/* this looks strange (-180, 181), but it works */
|
1999-04-03 03:46:59 +08:00
|
|
|
widget = info_dialog_add_scale (transform_info, "", &angle_val,
|
1999-07-09 22:51:01 +08:00
|
|
|
-180, 181, 0.01, 0.1, 1, -1,
|
1999-04-03 03:46:59 +08:00
|
|
|
(GtkSignalFunc) rotate_angle_changed,
|
|
|
|
tool);
|
|
|
|
gtk_widget_set_usize (widget, 180, 0);
|
|
|
|
|
|
|
|
spinbutton2 =
|
|
|
|
info_dialog_add_spinbutton (transform_info, _("Center X:"), NULL,
|
|
|
|
-1, 1, 1, 10, 1, 1, 2, NULL, NULL);
|
1999-04-06 20:13:54 +08:00
|
|
|
sizeentry =
|
1999-04-03 03:46:59 +08:00
|
|
|
info_dialog_add_sizeentry (transform_info, _("Y:"),
|
|
|
|
center_vals, 1,
|
1999-05-23 01:56:35 +08:00
|
|
|
gdisp->gimage->unit, "%a",
|
1999-04-06 20:13:54 +08:00
|
|
|
TRUE, TRUE, FALSE,
|
1999-04-05 20:48:48 +08:00
|
|
|
GIMP_SIZE_ENTRY_UPDATE_SIZE,
|
1999-04-03 03:46:59 +08:00
|
|
|
rotate_center_changed, tool);
|
1999-06-01 05:46:43 +08:00
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (sizeentry),
|
1999-04-05 20:48:48 +08:00
|
|
|
GTK_SPIN_BUTTON (spinbutton2), NULL);
|
1999-04-03 03:46:59 +08:00
|
|
|
|
|
|
|
gtk_table_set_row_spacing (GTK_TABLE (transform_info->info_table),
|
|
|
|
1, 6);
|
|
|
|
gtk_table_set_row_spacing (GTK_TABLE (transform_info->info_table),
|
|
|
|
2, 0);
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
1999-06-01 05:46:43 +08:00
|
|
|
|
|
|
|
gtk_signal_handler_block_by_data (GTK_OBJECT (sizeentry), tool);
|
|
|
|
|
|
|
|
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (sizeentry),
|
|
|
|
gdisp->gimage->unit);
|
|
|
|
if (gdisp->dot_for_dot)
|
2000-02-08 04:35:13 +08:00
|
|
|
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (sizeentry), GIMP_UNIT_PIXEL);
|
1999-06-01 05:46:43 +08:00
|
|
|
|
|
|
|
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (sizeentry), 0,
|
|
|
|
gdisp->gimage->xresolution, FALSE);
|
|
|
|
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
|
|
gdisp->gimage->yresolution, FALSE);
|
|
|
|
|
|
|
|
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 0,
|
|
|
|
-65536,
|
|
|
|
65536 + gdisp->gimage->width);
|
|
|
|
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
|
|
-65536,
|
|
|
|
65536 + gdisp->gimage->height);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (sizeentry), 0,
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool->x1, transform_tool->x2);
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (sizeentry), 1,
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool->y1, transform_tool->y2);
|
1999-04-06 20:13:54 +08:00
|
|
|
|
1999-06-01 05:46:43 +08:00
|
|
|
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 0,
|
|
|
|
center_vals[0]);
|
|
|
|
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
|
|
center_vals[1]);
|
|
|
|
|
|
|
|
gtk_widget_set_sensitive (transform_info->shell, TRUE);
|
|
|
|
|
|
|
|
gtk_signal_handler_unblock_by_data (GTK_OBJECT (sizeentry), tool);
|
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool->trans_info[ANGLE] = angle_val;
|
|
|
|
transform_tool->trans_info[REAL_ANGLE] = angle_val;
|
|
|
|
transform_tool->trans_info[CENTER_X] = center_vals[0];
|
|
|
|
transform_tool->trans_info[CENTER_Y] = center_vals[1];
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_MOTION:
|
2000-12-31 12:07:42 +08:00
|
|
|
rotate_tool_motion (tool, gdisp);
|
|
|
|
rotate_tool_recalc (tool, gdisp);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_RECALC:
|
2000-12-31 12:07:42 +08:00
|
|
|
rotate_tool_recalc (tool, gdisp);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
|
2000-12-29 23:22:01 +08:00
|
|
|
case TRANSFORM_FINISH:
|
Bit of a large checkin this - it's basically three things: 1 - GimpModules
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).
1999-01-11 08:57:33 +08:00
|
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), FALSE);
|
2001-04-25 02:43:31 +08:00
|
|
|
return gimp_rotate_tool_rotate (gdisp->gimage,
|
|
|
|
gimp_image_active_drawable (gdisp->gimage),
|
|
|
|
gdisp,
|
|
|
|
transform_tool->trans_info[ANGLE],
|
|
|
|
transform_tool->original,
|
|
|
|
gimp_transform_tool_smoothing (),
|
|
|
|
transform_tool->transform);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-04-25 02:43:31 +08:00
|
|
|
rotate_info_update (GimpTool *tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
GimpTransformTool *transform_tool;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
angle_val = gimp_rad_to_deg (transform_tool->trans_info[ANGLE]);
|
|
|
|
center_vals[0] = transform_tool->cx;
|
|
|
|
center_vals[1] = transform_tool->cy;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
info_dialog_update (transform_info);
|
|
|
|
info_dialog_popup (transform_info);
|
|
|
|
}
|
|
|
|
|
1998-08-15 21:34:54 +08:00
|
|
|
static void
|
2000-01-05 19:18:38 +08:00
|
|
|
rotate_angle_changed (GtkWidget *widget,
|
1999-04-03 03:46:59 +08:00
|
|
|
gpointer data)
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
GimpTool *tool;
|
|
|
|
GimpDrawTool *draw_tool;
|
|
|
|
GimpTransformTool *transform_tool;
|
|
|
|
gdouble value;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
tool = (GimpTool *) data;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
|
|
|
if (tool)
|
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
|
|
|
draw_tool = GIMP_DRAW_TOOL (tool);
|
1998-08-15 21:34:54 +08:00
|
|
|
|
2000-02-19 02:20:04 +08:00
|
|
|
value = gimp_deg_to_rad (GTK_ADJUSTMENT (widget)->value);
|
1998-08-15 21:34:54 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
if (value != transform_tool->trans_info[ANGLE])
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
gimp_draw_tool_pause (draw_tool);
|
|
|
|
transform_tool->trans_info[ANGLE] = value;
|
2000-12-31 12:07:42 +08:00
|
|
|
rotate_tool_recalc (tool, tool->gdisp);
|
2001-04-25 02:43:31 +08:00
|
|
|
gimp_draw_tool_resume (draw_tool);
|
1998-08-15 21:34:54 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-01-05 19:18:38 +08:00
|
|
|
rotate_center_changed (GtkWidget *widget,
|
1999-04-03 03:46:59 +08:00
|
|
|
gpointer data)
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
GimpTool *tool;
|
|
|
|
GimpDrawTool *draw_tool;
|
|
|
|
GimpTransformTool *transform_tool;
|
|
|
|
gint cx;
|
|
|
|
gint cy;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
tool = (GimpTool *) data;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
|
|
|
if (tool)
|
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
|
|
|
draw_tool = GIMP_DRAW_TOOL (tool);
|
1998-08-15 21:34:54 +08:00
|
|
|
|
2000-10-27 06:02:44 +08:00
|
|
|
cx = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 0));
|
|
|
|
cy = RINT (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 1));
|
1998-08-15 21:34:54 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
if ((cx != transform_tool->cx) ||
|
|
|
|
(cy != transform_tool->cy))
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
gimp_draw_tool_pause (draw_tool);
|
|
|
|
transform_tool->cx = cx;
|
|
|
|
transform_tool->cy = cy;
|
2000-12-31 12:07:42 +08:00
|
|
|
rotate_tool_recalc (tool, tool->gdisp);
|
2001-04-25 02:43:31 +08:00
|
|
|
gimp_draw_tool_resume (draw_tool);
|
1998-08-15 21:34:54 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
static void
|
2001-04-25 02:43:31 +08:00
|
|
|
rotate_tool_motion (GimpTool *tool,
|
2000-12-31 12:07:42 +08:00
|
|
|
GDisplay *gdisp)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
GimpTransformTool *transform_tool;
|
|
|
|
gdouble angle1, angle2, angle;
|
|
|
|
gdouble cx, cy;
|
|
|
|
gdouble x1, y1, x2, y2;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
if (transform_tool->function == TRANSFORM_HANDLE_CENTER)
|
1998-08-14 04:19:09 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool->cx = transform_tool->curx;
|
|
|
|
transform_tool->cy = transform_tool->cury;
|
1998-08-14 04:19:09 +08:00
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
cx = transform_tool->cx;
|
|
|
|
cy = transform_tool->cy;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
x1 = transform_tool->curx - cx;
|
|
|
|
x2 = transform_tool->lastx - cx;
|
|
|
|
y1 = cy - transform_tool->cury;
|
|
|
|
y2 = cy - transform_tool->lasty;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* find the first angle */
|
|
|
|
angle1 = atan2 (y1, x1);
|
|
|
|
|
|
|
|
/* find the angle */
|
|
|
|
angle2 = atan2 (y2, x2);
|
|
|
|
|
|
|
|
angle = angle2 - angle1;
|
|
|
|
|
1999-08-05 07:22:29 +08:00
|
|
|
if (angle > G_PI || angle < -G_PI)
|
2000-02-19 02:20:04 +08:00
|
|
|
angle = angle2 - ((angle1 < 0) ? 2.0 * G_PI + angle1 : angle1 - 2.0 * G_PI);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* increment the transform tool's angle */
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool->trans_info[REAL_ANGLE] += angle;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* limit the angle to between 0 and 360 degrees */
|
2001-04-25 02:43:31 +08:00
|
|
|
if (transform_tool->trans_info[REAL_ANGLE] < - G_PI)
|
|
|
|
transform_tool->trans_info[REAL_ANGLE] =
|
|
|
|
2.0 * G_PI - transform_tool->trans_info[REAL_ANGLE];
|
|
|
|
else if (transform_tool->trans_info[REAL_ANGLE] > G_PI)
|
|
|
|
transform_tool->trans_info[REAL_ANGLE] =
|
|
|
|
transform_tool->trans_info[REAL_ANGLE] - 2.0 * G_PI;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-05-31 22:11:10 +08:00
|
|
|
/* constrain the angle to 15-degree multiples if ctrl is held down */
|
2001-04-25 02:43:31 +08:00
|
|
|
if (transform_tool->state & GDK_CONTROL_MASK)
|
|
|
|
transform_tool->trans_info[ANGLE] =
|
|
|
|
FIFTEEN_DEG * (int) ((transform_tool->trans_info[REAL_ANGLE] +
|
1999-05-31 22:11:10 +08:00
|
|
|
FIFTEEN_DEG / 2.0) /
|
|
|
|
FIFTEEN_DEG);
|
1997-11-25 06:05:25 +08:00
|
|
|
else
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool->trans_info[ANGLE] = transform_tool->trans_info[REAL_ANGLE];
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
2000-01-05 19:18:38 +08:00
|
|
|
static void
|
2001-04-25 02:43:31 +08:00
|
|
|
rotate_tool_recalc (GimpTool *tool,
|
2000-12-31 12:07:42 +08:00
|
|
|
GDisplay *gdisp)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
2001-04-25 02:43:31 +08:00
|
|
|
GimpTransformTool *transform_tool;
|
|
|
|
gdouble cx, cy;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
transform_tool = GIMP_TRANSFORM_TOOL (tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
2001-04-25 02:43:31 +08:00
|
|
|
cx = transform_tool->cx;
|
|
|
|
cy = transform_tool->cy;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* assemble the transformation matrix */
|
2001-04-25 02:43:31 +08:00
|
|
|
gimp_matrix3_identity (transform_tool->transform);
|
|
|
|
gimp_matrix3_translate (transform_tool->transform, -cx, -cy);
|
|
|
|
gimp_matrix3_rotate (transform_tool->transform,
|
|
|
|
transform_tool->trans_info[ANGLE]);
|
|
|
|
gimp_matrix3_translate (transform_tool->transform, +cx, +cy);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* transform the bounding box */
|
2001-04-25 02:43:31 +08:00
|
|
|
gimp_transform_tool_transform_bounding_box (transform_tool);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* update the information dialog */
|
|
|
|
rotate_info_update (tool);
|
|
|
|
}
|