gimp/app/core/gimpimage-rotate.c
Michael Natterer 02d2b990f5 Redid the whole internal progress stuff: don't pass around
2004-08-10  Michael Natterer  <mitch@gimp.org>

	Redid the whole internal progress stuff: don't pass around
	progress_callback and progress_data; instead, provide a
	pointer to a GimpProgressInterface which can be implemented
	by a variety of backends.

	Addresses (but not yet fixes) bugs #6010, #97266 and #135185.

	* app/display/Makefile.am
	* app/display/gimpprogress.[ch]: removed the old progress hack.

	* app/core/Makefile.am
	* app/core/core-types.h
	* app/core/gimpprogress.[ch]: implement GimpProgressInterface.

	* app/widgets/Makefile.am
	* app/widgets/widgets-types.h
	* app/widgets/gimpprogressdialog.[ch]: the standalone progress
	dialog as widget implementing GimpProgressInterface.

	* app/display/gimpdisplay.c
	* app/display/gimpstatusbar.[ch]
	* app/widgets/gimpfiledialog.[ch]
	* app/widgets/gimpthumbbox.[ch]: added GimpProgressInterface
	implementation to these classes.

	* app/core/gimp-gui.[ch]
	* app/gui/gui-vtable.c: replaced the old progress vtable entries
	by two new to create and destroy a GimpProgressDialog in case
	no other progress is available.

	* app/pdb/procedural_db.[ch]
	* app/plug-in/plug-in-run.[ch]
	* tools/pdbgen/app.pl: pass a GimpProgress to all PDB wrappers and
	all plug-ins.

	* app/plug-in/plug-in.[ch]
	* app/plug-in/plug-ins.c
	* app/plug-in/plug-in-message.c
	* app/plug-in/plug-in-progress.c: handle the case there the
	plug-in was crated with a progress as well as the case where it
	wasn't.

	* app/app_procs.c
	* app/batch.c
	* app/xcf/xcf.c
	* app/file/file-open.[ch]
	* app/file/file-save.[ch]
	* app/widgets/gimphelp.c
	* app/widgets/gimpbrushselect.c
	* app/widgets/gimpfontselect.c
	* app/widgets/gimpgradientselect.c
	* app/widgets/gimppaletteselect.c
	* app/widgets/gimppatternselect.c: changed accordingly.

	* app/core/gimpimagefile.[ch]
	* app/display/gimpdisplayshell-dnd.c
	* app/gui/file-open-dialog.c
	* app/gui/file-open-location-dialog.c
	* app/gui/file-save-dialog.c
	* app/widgets/gimplayertreeview.c
	* app/widgets/gimptoolbox-dnd.c: pass a GimpProgress to all file
	related functions. Embed the progress in the file dialog where
	possible.

	* app/core/gimpdrawable-blend.[ch]
	* app/core/gimpdrawable-transform.[ch]
	* app/core/gimpimage-convert.[ch]
	* app/core/gimpimage-flip.[ch]
	* app/core/gimpimage-resize.[ch]
	* app/core/gimpimage-rotate.[ch]
	* app/core/gimpimage-scale.[ch]
	* app/core/gimpitem-linked.[ch]
	* app/core/gimpitem.[ch]
	* app/core/gimpchannel.c
	* app/core/gimpdrawable.c
	* app/core/gimplayer.c
	* app/core/gimpselection.c
	* app/vectors/gimpvectors.c: replaced callback/data by GimpProgress.

	* app/tools/gimpblendtool.c
	* app/tools/gimptransformtool.c
	* app/gui/convert-dialog.c
	* app/actions/documents-commands.c
	* app/actions/file-commands.c
	* app/actions/image-commands.c
	* app/actions/layers-commands.c
	* app/actions/plug-in-commands.c
	* app/actions/vectors-commands.c
	* tools/pdbgen/pdb/convert.pdb
	* tools/pdbgen/pdb/edit.pdb
	* tools/pdbgen/pdb/image.pdb
	* tools/pdbgen/pdb/layer.pdb: changed callers accordingly.

	* app/pdb/*_cmds.c: regenerated.
2004-08-10 18:47:21 +00:00

311 lines
8.4 KiB
C

/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <glib-object.h>
#include "core-types.h"
#include "gimp.h"
#include "gimpcontext.h"
#include "gimpimage.h"
#include "gimpimage-rotate.h"
#include "gimpimage-guides.h"
#include "gimpimage-undo.h"
#include "gimpimage-undo-push.h"
#include "gimpitem.h"
#include "gimplist.h"
#include "gimpprogress.h"
static void gimp_image_rotate_item_offset (GimpImage *gimage,
GimpRotationType rotate_type,
GimpItem *item,
gint off_x,
gint off_y);
static void gimp_image_rotate_guides (GimpImage *gimage,
GimpRotationType rotate_type);
void
gimp_image_rotate (GimpImage *gimage,
GimpContext *context,
GimpRotationType rotate_type,
GimpProgress *progress)
{
GimpItem *item;
GList *list;
gdouble center_x;
gdouble center_y;
gdouble progress_max;
gdouble progress_current = 1.0;
gint new_image_width;
gint new_image_height;
gboolean size_changed;
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
gimp_set_busy (gimage->gimp);
center_x = (gdouble) gimage->width / 2.0;
center_y = (gdouble) gimage->height / 2.0;
progress_max = (gimage->channels->num_children +
gimage->layers->num_children +
gimage->vectors->num_children +
1 /* selection */);
g_object_freeze_notify (G_OBJECT (gimage));
gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_ROTATE, NULL);
/* Resize the image (if needed) */
switch (rotate_type)
{
case GIMP_ROTATE_90:
case GIMP_ROTATE_270:
new_image_width = gimage->height;
new_image_height = gimage->width;
size_changed = TRUE;
break;
case GIMP_ROTATE_180:
new_image_width = gimage->width;
new_image_height = gimage->height;
size_changed = FALSE;
break;
default:
g_assert_not_reached ();
return;
}
/* Rotate all channels */
for (list = GIMP_LIST (gimage->channels)->list;
list;
list = g_list_next (list))
{
item = (GimpItem *) list->data;
gimp_item_rotate (item, context, rotate_type, center_x, center_y, FALSE);
item->offset_x = 0;
item->offset_y = 0;
if (progress)
gimp_progress_set_value (progress, progress_current++ / progress_max);
}
/* Rotate all vectors */
for (list = GIMP_LIST (gimage->vectors)->list;
list;
list = g_list_next (list))
{
item = (GimpItem *) list->data;
gimp_item_rotate (item, context, rotate_type, center_x, center_y, FALSE);
item->width = new_image_width;
item->height = new_image_height;
item->offset_x = 0;
item->offset_y = 0;
gimp_item_translate (item,
(new_image_width - gimage->width) / 2,
(new_image_height - gimage->height) / 2,
FALSE);
if (progress)
gimp_progress_set_value (progress, progress_current++ / progress_max);
}
/* Don't forget the selection mask! */
gimp_item_rotate (GIMP_ITEM (gimp_image_get_mask (gimage)), context,
rotate_type, center_x, center_y, FALSE);
GIMP_ITEM (gimage->selection_mask)->offset_x = 0;
GIMP_ITEM (gimage->selection_mask)->offset_y = 0;
if (progress)
gimp_progress_set_value (progress, progress_current++ / progress_max);
/* Rotate all layers */
for (list = GIMP_LIST (gimage->layers)->list;
list;
list = g_list_next (list))
{
gint off_x, off_y;
item = (GimpItem *) list->data;
gimp_item_offsets (item, &off_x, &off_y);
gimp_item_rotate (item, context, rotate_type, center_x, center_y, FALSE);
gimp_image_rotate_item_offset (gimage, rotate_type, item, off_x, off_y);
if (progress)
gimp_progress_set_value (progress, progress_current++ / progress_max);
}
/* Rotate all Guides */
gimp_image_rotate_guides (gimage, rotate_type);
/* Resize the image (if needed) */
if (size_changed)
{
gimp_image_undo_push_image_size (gimage, NULL);
g_object_set (gimage,
"width", new_image_width,
"height", new_image_height,
NULL);
if (gimage->xresolution != gimage->yresolution)
{
gdouble tmp;
gimp_image_undo_push_image_resolution (gimage, NULL);
tmp = gimage->xresolution;
gimage->yresolution = gimage->xresolution;
gimage->xresolution = tmp;
}
}
gimp_image_undo_group_end (gimage);
if (size_changed)
gimp_viewable_size_changed (GIMP_VIEWABLE (gimage));
g_object_thaw_notify (G_OBJECT (gimage));
gimp_unset_busy (gimage->gimp);
}
static void
gimp_image_rotate_item_offset (GimpImage *gimage,
GimpRotationType rotate_type,
GimpItem *item,
gint off_x,
gint off_y)
{
gint x = 0;
gint y = 0;
switch (rotate_type)
{
case GIMP_ROTATE_90:
x = gimage->height - off_y - gimp_item_width (item);
y = off_x;
break;
case GIMP_ROTATE_270:
x = off_y;
y = gimage->width - off_x - gimp_item_height (item);
break;
case GIMP_ROTATE_180:
return;
}
gimp_item_offsets (item, &off_x, &off_y);
x -= off_x;
y -= off_y;
if (x || y)
gimp_item_translate (item, x, y, FALSE);
}
static void
gimp_image_rotate_guides (GimpImage *gimage,
GimpRotationType rotate_type)
{
GList *list;
/* Rotate all Guides */
for (list = gimage->guides; list; list = g_list_next (list))
{
GimpGuide *guide = list->data;
switch (rotate_type)
{
case GIMP_ROTATE_90:
switch (guide->orientation)
{
case GIMP_ORIENTATION_HORIZONTAL:
gimp_image_undo_push_image_guide (gimage, NULL, guide);
guide->orientation = GIMP_ORIENTATION_VERTICAL;
guide->position = gimage->height - guide->position;
break;
case GIMP_ORIENTATION_VERTICAL:
gimp_image_undo_push_image_guide (gimage, NULL, guide);
guide->orientation = GIMP_ORIENTATION_HORIZONTAL;
break;
default:
break;
}
break;
case GIMP_ROTATE_180:
switch (guide->orientation)
{
case GIMP_ORIENTATION_HORIZONTAL:
gimp_image_move_guide (gimage, guide,
gimage->height - guide->position, TRUE);
break;
case GIMP_ORIENTATION_VERTICAL:
gimp_image_move_guide (gimage, guide,
gimage->width - guide->position, TRUE);
break;
default:
break;
}
break;
case GIMP_ROTATE_270:
switch (guide->orientation)
{
case GIMP_ORIENTATION_HORIZONTAL:
gimp_image_undo_push_image_guide (gimage, NULL, guide);
guide->orientation = GIMP_ORIENTATION_VERTICAL;
break;
case GIMP_ORIENTATION_VERTICAL:
gimp_image_undo_push_image_guide (gimage, NULL, guide);
guide->orientation = GIMP_ORIENTATION_HORIZONTAL;
guide->position = gimage->width - guide->position;
break;
default:
break;
}
break;
}
}
}