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 "appenv.h"
|
|
|
|
#include "drawable.h"
|
|
|
|
#include "gdisplay.h"
|
|
|
|
#include "gimage_mask.h"
|
|
|
|
#include "info_dialog.h"
|
|
|
|
#include "scale_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"
|
|
|
|
|
1999-05-31 22:11:10 +08:00
|
|
|
#include "libgimp/gimplimits.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
|
|
|
/* storage for information dialog fields */
|
1999-05-31 22:11:10 +08:00
|
|
|
static gchar orig_width_buf[MAX_INFO_BUF];
|
|
|
|
static gchar orig_height_buf[MAX_INFO_BUF];
|
|
|
|
static gdouble size_vals[2];
|
|
|
|
static gchar x_ratio_buf[MAX_INFO_BUF];
|
|
|
|
static gchar y_ratio_buf[MAX_INFO_BUF];
|
1999-04-03 03:46:59 +08:00
|
|
|
|
|
|
|
/* needed for original size unit update */
|
1999-05-31 22:11:10 +08:00
|
|
|
static GtkWidget *sizeentry;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* forward function declarations */
|
1999-05-31 22:11:10 +08:00
|
|
|
static void * scale_tool_recalc (Tool *, void *);
|
|
|
|
static void scale_tool_motion (Tool *, void *);
|
|
|
|
static void scale_info_update (Tool *);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
/* callback functions for the info dialog fields */
|
1999-05-31 22:11:10 +08:00
|
|
|
static void scale_size_changed (GtkWidget *w, gpointer data);
|
|
|
|
static void scale_unit_changed (GtkWidget *w, 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
|
|
|
scale_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
|
|
|
GDisplay *gdisp;
|
|
|
|
TransformCore *transform_core;
|
1999-04-06 20:13:54 +08:00
|
|
|
GtkWidget *spinbutton;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
gdisp = (GDisplay *) gdisp_ptr;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
|
|
|
switch (state)
|
|
|
|
{
|
|
|
|
case INIT :
|
1999-06-01 05:46:43 +08:00
|
|
|
size_vals[0] = transform_core->x2 - transform_core->x1;
|
|
|
|
size_vals[1] = transform_core->y2 - transform_core->y1;
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
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 (_("Scaling Information"));
|
1999-04-03 03:46:59 +08:00
|
|
|
|
|
|
|
info_dialog_add_label (transform_info, _("Original Width:"),
|
|
|
|
orig_width_buf);
|
|
|
|
info_dialog_add_label (transform_info, _("Height:"),
|
|
|
|
orig_height_buf);
|
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
spinbutton =
|
1999-04-03 03:46:59 +08:00
|
|
|
info_dialog_add_spinbutton (transform_info, _("Current Width:"),
|
|
|
|
NULL, -1, 1, 1, 10, 1, 1, 2, NULL, NULL);
|
|
|
|
sizeentry =
|
|
|
|
info_dialog_add_sizeentry (transform_info, _("Height:"),
|
|
|
|
size_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
|
|
|
scale_size_changed, tool);
|
|
|
|
gtk_signal_connect (GTK_OBJECT (sizeentry), "unit_changed",
|
|
|
|
scale_unit_changed, tool);
|
|
|
|
|
1999-06-01 05:46:43 +08:00
|
|
|
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (sizeentry),
|
|
|
|
GTK_SPIN_BUTTON (spinbutton), NULL);
|
1999-04-03 03:46:59 +08:00
|
|
|
|
|
|
|
info_dialog_add_label (transform_info, _("Scale Ratio X:"),
|
|
|
|
x_ratio_buf);
|
|
|
|
info_dialog_add_label (transform_info, _("Y:"),
|
|
|
|
y_ratio_buf);
|
|
|
|
|
|
|
|
gtk_table_set_row_spacing (GTK_TABLE (transform_info->info_table),
|
|
|
|
1, 4);
|
|
|
|
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)
|
|
|
|
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (sizeentry), UNIT_PIXEL);
|
|
|
|
|
|
|
|
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,
|
|
|
|
GIMP_MIN_IMAGE_SIZE,
|
|
|
|
GIMP_MAX_IMAGE_SIZE);
|
|
|
|
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
|
|
GIMP_MIN_IMAGE_SIZE,
|
|
|
|
GIMP_MAX_IMAGE_SIZE);
|
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,
|
1999-06-01 05:46:43 +08:00
|
|
|
0, size_vals[0]);
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (sizeentry), 1,
|
1999-06-01 05:46:43 +08:00
|
|
|
0, size_vals[1]);
|
|
|
|
|
|
|
|
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 0,
|
|
|
|
size_vals[0]);
|
|
|
|
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
|
|
size_vals[1]);
|
|
|
|
|
|
|
|
gtk_widget_set_sensitive (GTK_WIDGET (transform_info->shell), TRUE);
|
|
|
|
|
|
|
|
gtk_signal_handler_unblock_by_data (GTK_OBJECT (sizeentry), tool);
|
1999-04-06 20:13:54 +08:00
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
transform_core->trans_info [X0] = (double) transform_core->x1;
|
|
|
|
transform_core->trans_info [Y0] = (double) transform_core->y1;
|
|
|
|
transform_core->trans_info [X1] = (double) transform_core->x2;
|
|
|
|
transform_core->trans_info [Y1] = (double) transform_core->y2;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MOTION :
|
|
|
|
scale_tool_motion (tool, gdisp_ptr);
|
|
|
|
|
|
|
|
return (scale_tool_recalc (tool, gdisp_ptr));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case RECALC :
|
|
|
|
return (scale_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-03 03:46:59 +08:00
|
|
|
return scale_tool_scale (gdisp->gimage,
|
|
|
|
gimage_active_drawable (gdisp->gimage),
|
|
|
|
gdisp,
|
|
|
|
transform_core->trans_info,
|
|
|
|
transform_core->original,
|
|
|
|
transform_tool_smoothing (),
|
|
|
|
transform_core->transform);
|
1997-11-25 06:05:25 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
Tool *
|
|
|
|
tools_new_scale_tool ()
|
|
|
|
{
|
|
|
|
Tool * tool;
|
|
|
|
TransformCore * private;
|
|
|
|
|
|
|
|
tool = transform_core_new (SCALE, INTERACTIVE);
|
|
|
|
|
|
|
|
private = tool->private;
|
|
|
|
|
1999-06-01 05:46:43 +08:00
|
|
|
/* set the scale specific transformation attributes */
|
1997-11-25 06:05:25 +08:00
|
|
|
private->trans_func = scale_tool_transform;
|
1999-06-01 05:46:43 +08:00
|
|
|
private->trans_info[X0] = 0.0;
|
|
|
|
private->trans_info[Y0] = 0.0;
|
|
|
|
private->trans_info[X1] = 0.0;
|
|
|
|
private->trans_info[Y1] = 0.0;
|
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_scale_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
|
|
|
scale_info_update (Tool *tool)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
1999-04-03 03:46:59 +08:00
|
|
|
GDisplay * gdisp;
|
1997-11-25 06:05:25 +08:00
|
|
|
TransformCore * transform_core;
|
1999-04-03 03:46:59 +08:00
|
|
|
double ratio_x, ratio_y;
|
|
|
|
int x1, y1, x2, y2, x3, y3, x4, y4;
|
|
|
|
GUnit unit;
|
1999-05-23 01:56:35 +08:00
|
|
|
double unit_factor;
|
1999-04-03 03:46:59 +08:00
|
|
|
gchar format_buf[16];
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
static GUnit label_unit = UNIT_PIXEL;
|
|
|
|
|
1997-11-25 06:05:25 +08:00
|
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
1999-04-03 03:46:59 +08:00
|
|
|
unit = gimp_size_entry_get_unit (GIMP_SIZE_ENTRY (sizeentry));;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* Find original sizes */
|
|
|
|
x1 = transform_core->x1;
|
|
|
|
y1 = transform_core->y1;
|
|
|
|
x2 = transform_core->x2;
|
|
|
|
y2 = transform_core->y2;
|
1999-04-03 03:46:59 +08:00
|
|
|
|
1999-04-06 20:13:54 +08:00
|
|
|
if (unit != UNIT_PERCENT)
|
|
|
|
label_unit = unit;
|
|
|
|
|
|
|
|
unit_factor = gimp_unit_get_factor (label_unit);
|
|
|
|
|
|
|
|
if (label_unit) /* unit != UNIT_PIXEL */
|
1999-04-03 03:46:59 +08:00
|
|
|
{
|
new ui for the "Layer Offset" dialog.
1999-07-22 Michael Natterer <mitschel@cs.tu-berlin.de>
* app/channel_ops.[ch]: new ui for the "Layer Offset" dialog.
* app/channels_dialog.c
* app/layers_dialog.c: major code cleanup: Folded some callbacks
into common ones, "widget" instead of "w", indentation, ...
* app/commands.c
* app/interface.[ch]
* app/global_edit.c: the query boxes must be shown by the caller
now. There's no need to split up the string for the message box
manually as the Gtk 1.2 label widget handles newlines corectly.
Added the "edge_lock" toggle to the "Shrink Selection" dialog.
Nicer spacings for the query and message boxes.
* app/ink.c: tried to grab the pointer in the blob preview but
failed. Left the code there as a reminder (commented out).
* app/menus.c: reordered <Image>/Select.
I was bored and grep-ed the sources for ancient or deprecated stuff:
* app/about_dialog.[ch]
* app/actionarea.[ch]
* app/app_procs.c
* app/brush_edit.c
* app/brush_select.c
* app/color_select.c
* app/convert.c
* app/devices.c
* app/gdisplay.c
* app/gdisplay_ops.c
* app/histogram_tool.[ch]
* app/info_window.c
* app/install.c
* app/ops_buttons.c
* app/palette.c
* app/palette_select.c
* app/paths_dialog.c
* app/pattern_select.c
* app/resize.c
* app/scale_toolc.c
* app/text_tool.c:
s/container_border_width/container_set_border_width/g,
s/sprintf/g_snprintf/g, replaced some constant string lengths with
strlen(x).
* app/bezier_select.c
* app/blend.c
* app/boundary.c
* app/errors.[ch]
* app/free_select.c
* app/gimpbrushlist.c
* app/gimprc.c
* app/iscissors.c
* app/main.c
* app/patterns.[ch]
* app/text_tool.c: namespace fanaticism: prefixed all gimp error
functions with "gimp_" and formated the messages more uniformly.
* app/gradient.c
* app/gradient_select.c: same stuff as above for the ui
code. There are still some sub-dialogs which need cleanup.
Did some cleanup in most of these files: prototypes, removed tons
of #include's, i18n fixes, s/w/widget/ as above, indentation, ...
1999-07-23 00:21:10 +08:00
|
|
|
g_snprintf (format_buf, sizeof (format_buf), "%%.%df %s",
|
1999-04-06 20:13:54 +08:00
|
|
|
gimp_unit_get_digits (label_unit) + 1,
|
|
|
|
gimp_unit_get_symbol (label_unit));
|
1999-04-03 03:46:59 +08:00
|
|
|
g_snprintf (orig_width_buf, MAX_INFO_BUF, format_buf,
|
|
|
|
(x2 - x1) * unit_factor / gdisp->gimage->xresolution);
|
|
|
|
g_snprintf (orig_height_buf, MAX_INFO_BUF, format_buf,
|
|
|
|
(y2 - y1) * unit_factor / gdisp->gimage->yresolution);
|
|
|
|
}
|
|
|
|
else /* unit == UNIT_PIXEL */
|
|
|
|
{
|
|
|
|
g_snprintf (orig_width_buf, MAX_INFO_BUF, "%d", x2 - x1);
|
|
|
|
g_snprintf (orig_height_buf, MAX_INFO_BUF, "%d", y2 - y1);
|
|
|
|
}
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* Find current sizes */
|
1999-04-19 05:22:41 +08:00
|
|
|
x3 = (int) transform_core->trans_info [X0];
|
|
|
|
y3 = (int) transform_core->trans_info [Y0];
|
|
|
|
x4 = (int) transform_core->trans_info [X1];
|
|
|
|
y4 = (int) transform_core->trans_info [Y1];
|
1997-11-25 06:05:25 +08:00
|
|
|
|
1999-04-03 03:46:59 +08:00
|
|
|
size_vals[0] = x4 - x3;
|
|
|
|
size_vals[1] = y4 - y3;
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
ratio_x = ratio_y = 0.0;
|
|
|
|
|
|
|
|
if (x2 - x1)
|
|
|
|
ratio_x = (double) (x4 - x3) / (double) (x2 - x1);
|
|
|
|
if (y2 - y1)
|
|
|
|
ratio_y = (double) (y4 - y3) / (double) (y2 - y1);
|
|
|
|
|
1999-04-03 03:46:59 +08:00
|
|
|
g_snprintf (x_ratio_buf, MAX_INFO_BUF, "%0.2f", ratio_x);
|
|
|
|
g_snprintf (y_ratio_buf, MAX_INFO_BUF, "%0.2f", ratio_y);
|
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
|
1999-04-03 03:46:59 +08:00
|
|
|
scale_size_changed (GtkWidget *w,
|
|
|
|
gpointer data)
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
1999-04-03 03:46:59 +08:00
|
|
|
Tool *tool;
|
|
|
|
TransformCore *transform_core;
|
|
|
|
GDisplay *gdisp;
|
|
|
|
int width;
|
|
|
|
int height;
|
1998-08-15 21:34:54 +08:00
|
|
|
|
|
|
|
tool = (Tool *)data;
|
|
|
|
|
|
|
|
if (tool)
|
|
|
|
{
|
|
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
1999-05-31 22:11:10 +08:00
|
|
|
width = (int) (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (w), 0) + 0.5);
|
|
|
|
height = (int) (gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (w), 1) + 0.5);
|
1998-08-15 21:34:54 +08:00
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
if ((width != (transform_core->trans_info[X1] -
|
|
|
|
transform_core->trans_info[X0])) ||
|
|
|
|
(height != (transform_core->trans_info[Y1] -
|
|
|
|
transform_core->trans_info[Y0])))
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
1999-06-01 05:46:43 +08:00
|
|
|
draw_core_pause (transform_core->core, tool);
|
1999-04-19 05:22:41 +08:00
|
|
|
transform_core->trans_info[X1] =
|
|
|
|
transform_core->trans_info[X0] + width;
|
|
|
|
transform_core->trans_info[Y1] =
|
|
|
|
transform_core->trans_info[Y0] + height;
|
1998-08-15 21:34:54 +08:00
|
|
|
scale_tool_recalc (tool, gdisp);
|
1999-06-01 05:46:43 +08:00
|
|
|
draw_core_resume (transform_core->core, tool);
|
1998-08-15 21:34:54 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1999-04-03 03:46:59 +08:00
|
|
|
scale_unit_changed (GtkWidget *w,
|
|
|
|
gpointer data)
|
1998-08-15 21:34:54 +08:00
|
|
|
{
|
1999-04-03 03:46:59 +08:00
|
|
|
scale_info_update ((Tool*) data);
|
1998-08-15 21:34:54 +08:00
|
|
|
}
|
|
|
|
|
1998-03-19 06:35:31 +08:00
|
|
|
static void
|
1999-04-03 03:46:59 +08:00
|
|
|
scale_tool_motion (Tool *tool,
|
|
|
|
void *gdisp_ptr)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
GDisplay * gdisp;
|
|
|
|
TransformCore * transform_core;
|
|
|
|
double ratio;
|
|
|
|
double *x1, *y1;
|
|
|
|
double *x2, *y2;
|
|
|
|
int w, h;
|
|
|
|
int dir_x, dir_y;
|
|
|
|
int diff_x, diff_y;
|
|
|
|
|
|
|
|
gdisp = (GDisplay *) gdisp_ptr;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
|
|
|
|
|
|
|
diff_x = transform_core->curx - transform_core->lastx;
|
|
|
|
diff_y = transform_core->cury - transform_core->lasty;
|
|
|
|
|
|
|
|
switch (transform_core->function)
|
|
|
|
{
|
|
|
|
case HANDLE_1 :
|
1999-04-19 05:22:41 +08:00
|
|
|
x1 = &transform_core->trans_info [X0];
|
|
|
|
y1 = &transform_core->trans_info [Y0];
|
|
|
|
x2 = &transform_core->trans_info [X1];
|
|
|
|
y2 = &transform_core->trans_info [Y1];
|
1997-11-25 06:05:25 +08:00
|
|
|
dir_x = dir_y = 1;
|
|
|
|
break;
|
|
|
|
case HANDLE_2 :
|
1999-04-19 05:22:41 +08:00
|
|
|
x1 = &transform_core->trans_info [X1];
|
|
|
|
y1 = &transform_core->trans_info [Y0];
|
|
|
|
x2 = &transform_core->trans_info [X0];
|
|
|
|
y2 = &transform_core->trans_info [Y1];
|
1997-11-25 06:05:25 +08:00
|
|
|
dir_x = -1;
|
|
|
|
dir_y = 1;
|
|
|
|
break;
|
|
|
|
case HANDLE_3 :
|
1999-04-19 05:22:41 +08:00
|
|
|
x1 = &transform_core->trans_info [X0];
|
|
|
|
y1 = &transform_core->trans_info [Y1];
|
|
|
|
x2 = &transform_core->trans_info [X1];
|
|
|
|
y2 = &transform_core->trans_info [Y0];
|
1997-11-25 06:05:25 +08:00
|
|
|
dir_x = 1;
|
|
|
|
dir_y = -1;
|
|
|
|
break;
|
|
|
|
case HANDLE_4 :
|
1999-04-19 05:22:41 +08:00
|
|
|
x1 = &transform_core->trans_info [X1];
|
|
|
|
y1 = &transform_core->trans_info [Y1];
|
|
|
|
x2 = &transform_core->trans_info [X0];
|
|
|
|
y2 = &transform_core->trans_info [Y0];
|
1997-11-25 06:05:25 +08:00
|
|
|
dir_x = dir_y = -1;
|
|
|
|
break;
|
|
|
|
default :
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-06-18 04:34:50 +08:00
|
|
|
/* if just the mod1 key is down, affect only the height */
|
|
|
|
if (transform_core->state & GDK_MOD1_MASK && ! (transform_core->state & GDK_CONTROL_MASK))
|
1997-11-25 06:05:25 +08:00
|
|
|
diff_x = 0;
|
1999-06-18 04:34:50 +08:00
|
|
|
/* if just the control key is down, affect only the width */
|
|
|
|
else if (transform_core->state & GDK_CONTROL_MASK && ! (transform_core->state & GDK_MOD1_MASK))
|
1997-11-25 06:05:25 +08:00
|
|
|
diff_y = 0;
|
|
|
|
|
|
|
|
*x1 += diff_x;
|
|
|
|
*y1 += diff_y;
|
|
|
|
|
|
|
|
if (dir_x > 0)
|
|
|
|
{
|
|
|
|
if (*x1 >= *x2) *x1 = *x2 - 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (*x1 <= *x2) *x1 = *x2 + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dir_y > 0)
|
|
|
|
{
|
|
|
|
if (*y1 >= *y2) *y1 = *y2 - 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (*y1 <= *y2) *y1 = *y2 + 1;
|
|
|
|
}
|
|
|
|
|
1999-06-18 04:34:50 +08:00
|
|
|
/* if both the control key & mod1 keys are down, keep the aspect ratio intact */
|
|
|
|
if (transform_core->state & GDK_CONTROL_MASK && transform_core->state & GDK_MOD1_MASK)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
ratio = (double) (transform_core->x2 - transform_core->x1) /
|
|
|
|
(double) (transform_core->y2 - transform_core->y1);
|
|
|
|
|
|
|
|
w = ABS ((*x2 - *x1));
|
|
|
|
h = ABS ((*y2 - *y1));
|
|
|
|
|
|
|
|
if (w > h * ratio)
|
|
|
|
h = w / ratio;
|
|
|
|
else
|
|
|
|
w = h * ratio;
|
|
|
|
|
|
|
|
*y1 = *y2 - dir_y * h;
|
|
|
|
*x1 = *x2 - dir_x * w;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *
|
1999-04-03 03:46:59 +08:00
|
|
|
scale_tool_recalc (Tool *tool,
|
|
|
|
void *gdisp_ptr)
|
1997-11-25 06:05:25 +08:00
|
|
|
{
|
|
|
|
TransformCore * transform_core;
|
|
|
|
GDisplay * gdisp;
|
|
|
|
int x1, y1, x2, y2;
|
|
|
|
int diffx, diffy;
|
|
|
|
int cx, cy;
|
|
|
|
double scalex, scaley;
|
|
|
|
|
|
|
|
gdisp = (GDisplay *) tool->gdisp_ptr;
|
|
|
|
transform_core = (TransformCore *) tool->private;
|
1999-04-19 05:22:41 +08:00
|
|
|
x1 = (int) transform_core->trans_info [X0];
|
|
|
|
y1 = (int) transform_core->trans_info [Y0];
|
|
|
|
x2 = (int) transform_core->trans_info [X1];
|
|
|
|
y2 = (int) transform_core->trans_info [Y1];
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
scalex = scaley = 1.0;
|
|
|
|
if (transform_core->x2 - transform_core->x1)
|
|
|
|
scalex = (double) (x2 - x1) / (double) (transform_core->x2 - transform_core->x1);
|
|
|
|
if (transform_core->y2 - transform_core->y1)
|
|
|
|
scaley = (double) (y2 - y1) / (double) (transform_core->y2 - transform_core->y1);
|
|
|
|
|
|
|
|
switch (transform_core->function)
|
|
|
|
{
|
|
|
|
case HANDLE_1 :
|
|
|
|
cx = x2; cy = y2;
|
|
|
|
diffx = x2 - transform_core->x2;
|
|
|
|
diffy = y2 - transform_core->y2;
|
|
|
|
break;
|
|
|
|
case HANDLE_2 :
|
|
|
|
cx = x1; cy = y2;
|
|
|
|
diffx = x1 - transform_core->x1;
|
|
|
|
diffy = y2 - transform_core->y2;
|
|
|
|
break;
|
|
|
|
case HANDLE_3 :
|
|
|
|
cx = x2; cy = y1;
|
|
|
|
diffx = x2 - transform_core->x2;
|
|
|
|
diffy = y1 - transform_core->y1;
|
|
|
|
break;
|
|
|
|
case HANDLE_4 :
|
|
|
|
cx = x1; cy = y1;
|
|
|
|
diffx = x1 - transform_core->x1;
|
|
|
|
diffy = y1 - transform_core->y1;
|
|
|
|
break;
|
|
|
|
default :
|
|
|
|
cx = x1; cy = y1;
|
|
|
|
diffx = diffy = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* assemble the transformation matrix */
|
1998-10-14 10:54:02 +08:00
|
|
|
gimp_matrix_identity (transform_core->transform);
|
|
|
|
gimp_matrix_translate (transform_core->transform, (double) -cx + diffx, (double) -cy + diffy);
|
|
|
|
gimp_matrix_scale (transform_core->transform, scalex, scaley);
|
|
|
|
gimp_matrix_translate (transform_core->transform, (double) cx, (double) cy);
|
1997-11-25 06:05:25 +08:00
|
|
|
|
|
|
|
/* transform the bounding box */
|
|
|
|
transform_bounding_box (tool);
|
|
|
|
|
|
|
|
/* update the information dialog */
|
|
|
|
scale_info_update (tool);
|
|
|
|
|
|
|
|
return (void *) 1;
|
|
|
|
}
|
|
|
|
|
1999-04-19 05:22:41 +08:00
|
|
|
void *
|
1999-04-03 03:46:59 +08:00
|
|
|
scale_tool_scale (GImage *gimage,
|
|
|
|
GimpDrawable *drawable,
|
|
|
|
GDisplay *gdisp,
|
|
|
|
double *trans_info,
|
|
|
|
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, _("Scaling..."), 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
|
|
|
}
|