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 "shear_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"
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
/* 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
|
|
|
|
|
|
|
|
/* variables local to this file */
|
1999-05-31 22:11:10 +08:00
|
|
|
static gint direction_unknown;
|
|
|
|
static gdouble xshear_val;
|
|
|
|
static gdouble yshear_val;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* forward function declarations */
|
|
|
|
static void * shear_tool_recalc (Tool *, void *);
|
|
|
|
static void shear_tool_motion (Tool *, void *);
|
|
|
|
static void shear_info_update (Tool *);
|
|
|
|
|
1998-08-15 21:34:54 +08:00
|
|
|
/* Info dialog callback funtions */
|
|
|
|
static void shear_x_mag_changed (GtkWidget *, gpointer);
|
|
|
|
static void shear_y_mag_changed (GtkWidget *, gpointer);
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
void *
|
1999-04-03 06:27:05 +08:00
|
|
|
shear_tool_transform (Tool *tool,
|
|
|
|
gpointer gdisp_ptr,
|
|
|
|
int state)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-04-03 06:27:05 +08:00
|
|
|
TransformCore *transform_core;
|
|
|
|
GDisplay *gdisp;
|
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 (_("Shear Information"));
|
1999-04-03 06:27:05 +08:00
|
|
|
|
|
|
|
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);
|
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
|
|
|
direction_unknown = 1;
|
1999-07-29 07:00:08 +08:00
|
|
|
transform_core->trans_info[HORZ_OR_VERT] = ORIENTATION_HORIZONTAL;
|
1997-11-25 06:05:25 +08:00
|
|
|
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 :
|
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);
|
1997-11-25 06:05:25 +08:00
|
|
|
direction_unknown = 1;
|
1999-04-03 06:27:05 +08:00
|
|
|
return shear_tool_shear (gdisp->gimage,
|
|
|
|
gimage_active_drawable (gdisp->gimage),
|
|
|
|
gdisp,
|
|
|
|
transform_core->original,
|
|
|
|
transform_tool_smoothing (),
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->transform);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Tool *
|
1999-07-29 07:00:08 +08:00
|
|
|
tools_new_shear_tool (void)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
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 */
|
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 06:27:05 +08:00
|
|
|
tools_free_shear_tool (Tool *tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
transform_core_free (tool);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1999-04-03 06:27:05 +08:00
|
|
|
shear_info_update (Tool *tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
TransformCore * transform_core;
|
|
|
|
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
1999-04-03 06:27:05 +08:00
|
|
|
xshear_val = transform_core->trans_info[XSHEAR];
|
|
|
|
yshear_val = transform_core->trans_info[YSHEAR];
|
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
|
|
|
|
shear_x_mag_changed (GtkWidget *w,
|
1999-04-03 06:27:05 +08:00
|
|
|
gpointer data)
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
1999-04-03 06:27:05 +08:00
|
|
|
Tool *tool;
|
|
|
|
TransformCore *transform_core;
|
|
|
|
GDisplay *gdisp;
|
|
|
|
int 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 06:27:05 +08:00
|
|
|
value = GTK_ADJUSTMENT (w)->value;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
shear_y_mag_changed (GtkWidget *w,
|
1999-04-03 06:27:05 +08:00
|
|
|
gpointer data)
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
1999-04-03 06:27:05 +08:00
|
|
|
Tool *tool;
|
|
|
|
TransformCore *transform_core;
|
|
|
|
GDisplay *gdisp;
|
|
|
|
int 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 06:27:05 +08:00
|
|
|
value = GTK_ADJUSTMENT (w)->value;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
static void
|
1999-04-03 06:27:05 +08:00
|
|
|
shear_tool_motion (Tool *tool,
|
|
|
|
void *gdisp_ptr)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
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))
|
|
|
|
{
|
1999-07-29 07:00:08 +08:00
|
|
|
transform_core->trans_info[HORZ_OR_VERT] = ORIENTATION_HORIZONTAL;
|
|
|
|
transform_core->trans_info[ORIENTATION_VERTICAL] = 0.0;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
1999-07-29 07:00:08 +08:00
|
|
|
transform_core->trans_info[HORZ_OR_VERT] = ORIENTATION_VERTICAL;
|
|
|
|
transform_core->trans_info[ORIENTATION_HORIZONTAL] = 0.0;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
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 :
|
1999-07-29 07:00:08 +08:00
|
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info[XSHEAR] -= diffx;
|
|
|
|
else
|
|
|
|
transform_core->trans_info[YSHEAR] -= diffy;
|
|
|
|
break;
|
|
|
|
case HANDLE_2 :
|
1999-07-29 07:00:08 +08:00
|
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info[XSHEAR] -= diffx;
|
|
|
|
else
|
|
|
|
transform_core->trans_info[YSHEAR] += diffy;
|
|
|
|
break;
|
|
|
|
case HANDLE_3 :
|
1999-07-29 07:00:08 +08:00
|
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info[XSHEAR] += diffx;
|
|
|
|
else
|
|
|
|
transform_core->trans_info[YSHEAR] -= diffy;
|
|
|
|
break;
|
|
|
|
case HANDLE_4 :
|
1999-07-29 07:00:08 +08:00
|
|
|
if (dir == ORIENTATION_HORIZONTAL)
|
1997-11-25 06:05:25 +08:00
|
|
|
transform_core->trans_info[XSHEAR] += diffx;
|
|
|
|
else
|
|
|
|
transform_core->trans_info[YSHEAR] += diffy;
|
|
|
|
break;
|
|
|
|
default :
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void *
|
1999-04-03 06:27:05 +08:00
|
|
|
shear_tool_recalc (Tool *tool,
|
|
|
|
void *gdisp_ptr)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
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 */
|
1998-10-14 10:54:02 +08:00
|
|
|
gimp_matrix_identity (transform_core->transform);
|
|
|
|
gimp_matrix_translate (transform_core->transform, -cx, -cy);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* shear matrix */
|
1999-07-29 07:00:08 +08:00
|
|
|
if (transform_core->trans_info[HORZ_OR_VERT] == ORIENTATION_HORIZONTAL)
|
1998-10-14 10:54:02 +08:00
|
|
|
gimp_matrix_xshear (transform_core->transform,
|
1997-11-25 06:05:25 +08:00
|
|
|
(float) transform_core->trans_info [XSHEAR] / height);
|
|
|
|
else
|
1998-10-14 10:54:02 +08:00
|
|
|
gimp_matrix_yshear (transform_core->transform,
|
1997-11-25 06:05:25 +08:00
|
|
|
(float) transform_core->trans_info [YSHEAR] / width);
|
|
|
|
|
1998-10-14 10:54:02 +08:00
|
|
|
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 */
|
|
|
|
shear_info_update (tool);
|
|
|
|
|
|
|
|
return (void *) 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
void *
|
1999-07-29 07:00:08 +08:00
|
|
|
shear_tool_shear (GimpImage *gimage,
|
1999-04-03 06:27:05 +08:00
|
|
|
GimpDrawable *drawable,
|
|
|
|
GDisplay *gdisp,
|
|
|
|
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, _("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;
|
1997-11-25 06:05:25 +08:00
|
|
|
}
|