2003-02-07 Michael Natterer <mitch@gimp.org> Added object properties for almost all tool_options values and registered lots of enums with the type system: Part I (enum and type cleanup): * app/core/core-enums.[ch] * app/core/core-types.h: removed InternalOrientaionType and register GimpOrientationType. Register GimpChannelOps. Removed GimpToolOptionsGUIFunc. * app/xcf/xcf-private.h: added XcfOrientationType with the same values as the old InternalOrientationType * app/xcf/xcf-load.c * app/xcf/xcf-save.c: translate between GimpOrientationType and XcfOrientationType. * app/core/gimpdrawable-transform-utils.[ch] * app/core/gimpdrawable-transform.[ch] * app/core/gimpimage-crop.c * app/core/gimpimage-duplicate.c * app/core/gimpimage-guides.c * app/core/gimpimage-resize.c * app/core/gimpimage-scale.c * app/core/gimpimage.h * app/display/gimpdisplayshell.c * tools/pdbgen/stddefs.pdb * tools/pdbgen/pdb/transform_tools.pdb: changed accordingly. * app/pdb/guides_cmds.c * app/pdb/transform_tools_cmds.c * libgimp/gimpenums.h * libgimpproxy/gimpproxytypes.h * plug-ins/script-fu/script-fu-constants.c * tools/pdbgen/enums.pl: regenerated. * libgimptool/gimptoolenums.[ch]: added GimpTransformGridType. * libgimptool/gimptooltypes.h: removed GimpToolOptionsResetFunc, added GimpToolOptionsGUIFunc. Part II (tool options changes): * app/config/gimpconfig-utils.c (gimp_config_reset_properties): don't reset object properties because they have NULL as default value. * app/widgets/gimppropwidgets.[ch]: added gimp_prop_[enum|boolean]_radio_frame_new(), gimp_prop_paint_mode_menu_new() and gimp_prop_scale_entry_new(), which are all needed by the new tool options GUI code. * app/tools/tool_options.[ch]: removed the "reset_func" since the virtual reset() method is used now. * app/paint/gimpairbrushoptions.[ch] * app/paint/gimpcloneoptions.[ch] * app/paint/gimpconvolveoptions.[ch] * app/paint/gimpdodgeburnoptions.[ch] * app/paint/gimperaseroptions.[ch] * app/paint/gimppaintoptions.[ch] * app/paint/gimpsmudgeoptions.[ch]: added properties all over the place and removed the widget and default_value members from the structs. Renamed some values (e.g. s/type/clone_type/). Don't #include <gtk/gtk.h>. * app/paint/gimpairbrush.c * app/paint/gimpclone.c * app/paint/gimpconvolve.c * app/paint/gimpdodgeburn.c * app/paint/gimperaser.c * app/paint/gimppaintbrush.c * app/paint/gimppaintcore-stroke.c * app/paint/gimppaintcore.c * app/paint/gimppencil.c * app/paint/gimpsmudge.c * app/paint/paint-types.h * app/paint/paint.c: changed accordingly. Don't #include <gtk/gtk.h>. * tools/pdbgen/pdb/paint_tools.pdb: changed accordingly. * app/pdb/paint_tools_cmds.c: regenerated. * app/tools/gimpblendoptions.[ch] * app/tools/gimpbucketfilloptions.[ch] * app/tools/gimpcolorpickeroptions.[ch] * app/tools/gimpcropoptions.[ch] * app/tools/gimpflipoptions.[ch] * app/tools/gimpinkoptions.c * app/tools/gimpmagnifyoptions.[ch] * app/tools/gimpmeasureoptions.[ch] * app/tools/gimpmoveoptions.[ch] * app/tools/gimptextoptions.c * app/tools/paint_options.[ch] * app/tools/selection_options.[ch] * app/tools/transform_options.[ch]: ditto: added properties and removed widget and default_value stuff. Removed most reset functions. Use gimp_prop widgets all over the place, renamed some values as above. * app/tools/Makefile.am * app/tools/gimpairbrushtool.c * app/tools/gimpblendtool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpclonetool.c * app/tools/gimpconvolvetool.c * app/tools/gimpcroptool.c * app/tools/gimpdodgeburntool.c * app/tools/gimperasertool.c * app/tools/gimpfliptool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmovetool.c * app/tools/gimpselectiontool.c * app/tools/gimpsheartool.c * app/tools/gimpsmudgetool.c * app/tools/gimptransformtool.c * app/tools/gimpvectoroptions.c: changed accordingly. Ported the paint_options GUI constructors to gimp_prop widgets. * app/widgets/gimpselectioneditor.c * app/gui/tool-options-dialog.c: changed accordingly.
253 lines
5.6 KiB
C
253 lines
5.6 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 "gimpimage.h"
|
|
#include "gimpimage-guides.h"
|
|
|
|
#include "undo.h"
|
|
|
|
|
|
#define GUIDE_EPSILON 5
|
|
|
|
|
|
/* public functions */
|
|
|
|
GimpGuide *
|
|
gimp_image_add_hguide (GimpImage *gimage)
|
|
{
|
|
GimpGuide *guide;
|
|
|
|
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
|
|
|
|
guide = g_new (GimpGuide, 1);
|
|
|
|
guide->ref_count = 0;
|
|
guide->position = -1;
|
|
guide->guide_ID = gimage->gimp->next_guide_ID++;
|
|
guide->orientation = GIMP_ORIENTATION_HORIZONTAL;
|
|
|
|
gimage->guides = g_list_prepend (gimage->guides, guide);
|
|
|
|
return guide;
|
|
}
|
|
|
|
GimpGuide *
|
|
gimp_image_add_vguide (GimpImage *gimage)
|
|
{
|
|
GimpGuide *guide;
|
|
|
|
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
|
|
|
|
guide = g_new (GimpGuide, 1);
|
|
|
|
guide->ref_count = 0;
|
|
guide->position = -1;
|
|
guide->guide_ID = gimage->gimp->next_guide_ID++;
|
|
guide->orientation = GIMP_ORIENTATION_VERTICAL;
|
|
|
|
gimage->guides = g_list_prepend (gimage->guides, guide);
|
|
|
|
return guide;
|
|
}
|
|
|
|
void
|
|
gimp_image_add_guide (GimpImage *gimage,
|
|
GimpGuide *guide)
|
|
{
|
|
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
|
|
|
gimage->guides = g_list_prepend (gimage->guides, guide);
|
|
}
|
|
|
|
void
|
|
gimp_image_remove_guide (GimpImage *gimage,
|
|
GimpGuide *guide)
|
|
{
|
|
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
|
|
|
gimage->guides = g_list_remove (gimage->guides, guide);
|
|
}
|
|
|
|
void
|
|
gimp_image_delete_guide (GimpImage *gimage,
|
|
GimpGuide *guide)
|
|
{
|
|
guide->position = -1;
|
|
|
|
g_return_if_fail (GIMP_IS_IMAGE (gimage));
|
|
|
|
if (guide->ref_count <= 0)
|
|
{
|
|
gimage->guides = g_list_remove (gimage->guides, guide);
|
|
g_free (guide);
|
|
}
|
|
}
|
|
|
|
GimpGuide *
|
|
gimp_image_find_guide (GimpImage *gimage,
|
|
gdouble x,
|
|
gdouble y)
|
|
{
|
|
GList *list;
|
|
GimpGuide *guide;
|
|
|
|
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
|
|
|
|
if (x < 0 || x >= gimage->width ||
|
|
y < 0 || y >= gimage->height)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
for (list = gimage->guides; list; list = g_list_next (list))
|
|
{
|
|
guide = (GimpGuide *) list->data;
|
|
|
|
if (guide->position < 0)
|
|
continue;
|
|
|
|
switch (guide->orientation)
|
|
{
|
|
case GIMP_ORIENTATION_HORIZONTAL:
|
|
if (ABS (guide->position - y) < GUIDE_EPSILON)
|
|
return guide;
|
|
break;
|
|
|
|
case GIMP_ORIENTATION_VERTICAL:
|
|
if (ABS (guide->position - x) < GUIDE_EPSILON)
|
|
return guide;
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
gboolean
|
|
gimp_image_snap_point (GimpImage *gimage,
|
|
gdouble x,
|
|
gdouble y,
|
|
gint *tx,
|
|
gint *ty)
|
|
{
|
|
GList *list;
|
|
GimpGuide *guide;
|
|
gint minxdist, minydist;
|
|
gint dist;
|
|
gboolean snapped = FALSE;
|
|
|
|
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), FALSE);
|
|
g_return_val_if_fail (tx != NULL, FALSE);
|
|
g_return_val_if_fail (ty != NULL, FALSE);
|
|
|
|
*tx = x;
|
|
*ty = y;
|
|
|
|
if (x < 0 || x >= gimage->width ||
|
|
y < 0 || y >= gimage->height)
|
|
{
|
|
return FALSE;
|
|
}
|
|
|
|
minxdist = G_MAXINT;
|
|
minydist = G_MAXINT;
|
|
|
|
for (list = gimage->guides; list; list = g_list_next (list))
|
|
{
|
|
guide = (GimpGuide *) list->data;
|
|
|
|
switch (guide->orientation)
|
|
{
|
|
case GIMP_ORIENTATION_HORIZONTAL:
|
|
dist = ABS (guide->position - y);
|
|
|
|
if (dist < MIN (GUIDE_EPSILON, minydist))
|
|
{
|
|
minydist = dist;
|
|
*ty = guide->position;
|
|
snapped = TRUE;
|
|
}
|
|
break;
|
|
|
|
case GIMP_ORIENTATION_VERTICAL:
|
|
dist = ABS (guide->position - x);
|
|
|
|
if (dist < MIN (GUIDE_EPSILON, minxdist))
|
|
{
|
|
minxdist = dist;
|
|
*tx = guide->position;
|
|
snapped = TRUE;
|
|
}
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
return snapped;
|
|
}
|
|
|
|
gboolean
|
|
gimp_image_snap_rectangle (GimpImage *gimage,
|
|
gdouble x1,
|
|
gdouble y1,
|
|
gdouble x2,
|
|
gdouble y2,
|
|
gint *tx1,
|
|
gint *ty1)
|
|
{
|
|
gint nx1, ny1;
|
|
gint nx2, ny2;
|
|
gboolean snap1, snap2;
|
|
|
|
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), FALSE);
|
|
g_return_val_if_fail (tx1 != NULL, FALSE);
|
|
g_return_val_if_fail (ty1 != NULL, FALSE);
|
|
|
|
*tx1 = x1;
|
|
*ty1 = y1;
|
|
|
|
snap1 = gimp_image_snap_point (gimage, x1, y1, &nx1, &ny1);
|
|
snap2 = gimp_image_snap_point (gimage, x2, y2, &nx2, &ny2);
|
|
|
|
if (snap1 || snap2)
|
|
{
|
|
if (x1 != nx1)
|
|
*tx1 = nx1;
|
|
else if (x2 != nx2)
|
|
*tx1 = x1 + (nx2 - x2);
|
|
|
|
if (y1 != ny1)
|
|
*ty1 = ny1;
|
|
else if (y2 != ny2)
|
|
*ty1 = y1 + (ny2 - y2);
|
|
}
|
|
|
|
return snap1 || snap2;
|
|
}
|