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
|
|
|
*/
|
|
|
|
#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"
|
|
|
|
|
1998-01-22 15:02:57 +08:00
|
|
|
#include "tile_manager_pvt.h"
|
|
|
|
|
Lots of ii8n stuff here and some additions to the de.po. Applied
Wed Oct 14 17:46:15 EDT 1998 Adrian Likins <adrian@gimp.org>
* app/*, po/de.po, de/POTFILES.in, libgimp/gimpintl.h:
Lots of ii8n stuff here and some additions to the de.po.
Applied gimp-egger-981005-1 ,gimp-egger-981006-1,
gimp-egger-981007-1, gimp-egger-981008-1,
gimp-egger-981009-1.patch, gimp-egger-981010-1.patch
* plug-in/guillotine/guillotine.c: added the coordinates
of the split images from the original image to the title.
ie foo.jpg (0,0) for the image in the topleft.
* plug-in/script-fu/scripts/neon-logo.scm,
perspective-shadow.scm, predator.scm,rendermap.scm,
ripply-anim.scm, select_to_image.scm,swirltile.scm,
xach-effect.scm: updated scripts to use new script-fu stuff
wooo boy! a big un!
in testing this, it looks like some of the po files are busted.
but the code stuff seems okay.
-adrian
1998-10-15 07:23:52 +08:00
|
|
|
#include "libgimp/gimpintl.h"
|
1999-04-03 03:46:59 +08:00
|
|
|
#include "libgimp/gimpsizeentry.h"
|
Lots of ii8n stuff here and some additions to the de.po. Applied
Wed Oct 14 17:46:15 EDT 1998 Adrian Likins <adrian@gimp.org>
* app/*, po/de.po, de/POTFILES.in, libgimp/gimpintl.h:
Lots of ii8n stuff here and some additions to the de.po.
Applied gimp-egger-981005-1 ,gimp-egger-981006-1,
gimp-egger-981007-1, gimp-egger-981008-1,
gimp-egger-981009-1.patch, gimp-egger-981010-1.patch
* plug-in/guillotine/guillotine.c: added the coordinates
of the split images from the original image to the title.
ie foo.jpg (0,0) for the image in the topleft.
* plug-in/script-fu/scripts/neon-logo.scm,
perspective-shadow.scm, predator.scm,rendermap.scm,
ripply-anim.scm, select_to_image.scm,swirltile.scm,
xach-effect.scm: updated scripts to use new script-fu stuff
wooo boy! a big un!
in testing this, it looks like some of the po files are busted.
but the code stuff seems okay.
-adrian
1998-10-15 07:23:52 +08:00
|
|
|
|
1998-03-19 07:40:52 +08:00
|
|
|
#ifndef M_PI
|
|
|
|
#define M_PI 3.14159265358979323846
|
|
|
|
#endif /* M_PI */
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
/* index into trans_info array */
|
|
|
|
#define ANGLE 0
|
|
|
|
#define REAL_ANGLE 1
|
1998-08-14 04:19:09 +08:00
|
|
|
#define CENTER_X 2
|
|
|
|
#define CENTER_Y 3
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
#define EPSILON 0.018 /* ~ 1 degree */
|
|
|
|
#define FIFTEEN_DEG (M_PI / 12.0)
|
|
|
|
|
|
|
|
/* variables local to this file */
|
1999-04-03 03:46:59 +08:00
|
|
|
static gfloat angle_val;
|
|
|
|
static gfloat center_vals[2];
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
/* needed for size update */
|
|
|
|
static GtkWidget *sizeentry;
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
/* forward function declarations */
|
|
|
|
static void * rotate_tool_recalc (Tool *, void *);
|
|
|
|
static void rotate_tool_motion (Tool *, void *);
|
|
|
|
static void rotate_info_update (Tool *);
|
|
|
|
|
1998-08-15 21:34:54 +08:00
|
|
|
/* callback functions for the info dialog entries */
|
|
|
|
static void rotate_angle_changed (GtkWidget *entry, gpointer data);
|
1999-04-03 03:46:59 +08:00
|
|
|
static void rotate_center_changed (GtkWidget *entry, gpointer data);
|
1998-08-15 21:34:54 +08:00
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
void *
|
1999-04-03 03:46:59 +08:00
|
|
|
rotate_tool_transform (Tool *tool,
|
|
|
|
gpointer gdisp_ptr,
|
|
|
|
int state)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-04-03 03:46:59 +08:00
|
|
|
TransformCore *transform_core;
|
|
|
|
GDisplay *gdisp;
|
|
|
|
GtkWidget *widget;
|
|
|
|
GtkWidget *spinbutton2;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
gdisp = (GDisplay *) gdisp_ptr;
|
|
|
|
|
|
|
|
switch (state)
|
|
|
|
{
|
|
|
|
case INIT :
|
|
|
|
if (!transform_info)
|
|
|
|
{
|
Lots of ii8n stuff here and some additions to the de.po. Applied
Wed Oct 14 17:46:15 EDT 1998 Adrian Likins <adrian@gimp.org>
* app/*, po/de.po, de/POTFILES.in, libgimp/gimpintl.h:
Lots of ii8n stuff here and some additions to the de.po.
Applied gimp-egger-981005-1 ,gimp-egger-981006-1,
gimp-egger-981007-1, gimp-egger-981008-1,
gimp-egger-981009-1.patch, gimp-egger-981010-1.patch
* plug-in/guillotine/guillotine.c: added the coordinates
of the split images from the original image to the title.
ie foo.jpg (0,0) for the image in the topleft.
* plug-in/script-fu/scripts/neon-logo.scm,
perspective-shadow.scm, predator.scm,rendermap.scm,
ripply-anim.scm, select_to_image.scm,swirltile.scm,
xach-effect.scm: updated scripts to use new script-fu stuff
wooo boy! a big un!
in testing this, it looks like some of the po files are busted.
but the code stuff seems okay.
-adrian
1998-10-15 07:23:52 +08:00
|
|
|
transform_info = info_dialog_new (_("Rotation Information"));
|
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);
|
|
|
|
|
|
|
|
widget = info_dialog_add_scale (transform_info, "", &angle_val,
|
|
|
|
-180, 180, 0.01, 0.1, 1, -1,
|
|
|
|
(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,
|
|
|
|
gdisp->dot_for_dot ?
|
|
|
|
UNIT_PIXEL : 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-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
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 0,
|
1999-04-03 03:46:59 +08:00
|
|
|
-4096,
|
|
|
|
4096 + gdisp->gimage->width);
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (sizeentry), 0,
|
1999-04-03 03:46:59 +08:00
|
|
|
gdisp->gimage->xresolution, FALSE);
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 0,
|
1999-04-03 03:46:59 +08:00
|
|
|
center_vals[0]);
|
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
|
1999-04-03 03:46:59 +08:00
|
|
|
-4096,
|
|
|
|
4096 + gdisp->gimage->height);
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (sizeentry), 1,
|
1999-04-03 03:46:59 +08:00
|
|
|
gdisp->gimage->yresolution, FALSE);
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1,
|
1999-04-03 03:46:59 +08:00
|
|
|
center_vals[1]);
|
|
|
|
|
|
|
|
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
|
|
|
}
|
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), TRUE);
|
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,
|
|
|
|
transform_core->x1, transform_core->x2);
|
|
|
|
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
|
|
transform_core->y1, transform_core->y2);
|
|
|
|
|
1999-04-03 03:46:59 +08:00
|
|
|
transform_core->trans_info[ANGLE] = 0.0;
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info[REAL_ANGLE] = 0.0;
|
1998-08-14 04:19:09 +08:00
|
|
|
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;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
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 :
|
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);
|
1999-04-06 20:13:54 +08:00
|
|
|
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);
|
1997-11-25 06:05:25 +08:00
|
|
|
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;
|
1998-08-14 04:19:09 +08:00
|
|
|
private->trans_info[CENTER_X] = (private->x1 + private->x2) / 2;
|
|
|
|
private->trans_info[CENTER_Y] = (private->y1 + private->y2) / 2;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* assemble the transformation matrix */
|
1998-10-14 10:54:02 +08:00
|
|
|
gimp_matrix_identity (private->transform);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
return tool;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1999-04-03 03:46:59 +08:00
|
|
|
tools_free_rotate_tool (Tool *tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
transform_core_free (tool);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1999-04-03 03:46:59 +08:00
|
|
|
rotate_info_update (Tool *tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
TransformCore * transform_core;
|
|
|
|
double angle;
|
1998-08-14 04:19:09 +08:00
|
|
|
int cx, cy;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
|
|
|
angle = (transform_core->trans_info[ANGLE] * 180.0) / M_PI;
|
1998-08-14 04:19:09 +08:00
|
|
|
cx = transform_core->cx;
|
|
|
|
cy = transform_core->cy;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-03 03:46:59 +08:00
|
|
|
angle_val = angle;
|
|
|
|
center_vals[0] = cx;
|
|
|
|
center_vals[1] = 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
|
|
|
|
rotate_angle_changed (GtkWidget *w,
|
1999-04-03 03:46:59 +08:00
|
|
|
gpointer data)
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
1999-04-03 03:46:59 +08:00
|
|
|
Tool *tool;
|
|
|
|
GDisplay *gdisp;
|
|
|
|
TransformCore *transform_core;
|
|
|
|
double value;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
|
|
|
tool = (Tool *)data;
|
|
|
|
|
|
|
|
if (tool)
|
|
|
|
{
|
|
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
1999-04-03 03:46:59 +08:00
|
|
|
value = GTK_ADJUSTMENT (w)->value * M_PI / 180.0;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1999-04-03 03:46:59 +08:00
|
|
|
rotate_center_changed (GtkWidget *w,
|
|
|
|
gpointer data)
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
1999-04-03 03:46:59 +08:00
|
|
|
Tool *tool;
|
|
|
|
GDisplay *gdisp;
|
|
|
|
TransformCore *transform_core;
|
|
|
|
int cx;
|
|
|
|
int cy;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
|
|
|
tool = (Tool *)data;
|
|
|
|
|
|
|
|
if (tool)
|
|
|
|
{
|
|
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
1999-04-03 03:46:59 +08:00
|
|
|
cx = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (w), 0);
|
|
|
|
cy = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (w), 1);
|
1998-08-15 21:34:54 +08:00
|
|
|
|
1999-04-03 03:46:59 +08:00
|
|
|
if ((cx != transform_core->cx) ||
|
|
|
|
(cy != transform_core->cy))
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
|
|
|
draw_core_pause (transform_core->core, tool);
|
1999-04-03 03:46:59 +08:00
|
|
|
transform_core->cx = cx;
|
|
|
|
transform_core->cy = cy;
|
1998-08-15 21:34:54 +08:00
|
|
|
rotate_tool_recalc (tool, gdisp);
|
|
|
|
draw_core_resume (transform_core->core, tool);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
static void
|
1999-04-03 03:46:59 +08:00
|
|
|
rotate_tool_motion (Tool *tool,
|
|
|
|
void *gdisp_ptr)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
TransformCore * transform_core;
|
|
|
|
double angle1, angle2, angle;
|
|
|
|
double cx, cy;
|
|
|
|
double x1, y1, x2, y2;
|
|
|
|
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
1998-08-14 04:19:09 +08:00
|
|
|
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;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
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 */
|
|
|
|
|
1999-02-21 07:20:54 +08:00
|
|
|
if (transform_core->state & GDK_CONTROL_MASK)
|
1997-11-25 06:05:25 +08:00
|
|
|
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 *
|
1999-04-03 03:46:59 +08:00
|
|
|
rotate_tool_recalc (Tool *tool,
|
|
|
|
void *gdisp_ptr)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
TransformCore * transform_core;
|
|
|
|
GDisplay * gdisp;
|
|
|
|
double cx, cy;
|
|
|
|
|
|
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
1998-08-14 04:19:09 +08:00
|
|
|
cx = transform_core->cx;
|
|
|
|
cy = transform_core->cy;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* assemble the transformation matrix */
|
1998-10-14 10:54:02 +08:00
|
|
|
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);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* 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...
|
|
|
|
*/
|
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
void *
|
1999-04-03 03:46:59 +08:00
|
|
|
rotate_tool_rotate (GImage *gimage,
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
GDisplay *gdisp,
|
|
|
|
double angle,
|
|
|
|
TileManager *float_tiles,
|
|
|
|
int interpolation,
|
|
|
|
GimpMatrix matrix)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
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
|
|
|
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;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|