2001-05-11 Hans Breuer <hans@breuer.org> * app/makefile.msc : add appconfig.lib. Statically link libgimptool/gimptool.lib. * app/main.c : use gimp_locale_directory() * app/config/gimpconfig-utils.c : <string.h> * app/config/makefile.msc : add gimpscanner * app/core/gimpimagefile.c : some G_OS_WIN32 mess to get mkdir() and chmod() * app/display/gimpdisplayshell.c app/plug-in/plug-in-progrss.c app/tool/gimpcolorpickertool.c app/tool/gimpcroptool.c app/tool/gimpmeasuretool.c app/tool/gimpperspectivetool.c app/tool/gimprotatetool.c app/tool/gimpscaletool.c app/tool/gimpsheartool.c app/tool/gimptransformtool.c app/widgets/gimpcolormapeditor.c app/widgets/gimpcolorpanel.c app/widgets/gimptoolbox-color-area.c add #ifdef __GNUC__ to avoid breaking on non standard pragma #warning * app/tools/makefile.msc : add gimptoolcontrol remove tools-enum * app/tools/tool_manager.c : need to include libgimptool/gimptoolcontrol.h after core includes otherwise we would compile without prototypes or break miserably * app/gui/plug-in-menus.c : replace LOCALEDIR with gimp_locale_directory () * app/gui/preferences-dialog.c (prefs_notebook_append_page) : only try to gdk_pixbuf_new_from_file() with a valid filename. It should simply return NULL otherwise, but fails if the filename is an empty string. * app/paint-funcs/makefile.msc : add -FImsvc_recommended_pragmas.h * app/widgets/gimpcolormapeditor.c : the 'row' allocated needs to be 'xn * cellsize * 2' (to avoid accessing unowned memory) not only width, which has become allocation.width by someone commenting out the correct size calculation * app/widgets/gimpdialogfactory.c : varargs to macros are GCCism or at least non standard. #define DEBUG to g_print or nothing - without arguments - does fix it somewhat dirty as the compiler needs to tolerate the '(blah, foo, bar);' statement than * app/widgets/makefile.msc : updated * app/xcf/makefile.msc : add -FImsvc_recommended_pragmas.h * etc/gimprc.win32 : use ';' to separate theme-path * libgimpbase/gimpenv.c : #include <stdio.h> for sprintf() * app/widgets/gimpdnd.c (gimp_dnd_set_file_data) : the passed in vals chunk is not always null-terminated (at least not on win32). Use the length parameter too to avoid reading junk filenames. * libgimp/gimp.def : export gimp_image_get_name() * libgimpbase/gimpbase.def : export gimp_locale_directory() * libgimpbase/gimpenv.[ch] : added gimp_locale_directory () * libgimpbase/makefile.msc : define DATADIR and SYSCONFDIR to empty string to let gimp find its files in the common place (win32: relative to the top level gimp dir) * plug-ins/common/pixelize.c : <string.h> * plug-ins/flame/cmap.c : #include <glib.h> for g_random_int() * plug-ins/makefile.msc : -FImsvc_recommended_pragams.h and a little hack to give imagemap the prototypes it desires without changing the lexed source * themes/Default/images/makefile.msc : now added (see below) * themes/Default/images/stock-button-reset.png : made it binary
441 lines
13 KiB
C
441 lines
13 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 <gtk/gtk.h>
|
|
|
|
#include "libgimpmath/gimpmath.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "tools-types.h"
|
|
|
|
#ifdef __GNUC__
|
|
#warning FIXME #include "gui/gui-types.h"
|
|
#endif
|
|
#include "gui/gui-types.h"
|
|
|
|
#include "core/gimpimage.h"
|
|
#include "core/gimpdrawable-transform.h"
|
|
#include "core/gimpdrawable-transform-utils.h"
|
|
#include "core/gimptoolinfo.h"
|
|
|
|
#include "display/gimpdisplay.h"
|
|
|
|
#include "gui/info-dialog.h"
|
|
|
|
#include "gimprotatetool.h"
|
|
#include "transform_options.h"
|
|
|
|
#include "libgimp/gimpintl.h"
|
|
|
|
|
|
/* index into trans_info array */
|
|
#define ANGLE 0
|
|
#define REAL_ANGLE 1
|
|
#define CENTER_X 2
|
|
#define CENTER_Y 3
|
|
|
|
#define EPSILON 0.018 /* ~ 1 degree */
|
|
#define FIFTEEN_DEG (G_PI / 12.0)
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static void gimp_rotate_tool_class_init (GimpRotateToolClass *klass);
|
|
static void gimp_rotate_tool_init (GimpRotateTool *rotate_tool);
|
|
|
|
static TileManager * gimp_rotate_tool_transform (GimpTransformTool *tr_tool,
|
|
GimpDisplay *gdisp,
|
|
TransformState state);
|
|
|
|
static void rotate_tool_recalc (GimpTransformTool *tr_tool,
|
|
GimpDisplay *gdisp);
|
|
static void rotate_tool_motion (GimpTransformTool *tr_tool,
|
|
GimpDisplay *gdisp);
|
|
static void rotate_info_update (GimpTransformTool *tr_tool);
|
|
|
|
static void rotate_angle_changed (GtkWidget *entry,
|
|
gpointer data);
|
|
static void rotate_center_changed (GtkWidget *entry,
|
|
gpointer data);
|
|
|
|
|
|
/* variables local to this file */
|
|
static gdouble angle_val;
|
|
static gdouble center_vals[2];
|
|
|
|
/* needed for size update */
|
|
static GtkWidget *sizeentry = NULL;
|
|
|
|
static GimpTransformToolClass *parent_class = NULL;
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
gimp_rotate_tool_register (GimpToolRegisterCallback callback,
|
|
gpointer data)
|
|
{
|
|
(* callback) (GIMP_TYPE_ROTATE_TOOL,
|
|
transform_options_new,
|
|
FALSE,
|
|
"gimp-rotate-tool",
|
|
_("Rotate Tool"),
|
|
_("Rotate the layer or selection"),
|
|
N_("/Tools/Transform Tools/Rotate"), "<shift>R",
|
|
NULL, "tools/rotate.html",
|
|
GIMP_STOCK_TOOL_ROTATE,
|
|
data);
|
|
}
|
|
|
|
GType
|
|
gimp_rotate_tool_get_type (void)
|
|
{
|
|
static GType tool_type = 0;
|
|
|
|
if (! tool_type)
|
|
{
|
|
static const GTypeInfo tool_info =
|
|
{
|
|
sizeof (GimpRotateToolClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_rotate_tool_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpRotateTool),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) gimp_rotate_tool_init,
|
|
};
|
|
|
|
tool_type = g_type_register_static (GIMP_TYPE_TRANSFORM_TOOL,
|
|
"GimpRotateTool",
|
|
&tool_info, 0);
|
|
}
|
|
|
|
return tool_type;
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
gimp_rotate_tool_class_init (GimpRotateToolClass *klass)
|
|
{
|
|
GimpTransformToolClass *trans_class;
|
|
|
|
trans_class = GIMP_TRANSFORM_TOOL_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
trans_class->transform = gimp_rotate_tool_transform;
|
|
}
|
|
|
|
static void
|
|
gimp_rotate_tool_init (GimpRotateTool *rotate_tool)
|
|
{
|
|
GimpTool *tool;
|
|
|
|
tool = GIMP_TOOL (rotate_tool);
|
|
|
|
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
|
|
gimp_tool_control_set_preserve (tool->control, FALSE);
|
|
gimp_tool_control_set_tool_cursor (tool->control, GIMP_ROTATE_TOOL_CURSOR);
|
|
}
|
|
|
|
static TileManager *
|
|
gimp_rotate_tool_transform (GimpTransformTool *transform_tool,
|
|
GimpDisplay *gdisp,
|
|
TransformState state)
|
|
{
|
|
switch (state)
|
|
{
|
|
case TRANSFORM_INIT:
|
|
angle_val = 0.0;
|
|
center_vals[0] = transform_tool->cx;
|
|
center_vals[1] = transform_tool->cy;
|
|
|
|
if (! transform_tool->info_dialog)
|
|
{
|
|
GtkWidget *widget;
|
|
GtkWidget *spinbutton2;
|
|
|
|
transform_tool->info_dialog =
|
|
info_dialog_new (_("Rotation Information"),
|
|
gimp_standard_help_func,
|
|
"tools/transform_rotate.html");
|
|
|
|
gimp_transform_tool_info_dialog_connect (transform_tool,
|
|
GIMP_STOCK_TOOL_ROTATE);
|
|
|
|
widget =
|
|
info_dialog_add_spinbutton (transform_tool->info_dialog, _("Angle:"),
|
|
&angle_val,
|
|
-180, 180, 1, 15, 1, 1, 2,
|
|
G_CALLBACK (rotate_angle_changed),
|
|
transform_tool);
|
|
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (widget), TRUE);
|
|
|
|
/* this looks strange (-180, 181), but it works */
|
|
widget = info_dialog_add_scale (transform_tool->info_dialog, "",
|
|
&angle_val,
|
|
-180, 181, 0.01, 0.1, 1, -1,
|
|
G_CALLBACK (rotate_angle_changed),
|
|
transform_tool);
|
|
gtk_widget_set_size_request (widget, 180, -1);
|
|
|
|
spinbutton2 =
|
|
info_dialog_add_spinbutton (transform_tool->info_dialog,
|
|
_("Center X:"),
|
|
NULL,
|
|
-1, 1, 1, 10, 1, 1, 2, NULL, NULL);
|
|
sizeentry =
|
|
info_dialog_add_sizeentry (transform_tool->info_dialog, _("Y:"),
|
|
center_vals, 1,
|
|
gdisp->gimage->unit, "%a",
|
|
TRUE, TRUE, FALSE,
|
|
GIMP_SIZE_ENTRY_UPDATE_SIZE,
|
|
G_CALLBACK (rotate_center_changed),
|
|
transform_tool);
|
|
|
|
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (sizeentry),
|
|
GTK_SPIN_BUTTON (spinbutton2), NULL);
|
|
|
|
gtk_table_set_row_spacing (GTK_TABLE (transform_tool->info_dialog->info_table),
|
|
1, 6);
|
|
gtk_table_set_row_spacing (GTK_TABLE (transform_tool->info_dialog->info_table),
|
|
2, 0);
|
|
}
|
|
|
|
g_signal_handlers_block_by_func (G_OBJECT (sizeentry),
|
|
rotate_center_changed,
|
|
transform_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), GIMP_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,
|
|
-65536,
|
|
65536 + gdisp->gimage->width);
|
|
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
-65536,
|
|
65536 + gdisp->gimage->height);
|
|
|
|
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (sizeentry), 0,
|
|
transform_tool->x1, transform_tool->x2);
|
|
gimp_size_entry_set_size (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
transform_tool->y1, transform_tool->y2);
|
|
|
|
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 0,
|
|
center_vals[0]);
|
|
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1,
|
|
center_vals[1]);
|
|
|
|
g_signal_handlers_unblock_by_func (G_OBJECT (sizeentry),
|
|
rotate_center_changed,
|
|
transform_tool);
|
|
|
|
gtk_widget_set_sensitive (transform_tool->info_dialog->shell, TRUE);
|
|
|
|
transform_tool->trans_info[ANGLE] = angle_val;
|
|
transform_tool->trans_info[REAL_ANGLE] = angle_val;
|
|
transform_tool->trans_info[CENTER_X] = center_vals[0];
|
|
transform_tool->trans_info[CENTER_Y] = center_vals[1];
|
|
break;
|
|
|
|
case TRANSFORM_MOTION:
|
|
rotate_tool_motion (transform_tool, gdisp);
|
|
rotate_tool_recalc (transform_tool, gdisp);
|
|
break;
|
|
|
|
case TRANSFORM_RECALC:
|
|
rotate_tool_recalc (transform_tool, gdisp);
|
|
break;
|
|
|
|
case TRANSFORM_FINISH:
|
|
return gimp_transform_tool_transform_tiles (transform_tool,
|
|
_("Rotating..."));
|
|
break;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static void
|
|
rotate_info_update (GimpTransformTool *transform_tool)
|
|
{
|
|
angle_val = gimp_rad_to_deg (transform_tool->trans_info[ANGLE]);
|
|
center_vals[0] = transform_tool->trans_info[CENTER_X];
|
|
center_vals[1] = transform_tool->trans_info[CENTER_Y];
|
|
|
|
info_dialog_update (transform_tool->info_dialog);
|
|
info_dialog_popup (transform_tool->info_dialog);
|
|
}
|
|
|
|
static void
|
|
rotate_angle_changed (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpTool *tool;
|
|
GimpTransformTool *transform_tool;
|
|
gdouble value;
|
|
|
|
tool = GIMP_TOOL (data);
|
|
transform_tool = GIMP_TRANSFORM_TOOL (data);
|
|
|
|
value = gimp_deg_to_rad (GTK_ADJUSTMENT (widget)->value);
|
|
|
|
if (value != transform_tool->trans_info[ANGLE])
|
|
{
|
|
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
|
|
|
|
transform_tool->trans_info[ANGLE] = value;
|
|
|
|
rotate_tool_recalc (transform_tool, tool->gdisp);
|
|
|
|
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
|
|
}
|
|
}
|
|
|
|
static void
|
|
rotate_center_changed (GtkWidget *widget,
|
|
gpointer data)
|
|
{
|
|
GimpTool *tool;
|
|
GimpTransformTool *transform_tool;
|
|
gdouble cx;
|
|
gdouble cy;
|
|
|
|
tool = GIMP_TOOL (data);
|
|
transform_tool = GIMP_TRANSFORM_TOOL (data);
|
|
|
|
cx = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 0);
|
|
cy = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 1);
|
|
|
|
if ((cx != transform_tool->trans_info[CENTER_X]) ||
|
|
(cy != transform_tool->trans_info[CENTER_Y]))
|
|
{
|
|
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
|
|
|
|
transform_tool->trans_info[CENTER_X] = cx;
|
|
transform_tool->trans_info[CENTER_Y] = cy;
|
|
transform_tool->cx = cx;
|
|
transform_tool->cy = cy;
|
|
|
|
rotate_tool_recalc (transform_tool, tool->gdisp);
|
|
|
|
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
|
|
}
|
|
}
|
|
|
|
static void
|
|
rotate_tool_motion (GimpTransformTool *transform_tool,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
TransformOptions *options;
|
|
gdouble angle1, angle2, angle;
|
|
gdouble cx, cy;
|
|
gdouble x1, y1, x2, y2;
|
|
|
|
if (transform_tool->function == TRANSFORM_HANDLE_CENTER)
|
|
{
|
|
transform_tool->trans_info[CENTER_X] = transform_tool->curx;
|
|
transform_tool->trans_info[CENTER_Y] = transform_tool->cury;
|
|
transform_tool->cx = transform_tool->curx;
|
|
transform_tool->cy = transform_tool->cury;
|
|
|
|
return;
|
|
}
|
|
|
|
options = (TransformOptions *) GIMP_TOOL (transform_tool)->tool_info->tool_options;
|
|
|
|
cx = transform_tool->trans_info[CENTER_X];
|
|
cy = transform_tool->trans_info[CENTER_Y];
|
|
|
|
x1 = transform_tool->curx - cx;
|
|
x2 = transform_tool->lastx - cx;
|
|
y1 = cy - transform_tool->cury;
|
|
y2 = cy - transform_tool->lasty;
|
|
|
|
/* find the first angle */
|
|
angle1 = atan2 (y1, x1);
|
|
|
|
/* find the angle */
|
|
angle2 = atan2 (y2, x2);
|
|
|
|
angle = angle2 - angle1;
|
|
|
|
if (angle > G_PI || angle < -G_PI)
|
|
angle = angle2 - ((angle1 < 0) ? 2.0 * G_PI + angle1 : angle1 - 2.0 * G_PI);
|
|
|
|
/* increment the transform tool's angle */
|
|
transform_tool->trans_info[REAL_ANGLE] += angle;
|
|
|
|
/* limit the angle to between 0 and 360 degrees */
|
|
if (transform_tool->trans_info[REAL_ANGLE] < - G_PI)
|
|
transform_tool->trans_info[REAL_ANGLE] =
|
|
2.0 * G_PI - transform_tool->trans_info[REAL_ANGLE];
|
|
else if (transform_tool->trans_info[REAL_ANGLE] > G_PI)
|
|
transform_tool->trans_info[REAL_ANGLE] =
|
|
transform_tool->trans_info[REAL_ANGLE] - 2.0 * G_PI;
|
|
|
|
/* constrain the angle to 15-degree multiples if ctrl is held down */
|
|
if (options->constrain_1)
|
|
{
|
|
transform_tool->trans_info[ANGLE] =
|
|
FIFTEEN_DEG * (int) ((transform_tool->trans_info[REAL_ANGLE] +
|
|
FIFTEEN_DEG / 2.0) /
|
|
FIFTEEN_DEG);
|
|
}
|
|
else
|
|
{
|
|
transform_tool->trans_info[ANGLE] = transform_tool->trans_info[REAL_ANGLE];
|
|
}
|
|
}
|
|
|
|
static void
|
|
rotate_tool_recalc (GimpTransformTool *transform_tool,
|
|
GimpDisplay *gdisp)
|
|
{
|
|
gdouble cx, cy;
|
|
|
|
cx = transform_tool->trans_info[CENTER_X];
|
|
cy = transform_tool->trans_info[CENTER_Y];
|
|
|
|
transform_tool->cx = cx;
|
|
transform_tool->cy = cy;
|
|
|
|
gimp_drawable_transform_matrix_rotate_center (transform_tool->cx,
|
|
transform_tool->cy,
|
|
transform_tool->trans_info[ANGLE],
|
|
transform_tool->transform);
|
|
|
|
/* transform the bounding box */
|
|
gimp_transform_tool_transform_bounding_box (transform_tool);
|
|
|
|
/* update the information dialog */
|
|
rotate_info_update (transform_tool);
|
|
}
|