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.
170 lines
4.7 KiB
C
170 lines
4.7 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 "paint-types.h"
|
|
|
|
#include "core/gimpdrawable.h"
|
|
|
|
#include "vectors/gimpstroke.h"
|
|
#include "vectors/gimpvectors.h"
|
|
|
|
#include "gimppaintcore.h"
|
|
#include "gimppaintcore-stroke.h"
|
|
|
|
|
|
gboolean
|
|
gimp_paint_core_stroke (GimpPaintCore *core,
|
|
GimpDrawable *drawable,
|
|
GimpPaintOptions *paint_options,
|
|
GimpCoords *strokes,
|
|
gint n_strokes)
|
|
{
|
|
g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE);
|
|
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
|
|
g_return_val_if_fail (paint_options != NULL, FALSE);
|
|
g_return_val_if_fail (strokes != NULL, FALSE);
|
|
g_return_val_if_fail (n_strokes > 0, FALSE);
|
|
|
|
if (gimp_paint_core_start (core, drawable, paint_options, &strokes[0]))
|
|
{
|
|
gint i;
|
|
|
|
core->start_coords = strokes[0];
|
|
core->last_coords = strokes[0];
|
|
|
|
gimp_paint_core_paint (core, drawable, paint_options, INIT_PAINT);
|
|
|
|
gimp_paint_core_paint (core, drawable, paint_options, MOTION_PAINT);
|
|
|
|
for (i = 1; i < n_strokes; i++)
|
|
{
|
|
core->cur_coords = strokes[i];
|
|
|
|
gimp_paint_core_interpolate (core, drawable, paint_options);
|
|
|
|
core->last_coords = core->cur_coords;
|
|
}
|
|
|
|
gimp_paint_core_paint (core, drawable, paint_options, FINISH_PAINT);
|
|
|
|
gimp_paint_core_finish (core, drawable);
|
|
|
|
gimp_paint_core_cleanup (core);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
gboolean
|
|
gimp_paint_core_stroke_vectors (GimpPaintCore *core,
|
|
GimpDrawable *drawable,
|
|
GimpPaintOptions *paint_options,
|
|
GimpVectors *vectors)
|
|
{
|
|
GimpStroke *stroke;
|
|
GArray *coords = NULL;
|
|
gboolean closed;
|
|
|
|
g_return_val_if_fail (GIMP_IS_PAINT_CORE (core), FALSE);
|
|
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), FALSE);
|
|
g_return_val_if_fail (paint_options != NULL, FALSE);
|
|
g_return_val_if_fail (GIMP_IS_VECTORS (vectors), FALSE);
|
|
|
|
/* gimp_stroke_interpolate() may return NULL, so iterate over the
|
|
* list of strokes until one returns coords
|
|
*/
|
|
for (stroke = vectors->strokes; stroke; stroke = stroke->next)
|
|
{
|
|
coords = gimp_stroke_interpolate (stroke, 1.0, &closed);
|
|
|
|
if (coords)
|
|
break;
|
|
}
|
|
|
|
if (! coords)
|
|
return FALSE;
|
|
|
|
if (! gimp_paint_core_start (core, drawable, paint_options,
|
|
&(g_array_index (coords, GimpCoords, 0))))
|
|
{
|
|
g_array_free (coords, TRUE);
|
|
return FALSE;
|
|
}
|
|
|
|
gimp_paint_core_paint (core, drawable, paint_options, INIT_PAINT);
|
|
|
|
do
|
|
{
|
|
gint i;
|
|
|
|
core->start_coords = g_array_index (coords, GimpCoords, 0);
|
|
core->last_coords = g_array_index (coords, GimpCoords, 0);
|
|
|
|
gimp_paint_core_paint (core, drawable, paint_options, MOTION_PAINT);
|
|
|
|
for (i = 1; i < coords->len; i++)
|
|
{
|
|
core->cur_coords = g_array_index (coords, GimpCoords, i);
|
|
|
|
gimp_paint_core_interpolate (core, drawable, paint_options);
|
|
|
|
core->last_coords = core->cur_coords;
|
|
}
|
|
|
|
if (closed)
|
|
{
|
|
core->cur_coords = g_array_index (coords, GimpCoords, 0);
|
|
|
|
gimp_paint_core_interpolate (core, drawable, paint_options);
|
|
|
|
core->last_coords = core->cur_coords;
|
|
}
|
|
|
|
g_array_free (coords, TRUE);
|
|
coords = NULL;
|
|
|
|
if (stroke->next)
|
|
{
|
|
stroke = stroke->next;
|
|
|
|
/* see above */
|
|
for ( ; stroke; stroke = stroke->next)
|
|
{
|
|
coords = gimp_stroke_interpolate (stroke, 1.0, &closed);
|
|
|
|
if (coords)
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
while (coords);
|
|
|
|
gimp_paint_core_paint (core, drawable, paint_options, FINISH_PAINT);
|
|
|
|
gimp_paint_core_finish (core, drawable);
|
|
|
|
gimp_paint_core_cleanup (core);
|
|
|
|
return TRUE;
|
|
}
|