[gimp] app: use sliders to control "balance" and "base" for gegl:spiral
- From: N/A <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: use sliders to control "balance" and "base" for gegl:spiral
- Date: Mon, 3 Jul 2017 19:11:26 +0000 (UTC)
commit c7bc765a103e53d0240778f795b7c0f8c553d851
Author: Ell <ell_se yahoo com>
Date: Mon Jul 3 14:55:52 2017 -0400
app: use sliders to control "balance" and "base" for gegl:spiral
Switch the gegl:spiral prop gui from using a line controller to
a slider-line controller, and use sliders to control the "balance"
and "base" properties.
app/propgui/gimppropgui-spiral.c | 113 ++++++++++++++++++++++++++++++++------
1 files changed, 95 insertions(+), 18 deletions(-)
---
diff --git a/app/propgui/gimppropgui-spiral.c b/app/propgui/gimppropgui-spiral.c
index ef1a57d..450da45 100644
--- a/app/propgui/gimppropgui-spiral.c
+++ b/app/propgui/gimppropgui-spiral.c
@@ -37,22 +37,40 @@
#include "gimp-intl.h"
+typedef enum
+{
+ GEGL_SPIRAL_TYPE_LINEAR,
+ GEGL_SPIRAL_TYPE_LOGARITHMIC
+} GeglSpiralType;
+
+
static void
-line_callback (GObject *config,
- GeglRectangle *area,
- gdouble x1,
- gdouble y1,
- gdouble x2,
- gdouble y2)
+slider_line_callback (GObject *config,
+ GeglRectangle *area,
+ gdouble x1,
+ gdouble y1,
+ gdouble x2,
+ gdouble y2,
+ const GimpControllerSlider *sliders,
+ gint slider_count)
{
- gdouble x, y;
- gdouble radius;
- gdouble rotation;
+ GeglSpiralType type;
+ gdouble x, y;
+ gdouble radius;
+ gdouble rotation;
+ gdouble base;
+ gdouble balance;
g_object_set_data_full (G_OBJECT (config), "area",
g_memdup (area, sizeof (GeglRectangle)),
(GDestroyNotify) g_free);
+ g_object_get (config,
+ "type", &type,
+ "base", &base,
+ "balance", &balance,
+ NULL);
+
x = x1 / area->width;
y = y1 / area->height;
radius = sqrt (SQR (x2 - x1) + SQR (y2 - y1));
@@ -61,11 +79,37 @@ line_callback (GObject *config,
if (rotation < 0)
rotation += 360.0;
+ switch (type)
+ {
+ case GEGL_SPIRAL_TYPE_LINEAR:
+ balance = 3.0 - 4.0 * sliders[0].value;
+
+ break;
+
+ case GEGL_SPIRAL_TYPE_LOGARITHMIC:
+ {
+ gdouble old_base = base;
+
+ base = 1.0 / sliders[0].value;
+ base = MIN (base, 1000000.0);
+
+ /* keep "balance" fixed when changing "base". a bit ugly :P */
+ if (base == old_base)
+ {
+ balance = -4.0 * log (sliders[1].value) / log (base) - 1.0;
+ balance = CLAMP (balance, -1.0, 1.0);
+ }
+ }
+ break;
+ }
+
g_object_set (config,
"x", x,
"y", y,
"radius", radius,
+ "base", base,
"rotation", rotation,
+ "balance", balance,
NULL);
}
@@ -74,21 +118,29 @@ config_notify (GObject *config,
const GParamSpec *pspec,
gpointer set_data)
{
- GimpControllerLineCallback set_func;
- GeglRectangle *area;
- gdouble x, y;
- gdouble radius;
- gdouble rotation;
- gdouble x1, y1, x2, y2;
+ GimpControllerSliderLineCallback set_func;
+ GeglRectangle *area;
+ GeglSpiralType type;
+ gdouble x, y;
+ gdouble radius;
+ gdouble rotation;
+ gdouble base;
+ gdouble balance;
+ gdouble x1, y1, x2, y2;
+ GimpControllerSlider sliders[2];
+ gint slider_count = 0;
set_func = g_object_get_data (G_OBJECT (config), "set-func");
area = g_object_get_data (G_OBJECT (config), "area");
g_object_get (config,
+ "type", &type,
"x", &x,
"y", &y,
"radius", &radius,
"rotation", &rotation,
+ "base", &base,
+ "balance", &balance,
NULL);
x1 = x * area->width;
@@ -96,7 +148,32 @@ config_notify (GObject *config,
x2 = x1 + cos (rotation * (G_PI / 180.0)) * radius;
y2 = y1 - sin (rotation * (G_PI / 180.0)) * radius;
- set_func (set_data, area, x1, y1, x2, y2);
+ switch (type)
+ {
+ case GEGL_SPIRAL_TYPE_LINEAR:
+ slider_count = 1;
+
+ sliders[0].min = 0.5;
+ sliders[0].max = 1.0;
+ sliders[0].value = 0.5 + (1.0 - balance) / 4.0;
+
+ break;
+
+ case GEGL_SPIRAL_TYPE_LOGARITHMIC:
+ slider_count = 2;
+
+ sliders[0].min = 0.0;
+ sliders[0].max = 1.0;
+ sliders[0].value = 1.0 / base;
+
+ sliders[1].min = 1.0 / sqrt (base);
+ sliders[1].max = 1.0;
+ sliders[1].value = pow (base, -(balance + 1.0) / 4.0);
+
+ break;
+ }
+
+ set_func (set_data, area, x1, y1, x2, y2, sliders, slider_count);
}
GtkWidget *
@@ -130,8 +207,8 @@ _gimp_prop_gui_new_spiral (GObject *config,
gpointer set_data;
set_func = create_controller_func (creator,
- GIMP_CONTROLLER_TYPE_LINE,
- (GCallback) line_callback,
+ GIMP_CONTROLLER_TYPE_SLIDER_LINE,
+ (GCallback) slider_line_callback,
config,
&set_data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]