Partially implemented sample-merged healing.

app/paint/gimpheal.h

@@ -0,0 +1,64 @@
+/* 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.
+ */
+
+#ifndef __GIMP_HEAL_H__
+#define __GIMP_HEAL_H__
+
+#include "gimpbrushcore.h"
+
+#define GIMP_TYPE_HEAL (gimp_heal_get_type ())
+#define GIMP_HEAL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HEAL, GimpHeal))
+#define GIMP_HEAL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HEAL, GimpHealClass))
+#define GIMP_IS_HEAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HEAL))
+#define GIMP_IS_HEAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HEAL))
+#define GIMP_HEAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HEAL, GimpHealClass))
+
+typedef struct _GimpHeal GimpHeal;
+typedef struct _GimpHealClass GimpHealClass;
+
+struct _GimpHeal
+{
+ GimpBrushCore parent_instance;
+
+ gboolean set_source;
+
+ GimpDrawable *src_drawable;
+ gdouble src_x;
+ gdouble src_y;
+
+ gdouble orig_src_x;
+ gdouble orig_src_y;
+
+ gdouble offset_x;
+ gdouble offset_y;
+ gboolean first_stroke;
+};
+
+struct _GimpHealClass
+{
+ GimpBrushCoreClass parent_class;
+};
+
+
+void gimp_heal_register (Gimp *gimp,
+ GimpPaintRegisterCallback callback);
+
+GType gimp_heal_get_type (void) G_GNUC_CONST;
+
+
+#endif /* __GIMP_HEAL_H__ */

app/paint/gimphealoptions.c

@@ -0,0 +1,114 @@
+/* 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 "gimphealoptions.h"
+
+enum
+{
+ PROP_0,
+ PROP_ALIGN_MODE,
+ PROP_SAMPLE_MERGED
+};
+
+static void gimp_heal_options_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gimp_heal_options_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+G_DEFINE_TYPE (GimpHealOptions, gimp_heal_options, GIMP_TYPE_PAINT_OPTIONS)
+
+static void
+gimp_heal_options_class_init (GimpHealOptionsClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->set_property = gimp_heal_options_set_property;
+ object_class->get_property = gimp_heal_options_get_property;
+
+ GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_ALIGN_MODE,
+ "align-mode", NULL,
+ GIMP_TYPE_HEAL_ALIGN_MODE,
+ GIMP_HEAL_ALIGN_NO,
+ GIMP_PARAM_STATIC_STRINGS);
+
+ GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
+ "sample-merged", NULL,
+ FALSE,
+ GIMP_PARAM_STATIC_STRINGS);
+
+}
+
+static void
+gimp_heal_options_init (GimpHealOptions *options)
+{
+}
+
+static void
+gimp_heal_options_set_property (GObject *object,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GimpHealOptions *options = GIMP_HEAL_OPTIONS (object);
+
+ switch (property_id)
+ {
+ 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_heal_options_get_property (GObject *object,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GimpHealOptions *options = GIMP_HEAL_OPTIONS (object);
+
+ switch (property_id)
+ {
+ 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;
+ }
+}

app/paint/gimphealoptions.h

@@ -0,0 +1,48 @@
+/* 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.
+ */
+
+#ifndef __GIMP_HEAL_OPTIONS_H__
+#define __GIMP_HEAL_OPTIONS_H__
+
+
+#include "gimppaintoptions.h"
+
+
+#define GIMP_TYPE_HEAL_OPTIONS (gimp_heal_options_get_type ())
+#define GIMP_HEAL_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HEAL_OPTIONS, GimpHealOptions))
+#define GIMP_HEAL_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HEAL_OPTIONS, GimpHealOptionsClass))
+#define GIMP_IS_HEAL_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_HEAL_OPTIONS))
+#define GIMP_IS_HEAL_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_HEAL_OPTIONS))
+#define GIMP_HEAL_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HEAL_OPTIONS, GimpHealOptionsClass))
+
+
+typedef struct _GimpHealOptions GimpHealOptions;
+typedef struct _GimpPaintOptionsClass GimpHealOptionsClass;
+
+struct _GimpHealOptions
+{
+ GimpPaintOptions paint_options;
+
+ GimpHealAlignMode align_mode;
+ gboolean sample_merged;
+};
+
+
+GType gimp_heal_options_get_type (void) G_GNUC_CONST;
+
+#endif /* __GIMP_HEAL_OPTIONS_H__ */