mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-23 04:51:44 +00:00
26374e814e
2005-08-28 Michael Natterer <mitch@gimp.org> Immplement "Sample Merged" for the clone tool. Fixes bug #123627. * app/paint/gimppaintcore.[ch] (struct GimpPaintCore): added members "saved_proj_tiles" which stores the unmodified projection, "orig_proj_buf" which stores the unmodified temp paint application buf and "use_saved_proj" which controls if all the additional stuff should be allocated and managed. (gimp_paint_core_start): allocate the saved_proj_tiles if needed. (gimp_paint_core_get_orig_proj): new function like gimp_paint_core_get_orig_image() which returns unmodified projection pixels for paint application. (gimp_paint_core_validate_saved_proj_tiles): new function like gimp_paint_core_validate_undo_tiles() which copies the tiles that will be dirtied to saved_proj_tiles. (gimp_paint_core_paste): call above save_proj_tiles() so projection tiles are saved before dirtying them. * app/paint/gimpclone.[ch]: replaced member src_drawable by src_pickable and use the image's projection if sample_merged it TRUE. Adjust src offsets accordingly and use GimpPaintCore's new get_orig_proj() API to get the src pixels. * app/paint/gimpcloneoptions.[ch]: added boolean "sample_merged" property. * app/tools/gimpclonetool.c: follow GimpClone's src_drawable -> src_pickable change. (gimp_clone_tool_button_press): set the paint_core's "use_saved_proj" boolean before chaining up. (gimp_clone_options_gui): add a "Sample Merged" toggle button.
162 lines
4.9 KiB
C
162 lines
4.9 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 "libgimpconfig/gimpconfig.h"
|
|
|
|
#include "paint-types.h"
|
|
|
|
#include "gimpcloneoptions.h"
|
|
|
|
|
|
#define CLONE_DEFAULT_TYPE GIMP_IMAGE_CLONE
|
|
#define CLONE_DEFAULT_ALIGN_MODE GIMP_CLONE_ALIGN_NO
|
|
|
|
|
|
enum
|
|
{
|
|
PROP_0,
|
|
PROP_CLONE_TYPE,
|
|
PROP_ALIGN_MODE,
|
|
PROP_SAMPLE_MERGED
|
|
};
|
|
|
|
|
|
|
|
static void gimp_clone_options_class_init (GimpCloneOptionsClass *klass);
|
|
|
|
static void gimp_clone_options_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec);
|
|
static void gimp_clone_options_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec);
|
|
|
|
|
|
static GimpPaintOptionsClass *parent_class = NULL;
|
|
|
|
|
|
GType
|
|
gimp_clone_options_get_type (void)
|
|
{
|
|
static GType type = 0;
|
|
|
|
if (! type)
|
|
{
|
|
static const GTypeInfo info =
|
|
{
|
|
sizeof (GimpCloneOptionsClass),
|
|
(GBaseInitFunc) NULL,
|
|
(GBaseFinalizeFunc) NULL,
|
|
(GClassInitFunc) gimp_clone_options_class_init,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
sizeof (GimpCloneOptions),
|
|
0, /* n_preallocs */
|
|
(GInstanceInitFunc) NULL
|
|
};
|
|
|
|
type = g_type_register_static (GIMP_TYPE_PAINT_OPTIONS,
|
|
"GimpCloneOptions",
|
|
&info, 0);
|
|
}
|
|
|
|
return type;
|
|
}
|
|
|
|
static void
|
|
gimp_clone_options_class_init (GimpCloneOptionsClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
|
|
|
object_class->set_property = gimp_clone_options_set_property;
|
|
object_class->get_property = gimp_clone_options_get_property;
|
|
|
|
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_CLONE_TYPE,
|
|
"clone-type", NULL,
|
|
GIMP_TYPE_CLONE_TYPE,
|
|
CLONE_DEFAULT_TYPE,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_ALIGN_MODE,
|
|
"align-mode", NULL,
|
|
GIMP_TYPE_CLONE_ALIGN_MODE,
|
|
CLONE_DEFAULT_ALIGN_MODE,
|
|
0);
|
|
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
|
|
"sample-merged", NULL,
|
|
FALSE,
|
|
0);
|
|
}
|
|
|
|
static void
|
|
gimp_clone_options_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpCloneOptions *options = GIMP_CLONE_OPTIONS (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_CLONE_TYPE:
|
|
options->clone_type = g_value_get_enum (value);
|
|
break;
|
|
case PROP_ALIGN_MODE:
|
|
options->align_mode = g_value_get_enum (value);
|
|
break;
|
|
case PROP_SAMPLE_MERGED:
|
|
options->sample_merged = g_value_get_boolean (value);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_clone_options_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpCloneOptions *options = GIMP_CLONE_OPTIONS (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_CLONE_TYPE:
|
|
g_value_set_enum (value, options->clone_type);
|
|
break;
|
|
case PROP_ALIGN_MODE:
|
|
g_value_set_enum (value, options->align_mode);
|
|
break;
|
|
case PROP_SAMPLE_MERGED:
|
|
g_value_set_boolean (value, options->sample_merged);
|
|
break;
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|