[gimp] app: add a custom GUI for gegl:supernova, with an on-canvas controller
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: add a custom GUI for gegl:supernova, with an on-canvas controller
- Date: Mon, 3 Jul 2017 10:46:41 +0000 (UTC)
commit 6de4fca580c19e698900533366b7eb7c6725fe8d
Author: Michael Natterer <mitch gimp org>
Date: Mon Jul 3 12:45:59 2017 +0200
app: add a custom GUI for gegl:supernova, with an on-canvas controller
app/propgui/Makefile.am | 4 +-
app/propgui/gimppropgui-supernova.c | 141 +++++++++++++++++++++++++++++++++++
app/propgui/gimppropgui-supernova.h | 35 +++++++++
app/propgui/gimppropgui.c | 5 +-
4 files changed, 183 insertions(+), 2 deletions(-)
---
diff --git a/app/propgui/Makefile.am b/app/propgui/Makefile.am
index 5b7bb12..f45d705 100644
--- a/app/propgui/Makefile.am
+++ b/app/propgui/Makefile.am
@@ -36,4 +36,6 @@ libapppropgui_a_SOURCES = \
gimppropgui-hue-saturation.c \
gimppropgui-hue-saturation.h \
gimppropgui-spiral.c \
- gimppropgui-spiral.h
+ gimppropgui-spiral.h \
+ gimppropgui-supernova.c \
+ gimppropgui-supernova.h
diff --git a/app/propgui/gimppropgui-supernova.c b/app/propgui/gimppropgui-supernova.c
new file mode 100644
index 0000000..b79f916
--- /dev/null
+++ b/app/propgui/gimppropgui-supernova.c
@@ -0,0 +1,141 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-supernova.c
+ * Copyright (C) 2017 Michael Natterer <mitch gimp org>
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gtk/gtk.h>
+
+#include "libgimpmath/gimpmath.h"
+#include "libgimpwidgets/gimpwidgets.h"
+
+#include "propgui-types.h"
+
+#include "core/gimpcontext.h"
+
+#include "gimppropgui-generic.h"
+#include "gimppropgui-supernova.h"
+
+
+static void
+line_callback (GObject *config,
+ GeglRectangle *area,
+ gdouble x1,
+ gdouble y1,
+ gdouble x2,
+ gdouble y2)
+{
+ gdouble x, y;
+ gint radius;
+
+ g_object_set_data_full (G_OBJECT (config), "area",
+ g_memdup (area, sizeof (GeglRectangle)),
+ (GDestroyNotify) g_free);
+
+ x = x1 / area->width;
+ y = y1 / area->height;
+ radius = sqrt (SQR (x2 - x1) + SQR (y2 - y1));
+
+ g_object_set (config,
+ "center-x", x,
+ "center-y", y,
+ "radius", radius,
+ NULL);
+}
+
+static void
+config_notify (GObject *config,
+ const GParamSpec *pspec,
+ gpointer set_data)
+{
+ GimpControllerLineCallback set_func;
+ GeglRectangle *area;
+ gdouble x, y;
+ gint radius;
+ gdouble x1, y1, x2, y2;
+
+ set_func = g_object_get_data (G_OBJECT (config), "set-func");
+ area = g_object_get_data (G_OBJECT (config), "area");
+
+ g_object_get (config,
+ "center-x", &x,
+ "center-y", &y,
+ "radius", &radius,
+ NULL);
+
+ x1 = x * area->width;
+ y1 = y * area->height;
+ x2 = x1 + radius;
+ y2 = y1;
+
+ set_func (set_data, area, x1, y1, x2, y2);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_supernova (GObject *config,
+ GParamSpec **param_specs,
+ guint n_param_specs,
+ GeglRectangle *area,
+ GimpContext *context,
+ GimpCreatePickerFunc create_picker_func,
+ GimpCreateControllerFunc create_controller_func,
+ gpointer creator)
+{
+ GtkWidget *vbox;
+
+ g_return_val_if_fail (G_IS_OBJECT (config), NULL);
+ g_return_val_if_fail (param_specs != NULL, NULL);
+ g_return_val_if_fail (n_param_specs > 0, NULL);
+ g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
+
+ vbox = _gimp_prop_gui_new_generic (config,
+ param_specs, n_param_specs,
+ area, context,
+ create_picker_func,
+ create_controller_func,
+ creator);
+
+
+ if (create_controller_func)
+ {
+ GCallback set_func;
+ gpointer set_data;
+
+ set_func = create_controller_func (creator,
+ GIMP_CONTROLLER_TYPE_LINE,
+ (GCallback) line_callback,
+ config,
+ &set_data);
+
+ g_object_set_data (G_OBJECT (config), "set-func", set_func);
+
+ g_object_set_data_full (G_OBJECT (config), "area",
+ g_memdup (area, sizeof (GeglRectangle)),
+ (GDestroyNotify) g_free);
+
+ config_notify (config, NULL, set_data);
+
+ g_signal_connect (config, "notify",
+ G_CALLBACK (config_notify),
+ set_data);
+ }
+
+ return vbox;
+}
diff --git a/app/propgui/gimppropgui-supernova.h b/app/propgui/gimppropgui-supernova.h
new file mode 100644
index 0000000..429adb2
--- /dev/null
+++ b/app/propgui/gimppropgui-supernova.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-supernova.h
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_SUPERNOVA_H__
+#define __GIMP_PROP_GUI_SUPERNOVA_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_supernova (GObject *config,
+ GParamSpec **param_specs,
+ guint n_param_specs,
+ GeglRectangle *area,
+ GimpContext *context,
+ GimpCreatePickerFunc create_picker_func,
+ GimpCreateControllerFunc create_controller_func,
+ gpointer creator);
+
+
+#endif /* __GIMP_PROP_GUI_SUPERNOVA_H__ */
diff --git a/app/propgui/gimppropgui.c b/app/propgui/gimppropgui.c
index eab091a..175c9f4 100644
--- a/app/propgui/gimppropgui.c
+++ b/app/propgui/gimppropgui.c
@@ -51,10 +51,11 @@
#include "gimppropgui-color-rotate.h"
#include "gimppropgui-convolution-matrix.h"
#include "gimppropgui-diffration-patterns.h"
-#include "gimppropgui-spiral.h"
#include "gimppropgui-eval.h"
#include "gimppropgui-generic.h"
#include "gimppropgui-hue-saturation.h"
+#include "gimppropgui-spiral.h"
+#include "gimppropgui-supernova.h"
#include "gimp-intl.h"
@@ -467,6 +468,8 @@ gui_new_funcs[] =
_gimp_prop_gui_new_diffraction_patterns },
{ "GimpGegl-gegl-spiral-config",
_gimp_prop_gui_new_spiral },
+ { "GimpGegl-gegl-supernova-config",
+ _gimp_prop_gui_new_supernova },
{ NULL,
_gimp_prop_gui_new_generic }
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]