[gimp] Issue #2136 - On-image UI for adjusting Linear Motion Blur
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Issue #2136 - On-image UI for adjusting Linear Motion Blur
- Date: Fri, 4 Jan 2019 13:39:52 +0000 (UTC)
commit 39406b83d3a0dc6ccbc5f041b81423469f045371
Author: Michael Natterer <mitch gimp org>
Date: Fri Jan 4 14:36:10 2019 +0100
Issue #2136 - On-image UI for adjusting Linear Motion Blur
Add on-canvas GUI (simple lines) for circular, linear and zoom motion
blur. The restrictions in the interaction show pretty well that there
is room for improvement here, the line is just a bit too generic, but
it's better than nothing.
app/propgui/Makefile.am | 6 +
app/propgui/gimppropgui-motion-blur-circular.c | 151 +++++++++++++++++++++++++
app/propgui/gimppropgui-motion-blur-circular.h | 35 ++++++
app/propgui/gimppropgui-motion-blur-linear.c | 145 ++++++++++++++++++++++++
app/propgui/gimppropgui-motion-blur-linear.h | 35 ++++++
app/propgui/gimppropgui-motion-blur-zoom.c | 146 ++++++++++++++++++++++++
app/propgui/gimppropgui-motion-blur-zoom.h | 35 ++++++
app/propgui/gimppropgui.c | 9 ++
po/POTFILES.in | 3 +
9 files changed, 565 insertions(+)
---
diff --git a/app/propgui/Makefile.am b/app/propgui/Makefile.am
index a15c04b1e3..059a0b7b0b 100644
--- a/app/propgui/Makefile.am
+++ b/app/propgui/Makefile.am
@@ -37,6 +37,12 @@ libapppropgui_a_SOURCES = \
gimppropgui-generic.h \
gimppropgui-hue-saturation.c \
gimppropgui-hue-saturation.h \
+ gimppropgui-motion-blur-circular.c \
+ gimppropgui-motion-blur-circular.h \
+ gimppropgui-motion-blur-linear.c \
+ gimppropgui-motion-blur-linear.h \
+ gimppropgui-motion-blur-zoom.c \
+ gimppropgui-motion-blur-zoom.h \
gimppropgui-panorama-projection.c \
gimppropgui-panorama-projection.h \
gimppropgui-recursive-transform.c \
diff --git a/app/propgui/gimppropgui-motion-blur-circular.c b/app/propgui/gimppropgui-motion-blur-circular.c
new file mode 100644
index 0000000000..a008ef1397
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-circular.c
@@ -0,0 +1,151 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-circular.c
+ * Copyright (C) 2019 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 <https://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-motion-blur-circular.h"
+
+#include "gimp-intl.h"
+
+
+static void
+line_callback (GObject *config,
+ GeglRectangle *area,
+ gdouble x1,
+ gdouble y1,
+ gdouble x2,
+ gdouble y2)
+{
+ gdouble x, y;
+ gdouble angle;
+
+ 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;
+ angle = atan2 (-(y2 - y1), x2 - x1);
+
+ angle = angle * 180.0 / G_PI;
+
+ if (angle < 0)
+ angle += 360.0;
+
+ g_object_set (config,
+ "center-x", x,
+ "center-y", y,
+ "angle", angle,
+ NULL);
+}
+
+static void
+config_notify (GObject *config,
+ const GParamSpec *pspec,
+ gpointer set_data)
+{
+ GimpControllerLineCallback set_func;
+ GeglRectangle *area;
+ gdouble x, y;
+ gdouble angle;
+ 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,
+ "angle", &angle,
+ NULL);
+
+ angle = angle / 180.0 * G_PI;
+
+ x1 = x * area->width;
+ y1 = y * area->height;
+ x2 = x1 + cos (angle) * 100;
+ y2 = y1 - sin (angle) * 100;
+
+ set_func (set_data, area, x1, y1, x2, y2);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_circular (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,
+ _("Circular Motion Blur: "),
+ (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-motion-blur-circular.h b/app/propgui/gimppropgui-motion-blur-circular.h
new file mode 100644
index 0000000000..3bb851eadd
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-circular.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-circular.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 <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_MOTION_BLUR_CIRCULAR_H__
+#define __GIMP_PROP_GUI_MOTION_BLUR_CIRCULAR_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_circular (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_MOTION_BLUR_CIRCULAR_H__ */
diff --git a/app/propgui/gimppropgui-motion-blur-linear.c b/app/propgui/gimppropgui-motion-blur-linear.c
new file mode 100644
index 0000000000..ed917aa15c
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-linear.c
@@ -0,0 +1,145 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-linear.c
+ * Copyright (C) 2019 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 <https://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-motion-blur-linear.h"
+
+#include "gimp-intl.h"
+
+
+static void
+line_callback (GObject *config,
+ GeglRectangle *area,
+ gdouble x1,
+ gdouble y1,
+ gdouble x2,
+ gdouble y2)
+{
+ gdouble length;
+ gdouble angle;
+
+ g_object_set_data_full (G_OBJECT (config), "area",
+ g_memdup (area, sizeof (GeglRectangle)),
+ (GDestroyNotify) g_free);
+
+ length = sqrt (SQR (x2 - x1) + SQR (y2 - y1));
+ angle = atan2 (y2 - y1, x2 - x1);
+
+ angle = angle / G_PI * 180.0;
+
+ g_object_set (config,
+ "length", length,
+ "angle", angle,
+ NULL);
+}
+
+static void
+config_notify (GObject *config,
+ const GParamSpec *pspec,
+ gpointer set_data)
+{
+ GimpControllerLineCallback set_func;
+ GeglRectangle *area;
+ gdouble length;
+ gdouble angle;
+ 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,
+ "length", &length,
+ "angle", &angle,
+ NULL);
+
+ angle = angle / 180.0 * G_PI;
+
+ x1 = area->x + area->width / 2.0;
+ y1 = area->x + area->height / 2.0;
+ x2 = x1 + cos (angle) * length;
+ y2 = y1 + sin (angle) * length;
+
+ set_func (set_data, area, x1, y1, x2, y2);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_linear (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,
+ _("Linear Motion Blur: "),
+ (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-motion-blur-linear.h b/app/propgui/gimppropgui-motion-blur-linear.h
new file mode 100644
index 0000000000..aacb5280ff
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-linear.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-linear.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 <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_MOTION_BLUR_LINEAR_H__
+#define __GIMP_PROP_GUI_MOTION_BLUR_LINEAR_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_linear (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_MOTION_BLUR_LINEAR_H__ */
diff --git a/app/propgui/gimppropgui-motion-blur-zoom.c b/app/propgui/gimppropgui-motion-blur-zoom.c
new file mode 100644
index 0000000000..e8e359b942
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-zoom.c
@@ -0,0 +1,146 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-zoom.c
+ * Copyright (C) 2019 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 <https://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-motion-blur-zoom.h"
+
+#include "gimp-intl.h"
+
+
+static void
+line_callback (GObject *config,
+ GeglRectangle *area,
+ gdouble x1,
+ gdouble y1,
+ gdouble x2,
+ gdouble y2)
+{
+ gdouble x, y;
+ gdouble 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 = x2 - x1;
+
+ radius = CLAMP (radius / 100.0, -0.5, 1.0);
+
+ g_object_set (config,
+ "center-x", x,
+ "center-y", y,
+ "factor", radius,
+ NULL);
+}
+
+static void
+config_notify (GObject *config,
+ const GParamSpec *pspec,
+ gpointer set_data)
+{
+ GimpControllerLineCallback set_func;
+ GeglRectangle *area;
+ gdouble x, y;
+ gdouble 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,
+ "factor", &radius,
+ NULL);
+
+ x1 = x * area->width;
+ y1 = y * area->height;
+ x2 = x1 + radius * 100.0;
+ y2 = y1;
+
+ set_func (set_data, area, x1, y1, x2, y2);
+}
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_zoom (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,
+ _("Zoom Motion Blur: "),
+ (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-motion-blur-zoom.h b/app/propgui/gimppropgui-motion-blur-zoom.h
new file mode 100644
index 0000000000..ab383045dd
--- /dev/null
+++ b/app/propgui/gimppropgui-motion-blur-zoom.h
@@ -0,0 +1,35 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppropgui-motion-blur-zoom.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 <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PROP_GUI_MOTION_BLUR_ZOOM_H__
+#define __GIMP_PROP_GUI_MOTION_BLUR_ZOOM_H__
+
+
+GtkWidget *
+_gimp_prop_gui_new_motion_blur_zoom (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_MOTION_BLUR_ZOOM_H__ */
diff --git a/app/propgui/gimppropgui.c b/app/propgui/gimppropgui.c
index 1825570197..877aee9bb2 100644
--- a/app/propgui/gimppropgui.c
+++ b/app/propgui/gimppropgui.c
@@ -54,6 +54,9 @@
#include "gimppropgui-eval.h"
#include "gimppropgui-generic.h"
#include "gimppropgui-hue-saturation.h"
+#include "gimppropgui-motion-blur-circular.h"
+#include "gimppropgui-motion-blur-linear.h"
+#include "gimppropgui-motion-blur-zoom.h"
#include "gimppropgui-panorama-projection.h"
#include "gimppropgui-recursive-transform.h"
#include "gimppropgui-shadows-highlights.h"
@@ -463,6 +466,12 @@ gui_new_funcs[] =
_gimp_prop_gui_new_channel_mixer },
{ "GimpGegl-gegl-diffraction-patterns-config",
_gimp_prop_gui_new_diffraction_patterns },
+ { "GimpGegl-gegl-motion-blur-circular-config",
+ _gimp_prop_gui_new_motion_blur_circular },
+ { "GimpGegl-gegl-motion-blur-linear-config",
+ _gimp_prop_gui_new_motion_blur_linear },
+ { "GimpGegl-gegl-motion-blur-zoom-config",
+ _gimp_prop_gui_new_motion_blur_zoom },
{ "GimpGegl-gegl-panorama-projection-config",
_gimp_prop_gui_new_panorama_projection },
{ "GimpGegl-gegl-recursive-transform-config",
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bcdbb0a254..dbf322ec8f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -385,6 +385,9 @@ app/propgui/gimppropgui-convolution-matrix.c
app/propgui/gimppropgui-diffraction-patterns.c
app/propgui/gimppropgui-generic.c
app/propgui/gimppropgui-hue-saturation.c
+app/propgui/gimppropgui-motion-blur-circular.c
+app/propgui/gimppropgui-motion-blur-linear.c
+app/propgui/gimppropgui-motion-blur-zoom.c
app/propgui/gimppropgui-panorama-projection.c
app/propgui/gimppropgui-recursive-transform.c
app/propgui/gimppropgui-shadows-highlights.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
